diff --git a/DEPS b/DEPS index 2e93f27a..4c9968211 100644 --- a/DEPS +++ b/DEPS
@@ -304,11 +304,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': '1e88fbea224412c89dda1eadeed26d1da6a855ee', + 'skia_revision': 'aec91724bd33f20d216d24ecf4a6b5dd6b91fb39', # 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': '647886c3ed256b721c58a2d883154e1145e420a9', + 'v8_revision': 'fcdc6a91e9a4b69237a102d7793d1036c29830a0', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling ANGLE # and whatever else without interference from each other. @@ -331,7 +331,7 @@ # Three lines of non-changing comments so that # the commit queue can handle CLs rolling Fuchsia sdk # and whatever else without interference from each other. - 'fuchsia_version': 'version:11.20230106.2.1', + 'fuchsia_version': 'version:11.20230106.3.2', # 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. @@ -355,7 +355,7 @@ # Three lines of non-changing comments so that # the commit queue can handle CLs rolling freetype # and whatever else without interference from each other. - 'freetype_revision': 'ebe7e9128cdf81cb0a0d27fe293ecff96f6c98a8', + 'freetype_revision': 'b1c90733ee6a04882b133101d61b12e352eeb290', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling freetype # and whatever else without interference from each other. @@ -383,7 +383,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': 'e3645c15a32e5ddbf32c6ac9df09e2e110b93562', + 'devtools_frontend_revision': '780c183acf9bb225d66262e318f45ed672a483cc', # 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. @@ -419,7 +419,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': 'f7e6e8c900c7f86c65247f41d9ec3923c35cfcc7', + 'dawn_revision': '451ed5cd01fffb682e19f99cc7c2cfdc605663f4', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling feed # and whatever else without interference from each other. @@ -770,12 +770,12 @@ 'src/clank': { 'url': 'https://chrome-internal.googlesource.com/clank/internal/apps.git' + '@' + - '9cd1a4ba89eb080d9a0ef507ac91b1f5005f6e37', + '14bec7c613b171015cdfe31238b7c296424035d6', 'condition': 'checkout_android and checkout_src_internal', }, 'src/docs/website': { - 'url': Var('chromium_git') + '/website.git' + '@' + 'aaff8c73832da5174016a2eb114fcda9c0ec6c5f', + 'url': Var('chromium_git') + '/website.git' + '@' + 'b123a4f607db10cdd26d758394a701bdd80cb218', }, 'src/ios/third_party/earl_grey2/src': { @@ -869,7 +869,7 @@ 'packages': [ { 'package': 'chromium/rts/model/linux-amd64', - 'version': 'TFisH0uih1cY0FvdokODhQ7qyW5RYtJWakLod5Zl-AYC', + 'version': 'mNdE7JjG1XzGogUTM_AWf2eZ7S0_rb4cIKY1-hLSnMIC', }, ], 'dep_type': 'cipd', @@ -880,7 +880,7 @@ 'packages': [ { 'package': 'chromium/rts/model/mac-amd64', - 'version': 'N6FA4lQfiTA5oJ_lS8YMyWXJfWBYEaDGySl54PpxOUIC', + 'version': 'acPpnndxkLVNzIy7HWhFBO_x8ekK3eWPCvkN2LMpG3YC', }, ], 'dep_type': 'cipd', @@ -891,7 +891,7 @@ 'packages': [ { 'package': 'chromium/rts/model/windows-amd64', - 'version': 'bnkQpkISEIzwCPLh2W1mbBKP8-FhY-FAGT3d5dxX4QcC', + 'version': 'A8I-m9jMwqjqwTWPdJuhfje29-1wTW3FYgxJT-8waC4C', }, ], 'dep_type': 'cipd', @@ -959,7 +959,7 @@ 'packages': [ { 'package': 'chromium/third_party/androidx', - 'version': 'O5E80sO_hbtH5vZgoFc964juZ9h6sd7kJIIh_sJct0IC', + 'version': 'rbcH0Ds7XTT_mgj8fcUrPZMnFeGuzk0y5cZ_huUd_SMC', }, ], 'condition': 'checkout_android', @@ -1210,7 +1210,7 @@ Var('chromium_git') + '/devtools/devtools-frontend' + '@' + Var('devtools_frontend_revision'), 'src/third_party/devtools-frontend-internal': { - 'url': 'https://chrome-internal.googlesource.com/devtools/devtools-internal.git' + '@' + '3c9bc2dd134e5145033362a0e6886f02ff4a8bf4', + 'url': 'https://chrome-internal.googlesource.com/devtools/devtools-internal.git' + '@' + '98929b8d26eff02d847ef0798cea546410b8534a', 'condition': 'checkout_src_internal', }, @@ -1829,7 +1829,7 @@ Var('chromium_git') + '/external/github.com/gpuweb/cts.git' + '@' + 'e8109c7cac5b96ca739f484ea11579ca902db13d', 'src/third_party/webrtc': - Var('webrtc_git') + '/src.git' + '@' + '91375aa8f35e2ad3ed54e3c08a7c053404bb4779', + Var('webrtc_git') + '/src.git' + '@' + '7bb5b2a92bc7503f096381267017be2832692faf', # Wuffs' canonical repository is at github.com/google/wuffs, but we use # Skia's mirror of Wuffs, the same as in upstream Skia's DEPS file. @@ -1899,7 +1899,7 @@ Var('chromium_git') + '/v8/v8.git' + '@' + Var('v8_revision'), 'src-internal': { - 'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git@262e62ec9029bdf511acc5e28babca5f499405df', + 'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git@a356dc6ba8f422593333607053201d5f3bebf52d', 'condition': 'checkout_src_internal', }, @@ -1929,7 +1929,7 @@ 'packages': [ { 'package': 'chromeos_internal/apps/help_app/app', - 'version': 'OAmQrqdQc7xHAJnm9Ra0O7dW5RNNKeqQLdlS57Tu4z0C', + 'version': 'oT93IHYiecMemzY-QXeCm0a97PlaXOeFrXAzaR238o8C', }, ], 'condition': 'checkout_chromeos and checkout_src_internal', @@ -1940,7 +1940,7 @@ 'packages': [ { 'package': 'chromeos_internal/apps/media_app/app', - 'version': 'ImD810jXfFgEbvjKBOyi6BKJlq_TLd5ahOW4Bt-x4NwC', + 'version': 'UQ1mbt5-LdsQos32EST7h6UjNeZz1NIbIBQPo6fx5_8C', }, ], 'condition': 'checkout_chromeos and checkout_src_internal', @@ -1951,7 +1951,7 @@ 'packages': [ { 'package': 'chromeos_internal/apps/projector_app/app', - 'version': 'FRhftQtcl5kvhfKtUNeIE1LpRG3HZcAmln_SR9KXO9cC', + 'version': 'FNHjOHrJSRU4vpX1EQNs1uucTAlvWjmuNWhZf_9xuw0C', }, ], 'condition': 'checkout_chromeos and checkout_src_internal',
diff --git a/ash/accelerators/accelerator_layout_table.cc b/ash/accelerators/accelerator_layout_table.cc index d7e8b98c..134555b 100644 --- a/ash/accelerators/accelerator_layout_table.cc +++ b/ash/accelerators/accelerator_layout_table.cc
@@ -52,6 +52,7 @@ TextAcceleratorPart& TextAcceleratorPart::operator=( const TextAcceleratorPart&) = default; +// Constructor used for text-based layout accelerators. NonConfigurableAcceleratorDetails::NonConfigurableAcceleratorDetails( int message_id, std::vector<TextAcceleratorPart> replacements) { @@ -59,6 +60,13 @@ this->replacements = std::move(replacements); } +// Constructor used for standard accelerators (i.e, it contains at least one +// modifier and a set of keys). +NonConfigurableAcceleratorDetails::NonConfigurableAcceleratorDetails( + std::vector<ui::Accelerator> accels) { + accelerators = std::move(accels); +} + NonConfigurableAcceleratorDetails::NonConfigurableAcceleratorDetails( const NonConfigurableAcceleratorDetails&) = default; NonConfigurableAcceleratorDetails& NonConfigurableAcceleratorDetails::operator=( @@ -76,6 +84,9 @@ {TextAcceleratorPart(ui::EF_CONTROL_DOWN), TextAcceleratorPart(ui::KeyboardCode::VKEY_1), TextAcceleratorPart(ui::KeyboardCode::VKEY_8)})}, + {NonConfigurableActions::kBrowserNewTab, + NonConfigurableAcceleratorDetails( + {ui::Accelerator(ui::VKEY_T, ui::EF_CONTROL_DOWN)})}, }); return *nonConfigurableActionsMap; }
diff --git a/ash/accelerators/accelerator_layout_table.h b/ash/accelerators/accelerator_layout_table.h index 31e5cfb..02a6c3e7 100644 --- a/ash/accelerators/accelerator_layout_table.h +++ b/ash/accelerators/accelerator_layout_table.h
@@ -17,6 +17,8 @@ #include "base/containers/fixed_flat_map.h" #include "base/no_destructor.h" #include "base/strings/string_piece_forward.h" +#include "third_party/abseil-cpp/absl/types/optional.h" +#include "ui/base/accelerators/accelerator.h" #include "ui/events/event_constants.h" #include "ui/events/keycodes/keyboard_codes_posix.h" @@ -201,20 +203,34 @@ ~TextAcceleratorPart(); }; -// Contains info related to a non-configurable accelerator. The |message_id| and -// list of |replacements| are used by AcceleratorConfigurationProvider to -// construct arbitrary text with styled keys and modifiers interspersed. +// Contains info related to a non-configurable accelerator. A non-configurable +// accelerator can contain either a standard or text-based accelerator. The +// message_id and list of replacements will be provided when dealing +// with text-based accelerators; otherwise, accelerators will be provided +// and message_id/replacements should not have any value set. +// AcceleratorConfigurationProvider uses this struct to create a list of +// AcceleratorInfo struct's for each non-configurable action. struct ASH_EXPORT NonConfigurableAcceleratorDetails { NonConfigurableAcceleratorDetails( int message_id, std::vector<TextAcceleratorPart> replacements); + explicit NonConfigurableAcceleratorDetails( + std::vector<ui::Accelerator> accels); NonConfigurableAcceleratorDetails(const NonConfigurableAcceleratorDetails&); NonConfigurableAcceleratorDetails& operator=( const NonConfigurableAcceleratorDetails&); ~NonConfigurableAcceleratorDetails(); - int message_id; - std::vector<TextAcceleratorPart> replacements; + public: + bool IsStandardAccelerator() const { return accelerators.has_value(); } + + // These members are used for the Ambient action ids contained in + // the NonConfigurableActions enum. + absl::optional<int> message_id; + absl::optional<std::vector<TextAcceleratorPart>> replacements; + // This member is used for the Browser action ids contained in + // the NonConfigurableActions enum. + absl::optional<std::vector<ui::Accelerator>> accelerators; }; using NonConfigurableActionsMap = @@ -337,6 +353,12 @@ mojom::AcceleratorSubcategory::kGeneral, /*locked=*/true, mojom::AcceleratorLayoutStyle::kText, mojom::AcceleratorSource::kAmbient}, + {NonConfigurableActions::kBrowserNewTab, + IDS_ASH_ACCELERATOR_DESCRIPTION_NEW_TAB, + mojom::AcceleratorCategory::kTabsAndWindows, + mojom::AcceleratorSubcategory::kGeneral, + /*locked=*/true, mojom::AcceleratorLayoutStyle::kDefault, + mojom::AcceleratorSource::kAmbient}, // Page and Web Browser. {FOCUS_PREVIOUS_PANE, IDS_ASH_ACCELERATOR_DESCRIPTION_FOCUS_PREVIOUS_PANE,
diff --git a/ash/app_list/app_list_presenter_impl.cc b/ash/app_list/app_list_presenter_impl.cc index df38146c..7c47b235 100644 --- a/ash/app_list/app_list_presenter_impl.cc +++ b/ash/app_list/app_list_presenter_impl.cc
@@ -395,7 +395,6 @@ return; view_->OnAppListVisibilityWillChange(visible); view_->SetVisible(visible); - view_->search_box_view()->SetVisible(visible); } bool AppListPresenterImpl::HandleCloseOpenFolder() {
diff --git a/ash/app_list/app_list_presenter_unittest.cc b/ash/app_list/app_list_presenter_unittest.cc index 9399f3b6..7ddc544 100644 --- a/ash/app_list/app_list_presenter_unittest.cc +++ b/ash/app_list/app_list_presenter_unittest.cc
@@ -161,8 +161,7 @@ }; const gfx::Rect dialog_bounds = dialog->GetWindowBoundsInScreen(); - const gfx::Rect search_box_bounds = - search_box_view->GetWidget()->GetWindowBoundsInScreen(); + const gfx::Rect search_box_bounds = search_box_view->GetBoundsInScreen(); // The dialog should be horizontally centered within the search box. EXPECT_EQ(0, horizontal_center_offset(dialog_bounds, search_box_bounds)); // Verify the confirmation dialog is positioned with the top within search @@ -297,22 +296,6 @@ ui::PointerDetails(ui::EventPointerType::kTouch)); GetEventGenerator()->Dispatch(&long_press); } - - views::DialogDelegate* GetSearchResultPageAnchoredDialog() { - return search_result_page() - ->dialog_for_test() - ->widget() - ->widget_delegate() - ->AsDialogDelegate(); - } - - // Returns the |dialog| vertical offset from the top of the search box bounds. - int GetSearchResultsAnchoredDialogTopOffset(const views::Widget* dialog) { - const gfx::Rect dialog_bounds = dialog->GetWindowBoundsInScreen(); - const gfx::Rect search_box_bounds = - GetSearchBoxView()->GetWidget()->GetWindowBoundsInScreen(); - return dialog_bounds.y() - search_box_bounds.y(); - } }; // Instantiate the values in the parameterized tests. Used to @@ -2891,20 +2874,14 @@ const gfx::Rect app_list_bounds = GetAppListView()->GetWidget()->GetWindowBoundsInScreen(); - const gfx::Rect search_box_bounds = GetAppListView() - ->search_box_view() - ->GetWidget() - ->GetWindowBoundsInScreen(); + const gfx::Rect search_box_bounds = GetSearchBoxView()->GetBoundsInScreen(); UpdateDisplay("800x600"); GetAppListTestHelper()->WaitUntilIdle(); GetAppListTestHelper()->CheckVisibility(true); const gfx::Rect app_list_bounds2 = GetAppListView()->GetWidget()->GetWindowBoundsInScreen(); - const gfx::Rect search_box_bounds2 = GetAppListView() - ->search_box_view() - ->GetWidget() - ->GetWindowBoundsInScreen(); + const gfx::Rect search_box_bounds2 = GetSearchBoxView()->GetBoundsInScreen(); EXPECT_GT(app_list_bounds.size().GetArea(), app_list_bounds2.size().GetArea()); EXPECT_NE(search_box_bounds, search_box_bounds2); @@ -2922,20 +2899,14 @@ const gfx::Rect app_list_bounds = GetAppListView()->GetWidget()->GetWindowBoundsInScreen(); - const gfx::Rect search_box_bounds = GetAppListView() - ->search_box_view() - ->GetWidget() - ->GetWindowBoundsInScreen(); + const gfx::Rect search_box_bounds = GetSearchBoxView()->GetBoundsInScreen(); UpdateDisplay("800x600"); GetAppListTestHelper()->WaitUntilIdle(); GetAppListTestHelper()->CheckVisibility(true); const gfx::Rect app_list_bounds2 = GetAppListView()->GetWidget()->GetWindowBoundsInScreen(); - const gfx::Rect search_box_bounds2 = GetAppListView() - ->search_box_view() - ->GetWidget() - ->GetWindowBoundsInScreen(); + const gfx::Rect search_box_bounds2 = GetSearchBoxView()->GetBoundsInScreen(); EXPECT_GT(app_list_bounds.size().GetArea(), app_list_bounds2.size().GetArea()); EXPECT_NE(search_box_bounds, search_box_bounds2); @@ -2955,20 +2926,14 @@ const gfx::Rect app_list_bounds = GetAppListView()->GetWidget()->GetWindowBoundsInScreen(); - const gfx::Rect search_box_bounds = GetAppListView() - ->search_box_view() - ->GetWidget() - ->GetWindowBoundsInScreen(); + const gfx::Rect search_box_bounds = GetSearchBoxView()->GetBoundsInScreen(); UpdateDisplay("800x600"); GetAppListTestHelper()->WaitUntilIdle(); GetAppListTestHelper()->CheckVisibility(true); const gfx::Rect app_list_bounds2 = GetAppListView()->GetWidget()->GetWindowBoundsInScreen(); - const gfx::Rect search_box_bounds2 = GetAppListView() - ->search_box_view() - ->GetWidget() - ->GetWindowBoundsInScreen(); + const gfx::Rect search_box_bounds2 = GetSearchBoxView()->GetBoundsInScreen(); EXPECT_GT(app_list_bounds.size().GetArea(), app_list_bounds2.size().GetArea()); EXPECT_NE(search_box_bounds, search_box_bounds2);
diff --git a/ash/app_list/views/app_list_view.cc b/ash/app_list/views/app_list_view.cc index 7b286a0f..4086a77 100644 --- a/ash/app_list/views/app_list_view.cc +++ b/ash/app_list/views/app_list_view.cc
@@ -6,6 +6,7 @@ #include <algorithm> #include <cmath> +#include <memory> #include <string> #include <utility> #include <vector> @@ -344,7 +345,6 @@ time_shown_ = base::Time::Now(); InitContents(); InitWidget(parent); - InitChildWidget(); } void AppListView::InitContents() { @@ -355,14 +355,16 @@ AddChildView(std::make_unique<views::View>())); auto app_list_main_view = std::make_unique<AppListMainView>(delegate_, this); - search_box_view_ = new SearchBoxView(app_list_main_view.get(), delegate_, - /*is_app_list_bubble=*/false); - search_box_view_->InitializeForFullscreenLauncher(); + auto search_box_view = + std::make_unique<SearchBoxView>(app_list_main_view.get(), delegate_, + /*is_app_list_bubble=*/false); + search_box_view->InitializeForFullscreenLauncher(); - // Assign |app_list_main_view_| here since it is accessed during Init(). - app_list_main_view_ = app_list_main_view.get(); - app_list_main_view->Init(0, search_box_view_); - AddChildView(std::move(app_list_main_view)); + // Assign |app_list_main_view_| and |search_box_view_| here since they are + // accessed during Init(). + app_list_main_view_ = AddChildView(std::move(app_list_main_view)); + search_box_view_ = AddChildView(std::move(search_box_view)); + app_list_main_view_->Init(0, search_box_view_); } void AppListView::InitWidget(gfx::NativeView parent) { @@ -386,67 +388,6 @@ SetEnableArrowKeyTraversal(true); widget->GetNativeView()->AddObserver(this); - - // Directs A11y focus ring from search box view to AppListView's descendants - // (like ExpandArrowView) without focusing on the whole app list window when - // using search + arrow button. - search_box_view_->GetViewAccessibility().OverrideNextFocus(GetWidget()); - search_box_view_->GetViewAccessibility().OverridePreviousFocus(GetWidget()); -} - -void AppListView::InitChildWidget() { - // Create a widget for the SearchBoxView to live in. This allows the - // SearchBoxView to be on top of the custom launcher page's WebContents - // (otherwise the search box events will be captured by the WebContents). - views::Widget::InitParams search_box_widget_params( - views::Widget::InitParams::TYPE_CONTROL); - search_box_widget_params.parent = GetWidget()->GetNativeView(); - search_box_widget_params.opacity = - views::Widget::InitParams::WindowOpacity::kTranslucent; - search_box_widget_params.name = "SearchBoxView"; - - // Focus should be able to move from search box to items in app list view. - auto widget_delegate = std::make_unique<views::WidgetDelegate>(); - widget_delegate->SetFocusTraversesOut(true); - - // Default role of root view is ax::mojom::Role::kWindow which traps - // ChromeVox focus within the root view. Assign ax::mojom::Role::kGroup here - // to allow the focus to move from elements in search box to app list view. - widget_delegate->SetAccessibleRole(ax::mojom::Role::kGroup); - - // SearchBoxView used to be a WidgetDelegateView, so we follow the legacy - // behavior and have the Widget delete the delegate. - widget_delegate->SetOwnedByWidget(true); - search_box_widget_params.delegate = widget_delegate.release(); - - views::Widget* search_box_widget = new views::Widget; - search_box_widget->Init(std::move(search_box_widget_params)); - search_box_widget->SetContentsView(search_box_view_); - search_box_view_->MaybeCreateFocusRing(); - DCHECK_EQ(search_box_widget, search_box_view_->GetWidget()); - - // Assign an accessibility role to the native window of |search_box_widget|, - // so that hitting search+right could move ChromeVox focus across search box - // to other elements in app list view. - search_box_widget->GetNativeWindow()->SetProperty( - ui::kAXRoleOverride, - static_cast<ax::mojom::Role>(ax::mojom::Role::kGroup)); - - // The search box will not naturally receive focus by itself (because it is in - // a separate widget). Create this SearchBoxFocusHost in the main widget to - // forward the focus search into to the search box. - SearchBoxFocusHost* search_box_focus_host = - new SearchBoxFocusHost(search_box_widget); - AddChildView(search_box_focus_host); - search_box_widget->SetFocusTraversableParentView(search_box_focus_host); - search_box_widget->SetFocusTraversableParent( - GetWidget()->GetFocusTraversable()); - - // Directs A11y focus ring from AppListView's descendants to search box view - // without focusing on the whole app list window when using search + arrow - // button. - GetViewAccessibility().OverrideNextFocus(search_box_widget); - GetViewAccessibility().OverridePreviousFocus(search_box_widget); } void AppListView::Show(AppListViewState preferred_state) {
diff --git a/ash/app_list/views/app_list_view.h b/ash/app_list/views/app_list_view.h index 6bb0da03eb..fb416a8 100644 --- a/ash/app_list/views/app_list_view.h +++ b/ash/app_list/views/app_list_view.h
@@ -146,9 +146,6 @@ // Initializes this view's widget. void InitWidget(gfx::NativeView parent); - // Initializes the SearchBox's widget. - void InitChildWidget(); - // Sets the state of all child views to be re-shown, then shows the view. // |preferred_state| - The initial app list view state. void Show(AppListViewState preferred_state);
diff --git a/ash/app_list/views/app_list_view_unittest.cc b/ash/app_list/views/app_list_view_unittest.cc index d52db51..6fefb534 100644 --- a/ash/app_list/views/app_list_view_unittest.cc +++ b/ash/app_list/views/app_list_view_unittest.cc
@@ -284,7 +284,7 @@ // Checks the search box widget is at |expected| in the contents view's // coordinate space. - bool CheckSearchBoxWidget(const gfx::Rect& expected) { + bool CheckSearchBoxView(const gfx::Rect& expected) { ContentsView* contents_view = view_->app_list_main_view()->contents_view(); // Adjust for the search box view's shadow. gfx::Rect expected_with_shadow = @@ -295,7 +295,7 @@ views::View::ConvertPointToScreen(contents_view, &point); return gfx::Rect(point, expected_with_shadow.size()) == - view_->search_box_view()->GetWidget()->GetWindowBoundsInScreen(); + view_->search_box_view()->GetBoundsInScreen(); } void SetTextInSearchBox(const std::u16string& text) { @@ -1503,14 +1503,14 @@ views::test::RunScheduledLayout(contents_view); EXPECT_TRUE( contents_view->IsStateActive(ash::AppListState::kStateSearchResults)); - EXPECT_TRUE(CheckSearchBoxWidget(contents_view->GetSearchBoxBounds( + EXPECT_TRUE(CheckSearchBoxView(contents_view->GetSearchBoxBounds( ash::AppListState::kStateSearchResults))); // Check that typing into the search box triggers the search page. EXPECT_TRUE(SetAppListState(ash::AppListState::kStateApps)); views::test::RunScheduledLayout(contents_view); EXPECT_TRUE(IsStateShown(ash::AppListState::kStateApps)); - EXPECT_TRUE(CheckSearchBoxWidget( + EXPECT_TRUE(CheckSearchBoxView( contents_view->GetSearchBoxBounds(ash::AppListState::kStateApps))); std::u16string new_search_text = u"apple"; @@ -1524,7 +1524,7 @@ EXPECT_EQ(search_text, main_view->search_box_view()->current_query()); views::test::RunScheduledLayout(contents_view); EXPECT_TRUE(IsStateShown(ash::AppListState::kStateSearchResults)); - EXPECT_TRUE(CheckSearchBoxWidget(contents_view->GetSearchBoxBounds( + EXPECT_TRUE(CheckSearchBoxView(contents_view->GetSearchBoxBounds( ash::AppListState::kStateSearchResults))); } @@ -1698,12 +1698,12 @@ Initialize(/*is_tablet_mode=*/true); Show(); - EXPECT_TRUE(search_box_view()->GetWidget()->IsVisible()); + EXPECT_TRUE(search_box_view()->GetVisible()); contents_view()->ShowEmbeddedAssistantUI(true); EXPECT_TRUE(contents_view()->IsShowingEmbeddedAssistantUI()); - EXPECT_FALSE(search_box_view()->GetWidget()->IsVisible()); + EXPECT_FALSE(search_box_view()->GetVisible()); } TEST_F(AppListViewScalableLayoutTest, RegularLandscapeScreen) {
diff --git a/ash/app_list/views/contents_view.cc b/ash/app_list/views/contents_view.cc index bccf593..8bb4e235 100644 --- a/ash/app_list/views/contents_view.cc +++ b/ash/app_list/views/contents_view.cc
@@ -354,7 +354,7 @@ // to be original bounds. Note that this transform shouldn't be animated // through ui::LayerAnimator since intermediate transformed bounds might not // match with other animation and that could look janky. - search_box->GetWidget()->SetBounds(target_bounds); + search_box->SetBoundsRect(target_bounds); UpdateSearchBoxAnimation(0.0f, current_state, target_state); } @@ -383,7 +383,7 @@ static_cast<float>(current_bounds.width()) / target_bounds.width(), static_cast<float>(current_bounds.height()) / target_bounds.height()); } - search_box->GetWidget()->GetLayer()->SetTransform(transform); + search_box->layer()->SetTransform(transform); // Update search box view layer. const float current_radius = @@ -396,13 +396,10 @@ } void ContentsView::UpdateSearchBoxVisibility(AppListState current_state) { - auto* search_box_widget = GetSearchBoxView()->GetWidget(); - if (search_box_widget) { - // Hide search box widget in order to click on the embedded Assistant UI. - const bool show_search_box = - current_state != AppListState::kStateEmbeddedAssistant; - show_search_box ? search_box_widget->Show() : search_box_widget->Hide(); - } + // Hide search box widget in order to click on the embedded Assistant UI. + const bool show_search_box = + current_state != AppListState::kStateEmbeddedAssistant; + GetSearchBoxView()->SetVisible(show_search_box); } AppListPage* ContentsView::GetPageView(int index) const { @@ -515,7 +512,7 @@ search_box->UpdateBackground(current_state); // Reset the transform which can be set through animation - search_box->GetWidget()->GetLayer()->SetTransform(gfx::Transform()); + search_box->layer()->SetTransform(gfx::Transform()); } const char* ContentsView::GetClassName() const { @@ -585,7 +582,7 @@ const gfx::Rect search_rect = search_box->GetViewBoundsForSearchBoxContentsBounds( ConvertRectToWidgetWithoutTransform(search_box_bounds)); - search_box->GetWidget()->SetBounds(search_rect); + search_box->SetBoundsRect(search_rect); float search_box_opacity; if (app_list_features::IsAnimateScaleOnTabletModeTransitionEnabled()) { @@ -673,10 +670,10 @@ GetSearchBoxBoundsForViewState(target_page, target_view_state); SearchBoxView* search_box = GetSearchBoxView(); - const gfx::Rect target_search_box_widget_bounds = + const gfx::Rect target_search_box_rect = search_box->GetViewBoundsForSearchBoxContentsBounds( ConvertRectToWidgetWithoutTransform(target_search_box_bounds)); - search_box->GetWidget()->SetBounds(target_search_box_widget_bounds); + search_box->SetBoundsRect(target_search_box_rect); // Even though the target bounds are calculated for the target page, use the // last page for which app list view state was updated - in case page @@ -697,10 +694,14 @@ current_search_box_bounds.y() - GetSearchBoxBoundsForViewState(selected_page, target_view_state).y(); - // For search box, animate the search_box view layer instead of the widget - // layer to avoid conflict with pagination model transitions (which update the - // search box widget layer transform as the transition progresses). - animate_transform(duration, y_offset, search_box->layer()); + // Only animate the y_offset of the search box layer transform when going + // to/from closed state so that tablet <-> clamshell transition looks correct + // and to avoid conflicting with pagination model transitions (which update + // the same search box layer transform as the transition progresses). + if (target_view_state == AppListViewState::kClosed || + last_target_view_state_ == AppListViewState::kClosed) { + animate_transform(duration, y_offset, search_box->layer()); + } // Update app list page bounds to their target values. This assumes that // potential in-progress pagination transition does not directly animate page
diff --git a/ash/app_list/views/search_box_view.cc b/ash/app_list/views/search_box_view.cc index e3e9b30e..949ef10 100644 --- a/ash/app_list/views/search_box_view.cc +++ b/ash/app_list/views/search_box_view.cc
@@ -466,12 +466,9 @@ focus_ring_layer_->SetBounds(bounds()); } -// static -int SearchBoxView::GetFocusRingSpacing() { - return kSearchBoxFocusRingWidth + kSearchBoxFocusRingPadding; -} - -void SearchBoxView::MaybeCreateFocusRing() { +void SearchBoxView::AddedToWidget() { + // Creating the search box focus ring relies on its parent layer which only + // exists after widget initialization. if (!is_app_list_bubble_) { focus_ring_layer_ = std::make_unique<FocusRingLayer>(); focus_ring_layer_->SetColor( @@ -482,6 +479,11 @@ } } +// static +int SearchBoxView::GetFocusRingSpacing() { + return kSearchBoxFocusRingWidth + kSearchBoxFocusRingPadding; +} + void SearchBoxView::RecordSearchBoxActivationHistogram( ui::EventType event_type) { ActivationSource activation_type;
diff --git a/ash/app_list/views/search_box_view.h b/ash/app_list/views/search_box_view.h index 05d9712..6795b2e 100644 --- a/ash/app_list/views/search_box_view.h +++ b/ash/app_list/views/search_box_view.h
@@ -76,9 +76,6 @@ // Returns the total focus ring spacing for use in folders. static int GetFocusRingSpacing(); - // Creates a focus ring layer if the search box is not in the bubble launcher. - void MaybeCreateFocusRing(); - // Overridden from SearchBoxViewBase: void UpdateSearchTextfieldAccessibleNodeData( ui::AXNodeData* node_data) override; @@ -103,6 +100,7 @@ const char* GetClassName() const override; void OnThemeChanged() override; void OnBoundsChanged(const gfx::Rect& previous_bounds) override; + void AddedToWidget() override; // Updates the search box's background corner radius and color based on the // state of AppListModel.
diff --git a/ash/search_box/search_box_view_base.cc b/ash/search_box/search_box_view_base.cc index b81880ff..8ee4c2a 100644 --- a/ash/search_box/search_box_view_base.cc +++ b/ash/search_box/search_box_view_base.cc
@@ -732,12 +732,12 @@ if (located_event->type() == ui::ET_MOUSE_PRESSED || located_event->type() == ui::ET_GESTURE_TAP) { const bool event_is_in_searchbox_bounds = - GetWidget()->GetWindowBoundsInScreen().Contains( - located_event->root_location()); - // Don't handle an event out of the searchbox bounds. + GetBoundsInScreen().Contains(located_event->root_location()); if (!event_is_in_searchbox_bounds) return; + located_event->SetHandled(); + // If the event is in an inactive empty search box, enable the search box. if (!is_search_box_active_ && search_box_->GetText().empty()) { SetSearchBoxActive(true, located_event->type());
diff --git a/ash/strings/ash_strings_af.xtb b/ash/strings/ash_strings_af.xtb index 8a564d7..29f83eca 100644 --- a/ash/strings/ash_strings_af.xtb +++ b/ash/strings/ash_strings_af.xtb
@@ -264,6 +264,7 @@ <translation id="2354174487190027830">Aktiveer tans <ph name="NAME" /></translation> <translation id="2359808026110333948">Gaan voort</translation> <translation id="2367186422933365202">Kan nie by jou Chromebook aanmeld nie</translation> +<translation id="2367972762794486313">Wys programme</translation> <translation id="2369165858548251131">"Hallo" in Chinees</translation> <translation id="2390318262976603432">Locale-instellings</translation> <translation id="240006516586367791">Mediakontroles</translation>
diff --git a/ash/strings/ash_strings_am.xtb b/ash/strings/ash_strings_am.xtb index 1c63c65..31726c41 100644 --- a/ash/strings/ash_strings_am.xtb +++ b/ash/strings/ash_strings_am.xtb
@@ -263,6 +263,7 @@ <translation id="2354174487190027830"><ph name="NAME" />ን በማግበር ላይ</translation> <translation id="2359808026110333948">ቀጥል</translation> <translation id="2367186422933365202">ወደ የእርስዎ Chromebook መግባት አልተቻለም</translation> +<translation id="2367972762794486313">መተግበሪያዎችን አሳይ</translation> <translation id="2369165858548251131">«Hello» በቻይንኛ</translation> <translation id="2390318262976603432">የቋንቋ ቅንብሮች</translation> <translation id="240006516586367791">የሚዲያ መቆጣጠሪያዎች</translation>
diff --git a/ash/strings/ash_strings_ar.xtb b/ash/strings/ash_strings_ar.xtb index d7c55ef..0cb97422 100644 --- a/ash/strings/ash_strings_ar.xtb +++ b/ash/strings/ash_strings_ar.xtb
@@ -264,6 +264,7 @@ <translation id="2354174487190027830">تفعيل <ph name="NAME" /></translation> <translation id="2359808026110333948">متابعة</translation> <translation id="2367186422933365202">يتعذّر تسجيل الدخول إلى جهاز Chromebook.</translation> +<translation id="2367972762794486313">إظهار التطبيقات</translation> <translation id="2369165858548251131">"مرحبًا" باللغة الصينية</translation> <translation id="2390318262976603432">إعدادات اللغة</translation> <translation id="240006516586367791">عناصر التحكُّم في الوسائط</translation>
diff --git a/ash/strings/ash_strings_as.xtb b/ash/strings/ash_strings_as.xtb index ba81ac9..36337c8 100644 --- a/ash/strings/ash_strings_as.xtb +++ b/ash/strings/ash_strings_as.xtb
@@ -239,6 +239,7 @@ <translation id="2224075387478458881">সুৰক্ষিত সমল দৃশ্যমান হৈ থকাৰ সময়ত স্ক্ৰীন ৰেকৰ্ডিঙৰ অনুমতি দিয়া নহয়</translation> <translation id="2227179592712503583">পৰামৰ্শ আঁতৰাওক</translation> <translation id="225680501294068881">ডিভাইচসমূহৰ বাবে স্কেন কৰি থকা হৈছে...</translation> +<translation id="225716114209817872">সৰ্বাধিক</translation> <translation id="2257486738914982088"><ph name="FILENAME" /> ডাউনল’ড কৰি থাকোঁতে কিবা ভুল হৈছে</translation> <translation id="2258734398699965611">পৰামৰ্শিত ফাইল</translation> <translation id="2268130516524549846">ব্লুটুথ অক্ষম কৰা হ’ল</translation> @@ -263,6 +264,7 @@ <translation id="2354174487190027830"><ph name="NAME" /> সক্ৰিয় কৰি থকা হৈছে</translation> <translation id="2359808026110333948">অব্যাহত ৰাখক</translation> <translation id="2367186422933365202">আপোনাৰ Chromebookত ছাইন ইন কৰিব পৰা নাই</translation> +<translation id="2367972762794486313">এপ্সমূহ দেখুৱাওক</translation> <translation id="2369165858548251131">চীনা ভাষাত "নমস্কাৰ"</translation> <translation id="2390318262976603432">স্থানীয় ভাষাৰ ছেটিংসমূহ</translation> <translation id="240006516586367791">মিডিয়াৰ নিয়ন্ত্ৰণ</translation> @@ -1014,6 +1016,7 @@ <translation id="6537924328260219877">ছিগনেলৰ ক্ষমতা <ph name="SIGNAL_STRENGTH" />, ফ’নৰ বেটাৰী <ph name="BATTERY_STATUS" /></translation> <translation id="6539852571005954999"><ph name="FILENAME" /> স্কেনিং ডাউনল’ড কৰক</translation> <translation id="6542521951477560771"><ph name="RECEIVER_NAME" /> লৈ কাষ্ট কৰি থকা হৈছে</translation> +<translation id="6548693220024099658">পটভূমি অস্পষ্ট কৰা</translation> <translation id="655633303491376835"><ph name="APP_NAME" /> নতুনকৈ ইনষ্টল কৰা</translation> <translation id="6559976592393364813">প্ৰশাসকক সোধক</translation> @@ -1420,6 +1423,7 @@ <translation id="878215960996152260"><ph name="APP_NAME" />, ইনষ্টল কৰা এপ্, অৱৰোধিত</translation> <translation id="8785070478575117577"><ph name="NETWORK_NAME" />ত সংযোগ কৰক</translation> <translation id="8788027118671217603"><ph name="STATE_TEXT" />। <ph name="ENTERPRISE_TEXT" /></translation> +<translation id="8790998409862094015">বেছি</translation> <translation id="8806053966018712535"><ph name="FOLDER_NAME" /> ফ’ল্ডাৰ</translation> <translation id="880709030178078220">"সহায়"</translation> <translation id="8814190375133053267">ৱাই-ফাই</translation>
diff --git a/ash/strings/ash_strings_az.xtb b/ash/strings/ash_strings_az.xtb index e1b706d..8738e568 100644 --- a/ash/strings/ash_strings_az.xtb +++ b/ash/strings/ash_strings_az.xtb
@@ -264,6 +264,7 @@ <translation id="2354174487190027830"><ph name="NAME" /> aktivləşdirilir</translation> <translation id="2359808026110333948">Davam edin</translation> <translation id="2367186422933365202">Chromebook'a daxil olmaq olmur</translation> +<translation id="2367972762794486313">Tətbiqləri göstərin</translation> <translation id="2369165858548251131">Çin dilində "Salam"</translation> <translation id="2390318262976603432">Yerli ayarlar</translation> <translation id="240006516586367791">Media nizamlayıcıları</translation>
diff --git a/ash/strings/ash_strings_be.xtb b/ash/strings/ash_strings_be.xtb index b8961d8..79ff751e 100644 --- a/ash/strings/ash_strings_be.xtb +++ b/ash/strings/ash_strings_be.xtb
@@ -263,6 +263,7 @@ <translation id="2354174487190027830">Ідзе актывацыя сеткі <ph name="NAME" /></translation> <translation id="2359808026110333948">Працягнуць</translation> <translation id="2367186422933365202">Не ўдаецца выканаць уваход на прыладзе Chromebook</translation> +<translation id="2367972762794486313">Паказаць праграмы</translation> <translation id="2369165858548251131">"Вітаю" па-кітайску</translation> <translation id="2390318262976603432">Рэгіянальныя налады</translation> <translation id="240006516586367791">Элементы кіравання мультымедыя</translation>
diff --git a/ash/strings/ash_strings_bg.xtb b/ash/strings/ash_strings_bg.xtb index 62d4665..b18d734 100644 --- a/ash/strings/ash_strings_bg.xtb +++ b/ash/strings/ash_strings_bg.xtb
@@ -264,6 +264,7 @@ <translation id="2354174487190027830">„<ph name="NAME" />“ се активира</translation> <translation id="2359808026110333948">Напред</translation> <translation id="2367186422933365202">Не можете да влезете в своя Chromebook</translation> +<translation id="2367972762794486313">Показване на приложенията</translation> <translation id="2369165858548251131">„Hello“ in Chinese</translation> <translation id="2390318262976603432">Настройки на локала</translation> <translation id="240006516586367791">Контроли за мултимедия</translation>
diff --git a/ash/strings/ash_strings_bn.xtb b/ash/strings/ash_strings_bn.xtb index bed7fa13..842ea7c6f 100644 --- a/ash/strings/ash_strings_bn.xtb +++ b/ash/strings/ash_strings_bn.xtb
@@ -239,6 +239,7 @@ <translation id="2224075387478458881">কোনও সুরক্ষিত কন্টেন্ট দেখানোর সময় স্ক্রিন রেকর্ড করার অনুমতি দেওয়া হয় না</translation> <translation id="2227179592712503583">সাজেশন সরিয়ে দিন</translation> <translation id="225680501294068881">ডিভাইসগুলির জন্য স্ক্যান করা হচ্ছে...</translation> +<translation id="225716114209817872">সর্বাধিক</translation> <translation id="2257486738914982088"><ph name="FILENAME" /> ডাউনলোড করার সময় কিছু সমস্যা হয়েছে</translation> <translation id="2258734398699965611">সাজেস্ট করা ফাইল</translation> <translation id="2268130516524549846">ব্লুটুথ অক্ষমিত</translation> @@ -263,6 +264,7 @@ <translation id="2354174487190027830"><ph name="NAME" /> সক্রিয় করা হচ্ছে</translation> <translation id="2359808026110333948">চালিয়ে যান</translation> <translation id="2367186422933365202">Chromebook-এ সাইন-ইন করা যায়নি</translation> +<translation id="2367972762794486313">অ্যাপ্লিকেশানগুলি দেখান</translation> <translation id="2369165858548251131">চীনা ভাষায় "হ্যালো"</translation> <translation id="2390318262976603432">লোকেল সেটিংস</translation> <translation id="240006516586367791">মিডিয়া কন্ট্রোল</translation> @@ -1014,6 +1016,7 @@ <translation id="6537924328260219877">সিগন্যাল: <ph name="SIGNAL_STRENGTH" />, ফোনের ব্যাটারি <ph name="BATTERY_STATUS" /></translation> <translation id="6539852571005954999">ডাউনলোডের জন্য <ph name="FILENAME" /> ফাইল স্ক্যান করা হচ্ছে</translation> <translation id="6542521951477560771"><ph name="RECEIVER_NAME" /> এ কাস্ট করা হচ্ছে</translation> +<translation id="6548693220024099658">ব্যাকগ্রাউন্ড অস্পষ্ট</translation> <translation id="655633303491376835"><ph name="APP_NAME" /> নতুন ইনস্টল</translation> <translation id="6559976592393364813">অ্যাডমিনিস্ট্রেটরকে জিজ্ঞাসা করুন</translation> @@ -1420,6 +1423,7 @@ <translation id="878215960996152260"><ph name="APP_NAME" />, ইনস্টল করা অ্যাপ, ব্লক করা হয়েছে</translation> <translation id="8785070478575117577"><ph name="NETWORK_NAME" />-এ কানেক্ট করুন</translation> <translation id="8788027118671217603"><ph name="STATE_TEXT" />। <ph name="ENTERPRISE_TEXT" /></translation> +<translation id="8790998409862094015">খুব</translation> <translation id="8806053966018712535"><ph name="FOLDER_NAME" /> ফোল্ডার</translation> <translation id="880709030178078220">"সহায়তা করুন"</translation> <translation id="8814190375133053267">ওয়াই-ফাই</translation>
diff --git a/ash/strings/ash_strings_bs.xtb b/ash/strings/ash_strings_bs.xtb index 378387c8..b22fbbf 100644 --- a/ash/strings/ash_strings_bs.xtb +++ b/ash/strings/ash_strings_bs.xtb
@@ -264,6 +264,7 @@ <translation id="2354174487190027830">Aktiviranje mreže <ph name="NAME" /></translation> <translation id="2359808026110333948">Nastavi</translation> <translation id="2367186422933365202">Nije se moguće prijaviti na Chromebook</translation> +<translation id="2367972762794486313">Prikaži aplikacije</translation> <translation id="2369165858548251131">"Zdravo" na kineskom</translation> <translation id="2390318262976603432">Postavke jezika/zemlje</translation> <translation id="240006516586367791">Kontrole medija</translation>
diff --git a/ash/strings/ash_strings_ca.xtb b/ash/strings/ash_strings_ca.xtb index 5fef674..8b01d359d 100644 --- a/ash/strings/ash_strings_ca.xtb +++ b/ash/strings/ash_strings_ca.xtb
@@ -264,6 +264,7 @@ <translation id="2354174487190027830">S'està activant <ph name="NAME" /></translation> <translation id="2359808026110333948">Continua</translation> <translation id="2367186422933365202">No es pot iniciar la sessió al Chromebook</translation> +<translation id="2367972762794486313">Mostra les aplicacions</translation> <translation id="2369165858548251131">"Hola" en xinès</translation> <translation id="2390318262976603432">Configuració regional</translation> <translation id="240006516586367791">Controls multimèdia</translation>
diff --git a/ash/strings/ash_strings_cs.xtb b/ash/strings/ash_strings_cs.xtb index c7b8b59..70a2149 100644 --- a/ash/strings/ash_strings_cs.xtb +++ b/ash/strings/ash_strings_cs.xtb
@@ -264,6 +264,7 @@ <translation id="2354174487190027830">Aktivace sítě <ph name="NAME" /></translation> <translation id="2359808026110333948">Pokračovat</translation> <translation id="2367186422933365202">Přihlášení do Chromebooku se nezdařilo</translation> +<translation id="2367972762794486313">Zobrazit aplikace</translation> <translation id="2369165858548251131">„Ahoj“ čínsky</translation> <translation id="2390318262976603432">Nastavení národního prostředí</translation> <translation id="240006516586367791">Ovládání médií</translation>
diff --git a/ash/strings/ash_strings_cy.xtb b/ash/strings/ash_strings_cy.xtb index dbc4738..d24c743 100644 --- a/ash/strings/ash_strings_cy.xtb +++ b/ash/strings/ash_strings_cy.xtb
@@ -263,6 +263,7 @@ <translation id="2354174487190027830">Wrthi'n gweithredu <ph name="NAME" /></translation> <translation id="2359808026110333948">Parhau</translation> <translation id="2367186422933365202">Methu â mewngofnodi i'ch Chromebook</translation> +<translation id="2367972762794486313">Dangos apiau</translation> <translation id="2369165858548251131">"Helo" yn Tsieinëeg</translation> <translation id="2390318262976603432">Gosodiadau Lle</translation> <translation id="240006516586367791">Rheolaethau cyfryngau</translation>
diff --git a/ash/strings/ash_strings_da.xtb b/ash/strings/ash_strings_da.xtb index 9c187e8..17b90d2 100644 --- a/ash/strings/ash_strings_da.xtb +++ b/ash/strings/ash_strings_da.xtb
@@ -263,6 +263,7 @@ <translation id="2354174487190027830">Aktiverer <ph name="NAME" /></translation> <translation id="2359808026110333948">Fortsæt</translation> <translation id="2367186422933365202">Det lykkedes ikke at logge ind på din Chromebook</translation> +<translation id="2367972762794486313">Vis apps</translation> <translation id="2369165858548251131">"Hej" på kinesisk</translation> <translation id="2390318262976603432">Lokale indstillinger</translation> <translation id="240006516586367791">Mediestyring</translation>
diff --git a/ash/strings/ash_strings_de.xtb b/ash/strings/ash_strings_de.xtb index 7b82ca6..3d3261c 100644 --- a/ash/strings/ash_strings_de.xtb +++ b/ash/strings/ash_strings_de.xtb
@@ -239,6 +239,7 @@ <translation id="2224075387478458881">Die Bildschirmaufzeichnung ist blockiert, wenn geschützte Inhalte sichtbar sind</translation> <translation id="2227179592712503583">Vorschlag entfernen</translation> <translation id="225680501294068881">Nach Geräten wird gesucht...</translation> +<translation id="225716114209817872">Maximal</translation> <translation id="2257486738914982088">Fehler beim Herunterladen von „<ph name="FILENAME" />“</translation> <translation id="2258734398699965611">Vorgeschlagene Dateien</translation> <translation id="2268130516524549846">Bluetooth deaktiviert</translation> @@ -263,6 +264,7 @@ <translation id="2354174487190027830"><ph name="NAME" /> wird aktiviert</translation> <translation id="2359808026110333948">Weiter</translation> <translation id="2367186422933365202">Anmeldung auf dem Chromebook nicht möglich</translation> +<translation id="2367972762794486313">Apps anzeigen</translation> <translation id="2369165858548251131">"Hallo" auf Chinesisch</translation> <translation id="2390318262976603432">Spracheinstellungen</translation> <translation id="240006516586367791">Mediensteuerelemente</translation> @@ -1013,6 +1015,7 @@ <translation id="6537924328260219877">Signalstärke bei <ph name="SIGNAL_STRENGTH" />, Smartphone-Akku bei <ph name="BATTERY_STATUS" /></translation> <translation id="6539852571005954999">Download angehalten. <ph name="FILENAME" /> wird gescannt.</translation> <translation id="6542521951477560771">Inhalte werden an <ph name="RECEIVER_NAME" /> gestreamt</translation> +<translation id="6548693220024099658">Weichgezeichneter Hintergrund</translation> <translation id="655633303491376835"><ph name="APP_NAME" /> Neuinstallation</translation> <translation id="6559976592393364813">Administrator fragen</translation> @@ -1419,6 +1422,7 @@ <translation id="878215960996152260"><ph name="APP_NAME" />, installierte App, gesperrt</translation> <translation id="8785070478575117577">Mit <ph name="NETWORK_NAME" /> verbinden</translation> <translation id="8788027118671217603"><ph name="STATE_TEXT" />. <ph name="ENTERPRISE_TEXT" /></translation> +<translation id="8790998409862094015">Stark</translation> <translation id="8806053966018712535">Ordner <ph name="FOLDER_NAME" /></translation> <translation id="880709030178078220">„Hilfe“</translation> <translation id="8814190375133053267">WLAN</translation>
diff --git a/ash/strings/ash_strings_el.xtb b/ash/strings/ash_strings_el.xtb index d146337..08e3116 100644 --- a/ash/strings/ash_strings_el.xtb +++ b/ash/strings/ash_strings_el.xtb
@@ -28,6 +28,7 @@ <translation id="1104621072296271835">Οι συσκευές σας λειτουργούν ακόμα καλύτερα συνδυαστικά</translation> <translation id="1111021433905331574">Μπορείτε να αλλάξετε το χρώμα του οπίσθιου φωτισμού του πληκτρολογίου σας στις Ρυθμίσεις > <ph name="APP_TITLE" /></translation> <translation id="112308213915226829">Αυτόματη απόκρυψη ραφιού</translation> +<translation id="1135788167815124787">Εκ νέου φωτισμός πορτραίτου</translation> <translation id="1142002900084379065">Πρόσφατες φωτογραφίες</translation> <translation id="1148499908455722006">Άνοιγμα παραθύρου διαλόγου πληροφοριών για <ph name="USER_NAME" /></translation> <translation id="1150989369772528668">Ημερολόγιο</translation> @@ -263,6 +264,7 @@ <translation id="2354174487190027830">Ενεργοποίηση <ph name="NAME" /></translation> <translation id="2359808026110333948">Συνέχεια</translation> <translation id="2367186422933365202">Δεν είναι δυνατή η σύνδεση στο Chromebook</translation> +<translation id="2367972762794486313">Εμφάνιση εφαρμογών</translation> <translation id="2369165858548251131">"Γεια σας" στα κινεζικά</translation> <translation id="2390318262976603432">Τοπικές ρυθμίσεις</translation> <translation id="240006516586367791">Στοιχεία ελέγχου μέσων</translation>
diff --git a/ash/strings/ash_strings_en-GB.xtb b/ash/strings/ash_strings_en-GB.xtb index c5c1857..23ffdc61 100644 --- a/ash/strings/ash_strings_en-GB.xtb +++ b/ash/strings/ash_strings_en-GB.xtb
@@ -265,6 +265,7 @@ <translation id="2354174487190027830">Activating <ph name="NAME" /></translation> <translation id="2359808026110333948">Continue</translation> <translation id="2367186422933365202">Can't sign in to your Chromebook</translation> +<translation id="2367972762794486313">Show apps</translation> <translation id="2369165858548251131">"Hello" in Chinese</translation> <translation id="2390318262976603432">Locale settings</translation> <translation id="240006516586367791">Media controls</translation> @@ -696,6 +697,7 @@ <translation id="4740516757091333363">Delete saved desk?</translation> <translation id="4752784485658729358">Only six saved desks allowed. Remove a desk to save a new one.</translation> <translation id="4759238208242260848">Downloads</translation> +<translation id="4762573482154983647">Hide apps</translation> <translation id="4774338217796918551">Come back tomorrow at <ph name="COME_BACK_TIME" />.</translation> <translation id="4776917500594043016">Password for <ph name="USER_EMAIL_ADDRESS" /></translation> <translation id="4777825441726637019">Play Store</translation>
diff --git a/ash/strings/ash_strings_es-419.xtb b/ash/strings/ash_strings_es-419.xtb index 10f1c95..78e35d65 100644 --- a/ash/strings/ash_strings_es-419.xtb +++ b/ash/strings/ash_strings_es-419.xtb
@@ -263,6 +263,7 @@ <translation id="2354174487190027830">Activación de <ph name="NAME" /></translation> <translation id="2359808026110333948">Continuar</translation> <translation id="2367186422933365202">No se puede acceder a la Chromebook</translation> +<translation id="2367972762794486313">Mostrar aplicaciones</translation> <translation id="2369165858548251131">"Hola" en chino</translation> <translation id="2390318262976603432">Configuración regional</translation> <translation id="240006516586367791">Controles multimedia</translation>
diff --git a/ash/strings/ash_strings_es.xtb b/ash/strings/ash_strings_es.xtb index 94a51bd7..9597e82 100644 --- a/ash/strings/ash_strings_es.xtb +++ b/ash/strings/ash_strings_es.xtb
@@ -263,6 +263,7 @@ <translation id="2354174487190027830">Activación de <ph name="NAME" /></translation> <translation id="2359808026110333948">Continuar</translation> <translation id="2367186422933365202">No se puede iniciar sesión en tu Chromebook</translation> +<translation id="2367972762794486313">Mostrar aplicaciones</translation> <translation id="2369165858548251131">"Hola" en chino</translation> <translation id="2390318262976603432">Configuración regional</translation> <translation id="240006516586367791">Controles multimedia</translation>
diff --git a/ash/strings/ash_strings_et.xtb b/ash/strings/ash_strings_et.xtb index df3023d..14c8c3487 100644 --- a/ash/strings/ash_strings_et.xtb +++ b/ash/strings/ash_strings_et.xtb
@@ -264,6 +264,7 @@ <translation id="2354174487190027830">Võrgu <ph name="NAME" /> aktiveerimine</translation> <translation id="2359808026110333948">Jätka</translation> <translation id="2367186422933365202">Teie Chromebooki ei õnnestu sisse logida</translation> +<translation id="2367972762794486313">Rakenduste kuvamine</translation> <translation id="2369165858548251131">„Tere” hiina keeles</translation> <translation id="2390318262976603432">Lokaadi seaded</translation> <translation id="240006516586367791">Meedia juhtnupud</translation> @@ -508,6 +509,7 @@ <translation id="3713734891607377840">Lõpetamisel avatakse</translation> <translation id="3726171378575546917">Rakendusi <ph name="UNAVAILABLE_APPS_ONE" />, <ph name="UNAVAILABLE_APPS_TWO" /> ja veel <ph name="UNAVAILABLE_APPS_COUNT" /> rakendust pole selles seadmes.</translation> <translation id="3735740477244556633">Sortimisalus:</translation> +<translation id="3738664582935948253">Saate nüüd ekraanikuva salvestistes näidata klikke ja klaviatuuri otseteid</translation> <translation id="3742055079367172538">Ekraanipilt on tehtud</translation> <translation id="3765841986579723851">Täna muudetud</translation> <translation id="3773700760453577392">Administraator on keelanud e-posti aadressi <ph name="USER_EMAIL" /> puhul mitmele kontole sisselogimise.
diff --git a/ash/strings/ash_strings_eu.xtb b/ash/strings/ash_strings_eu.xtb index 687d183..729b0df9 100644 --- a/ash/strings/ash_strings_eu.xtb +++ b/ash/strings/ash_strings_eu.xtb
@@ -263,6 +263,7 @@ <translation id="2354174487190027830"><ph name="NAME" /> aktibatzen</translation> <translation id="2359808026110333948">Egin aurrera</translation> <translation id="2367186422933365202">Ezin da hasi saioa Chromebook-ean</translation> +<translation id="2367972762794486313">Erakutsi aplikazioak</translation> <translation id="2369165858548251131">Nola esaten da "Kaixo" txineraz</translation> <translation id="2390318262976603432">Lurraldeko ezarpenak</translation> <translation id="240006516586367791">Multimedia-edukia kontrolatzeko aukerak</translation>
diff --git a/ash/strings/ash_strings_fa.xtb b/ash/strings/ash_strings_fa.xtb index e768bea..24b0c4c 100644 --- a/ash/strings/ash_strings_fa.xtb +++ b/ash/strings/ash_strings_fa.xtb
@@ -239,6 +239,7 @@ <translation id="2224075387478458881">ضبط صفحهنمایش هنگامی که محتوای محافظتشده نمایان باشد مجاز نیست</translation> <translation id="2227179592712503583">حذف پیشنهاد</translation> <translation id="225680501294068881">درحال جستجو برای دستگاهها...</translation> +<translation id="225716114209817872">حداکثر</translation> <translation id="2257486738914982088">هنگام بارگیری <ph name="FILENAME" /> مشکلی پیش آمد</translation> <translation id="2258734398699965611">فایلهای پیشنهادی</translation> <translation id="2268130516524549846">بلوتوث غیرفعال است</translation> @@ -263,6 +264,7 @@ <translation id="2354174487190027830">فعالسازی <ph name="NAME" /></translation> <translation id="2359808026110333948">ادامه</translation> <translation id="2367186422933365202">نمیتوان به سیستم Chromebook وارد شد</translation> +<translation id="2367972762794486313">نمایش برنامهها</translation> <translation id="2369165858548251131">«Hello» in Chinese (سلام به زبان چینی)</translation> <translation id="2390318262976603432">تنظیمات منطقه زبانی</translation> <translation id="240006516586367791">کنترلهای رسانه</translation> @@ -1012,6 +1014,7 @@ <translation id="6537924328260219877">قدرت سیگنال <ph name="SIGNAL_STRENGTH" />، باتری تلفن <ph name="BATTERY_STATUS" /></translation> <translation id="6539852571005954999">بارگیری <ph name="FILENAME" /> درحال اسکن</translation> <translation id="6542521951477560771">پخش محتوا به <ph name="RECEIVER_NAME" /></translation> +<translation id="6548693220024099658">پسزمینه محو</translation> <translation id="655633303491376835"><ph name="APP_NAME" /> نصب جدید</translation> <translation id="6559976592393364813">سؤال از سرپرست</translation> @@ -1417,6 +1420,7 @@ <translation id="878215960996152260"><ph name="APP_NAME" />، برنامه نصبشده، مسدودشده</translation> <translation id="8785070478575117577">اتصال به <ph name="NETWORK_NAME" /></translation> <translation id="8788027118671217603"><ph name="STATE_TEXT" />. <ph name="ENTERPRISE_TEXT" /></translation> +<translation id="8790998409862094015">زیاد</translation> <translation id="8806053966018712535">پوشه <ph name="FOLDER_NAME" /></translation> <translation id="880709030178078220">«راهنمایی»</translation> <translation id="8814190375133053267">Wi-Fi</translation>
diff --git a/ash/strings/ash_strings_fi.xtb b/ash/strings/ash_strings_fi.xtb index 9caaff5..62aa98f 100644 --- a/ash/strings/ash_strings_fi.xtb +++ b/ash/strings/ash_strings_fi.xtb
@@ -265,6 +265,7 @@ <translation id="2354174487190027830">Aktivoidaan <ph name="NAME" /></translation> <translation id="2359808026110333948">Jatka</translation> <translation id="2367186422933365202">Chromebookiin kirjautuminen ei onnistu</translation> +<translation id="2367972762794486313">Näytä sovellukset</translation> <translation id="2369165858548251131">"Hei" kiinaksi</translation> <translation id="2390318262976603432">Kieli- ja maa-asetukset</translation> <translation id="240006516586367791">Mediaohjaimet</translation>
diff --git a/ash/strings/ash_strings_fil.xtb b/ash/strings/ash_strings_fil.xtb index 21a6897..0302004 100644 --- a/ash/strings/ash_strings_fil.xtb +++ b/ash/strings/ash_strings_fil.xtb
@@ -264,6 +264,7 @@ <translation id="2354174487190027830">Ina-activate ang <ph name="NAME" /></translation> <translation id="2359808026110333948">Magpatuloy</translation> <translation id="2367186422933365202">Hindi makapag-sign in sa iyong Chromebook</translation> +<translation id="2367972762794486313">Ipakita ang apps</translation> <translation id="2369165858548251131">"Kumusta" sa Chinese</translation> <translation id="2390318262976603432">Mga Setting ng Lokalidad</translation> <translation id="240006516586367791">Mga kontrol ng media</translation>
diff --git a/ash/strings/ash_strings_fr-CA.xtb b/ash/strings/ash_strings_fr-CA.xtb index efb80e3..86ae030 100644 --- a/ash/strings/ash_strings_fr-CA.xtb +++ b/ash/strings/ash_strings_fr-CA.xtb
@@ -28,6 +28,7 @@ <translation id="1104621072296271835">Vos appareils fonctionnent encore mieux ensemble</translation> <translation id="1111021433905331574">Vous pouvez changer la couleur du rétroéclairage de votre clavier dans Paramètres > <ph name="APP_TITLE" /></translation> <translation id="112308213915226829">Masquer automatiquement l'étagère</translation> +<translation id="1135788167815124787">Modification de l'éclairage du portrait</translation> <translation id="1142002900084379065">Photos récentes</translation> <translation id="1148499908455722006">Ouvrir la boîte de dialogue d'information pour <ph name="USER_NAME" /></translation> <translation id="1150989369772528668">Agenda</translation> @@ -264,6 +265,7 @@ <translation id="2354174487190027830">Activation du réseau <ph name="NAME" /> en cours…</translation> <translation id="2359808026110333948">Continuer</translation> <translation id="2367186422933365202">Impossible de se connecter à votre Chromebook</translation> +<translation id="2367972762794486313">Afficher les applications</translation> <translation id="2369165858548251131">Comment dit-on « Bonjour » en chinois?</translation> <translation id="2390318262976603432">Paramètres régionaux</translation> <translation id="240006516586367791">Commandes multimédias</translation>
diff --git a/ash/strings/ash_strings_fr.xtb b/ash/strings/ash_strings_fr.xtb index 1c45b633..fdb6a63 100644 --- a/ash/strings/ash_strings_fr.xtb +++ b/ash/strings/ash_strings_fr.xtb
@@ -239,6 +239,7 @@ <translation id="2224075387478458881">L'enregistrement d'écran n'est pas autorisé lorsqu'un contenu protégé est affiché</translation> <translation id="2227179592712503583">Supprimer la suggestion</translation> <translation id="225680501294068881">Recherche d'appareils…</translation> +<translation id="225716114209817872">Maximal</translation> <translation id="2257486738914982088">Une erreur s'est produite lors du téléchargement de <ph name="FILENAME" /></translation> <translation id="2258734398699965611">Fichiers suggérés</translation> <translation id="2268130516524549846">Bluetooth désactivé</translation> @@ -263,6 +264,7 @@ <translation id="2354174487190027830">Activation du réseau <ph name="NAME" /> en cours…</translation> <translation id="2359808026110333948">Continuer</translation> <translation id="2367186422933365202">Impossible de se connecter au Chromebook</translation> +<translation id="2367972762794486313">Afficher les applications</translation> <translation id="2369165858548251131">"Bonjour" en chinois</translation> <translation id="2390318262976603432">Options des paramètres régionaux</translation> <translation id="240006516586367791">Commandes multimédias</translation> @@ -1012,6 +1014,7 @@ <translation id="6537924328260219877">Force du signal : <ph name="SIGNAL_STRENGTH" />, batterie du téléphone à <ph name="BATTERY_STATUS" /></translation> <translation id="6539852571005954999">Téléchargement en cours d'analyse : <ph name="FILENAME" /></translation> <translation id="6542521951477560771">Diffusion vers <ph name="RECEIVER_NAME" />…</translation> +<translation id="6548693220024099658">Flou d'arrière-plan</translation> <translation id="655633303491376835"><ph name="APP_NAME" /> Nouvelle installation</translation> <translation id="6559976592393364813">Se renseigner auprès de l'administrateur</translation> @@ -1417,6 +1420,7 @@ <translation id="878215960996152260"><ph name="APP_NAME" />, appli installée, bloquée</translation> <translation id="8785070478575117577">Se connecter à <ph name="NETWORK_NAME" /></translation> <translation id="8788027118671217603"><ph name="STATE_TEXT" />. <ph name="ENTERPRISE_TEXT" /></translation> +<translation id="8790998409862094015">Intense</translation> <translation id="8806053966018712535">Dossier <ph name="FOLDER_NAME" /></translation> <translation id="880709030178078220">"Aide"</translation> <translation id="8814190375133053267">Wi-Fi </translation>
diff --git a/ash/strings/ash_strings_gl.xtb b/ash/strings/ash_strings_gl.xtb index 85c1df8..f341714 100644 --- a/ash/strings/ash_strings_gl.xtb +++ b/ash/strings/ash_strings_gl.xtb
@@ -263,6 +263,7 @@ <translation id="2354174487190027830">Activando <ph name="NAME" /></translation> <translation id="2359808026110333948">Continuar</translation> <translation id="2367186422933365202">Non se puido iniciar sesión no Chromebook</translation> +<translation id="2367972762794486313">Mostrar aplicacións</translation> <translation id="2369165858548251131">"Ola" en chinés</translation> <translation id="2390318262976603432">Opcións de configuración local</translation> <translation id="240006516586367791">Controis multimedia</translation>
diff --git a/ash/strings/ash_strings_gu.xtb b/ash/strings/ash_strings_gu.xtb index ab63f3be..d0a6a03 100644 --- a/ash/strings/ash_strings_gu.xtb +++ b/ash/strings/ash_strings_gu.xtb
@@ -264,6 +264,7 @@ <translation id="2354174487190027830"><ph name="NAME" /> ને સક્રિય કરી રહ્યું છે</translation> <translation id="2359808026110333948">આગળ વધો</translation> <translation id="2367186422933365202">તમારી Chromebookમાં સાઇન ઇન કરી શકતા નથી</translation> +<translation id="2367972762794486313">ઍપ્લિકેશનો બતાવો</translation> <translation id="2369165858548251131">ચીની ભાષામાં "નમસ્કાર"</translation> <translation id="2390318262976603432">લોકેલ સેટિંગ</translation> <translation id="240006516586367791">મીડિયા નિયંત્રણો</translation>
diff --git a/ash/strings/ash_strings_hi.xtb b/ash/strings/ash_strings_hi.xtb index 5fb8502e..545e22c 100644 --- a/ash/strings/ash_strings_hi.xtb +++ b/ash/strings/ash_strings_hi.xtb
@@ -263,6 +263,7 @@ <translation id="2354174487190027830"><ph name="NAME" /> सक्रिय हो रहा है</translation> <translation id="2359808026110333948">जारी रखें</translation> <translation id="2367186422933365202">आपके Chromebook में साइन इन नहीं हो पाया</translation> +<translation id="2367972762794486313">ऐप्स दिखाएं</translation> <translation id="2369165858548251131">चाइनीज़ भाषा में "नमस्ते" कैसे बोलते हैं</translation> <translation id="2390318262976603432">स्थान-भाषा की सेटिंग</translation> <translation id="240006516586367791">मीडिया कंट्रोल</translation>
diff --git a/ash/strings/ash_strings_hr.xtb b/ash/strings/ash_strings_hr.xtb index 3bd5103..11e23936 100644 --- a/ash/strings/ash_strings_hr.xtb +++ b/ash/strings/ash_strings_hr.xtb
@@ -263,6 +263,7 @@ <translation id="2354174487190027830">Aktiviranje mreže <ph name="NAME" /></translation> <translation id="2359808026110333948">Nastavi</translation> <translation id="2367186422933365202">Prijava na Chromebook nije uspjela</translation> +<translation id="2367972762794486313">Prikaz aplikacija</translation> <translation id="2369165858548251131">"Zdravo" na kineskom</translation> <translation id="2390318262976603432">Postavke oznake zemlje/jezika</translation> <translation id="240006516586367791">Medijske kontrole</translation>
diff --git a/ash/strings/ash_strings_hu.xtb b/ash/strings/ash_strings_hu.xtb index 7c34431..1429fa9 100644 --- a/ash/strings/ash_strings_hu.xtb +++ b/ash/strings/ash_strings_hu.xtb
@@ -265,6 +265,7 @@ <translation id="2354174487190027830"><ph name="NAME" /> aktiválása</translation> <translation id="2359808026110333948">Tovább</translation> <translation id="2367186422933365202">Nem lehet bejelentkezni a Chromebookra</translation> +<translation id="2367972762794486313">Alkalmazások megjelenítése</translation> <translation id="2369165858548251131">„Helló” kínai nyelven</translation> <translation id="2390318262976603432">Nyelv- és országkód beállításai</translation> <translation id="240006516586367791">Médiaelemek vezérlője</translation>
diff --git a/ash/strings/ash_strings_hy.xtb b/ash/strings/ash_strings_hy.xtb index 57f621b5..2757a57e 100644 --- a/ash/strings/ash_strings_hy.xtb +++ b/ash/strings/ash_strings_hy.xtb
@@ -28,6 +28,7 @@ <translation id="1104621072296271835">Միասին ձեր սարքերն ավելի լավ կաշխատեն</translation> <translation id="1111021433905331574">Ստեղնաշարի հետնալույսի գույնը փոխելու համար անցեք Կարգավորումներ > <ph name="APP_TITLE" /></translation> <translation id="112308213915226829">Ինքնաթաքցնել դարակը</translation> +<translation id="1135788167815124787">Դիմանկարի վերալուսավորում</translation> <translation id="1142002900084379065">Վերջին լուսանկարները</translation> <translation id="1148499908455722006">Բացել <ph name="USER_NAME" /> հաշվի տեղեկությունների երկխոսության պատուհանը</translation> <translation id="1150989369772528668">Օրացույց</translation> @@ -239,6 +240,7 @@ <translation id="2224075387478458881">Էկրանի տեսագրում չի թույլատրվում, երբ պաշտպանված բովանդակություն է տեսանելի</translation> <translation id="2227179592712503583">Հեռացնել հուշումը</translation> <translation id="225680501294068881">Սարքերի որոնում…</translation> +<translation id="225716114209817872">Առավելագույն</translation> <translation id="2257486738914982088">Ֆայլը (<ph name="FILENAME" />) ներբեռնելիս սխալ առաջացավ</translation> <translation id="2258734398699965611">Առաջարկվող ֆայլեր</translation> <translation id="2268130516524549846">Bluetooth-ն անջատված է</translation> @@ -263,6 +265,7 @@ <translation id="2354174487190027830"><ph name="NAME" />-ի ակտիվացում</translation> <translation id="2359808026110333948">Շարունակել</translation> <translation id="2367186422933365202">Չհաջողվեց մուտք գործել Chromebook</translation> +<translation id="2367972762794486313">Ցույց տալ հավելվածները</translation> <translation id="2369165858548251131">Ինչպես չինարեն ասել «Բարև»</translation> <translation id="2390318262976603432">Լեզվի կարգավորումներ</translation> <translation id="240006516586367791">Մեդիա կարգավորումներ</translation> @@ -1012,6 +1015,7 @@ <translation id="6537924328260219877">Ազդանշանի ուժգնությունը՝ <ph name="SIGNAL_STRENGTH" />, մարտկոցի լիցքը՝ <ph name="BATTERY_STATUS" /></translation> <translation id="6539852571005954999">Ներբեռնումը դադարեցված է, <ph name="FILENAME" /> ֆայլը ստուգվում է</translation> <translation id="6542521951477560771">Հեռարձակում «<ph name="RECEIVER_NAME" />» սարքին</translation> +<translation id="6548693220024099658">Ֆոնի շաղում</translation> <translation id="655633303491376835"><ph name="APP_NAME" /> Նոր տեղադրում</translation> <translation id="6559976592393364813">Հարցրեք ադմինիստրատորին</translation> @@ -1417,6 +1421,7 @@ <translation id="878215960996152260"><ph name="APP_NAME" />, տեղադրված հավելված, արգելափակված է</translation> <translation id="8785070478575117577">Միացում «<ph name="NETWORK_NAME" />» ցանցին</translation> <translation id="8788027118671217603"><ph name="STATE_TEXT" />։ <ph name="ENTERPRISE_TEXT" /></translation> +<translation id="8790998409862094015">Ուժեղ</translation> <translation id="8806053966018712535">Պանակ <ph name="FOLDER_NAME" /></translation> <translation id="880709030178078220">«Help» (օգնություն)</translation> <translation id="8814190375133053267">Wi-Fi</translation>
diff --git a/ash/strings/ash_strings_id.xtb b/ash/strings/ash_strings_id.xtb index 28df404..34b12b7 100644 --- a/ash/strings/ash_strings_id.xtb +++ b/ash/strings/ash_strings_id.xtb
@@ -264,6 +264,7 @@ <translation id="2354174487190027830">Mengaktifkan <ph name="NAME" /></translation> <translation id="2359808026110333948">Lanjutkan</translation> <translation id="2367186422933365202">Tidak dapat login ke Chromebook</translation> +<translation id="2367972762794486313">Tampilkan aplikasi</translation> <translation id="2369165858548251131">"Halo" dalam bahasa China</translation> <translation id="2390318262976603432">Setelan Lokal</translation> <translation id="240006516586367791">Kontrol media</translation>
diff --git a/ash/strings/ash_strings_is.xtb b/ash/strings/ash_strings_is.xtb index bbc0bb8..1e497b5 100644 --- a/ash/strings/ash_strings_is.xtb +++ b/ash/strings/ash_strings_is.xtb
@@ -263,6 +263,7 @@ <translation id="2354174487190027830">Virkjar <ph name="NAME" /></translation> <translation id="2359808026110333948">Halda áfram</translation> <translation id="2367186422933365202">Ekki tókst að skrá þig inn á Chromebook</translation> +<translation id="2367972762794486313">Sýna forrit</translation> <translation id="2369165858548251131">„Halló“ á kínversku</translation> <translation id="2390318262976603432">Stillingar tungumálskóða</translation> <translation id="240006516586367791">Efnisstýringar</translation>
diff --git a/ash/strings/ash_strings_it.xtb b/ash/strings/ash_strings_it.xtb index 79329d4..0d910ee 100644 --- a/ash/strings/ash_strings_it.xtb +++ b/ash/strings/ash_strings_it.xtb
@@ -263,6 +263,7 @@ <translation id="2354174487190027830">Attivazione di <ph name="NAME" /></translation> <translation id="2359808026110333948">Continua</translation> <translation id="2367186422933365202">Impossibile accedere a Chromebook</translation> +<translation id="2367972762794486313">Mostra app</translation> <translation id="2369165858548251131">"Ciao" in cinese</translation> <translation id="2390318262976603432">Impostazioni internazionali</translation> <translation id="240006516586367791">Controlli multimediali</translation>
diff --git a/ash/strings/ash_strings_iw.xtb b/ash/strings/ash_strings_iw.xtb index 22acf8af..95cffb5 100644 --- a/ash/strings/ash_strings_iw.xtb +++ b/ash/strings/ash_strings_iw.xtb
@@ -264,6 +264,7 @@ <translation id="2354174487190027830">המערכת מפעילה את <ph name="NAME" /></translation> <translation id="2359808026110333948">המשך</translation> <translation id="2367186422933365202">לא ניתן להיכנס אל ה-Chromebook</translation> +<translation id="2367972762794486313">הצגת אפליקציות</translation> <translation id="2369165858548251131">"שלום" בסינית</translation> <translation id="2390318262976603432">הגדרות שילוב של שפה ואזור</translation> <translation id="240006516586367791">פקדי מדיה</translation>
diff --git a/ash/strings/ash_strings_ja.xtb b/ash/strings/ash_strings_ja.xtb index 25474b1..bc99d37 100644 --- a/ash/strings/ash_strings_ja.xtb +++ b/ash/strings/ash_strings_ja.xtb
@@ -264,6 +264,7 @@ <translation id="2354174487190027830"><ph name="NAME" /> を有効にしています</translation> <translation id="2359808026110333948">続行</translation> <translation id="2367186422933365202">Chromebook にログインできません</translation> +<translation id="2367972762794486313">アプリを表示</translation> <translation id="2369165858548251131">中国語で「こんにちは」ってどう言うの</translation> <translation id="2390318262976603432">言語 / 地域設定</translation> <translation id="240006516586367791">メディア コントロール</translation>
diff --git a/ash/strings/ash_strings_ka.xtb b/ash/strings/ash_strings_ka.xtb index 4ec5a07..be5331e 100644 --- a/ash/strings/ash_strings_ka.xtb +++ b/ash/strings/ash_strings_ka.xtb
@@ -265,6 +265,7 @@ <translation id="2354174487190027830"><ph name="NAME" />-ის გააქტიურება</translation> <translation id="2359808026110333948">გაგრძელება</translation> <translation id="2367186422933365202">თქვენს Chromebook-ში შესვლა ვერ მოხერხდა</translation> +<translation id="2367972762794486313">პროგრამების ჩვენება</translation> <translation id="2369165858548251131">„გამარჯობა“ ჩინურად</translation> <translation id="2390318262976603432">ლოკალის პარამეტრები</translation> <translation id="240006516586367791">მედიის მართვის საშუალებები</translation>
diff --git a/ash/strings/ash_strings_kk.xtb b/ash/strings/ash_strings_kk.xtb index 08cedddd..74d611fd 100644 --- a/ash/strings/ash_strings_kk.xtb +++ b/ash/strings/ash_strings_kk.xtb
@@ -263,6 +263,7 @@ <translation id="2354174487190027830"><ph name="NAME" /> белсендіру</translation> <translation id="2359808026110333948">Жалғастыру</translation> <translation id="2367186422933365202">Chromebook құрылғысына кіру мүмкін емес.</translation> +<translation id="2367972762794486313">Қолданбаларды көрсету</translation> <translation id="2369165858548251131">Қытай тілінде "Сәлем" қалай болады?</translation> <translation id="2390318262976603432">Тіл параметрлері</translation> <translation id="240006516586367791">Мультимедианы басқару элементтері</translation>
diff --git a/ash/strings/ash_strings_km.xtb b/ash/strings/ash_strings_km.xtb index 937d38cf..ee4c5a5 100644 --- a/ash/strings/ash_strings_km.xtb +++ b/ash/strings/ash_strings_km.xtb
@@ -265,6 +265,7 @@ <translation id="2354174487190027830">កំពុងធ្វើសកម្មភាព <ph name="NAME" /></translation> <translation id="2359808026110333948">បន្ត</translation> <translation id="2367186422933365202">មិនអាចចូល Chromebook របស់អ្នកបានទេ</translation> +<translation id="2367972762794486313">បង្ហាញកម្មវិធី</translation> <translation id="2369165858548251131">"សួស្ដី" ជាភាសាចិន</translation> <translation id="2390318262976603432">ការកំណត់ភាសា</translation> <translation id="240006516586367791">ការគ្រប់គ្រងមេឌៀ</translation>
diff --git a/ash/strings/ash_strings_kn.xtb b/ash/strings/ash_strings_kn.xtb index 49cdbd0..e7cd857 100644 --- a/ash/strings/ash_strings_kn.xtb +++ b/ash/strings/ash_strings_kn.xtb
@@ -239,6 +239,7 @@ <translation id="2224075387478458881">ಸುರಕ್ಷಿತ ವಿಷಯವು ಗೋಚರಿಸಿದಾಗ ಸ್ಕ್ರೀನ್ ರೆಕಾರ್ಡಿಂಗ್ ಅನ್ನು ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ</translation> <translation id="2227179592712503583">ಸಲಹೆಯನ್ನು ತೆಗೆದುಹಾಕಿ</translation> <translation id="225680501294068881">ಸಾಧನಗಳಿಗಾಗಿ ಸ್ಕ್ಯಾನ್ ಮಾಡಲಾಗುತ್ತಿದೆ...</translation> +<translation id="225716114209817872">ಗರಿಷ್ಟ</translation> <translation id="2257486738914982088"><ph name="FILENAME" /> ಅನ್ನು ಡೌನ್ಲೋಡ್ ಮಾಡುವಾಗ ಏನೋ ತಪ್ಪಾಗಿದೆ</translation> <translation id="2258734398699965611">ಸೂಚಿಸಲಾದ ಫೈಲ್ಗಳು</translation> <translation id="2268130516524549846">ಬ್ಲೂಟೂತ್ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ</translation> @@ -263,6 +264,7 @@ <translation id="2354174487190027830"><ph name="NAME" /> ಅನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಲಾಗುತ್ತಿದೆ</translation> <translation id="2359808026110333948">ಮುಂದುವರೆಸಿ</translation> <translation id="2367186422933365202">ನಿಮ್ಮ Chromebook ಗೆ ಸೈನ್ ಇನ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗುತ್ತಿಲ್ಲ</translation> +<translation id="2367972762794486313">ಅಪ್ಲಿಕೇಶನ್ಗಳನ್ನು ತೋರಿಸು</translation> <translation id="2369165858548251131">ಚೈನಿಸ್ ಭಾಷೆಯಲ್ಲಿ "ನಮಸ್ಕಾರ"</translation> <translation id="2390318262976603432">ಸ್ಥಳೀಯ ಭಾಷೆ ಸೆಟ್ಟಿಂಗ್ಗಳು</translation> <translation id="240006516586367791">ಮೀಡಿಯಾ ನಿಯಂತ್ರಣಗಳು</translation> @@ -507,6 +509,7 @@ <translation id="3713734891607377840">ಪೂರ್ಣವಾದಾಗ ತೆರೆಯಿರಿ</translation> <translation id="3726171378575546917">ಈ ಸಾಧನದಲ್ಲಿ <ph name="UNAVAILABLE_APPS_ONE" />, <ph name="UNAVAILABLE_APPS_TWO" /> ಮತ್ತು ಇನ್ನೂ <ph name="UNAVAILABLE_APPS_COUNT" /> ಆ್ಯಪ್ಗಳು ಲಭ್ಯವಿಲ್ಲ.</translation> <translation id="3735740477244556633">ಈ ಪ್ರಕಾರ ವಿಂಗಡಿಸಿ</translation> +<translation id="3738664582935948253">ನೀವು ಈಗ ಸ್ಕ್ರೀನ್ ರೆಕಾರ್ಡಿಂಗ್ಗಳಲ್ಲಿ ಕ್ಲಿಕ್ಗಳು ಮತ್ತು ಕೀಬೋರ್ಡ್ ಶಾರ್ಟ್ಕಟ್ಗಳನ್ನು ತೋರಿಸಬಹುದು</translation> <translation id="3742055079367172538">ಸ್ಕ್ರಿನ್ಶಾಟ್ ತೆಗೆದುಕೊಳ್ಳಲಾಗಿದೆ</translation> <translation id="3765841986579723851">ಇಂದು ಎಡಿಟ್ ಮಾಡಲಾಗಿದೆ</translation> <translation id="3773700760453577392"><ph name="USER_EMAIL" /> ಗೆ ಬಹು ಸೈನ್-ಇನ್ ಅನುಮತಿಯನ್ನು ನಿರ್ವಾಹಕರು ರದ್ದುಗೊಳಿಸಿದ್ದಾರೆ. ಮುಂದುವರಿಯಲು ಎಲ್ಲ ಬಳಕೆದಾರರು ಸೈನ್ ಔಟ್ ಮಾಡಬೇಕು.</translation> @@ -1013,6 +1016,7 @@ <translation id="6537924328260219877">ಸಿಗ್ನಲ್ ಸಾಮರ್ಥ್ಯ <ph name="SIGNAL_STRENGTH" />, ಫೋನ್ ಬ್ಯಾಟರಿ <ph name="BATTERY_STATUS" /></translation> <translation id="6539852571005954999">ಸ್ಕ್ಯಾನ್ ಆಗುತ್ತಿರುವ <ph name="FILENAME" /> ಅನ್ನು ಡೌನ್ಲೋಡ್ ಮಾಡಿ</translation> <translation id="6542521951477560771"><ph name="RECEIVER_NAME" /> ಗೆ ಬಿತ್ತರಿಸಲಾಗುತ್ತಿದೆ</translation> +<translation id="6548693220024099658">ಹಿನ್ನೆಲೆ ಮಸುಕು</translation> <translation id="655633303491376835"><ph name="APP_NAME" /> ಹೊಸ ಇನ್ಸ್ಟಾಲ್</translation> <translation id="6559976592393364813">ನಿರ್ವಾಹಕರನ್ನು ಕೇಳಿ</translation> @@ -1419,6 +1423,7 @@ <translation id="878215960996152260"><ph name="APP_NAME" />, ಇನ್ಸ್ಟಾಲ್ ಮಾಡಿದ ಆ್ಯಪ್, ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ</translation> <translation id="8785070478575117577"><ph name="NETWORK_NAME" /> ಗೆ ಕನೆಕ್ಟ್ ಮಾಡಿ</translation> <translation id="8788027118671217603"><ph name="STATE_TEXT" />. <ph name="ENTERPRISE_TEXT" /></translation> +<translation id="8790998409862094015">ಭಾರಿ</translation> <translation id="8806053966018712535">ಫೋಲ್ಡರ್ <ph name="FOLDER_NAME" /></translation> <translation id="880709030178078220">"ಸಹಾಯ"</translation> <translation id="8814190375133053267">ವೈ-ಫೈ</translation>
diff --git a/ash/strings/ash_strings_ko.xtb b/ash/strings/ash_strings_ko.xtb index 0ad1515..dba12d7 100644 --- a/ash/strings/ash_strings_ko.xtb +++ b/ash/strings/ash_strings_ko.xtb
@@ -263,6 +263,7 @@ <translation id="2354174487190027830"><ph name="NAME" /> 활성화 중</translation> <translation id="2359808026110333948">계속</translation> <translation id="2367186422933365202">Chromebook에 로그인할 수 없음</translation> +<translation id="2367972762794486313">앱 표시</translation> <translation id="2369165858548251131">중국어로 '안녕'</translation> <translation id="2390318262976603432">언어 설정</translation> <translation id="240006516586367791">미디어 컨트롤</translation>
diff --git a/ash/strings/ash_strings_ky.xtb b/ash/strings/ash_strings_ky.xtb index fb23809..4225178 100644 --- a/ash/strings/ash_strings_ky.xtb +++ b/ash/strings/ash_strings_ky.xtb
@@ -263,6 +263,7 @@ <translation id="2354174487190027830"><ph name="NAME" /> жандыруу</translation> <translation id="2359808026110333948">Улантуу</translation> <translation id="2367186422933365202">Chromebook'ка кирген жоксуз</translation> +<translation id="2367972762794486313">Колдонмолорду көрсөтүү</translation> <translation id="2369165858548251131">Кытайча "Салам"</translation> <translation id="2390318262976603432">Тил жөндөөлөрү</translation> <translation id="240006516586367791">Медианы башкаруу элементтери</translation>
diff --git a/ash/strings/ash_strings_lo.xtb b/ash/strings/ash_strings_lo.xtb index 28e7690..59e5dd7 100644 --- a/ash/strings/ash_strings_lo.xtb +++ b/ash/strings/ash_strings_lo.xtb
@@ -263,6 +263,7 @@ <translation id="2354174487190027830">ກຳລັງເປີດນຳໃຊ້ <ph name="NAME" /></translation> <translation id="2359808026110333948">ສືບຕໍ່</translation> <translation id="2367186422933365202">ບໍ່ສາມາດເຂົ້າສູ່ລະບົບຫາ Chromebook ຂອງທ່ານໄດ້</translation> +<translation id="2367972762794486313">ສະແດງແອັບ</translation> <translation id="2369165858548251131">"ສະບາຍດີ" ເປັນພາສາຈີນ</translation> <translation id="2390318262976603432">ການຕັ້ງຄ່າສະຖານທີ່</translation> <translation id="240006516586367791">ການຄວບຄຸມມີເດຍ</translation>
diff --git a/ash/strings/ash_strings_lt.xtb b/ash/strings/ash_strings_lt.xtb index 10d67a39a..7c72b22 100644 --- a/ash/strings/ash_strings_lt.xtb +++ b/ash/strings/ash_strings_lt.xtb
@@ -264,6 +264,7 @@ <translation id="2354174487190027830">Aktyvinamas „<ph name="NAME" />“</translation> <translation id="2359808026110333948">Tęskite</translation> <translation id="2367186422933365202">Nepavyksta prisijungti prie „Chromebook“</translation> +<translation id="2367972762794486313">Rodyti programas</translation> <translation id="2369165858548251131">„Labas“ kinų kalba</translation> <translation id="2390318262976603432">Lokalės nustatymai</translation> <translation id="240006516586367791">Medijos valdikliai</translation>
diff --git a/ash/strings/ash_strings_lv.xtb b/ash/strings/ash_strings_lv.xtb index 264428fb6..d090609 100644 --- a/ash/strings/ash_strings_lv.xtb +++ b/ash/strings/ash_strings_lv.xtb
@@ -263,6 +263,7 @@ <translation id="2354174487190027830">Notiek <ph name="NAME" /> aktivizēšana.</translation> <translation id="2359808026110333948">Turpināt</translation> <translation id="2367186422933365202">Nevar pierakstīties Chromebook datorā.</translation> +<translation id="2367972762794486313">Rādīt lietotnes</translation> <translation id="2369165858548251131">“Sveiki!” ķīniešu valodā</translation> <translation id="2390318262976603432">Lokalizācijas iestatījumi</translation> <translation id="240006516586367791">Multivides vadīklas</translation>
diff --git a/ash/strings/ash_strings_mk.xtb b/ash/strings/ash_strings_mk.xtb index de0146b3..973f84f0 100644 --- a/ash/strings/ash_strings_mk.xtb +++ b/ash/strings/ash_strings_mk.xtb
@@ -264,6 +264,7 @@ <translation id="2354174487190027830">Се активира <ph name="NAME" /></translation> <translation id="2359808026110333948">Продолжи</translation> <translation id="2367186422933365202">Не може да се најавите на вашиот Chromebook</translation> +<translation id="2367972762794486313">Покажи апликации</translation> <translation id="2369165858548251131">„Здраво“ на кинески</translation> <translation id="2390318262976603432">Поставки за локален стандард</translation> <translation id="240006516586367791">Контроли за аудиовизуелни содржини</translation>
diff --git a/ash/strings/ash_strings_ml.xtb b/ash/strings/ash_strings_ml.xtb index 743838d..fb5034d 100644 --- a/ash/strings/ash_strings_ml.xtb +++ b/ash/strings/ash_strings_ml.xtb
@@ -264,6 +264,7 @@ <translation id="2354174487190027830"><ph name="NAME" /> സജീവമാക്കുന്നു</translation> <translation id="2359808026110333948">തുടരുക</translation> <translation id="2367186422933365202">നിങ്ങളുടെ Chromebook-ലേക്ക് സൈൻ ഇൻ ചെയ്യാനാകുന്നില്ല</translation> +<translation id="2367972762794486313">അപ്ലിക്കേഷനുകൾ കാണിക്കുക</translation> <translation id="2369165858548251131">"ഹലോ" എന്നത് ചൈനീസിൽ</translation> <translation id="2390318262976603432">ഭാഷാ ക്രമീകരണം</translation> <translation id="240006516586367791">മീഡിയാ നിയന്ത്രണങ്ങൾ</translation> @@ -508,6 +509,7 @@ <translation id="3713734891607377840">പൂർത്തിയാകുമ്പോൾ തുറക്കുക</translation> <translation id="3726171378575546917"><ph name="UNAVAILABLE_APPS_ONE" />, <ph name="UNAVAILABLE_APPS_TWO" /> എന്നിവയും മറ്റ് <ph name="UNAVAILABLE_APPS_COUNT" /> എണ്ണവും ഈ ഉപകരണത്തിൽ ലഭ്യമല്ല.</translation> <translation id="3735740477244556633">ഇപ്രകാരം അടുക്കുക</translation> +<translation id="3738664582935948253">ഇപ്പോൾ നിങ്ങൾക്ക് സ്ക്രീൻ റെക്കോർഡിംഗുകളിൽ ക്ലിക്ക്, കീബോർഡ് കുറുക്കുവഴികൾ കാണിക്കാനാകും</translation> <translation id="3742055079367172538">സ്ക്രീൻഷോട്ട് എടുത്തു</translation> <translation id="3765841986579723851">ഇന്ന് എഡിറ്റ് ചെയ്തത്</translation> <translation id="3773700760453577392"><ph name="USER_EMAIL" /> എന്ന ഇമെയിലിലേക്ക് ഒന്നിലധികം പേർ സൈൻ ഇൻ ചെയ്യുന്നത് ഒരു അഡ്മിനിസ്ട്രേറ്റർ വിലക്കിയിരിക്കുന്നു. തുടരാൻ, എല്ലാ ഉപയോക്താക്കളും സൈൻ ഔട്ട് ചെയ്യണം.</translation>
diff --git a/ash/strings/ash_strings_mn.xtb b/ash/strings/ash_strings_mn.xtb index cd24041..eb42914 100644 --- a/ash/strings/ash_strings_mn.xtb +++ b/ash/strings/ash_strings_mn.xtb
@@ -264,6 +264,7 @@ <translation id="2354174487190027830"><ph name="NAME" /> идэвхжүүлж байна</translation> <translation id="2359808026110333948">Цааш</translation> <translation id="2367186422933365202">Таны Chromebook-д нэвтрэх боломжгүй</translation> +<translation id="2367972762794486313">Аппликейшнүүдийг харуулах</translation> <translation id="2369165858548251131">"Сайн байна уу?"-г хятад хэлээр</translation> <translation id="2390318262976603432">Хэл болон улсын кодын тохиргоо</translation> <translation id="240006516586367791">Медиа хяналт</translation>
diff --git a/ash/strings/ash_strings_mr.xtb b/ash/strings/ash_strings_mr.xtb index 0a4045c..627e649 100644 --- a/ash/strings/ash_strings_mr.xtb +++ b/ash/strings/ash_strings_mr.xtb
@@ -263,6 +263,7 @@ <translation id="2354174487190027830"><ph name="NAME" /> सक्रिय करत आहे</translation> <translation id="2359808026110333948">सुरू ठेवा</translation> <translation id="2367186422933365202">तुमच्या Chromebook मध्ये साइन इन करू शकत नाही</translation> +<translation id="2367972762794486313">अॅप्स दर्शवा</translation> <translation id="2369165858548251131">चिनी भाषेत "हॅलो"</translation> <translation id="2390318262976603432">लोकॅल सेटिंग्ज</translation> <translation id="240006516586367791">मीडिया नियंत्रणे</translation>
diff --git a/ash/strings/ash_strings_ms.xtb b/ash/strings/ash_strings_ms.xtb index b865cf9..9e7f56f 100644 --- a/ash/strings/ash_strings_ms.xtb +++ b/ash/strings/ash_strings_ms.xtb
@@ -263,6 +263,7 @@ <translation id="2354174487190027830">Mengaktifkan <ph name="NAME" /></translation> <translation id="2359808026110333948">Teruskan</translation> <translation id="2367186422933365202">Tidak dapat log masuk ke Chromebook anda</translation> +<translation id="2367972762794486313">Paparkan apl</translation> <translation id="2369165858548251131">"Helo" dalam bahasa Cina</translation> <translation id="2390318262976603432">Tetapan Tempat Peristiwa</translation> <translation id="240006516586367791">Kawalan media</translation>
diff --git a/ash/strings/ash_strings_my.xtb b/ash/strings/ash_strings_my.xtb index 01404bd6..3597615 100644 --- a/ash/strings/ash_strings_my.xtb +++ b/ash/strings/ash_strings_my.xtb
@@ -263,6 +263,7 @@ <translation id="2354174487190027830"><ph name="NAME" />ကို ဖွင့်သုံးနေ</translation> <translation id="2359808026110333948">ဆက်လုပ်ရန်</translation> <translation id="2367186422933365202">သင့် Chromebook သို့ လက်မှတ်ထိုးဝင်၍ မရပါ</translation> +<translation id="2367972762794486313">အက်ပ်များကို ပြပေးရန်</translation> <translation id="2369165858548251131">"Hello" ကို တရုတ်လို ဘယ်လိုပြောလဲ</translation> <translation id="2390318262976603432">ဘာသာစကား ဆက်တင်များ</translation> <translation id="240006516586367791">မီဒီယာ ထိန်းချုပ်မှုများ</translation>
diff --git a/ash/strings/ash_strings_ne.xtb b/ash/strings/ash_strings_ne.xtb index 06d7c497..09eb26e2 100644 --- a/ash/strings/ash_strings_ne.xtb +++ b/ash/strings/ash_strings_ne.xtb
@@ -264,6 +264,7 @@ <translation id="2354174487190027830"><ph name="NAME" /> लाई सक्रिय बनाउँदै</translation> <translation id="2359808026110333948">जारी राख्नुहोस्</translation> <translation id="2367186422933365202">तपाईंको Chromebook मा साइन इन गर्न सकिएन</translation> +<translation id="2367972762794486313">एप्स देखाउनुहोस्</translation> <translation id="2369165858548251131">चिनियाँ भाषामा "नमस्ते" कसरी भनिन्छ</translation> <translation id="2390318262976603432">भाषिक भेदका सेटिङहरू</translation> <translation id="240006516586367791">मिडियासम्बन्धी नियन्त्रणहरू</translation> @@ -508,6 +509,7 @@ <translation id="3713734891607377840">डाउनलोड भएपछि खुल्ने छ</translation> <translation id="3726171378575546917">यो डिभाइसमा <ph name="UNAVAILABLE_APPS_ONE" />, <ph name="UNAVAILABLE_APPS_TWO" /> र <ph name="UNAVAILABLE_APPS_COUNT" /> उपलब्ध छैनन्।</translation> <translation id="3735740477244556633">यसअनुसार क्रमबद्ध गर्नुहोस्</translation> +<translation id="3738664582935948253">तपाईं अब स्क्रिन रेकर्डिङमा क्लिक तथा किबोर्डका सर्टकटहरू देखाउन सक्नुहुन्छ</translation> <translation id="3742055079367172538">स्क्रिनसट लिइयो</translation> <translation id="3765841986579723851">आज सम्पादन गरिएको</translation> <translation id="3773700760453577392">कुनै प्रशासकले <ph name="USER_EMAIL" /> बाट एकभन्दा बढी साइन इन गर्ने अनुमति दिनुभएको छैन। जारी राख्न सबै प्रयोगकर्ताहरूले अनिवार्य रूपमा साइन आउट गर्नु पर्छ।</translation>
diff --git a/ash/strings/ash_strings_nl.xtb b/ash/strings/ash_strings_nl.xtb index 2cdf450..9fda69a 100644 --- a/ash/strings/ash_strings_nl.xtb +++ b/ash/strings/ash_strings_nl.xtb
@@ -263,6 +263,7 @@ <translation id="2354174487190027830"><ph name="NAME" /> activeren</translation> <translation id="2359808026110333948">Doorgaan</translation> <translation id="2367186422933365202">Kan niet inloggen op je Chromebook</translation> +<translation id="2367972762794486313">Apps bekijken</translation> <translation id="2369165858548251131">Chinees voor 'hallo'</translation> <translation id="2390318262976603432">Landinstellingen</translation> <translation id="240006516586367791">Mediabediening</translation> @@ -507,6 +508,7 @@ <translation id="3713734891607377840">Openen na afronding</translation> <translation id="3726171378575546917"><ph name="UNAVAILABLE_APPS_ONE" />, <ph name="UNAVAILABLE_APPS_TWO" /> en nog <ph name="UNAVAILABLE_APPS_COUNT" /> staan niet op dit apparaat.</translation> <translation id="3735740477244556633">Sorteren op</translation> +<translation id="3738664582935948253">Je kunt nu klikken en sneltoetsen tonen in schermopnamen</translation> <translation id="3742055079367172538">Screenshot gemaakt</translation> <translation id="3765841986579723851">Vandaag bewerkt</translation> <translation id="3773700760453577392">Een beheerder heeft geen toestemming gegeven voor toegang tot meerdere accounts voor <ph name="USER_EMAIL" />. Alle gebruikers moeten uitloggen om door te gaan.</translation>
diff --git a/ash/strings/ash_strings_no.xtb b/ash/strings/ash_strings_no.xtb index f0a3ad3..e808eae 100644 --- a/ash/strings/ash_strings_no.xtb +++ b/ash/strings/ash_strings_no.xtb
@@ -239,6 +239,7 @@ <translation id="2224075387478458881">Skjermopptak tillates ikke når beskyttet innhold er synlig</translation> <translation id="2227179592712503583">Fjern forslaget</translation> <translation id="225680501294068881">Leter etter enheter ...</translation> +<translation id="225716114209817872">Maksimum</translation> <translation id="2257486738914982088">Noe gikk galt under nedlasting av <ph name="FILENAME" /></translation> <translation id="2258734398699965611">Foreslåtte filer</translation> <translation id="2268130516524549846">Bluetooth er deaktivert</translation> @@ -263,6 +264,7 @@ <translation id="2354174487190027830">Aktiverer <ph name="NAME" /></translation> <translation id="2359808026110333948">Fortsett</translation> <translation id="2367186422933365202">Kan ikke logge på Chromebooken</translation> +<translation id="2367972762794486313">Vis apper</translation> <translation id="2369165858548251131">«Hei» på kinesisk</translation> <translation id="2390318262976603432">Lokalitetsinnstillinger</translation> <translation id="240006516586367791">Mediekontroller</translation> @@ -1014,6 +1016,7 @@ <translation id="6537924328260219877">Signalstyrke <ph name="SIGNAL_STRENGTH" /> – telefonbatterinivå <ph name="BATTERY_STATUS" /></translation> <translation id="6539852571005954999">Nedlastingen skannes: <ph name="FILENAME" /></translation> <translation id="6542521951477560771">Caster til <ph name="RECEIVER_NAME" /></translation> +<translation id="6548693220024099658">Uskarp bakgrunn</translation> <translation id="655633303491376835"><ph name="APP_NAME" /> Nylig installert</translation> <translation id="6559976592393364813">Spør administratoren</translation> @@ -1420,6 +1423,7 @@ <translation id="878215960996152260"><ph name="APP_NAME" />, installert app, blokkert</translation> <translation id="8785070478575117577">Koble til <ph name="NETWORK_NAME" /></translation> <translation id="8788027118671217603"><ph name="STATE_TEXT" />. <ph name="ENTERPRISE_TEXT" /></translation> +<translation id="8790998409862094015">Kraftig</translation> <translation id="8806053966018712535">Mappen <ph name="FOLDER_NAME" /></translation> <translation id="880709030178078220">«Hjelp»</translation> <translation id="8814190375133053267">Wifi</translation>
diff --git a/ash/strings/ash_strings_or.xtb b/ash/strings/ash_strings_or.xtb index e413e0c..8361c933 100644 --- a/ash/strings/ash_strings_or.xtb +++ b/ash/strings/ash_strings_or.xtb
@@ -263,6 +263,7 @@ <translation id="2354174487190027830"><ph name="NAME" /> ସକ୍ରିୟ କରାଯାଉଛି</translation> <translation id="2359808026110333948">ଜାରି ରଖନ୍ତୁ</translation> <translation id="2367186422933365202">ଆପଣଙ୍କ Chromebookରେ ସାଇନ୍ ଇନ୍ କରାଯାଇପାରିବ ନାହିଁ</translation> +<translation id="2367972762794486313">ଆପ୍ସ ଦେଖାନ୍ତୁ</translation> <translation id="2369165858548251131">ଚୀନୀୟ ଭାଷାରେ "ନମସ୍କାର"</translation> <translation id="2390318262976603432">ଲୋକେଲ୍ ସେଟିଂସ୍</translation> <translation id="240006516586367791">ମିଡିଆ ନିୟନ୍ତ୍ରଣଗୁଡ଼ିକ</translation>
diff --git a/ash/strings/ash_strings_pa.xtb b/ash/strings/ash_strings_pa.xtb index 882d824..984c5d68 100644 --- a/ash/strings/ash_strings_pa.xtb +++ b/ash/strings/ash_strings_pa.xtb
@@ -263,6 +263,7 @@ <translation id="2354174487190027830"><ph name="NAME" /> ਨੂੰ ਐਕਟੀਵੇਟ ਕਰ ਰਿਹਾ ਹੈ</translation> <translation id="2359808026110333948">ਜਾਰੀ ਰੱਖੋ</translation> <translation id="2367186422933365202">ਤੁਹਾਡੀ Chromebook ਵਿੱਚ ਸਾਈਨ-ਇਨ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ</translation> +<translation id="2367972762794486313">ਐਪਸ ਦਿਖਾਓ</translation> <translation id="2369165858548251131">ਚੀਨੀ ਭਾਸ਼ਾ ਵਿੱਚ "ਸਤਿ ਸ੍ਰੀ ਅਕਾਲ"</translation> <translation id="2390318262976603432">ਲੋਕੇਲ ਸੈਟਿੰਗਾਂ</translation> <translation id="240006516586367791">ਮੀਡੀਆ ਕੰਟਰੋਲ</translation>
diff --git a/ash/strings/ash_strings_pl.xtb b/ash/strings/ash_strings_pl.xtb index c983dec..79ceef2a 100644 --- a/ash/strings/ash_strings_pl.xtb +++ b/ash/strings/ash_strings_pl.xtb
@@ -265,6 +265,7 @@ <translation id="2354174487190027830">Aktywuję <ph name="NAME" /></translation> <translation id="2359808026110333948">Dalej</translation> <translation id="2367186422933365202">Nie mogę zalogować się na Chromebooku</translation> +<translation id="2367972762794486313">Pokaż aplikacje</translation> <translation id="2369165858548251131">„Cześć” po chińsku</translation> <translation id="2390318262976603432">Ustawienia języka</translation> <translation id="240006516586367791">Sterowanie multimediami</translation>
diff --git a/ash/strings/ash_strings_pt-BR.xtb b/ash/strings/ash_strings_pt-BR.xtb index fa4112c4..69fa94d 100644 --- a/ash/strings/ash_strings_pt-BR.xtb +++ b/ash/strings/ash_strings_pt-BR.xtb
@@ -28,6 +28,7 @@ <translation id="1104621072296271835">Seus dispositivos funcionam ainda melhor juntos</translation> <translation id="1111021433905331574">É possível mudar a cor da luz de fundo do teclado em "Configurações > <ph name="APP_TITLE" />"</translation> <translation id="112308213915226829">Ocultar estante automaticamente</translation> +<translation id="1135788167815124787">Reiluminação para retrato</translation> <translation id="1142002900084379065">Fotos recentes</translation> <translation id="1148499908455722006">Abrir a caixa de diálogo de informações da conta <ph name="USER_NAME" /></translation> <translation id="1150989369772528668">Agenda</translation> @@ -264,6 +265,7 @@ <translation id="2354174487190027830">Ativando <ph name="NAME" /></translation> <translation id="2359808026110333948">Continuar</translation> <translation id="2367186422933365202">Não foi possível fazer login no Chromebook</translation> +<translation id="2367972762794486313">Mostrar aplicativos</translation> <translation id="2369165858548251131">"Olá" em chinês</translation> <translation id="2390318262976603432">Configurações de localidade</translation> <translation id="240006516586367791">Controles de mídia</translation>
diff --git a/ash/strings/ash_strings_pt-PT.xtb b/ash/strings/ash_strings_pt-PT.xtb index 8ac83d8..a43def8 100644 --- a/ash/strings/ash_strings_pt-PT.xtb +++ b/ash/strings/ash_strings_pt-PT.xtb
@@ -265,6 +265,7 @@ <translation id="2354174487190027830">A ativar <ph name="NAME" /></translation> <translation id="2359808026110333948">Continuar</translation> <translation id="2367186422933365202">Não é possível iniciar sessão no Chromebook</translation> +<translation id="2367972762794486313">Mostrar aplicações</translation> <translation id="2369165858548251131">"Olá" em chinês</translation> <translation id="2390318262976603432">Definições locais</translation> <translation id="240006516586367791">Controlos de multimédia</translation>
diff --git a/ash/strings/ash_strings_ro.xtb b/ash/strings/ash_strings_ro.xtb index 002f238..badf76ed 100644 --- a/ash/strings/ash_strings_ro.xtb +++ b/ash/strings/ash_strings_ro.xtb
@@ -265,6 +265,7 @@ <translation id="2354174487190027830">Se activează <ph name="NAME" /></translation> <translation id="2359808026110333948">Continuă</translation> <translation id="2367186422933365202">Nu te poți conecta la Chromebook</translation> +<translation id="2367972762794486313">Afișați aplicații</translation> <translation id="2369165858548251131">„Bună” în chineză</translation> <translation id="2390318262976603432">Setări de limbă</translation> <translation id="240006516586367791">Comenzi media</translation>
diff --git a/ash/strings/ash_strings_ru.xtb b/ash/strings/ash_strings_ru.xtb index f8821d4..a37e646 100644 --- a/ash/strings/ash_strings_ru.xtb +++ b/ash/strings/ash_strings_ru.xtb
@@ -263,6 +263,7 @@ <translation id="2354174487190027830">Активация <ph name="NAME" /></translation> <translation id="2359808026110333948">Продолжить</translation> <translation id="2367186422933365202">Не удалось войти в аккаунт на устройстве Chromebook.</translation> +<translation id="2367972762794486313">Показать сервисы</translation> <translation id="2369165858548251131">"Привет" по-китайски</translation> <translation id="2390318262976603432">Региональные настройки</translation> <translation id="240006516586367791">Управление медиаконтентом</translation>
diff --git a/ash/strings/ash_strings_si.xtb b/ash/strings/ash_strings_si.xtb index 75b35d50..b9f4115 100644 --- a/ash/strings/ash_strings_si.xtb +++ b/ash/strings/ash_strings_si.xtb
@@ -263,6 +263,7 @@ <translation id="2354174487190027830"><ph name="NAME" /> සක්රීය කරමින්</translation> <translation id="2359808026110333948">කරගෙන යන්න</translation> <translation id="2367186422933365202">ඔබගේ Chromebook වෙත පිරීමට නොහැකිය</translation> +<translation id="2367972762794486313">යෙදුම් පෙන්වන්න</translation> <translation id="2369165858548251131">චීන භාෂාවෙන් "Hello"</translation> <translation id="2390318262976603432">පෙදෙසි සැකසීම්</translation> <translation id="240006516586367791">මාධ්ය පාලන</translation>
diff --git a/ash/strings/ash_strings_sk.xtb b/ash/strings/ash_strings_sk.xtb index a3241692..098d156e 100644 --- a/ash/strings/ash_strings_sk.xtb +++ b/ash/strings/ash_strings_sk.xtb
@@ -28,6 +28,7 @@ <translation id="1104621072296271835">Vaše zariadenia fungujú spoločne ešte lepšie</translation> <translation id="1111021433905331574">Farbu podsvietenia klávesnice môžete zmeniť v sekcii Nastavenia > <ph name="APP_TITLE" /></translation> <translation id="112308213915226829">Automatické skrývanie poličky</translation> +<translation id="1135788167815124787">Osvetlenie portrétu</translation> <translation id="1142002900084379065">Najnovšie fotky</translation> <translation id="1148499908455722006">Otvoriť dialógové okno informácií o používateľovi <ph name="USER_NAME" /></translation> <translation id="1150989369772528668">Kalendár</translation> @@ -263,6 +264,7 @@ <translation id="2354174487190027830">Aktivujte sa sieť <ph name="NAME" /></translation> <translation id="2359808026110333948">Pokračovať</translation> <translation id="2367186422933365202">Do Chromebooku sa nedá prihlásiť</translation> +<translation id="2367972762794486313">Zobraziť aplikácie</translation> <translation id="2369165858548251131">„Dobrý deň“ po čínsky</translation> <translation id="2390318262976603432">Miestne nastavenia</translation> <translation id="240006516586367791">Ovládanie médií</translation>
diff --git a/ash/strings/ash_strings_sl.xtb b/ash/strings/ash_strings_sl.xtb index b01bbb1b..d653092 100644 --- a/ash/strings/ash_strings_sl.xtb +++ b/ash/strings/ash_strings_sl.xtb
@@ -263,6 +263,7 @@ <translation id="2354174487190027830">Aktiviranje omrežja <ph name="NAME" /></translation> <translation id="2359808026110333948">Naprej</translation> <translation id="2367186422933365202">Prijava v Chromebook ni mogoča.</translation> +<translation id="2367972762794486313">Pokaži aplikacije</translation> <translation id="2369165858548251131">»Živijo« po kitajsko</translation> <translation id="2390318262976603432">Nastavitve jezika</translation> <translation id="240006516586367791">Kontrolniki predstavnosti</translation>
diff --git a/ash/strings/ash_strings_sq.xtb b/ash/strings/ash_strings_sq.xtb index b6846c3..bf9d4e2 100644 --- a/ash/strings/ash_strings_sq.xtb +++ b/ash/strings/ash_strings_sq.xtb
@@ -263,6 +263,7 @@ <translation id="2354174487190027830">Po aktivizon <ph name="NAME" /></translation> <translation id="2359808026110333948">Vazhdo</translation> <translation id="2367186422933365202">Nuk mund të identifikohesh në Chromebook-un tënd</translation> +<translation id="2367972762794486313">Shfaq aplikacionet</translation> <translation id="2369165858548251131">"Përshëndetje" në kinezisht</translation> <translation id="2390318262976603432">Cilësimet rajonale</translation> <translation id="240006516586367791">Kontrollet e medias</translation>
diff --git a/ash/strings/ash_strings_sr-Latn.xtb b/ash/strings/ash_strings_sr-Latn.xtb index 1080922..73f47b4 100644 --- a/ash/strings/ash_strings_sr-Latn.xtb +++ b/ash/strings/ash_strings_sr-Latn.xtb
@@ -265,6 +265,7 @@ <translation id="2354174487190027830">Aktiviranje mreže <ph name="NAME" /></translation> <translation id="2359808026110333948">Nastavi</translation> <translation id="2367186422933365202">Ne možete da se prijavite na Chromebook</translation> +<translation id="2367972762794486313">Prikažite aplikacije</translation> <translation id="2369165858548251131">„Zdravo“ na kineskom</translation> <translation id="2390318262976603432">Podešavanja lokaliteta</translation> <translation id="240006516586367791">Kontrole medija</translation>
diff --git a/ash/strings/ash_strings_sr.xtb b/ash/strings/ash_strings_sr.xtb index 9698cbd..c7ac4f44 100644 --- a/ash/strings/ash_strings_sr.xtb +++ b/ash/strings/ash_strings_sr.xtb
@@ -265,6 +265,7 @@ <translation id="2354174487190027830">Активирање мреже <ph name="NAME" /></translation> <translation id="2359808026110333948">Настави</translation> <translation id="2367186422933365202">Не можете да се пријавите на Chromebook</translation> +<translation id="2367972762794486313">Прикажите апликације</translation> <translation id="2369165858548251131">„Здраво“ на кинеском</translation> <translation id="2390318262976603432">Подешавања локалитета</translation> <translation id="240006516586367791">Контроле медија</translation>
diff --git a/ash/strings/ash_strings_sv.xtb b/ash/strings/ash_strings_sv.xtb index 226632a5a..16e7ec1 100644 --- a/ash/strings/ash_strings_sv.xtb +++ b/ash/strings/ash_strings_sv.xtb
@@ -264,6 +264,7 @@ <translation id="2354174487190027830">Aktiverar <ph name="NAME" /></translation> <translation id="2359808026110333948">Fortsätt</translation> <translation id="2367186422933365202">Det går inte att logga in på Chromebook</translation> +<translation id="2367972762794486313">Visa appar</translation> <translation id="2369165858548251131">”Hej” på kinesiska</translation> <translation id="2390318262976603432">Inställningar av språkkod</translation> <translation id="240006516586367791">Mediekontroller</translation>
diff --git a/ash/strings/ash_strings_sw.xtb b/ash/strings/ash_strings_sw.xtb index dd65f90..e3dfc73 100644 --- a/ash/strings/ash_strings_sw.xtb +++ b/ash/strings/ash_strings_sw.xtb
@@ -263,6 +263,7 @@ <translation id="2354174487190027830">Inaanza kutumia <ph name="NAME" /></translation> <translation id="2359808026110333948">Endelea</translation> <translation id="2367186422933365202">Imeshindwa kuingia katika akaunti kwenye Chromebook yako</translation> +<translation id="2367972762794486313">Onyesha programu</translation> <translation id="2369165858548251131">"Hujambo" kwa Kichina</translation> <translation id="2390318262976603432">Mipangilio ya Lugha</translation> <translation id="240006516586367791">Vidhibiti vya maudhui</translation>
diff --git a/ash/strings/ash_strings_ta.xtb b/ash/strings/ash_strings_ta.xtb index 5f34e93..7b44c6e 100644 --- a/ash/strings/ash_strings_ta.xtb +++ b/ash/strings/ash_strings_ta.xtb
@@ -264,6 +264,7 @@ <translation id="2354174487190027830"><ph name="NAME" /> ஐச் செயல்படுத்துகிறது</translation> <translation id="2359808026110333948">தொடர்க</translation> <translation id="2367186422933365202">Chromebookகில் உள்நுழைய முடியவில்லை</translation> +<translation id="2367972762794486313">பயன்பாடுகளைக் காட்டு</translation> <translation id="2369165858548251131">சீன மொழியில் "ஹலோ"</translation> <translation id="2390318262976603432">மொழி அமைப்புகள்</translation> <translation id="240006516586367791">மீடியா கட்டுப்பாடுகள்</translation> @@ -508,6 +509,7 @@ <translation id="3713734891607377840">பதிவிறக்கியதும் திற</translation> <translation id="3726171378575546917"><ph name="UNAVAILABLE_APPS_ONE" />, <ph name="UNAVAILABLE_APPS_TWO" /> ஆகியவையும் மேலும் <ph name="UNAVAILABLE_APPS_COUNT" /> ஆப்ஸும் இந்தச் சாதனத்தில் இல்லை.</translation> <translation id="3735740477244556633">இதன்படி வரிசைப்படுத்து</translation> +<translation id="3738664582935948253">ஸ்கிரீன் ரெக்கார்டிங்குகளில் கிளிக்குகளையும் கீபோர்டு ஷார்ட்கட்களையும் இப்போது நீங்கள் காட்டலாம்</translation> <translation id="3742055079367172538">ஸ்கிரீன்ஷாட் எடுக்கப்பட்டது</translation> <translation id="3765841986579723851">இன்று திருத்தப்பட்டது</translation> <translation id="3773700760453577392"><ph name="USER_EMAIL" />க்கு, பல உள்நுழைவை நிர்வாகி அனுமதிக்கவில்லை. தொடர, எல்லாப் பயனர்களும் வெளியேற வேண்டும்.</translation>
diff --git a/ash/strings/ash_strings_te.xtb b/ash/strings/ash_strings_te.xtb index 7c4a157..f640bb82 100644 --- a/ash/strings/ash_strings_te.xtb +++ b/ash/strings/ash_strings_te.xtb
@@ -28,6 +28,7 @@ <translation id="1104621072296271835">మీ పరికరాలు కలిసికట్టుగా మరింత బాగా పనిచేస్తాయి</translation> <translation id="1111021433905331574">మీరు మీ కీబోర్డ్ బ్యాక్లైట్ రంగును సెట్టింగ్లు > <ph name="APP_TITLE" />లో మార్చవచ్చు</translation> <translation id="112308213915226829">అరను ఆటోమేటిక్గా దాచు</translation> +<translation id="1135788167815124787">పోర్ట్రెయిట్ రీలైటింగ్</translation> <translation id="1142002900084379065">ఇటీవలి ఫోటోలు</translation> <translation id="1148499908455722006"><ph name="USER_NAME" /> కోసం సమాచార డైలాగ్ను తెరవండి</translation> <translation id="1150989369772528668">క్యాలెండర్</translation> @@ -239,6 +240,7 @@ <translation id="2224075387478458881">గోప్యమైన కంటెంట్ కనిపించినప్పుడు స్క్రీన్ రికార్డింగ్ అనుమతించబడదు</translation> <translation id="2227179592712503583">సూచనను తీసివేయండి</translation> <translation id="225680501294068881">పరికరాల కోసం స్కాన్ చేస్తోంది...</translation> +<translation id="225716114209817872">గరిష్ఠం</translation> <translation id="2257486738914982088"><ph name="FILENAME" />ను డౌన్లోడ్ చేస్తున్నప్పుడు ఏదో తప్పు జరిగింది</translation> <translation id="2258734398699965611">సూచించిన ఫైల్స్</translation> <translation id="2268130516524549846">బ్లూటూత్ నిలిపివేయబడింది</translation> @@ -263,6 +265,7 @@ <translation id="2354174487190027830"><ph name="NAME" />ని సక్రియం చేస్తోంది</translation> <translation id="2359808026110333948">కొనసాగించండి</translation> <translation id="2367186422933365202">మీ Chromebookకు సైన్ ఇన్ చేయడం సాధ్యపడలేదు</translation> +<translation id="2367972762794486313">యాప్లను చూపు</translation> <translation id="2369165858548251131">చైనీస్లో "హలో"</translation> <translation id="2390318262976603432">లొకేల్ సెట్టింగ్లు</translation> <translation id="240006516586367791">మీడియా నియంత్రణలు</translation> @@ -1015,6 +1018,7 @@ <translation id="6537924328260219877">సిగ్నల్ సామర్థ్యం <ph name="SIGNAL_STRENGTH" />, ఫోన్ బ్యాటరీ <ph name="BATTERY_STATUS" /></translation> <translation id="6539852571005954999">డౌన్లోడ్ చేయడానికి <ph name="FILENAME" />ను స్కాన్ చేస్తోంది</translation> <translation id="6542521951477560771"><ph name="RECEIVER_NAME" />కు ప్రసారం చేస్తున్నారు</translation> +<translation id="6548693220024099658">బ్యాక్గ్రౌండ్ బ్లర్</translation> <translation id="655633303491376835"><ph name="APP_NAME" /> కొత్తగా ఇన్స్టాల్ చేయబడింది</translation> <translation id="6559976592393364813">నిర్వాహకుడిని అడగండి</translation> @@ -1421,6 +1425,7 @@ <translation id="878215960996152260"><ph name="APP_NAME" />, ఇన్స్టాల్ చేయబడిన యాప్, బ్లాక్ చేయబడింది</translation> <translation id="8785070478575117577"><ph name="NETWORK_NAME" />కు కనెక్ట్ చేయండి</translation> <translation id="8788027118671217603"><ph name="STATE_TEXT" />. <ph name="ENTERPRISE_TEXT" /></translation> +<translation id="8790998409862094015">అధికం</translation> <translation id="8806053966018712535">ఫోల్డర్ <ph name="FOLDER_NAME" /></translation> <translation id="880709030178078220">"సహాయం"</translation> <translation id="8814190375133053267">Wi-Fi</translation>
diff --git a/ash/strings/ash_strings_th.xtb b/ash/strings/ash_strings_th.xtb index 8e084e9d..761a12e6 100644 --- a/ash/strings/ash_strings_th.xtb +++ b/ash/strings/ash_strings_th.xtb
@@ -264,6 +264,7 @@ <translation id="2354174487190027830">กำลังเปิดใช้งาน <ph name="NAME" /></translation> <translation id="2359808026110333948">ต่อไป</translation> <translation id="2367186422933365202">ลงชื่อเข้าใช้ Chromebook ไม่ได้</translation> +<translation id="2367972762794486313">แสดงแอป</translation> <translation id="2369165858548251131">"สวัสดี" ในภาษาจีน</translation> <translation id="2390318262976603432">การตั้งค่าภาษา</translation> <translation id="240006516586367791">การควบคุมสื่อ</translation>
diff --git a/ash/strings/ash_strings_tr.xtb b/ash/strings/ash_strings_tr.xtb index 14b075c..f4465158 100644 --- a/ash/strings/ash_strings_tr.xtb +++ b/ash/strings/ash_strings_tr.xtb
@@ -263,6 +263,7 @@ <translation id="2354174487190027830"><ph name="NAME" /> etkinleştiriliyor</translation> <translation id="2359808026110333948">Devam et</translation> <translation id="2367186422933365202">Chromebook'unuzda oturum açılamıyor</translation> +<translation id="2367972762794486313">Uygulamaları göster</translation> <translation id="2369165858548251131">Çince "Merhaba"</translation> <translation id="2390318262976603432">Yerel Ayarlar</translation> <translation id="240006516586367791">Medya denetimleri</translation>
diff --git a/ash/strings/ash_strings_uk.xtb b/ash/strings/ash_strings_uk.xtb index c69da90..62f97dc 100644 --- a/ash/strings/ash_strings_uk.xtb +++ b/ash/strings/ash_strings_uk.xtb
@@ -263,6 +263,7 @@ <translation id="2354174487190027830">Активація <ph name="NAME" /></translation> <translation id="2359808026110333948">Продовжити</translation> <translation id="2367186422933365202">Не вдається ввійти в обліковий запис на Chromebook</translation> +<translation id="2367972762794486313">Показати програми</translation> <translation id="2369165858548251131">Як сказати "привіт" китайською</translation> <translation id="2390318262976603432">Налаштування мовного коду</translation> <translation id="240006516586367791">Елементи керування медіа</translation>
diff --git a/ash/strings/ash_strings_ur.xtb b/ash/strings/ash_strings_ur.xtb index 78a543a..00e680bc 100644 --- a/ash/strings/ash_strings_ur.xtb +++ b/ash/strings/ash_strings_ur.xtb
@@ -239,6 +239,7 @@ <translation id="2224075387478458881">تحفظ یافتہ مواد کے مرئی ہونے پر اسکرین ریکارڈنگ کی اجازت نہیں ہے</translation> <translation id="2227179592712503583">تجویز ہٹائیں</translation> <translation id="225680501294068881">آلات کیلئے سکیننگ کی جا رہی ہے…</translation> +<translation id="225716114209817872">زیادہ سے زیادہ</translation> <translation id="2257486738914982088"><ph name="FILENAME" /> ڈاؤن لوڈ کرنے کے دوران کچھ غلط ہو گیا</translation> <translation id="2258734398699965611">تجویز کردہ فائلز</translation> <translation id="2268130516524549846">بلوٹوتھ غیر فعال کر دیا گیا</translation> @@ -263,6 +264,7 @@ <translation id="2354174487190027830"><ph name="NAME" /> کو فعال کیا جا رہا ہے</translation> <translation id="2359808026110333948">جاری رکھیں</translation> <translation id="2367186422933365202">اپنے Chromebook میں سائن ان نہیں کر سکتے</translation> +<translation id="2367972762794486313">ایپس دکھائیں</translation> <translation id="2369165858548251131">چینی میں "ہیلو"</translation> <translation id="2390318262976603432">مقامی ترتیبات</translation> <translation id="240006516586367791">میڈیا کنٹرولز</translation> @@ -1014,6 +1016,7 @@ <translation id="6537924328260219877">سگنل کی مضبوطی <ph name="SIGNAL_STRENGTH" />، فون کی بیٹری <ph name="BATTERY_STATUS" /></translation> <translation id="6539852571005954999">اسکین ہونے والی <ph name="FILENAME" /> کو ڈاؤن لوڈ کریں</translation> <translation id="6542521951477560771"><ph name="RECEIVER_NAME" /> پر کاسٹ کیا جا رہا ہے</translation> +<translation id="6548693220024099658">پس منظر کا دھندلا پن</translation> <translation id="655633303491376835">نئی انسٹال کردہ <ph name="APP_NAME" /></translation> <translation id="6559976592393364813">منتظم سے پوچھیں</translation> <translation id="6565007273808762236">eSIM کنکشن دستیاب نہیں ہے</translation> @@ -1419,6 +1422,7 @@ <translation id="878215960996152260"><ph name="APP_NAME" />، انسٹال کردہ ایپ، مسدود ہے</translation> <translation id="8785070478575117577"><ph name="NETWORK_NAME" /> سے منسلک کریں</translation> <translation id="8788027118671217603"><ph name="STATE_TEXT" />۔ <ph name="ENTERPRISE_TEXT" /></translation> +<translation id="8790998409862094015">بہت زیادہ</translation> <translation id="8806053966018712535">فولڈر <ph name="FOLDER_NAME" /></translation> <translation id="880709030178078220">"مدد"</translation> <translation id="8814190375133053267">Wi-Fi</translation>
diff --git a/ash/strings/ash_strings_uz.xtb b/ash/strings/ash_strings_uz.xtb index e035400..a2ffa84b 100644 --- a/ash/strings/ash_strings_uz.xtb +++ b/ash/strings/ash_strings_uz.xtb
@@ -264,6 +264,7 @@ <translation id="2354174487190027830"><ph name="NAME" /> faollashtirilmoqda</translation> <translation id="2359808026110333948">Davom etish</translation> <translation id="2367186422933365202">Chromebook hisobiga kirilmadi</translation> +<translation id="2367972762794486313">Ilovalarni ko‘rsatish</translation> <translation id="2369165858548251131">Xitoy tilida “Salom”</translation> <translation id="2390318262976603432">Mahalliy sozlamalar</translation> <translation id="240006516586367791">Media boshqaruvi</translation>
diff --git a/ash/strings/ash_strings_vi.xtb b/ash/strings/ash_strings_vi.xtb index 8a86277..f309956 100644 --- a/ash/strings/ash_strings_vi.xtb +++ b/ash/strings/ash_strings_vi.xtb
@@ -263,6 +263,7 @@ <translation id="2354174487190027830">Kích hoạt <ph name="NAME" /></translation> <translation id="2359808026110333948">Tiếp tục</translation> <translation id="2367186422933365202">Không thể đăng nhập vào Chromebook của bạn</translation> +<translation id="2367972762794486313">Hiển thị ứng dụng</translation> <translation id="2369165858548251131">"Xin chào" bằng tiếng Trung</translation> <translation id="2390318262976603432">Cài đặt ngôn ngữ</translation> <translation id="240006516586367791">Điều khiển nội dung nghe nhìn</translation>
diff --git a/ash/strings/ash_strings_zh-CN.xtb b/ash/strings/ash_strings_zh-CN.xtb index d266685..d838126 100644 --- a/ash/strings/ash_strings_zh-CN.xtb +++ b/ash/strings/ash_strings_zh-CN.xtb
@@ -264,6 +264,7 @@ <translation id="2354174487190027830">正在激活“<ph name="NAME" />”</translation> <translation id="2359808026110333948">继续</translation> <translation id="2367186422933365202">无法登录 Chromebook</translation> +<translation id="2367972762794486313">显示应用</translation> <translation id="2369165858548251131">“你好”用英文怎么说</translation> <translation id="2390318262976603432">语言区域设置</translation> <translation id="240006516586367791">媒体控件</translation>
diff --git a/ash/strings/ash_strings_zh-HK.xtb b/ash/strings/ash_strings_zh-HK.xtb index 8339dd26..d230851 100644 --- a/ash/strings/ash_strings_zh-HK.xtb +++ b/ash/strings/ash_strings_zh-HK.xtb
@@ -264,6 +264,7 @@ <translation id="2354174487190027830">正在啟用 <ph name="NAME" /></translation> <translation id="2359808026110333948">繼續</translation> <translation id="2367186422933365202">無法登入 Chromebook</translation> +<translation id="2367972762794486313">顯示應用程式</translation> <translation id="2369165858548251131">「你好」嘅英文</translation> <translation id="2390318262976603432">語言代碼設定</translation> <translation id="240006516586367791">媒體控制項</translation> @@ -695,6 +696,7 @@ <translation id="4740516757091333363">要刪除已儲存的桌面嗎？</translation> <translation id="4752784485658729358">只允許儲存 6 個桌面。請移除一個桌面以儲存新桌面。</translation> <translation id="4759238208242260848">下載</translation> +<translation id="4762573482154983647">隱藏應用程式</translation> <translation id="4774338217796918551">明天<ph name="COME_BACK_TIME" /> 後才可使用。</translation> <translation id="4776917500594043016"><ph name="USER_EMAIL_ADDRESS" /> 的密碼</translation> <translation id="4777825441726637019">Play 商店</translation>
diff --git a/ash/strings/ash_strings_zh-TW.xtb b/ash/strings/ash_strings_zh-TW.xtb index 4370dc1..1433bbb3 100644 --- a/ash/strings/ash_strings_zh-TW.xtb +++ b/ash/strings/ash_strings_zh-TW.xtb
@@ -264,6 +264,7 @@ <translation id="2354174487190027830">正在啟用 <ph name="NAME" /></translation> <translation id="2359808026110333948">繼續</translation> <translation id="2367186422933365202">無法登入 Chromebook</translation> +<translation id="2367972762794486313">顯示應用程式</translation> <translation id="2369165858548251131">「你好」的英文</translation> <translation id="2390318262976603432">語言代碼設定</translation> <translation id="240006516586367791">媒體控制項</translation>
diff --git a/ash/strings/ash_strings_zu.xtb b/ash/strings/ash_strings_zu.xtb index 6b508ed..de4934c0 100644 --- a/ash/strings/ash_strings_zu.xtb +++ b/ash/strings/ash_strings_zu.xtb
@@ -263,6 +263,7 @@ <translation id="2354174487190027830">Yenza kusebenze i-<ph name="NAME" /></translation> <translation id="2359808026110333948">Qhubeka</translation> <translation id="2367186422933365202">Ayikwazi ukungena ngemvume ku-Chromebook yakho</translation> +<translation id="2367972762794486313">Bonisa izinhlelo zokusebenza</translation> <translation id="2369165858548251131">"Sawubona" ngesi-Chinese</translation> <translation id="2390318262976603432">Izilungiselelo Zesifunda</translation> <translation id="240006516586367791">Izilawuli zemidiya</translation> @@ -507,6 +508,7 @@ <translation id="3713734891607377840">Vula lapho isiqedile</translation> <translation id="3726171378575546917"><ph name="UNAVAILABLE_APPS_ONE" />, <ph name="UNAVAILABLE_APPS_TWO" />, nangu-<ph name="UNAVAILABLE_APPS_COUNT" /> ngaphezulu awekho kule divayisi.</translation> <translation id="3735740477244556633">Hlunga nge-</translation> +<translation id="3738664582935948253">Manje ungabonisa ukuchofoza nezinqamuleli zekhibhodi ekurekhodweni kwesikrini</translation> <translation id="3742055079367172538">Kuthathwe isithombe-skrini</translation> <translation id="3765841986579723851">Kuhlelwe namuhla</translation> <translation id="3773700760453577392">Umlawuli akazange avumele ukungena ngemvume okuningi kwe-<ph name="USER_EMAIL" />. Bonke abasebenzisi kumele baphume ngemvume ukuze baqhubeke.</translation>
diff --git a/ash/system/bluetooth/bluetooth_device_status_ui_handler.cc b/ash/system/bluetooth/bluetooth_device_status_ui_handler.cc index e1859cb..2eea8ff7 100644 --- a/ash/system/bluetooth/bluetooth_device_status_ui_handler.cc +++ b/ash/system/bluetooth/bluetooth_device_status_ui_handler.cc
@@ -6,6 +6,7 @@ #include "ash/constants/notifier_catalogs.h" #include "ash/public/cpp/bluetooth_config_service.h" +#include "ash/public/cpp/hats_bluetooth_revamp_trigger.h" #include "ash/public/cpp/system/toast_data.h" #include "ash/public/cpp/system/toast_manager.h" #include "ash/strings/grit/ash_strings.h" @@ -78,6 +79,10 @@ ShowToast(std::move(toast_data)); device::RecordUiSurfaceDisplayed( device::BluetoothUiSurface::kConnectionToast); + + if (auto* hats_bluetooth_revamp_trigger = HatsBluetoothRevampTrigger::Get()) { + hats_bluetooth_revamp_trigger->TryToShowSurvey(); + } } void BluetoothDeviceStatusUiHandler::ShowToast(ash::ToastData toast_data) {
diff --git a/ash/system/bluetooth/bluetooth_device_status_ui_handler_unittest.cc b/ash/system/bluetooth/bluetooth_device_status_ui_handler_unittest.cc index 121a705..be3d207 100644 --- a/ash/system/bluetooth/bluetooth_device_status_ui_handler_unittest.cc +++ b/ash/system/bluetooth/bluetooth_device_status_ui_handler_unittest.cc
@@ -4,6 +4,8 @@ #include "ash/system/bluetooth/bluetooth_device_status_ui_handler.h" +#include "ash/public/cpp/fake_hats_bluetooth_revamp_trigger_impl.h" +#include "ash/public/cpp/hats_bluetooth_revamp_trigger.h" #include "ash/public/cpp/system/toast_data.h" #include "ash/public/cpp/system/toast_manager.h" #include "ash/strings/grit/ash_strings.h" @@ -34,6 +36,9 @@ public: void SetUp() override { AshTestBase::SetUp(); + + fake_trigger_impl_ = std::make_unique<FakeHatsBluetoothRevampTriggerImpl>(); + device_status_ui_handler_ = std::make_unique<NiceMock<MockBluetoothDeviceStatusUiHandler>>(); base::RunLoop().RunUntilIdle(); @@ -67,6 +72,10 @@ return paired_device; } + size_t GetTryToShowSurveyCount() { + return fake_trigger_impl_->try_to_show_survey_count(); + } + private: bluetooth_config::FakeBluetoothDeviceStatusNotifier* fake_device_status_notifier() { @@ -75,6 +84,7 @@ ->fake_bluetooth_device_status_notifier(); } + std::unique_ptr<FakeHatsBluetoothRevampTriggerImpl> fake_trigger_impl_; std::unique_ptr<MockBluetoothDeviceStatusUiHandler> device_status_ui_handler_; }; @@ -84,8 +94,10 @@ } TEST_F(BluetoothDeviceStatusUiHandlerTest, ConnectedDevice) { + EXPECT_EQ(0u, GetTryToShowSurveyCount()); EXPECT_CALL(device_status_ui_handler(), ShowToast); SetConnectedDevice(GetPairedDevice()); + EXPECT_EQ(2u, GetTryToShowSurveyCount()); } TEST_F(BluetoothDeviceStatusUiHandlerTest, DisconnectedDevice) {
diff --git a/ash/system/video_conference/bubble/return_to_app_panel.cc b/ash/system/video_conference/bubble/return_to_app_panel.cc index 4ff369c..e544ca39 100644 --- a/ash/system/video_conference/bubble/return_to_app_panel.cc +++ b/ash/system/video_conference/bubble/return_to_app_panel.cc
@@ -32,8 +32,10 @@ const int kReturnToAppPanelRadius = 16; const int kReturnToAppPanelSpacing = 8; -const int kReturnToAppButtonSpacing = 12; +const int kReturnToAppButtonTopRowSpacing = 12; +const int kReturnToAppButtonSpacing = 16; const int kReturnToAppButtonIconsSpacing = 2; +const int kReturnToAppIconSize = 20; // Creates a view containing camera, microphone, and screen share icons that // shows capturing state of a media app. @@ -44,7 +46,7 @@ auto container = std::make_unique<views::View>(); container->SetLayoutManager(std::make_unique<views::FlexLayout>()) ->SetOrientation(views::LayoutOrientation::kHorizontal) - .SetMainAxisAlignment(views::LayoutAlignment::kCenter) + .SetMainAxisAlignment(views::LayoutAlignment::kEnd) .SetCrossAxisAlignment(views::LayoutAlignment::kStretch) .SetDefault(views::kMarginsKey, gfx::Insets::TLBR(0, kReturnToAppButtonIconsSpacing / 2, 0, @@ -53,21 +55,24 @@ if (is_capturing_camera) { auto camera_icon = std::make_unique<views::ImageView>(); camera_icon->SetImage(ui::ImageModel::FromVectorIcon( - kPrivacyIndicatorsCameraIcon, cros_tokens::kCrosSysPositive)); + kPrivacyIndicatorsCameraIcon, cros_tokens::kCrosSysPositive, + kReturnToAppIconSize)); container->AddChildView(std::move(camera_icon)); } if (is_capturing_microphone) { auto microphone_icon = std::make_unique<views::ImageView>(); microphone_icon->SetImage(ui::ImageModel::FromVectorIcon( - kPrivacyIndicatorsMicrophoneIcon, cros_tokens::kCrosSysPositive)); + kPrivacyIndicatorsMicrophoneIcon, cros_tokens::kCrosSysPositive, + kReturnToAppIconSize)); container->AddChildView(std::move(microphone_icon)); } if (is_capturing_screen) { auto screen_share_icon = std::make_unique<views::ImageView>(); screen_share_icon->SetImage(ui::ImageModel::FromVectorIcon( - kPrivacyIndicatorsScreenShareIcon, cros_tokens::kCrosSysPositive)); + kPrivacyIndicatorsScreenShareIcon, cros_tokens::kCrosSysPositive, + kReturnToAppIconSize)); container->AddChildView(std::move(screen_share_icon)); } @@ -152,16 +157,23 @@ is_capturing_microphone_(is_capturing_microphone), is_capturing_screen_(is_capturing_screen), panel_(panel) { + auto spacing = is_top_row ? kReturnToAppButtonTopRowSpacing / 2 + : kReturnToAppButtonSpacing / 2; SetLayoutManager(std::make_unique<views::FlexLayout>()) ->SetOrientation(views::LayoutOrientation::kHorizontal) - .SetMainAxisAlignment(views::LayoutAlignment::kCenter) + .SetMainAxisAlignment(is_top_row ? views::LayoutAlignment::kCenter + : views::LayoutAlignment::kStart) .SetCrossAxisAlignment(views::LayoutAlignment::kStretch) .SetDefault(views::kMarginsKey, - gfx::Insets::TLBR(0, kReturnToAppButtonSpacing / 2, 0, - kReturnToAppButtonSpacing / 2)); + gfx::Insets::TLBR(0, spacing, 0, spacing)); icons_container_ = AddChildView(CreateReturnToAppIconsContainer( is_capturing_camera, is_capturing_microphone, is_capturing_screen)); + if (!is_top_row) { + icons_container_->SetPreferredSize( + gfx::Size(/*width=*/kReturnToAppIconSize * panel->max_capturing_count(), + /*height=*/kReturnToAppIconSize)); + } label_ = AddChildView(std::make_unique<views::Label>(display_text)); @@ -216,7 +228,7 @@ .SetCrossAxisAlignment(views::LayoutAlignment::kStretch) .SetDefault(views::kMarginsKey, gfx::Insets::TLBR(0, 0, kReturnToAppPanelSpacing, 0)) - .SetInteriorMargin(gfx::Insets::TLBR(12, 0, 0, 0)); + .SetInteriorMargin(gfx::Insets::TLBR(12, 16, 8, 16)); // Add running media apps buttons to the panel. VideoConferenceTrayController::Get()->GetMediaApps(base::BindOnce( @@ -270,11 +282,10 @@ bool any_apps_capturing_screen = false; for (auto& app : apps) { - AddChildView(std::make_unique<ReturnToAppButton>( - /*panel=*/this, - /*is_top_row=*/false, app->is_capturing_camera, - app->is_capturing_microphone, app->is_capturing_screen, - GetMediaAppDisplayText(app))); + max_capturing_count_ = + std::max(max_capturing_count_, app->is_capturing_camera + + app->is_capturing_microphone + + app->is_capturing_screen); any_apps_capturing_camera |= app->is_capturing_camera; any_apps_capturing_microphone |= app->is_capturing_microphone; @@ -285,15 +296,20 @@ IDS_ASH_VIDEO_CONFERENCE_RETURN_TO_APP_SUMMARY_TEXT, static_cast<int>(apps.size())); - summary_row_view_ = - AddChildViewAt(std::make_unique<ReturnToAppButton>( - /*panel=*/this, - /*is_top_row=*/true, any_apps_capturing_camera, - any_apps_capturing_microphone, - any_apps_capturing_screen, summary_text), - 0); + summary_row_view_ = AddChildView(std::make_unique<ReturnToAppButton>( + /*panel=*/this, + /*is_top_row=*/true, any_apps_capturing_camera, + any_apps_capturing_microphone, any_apps_capturing_screen, summary_text)); summary_row_view_->AddObserver(this); + for (auto& app : apps) { + AddChildView(std::make_unique<ReturnToAppButton>( + /*panel=*/this, + /*is_top_row=*/false, app->is_capturing_camera, + app->is_capturing_microphone, app->is_capturing_screen, + GetMediaAppDisplayText(app))); + } + OnExpandedStateChanged(false); }
diff --git a/ash/system/video_conference/bubble/return_to_app_panel.h b/ash/system/video_conference/bubble/return_to_app_panel.h index 7d6e686b..2a2b82a 100644 --- a/ash/system/video_conference/bubble/return_to_app_panel.h +++ b/ash/system/video_conference/bubble/return_to_app_panel.h
@@ -122,6 +122,8 @@ ReturnToAppPanel& operator=(const ReturnToAppPanel&) = delete; ~ReturnToAppPanel() override; + int max_capturing_count() { return max_capturing_count_; } + private: // ReturnToAppButton::Observer: void OnExpandedStateChanged(bool expanded) override; @@ -134,6 +136,11 @@ // by the views hierarchy. ReturnToAppButton* summary_row_view_ = nullptr; + // Keep track the maximum number of capturing that an individual media app + // has. This number is used to make sure the icons in `ReturnToAppButton` are + // right aligned with each other. + int max_capturing_count_ = 0; + base::WeakPtrFactory<ReturnToAppPanel> weak_ptr_factory_{this}; };
diff --git a/ash/system/video_conference/bubble/return_to_app_panel_unittest.cc b/ash/system/video_conference/bubble/return_to_app_panel_unittest.cc index 411d308..37ab2ac 100644 --- a/ash/system/video_conference/bubble/return_to_app_panel_unittest.cc +++ b/ash/system/video_conference/bubble/return_to_app_panel_unittest.cc
@@ -18,6 +18,19 @@ namespace { +crosapi::mojom::VideoConferenceMediaAppInfoPtr CreateFakeMediaApp( + bool is_capturing_camera, + bool is_capturing_microphone, + bool is_capturing_screen, + const std::u16string& title, + std::string url) { + return crosapi::mojom::VideoConferenceMediaAppInfo::New( + /*id=*/base::UnguessableToken::Create(), + /*last_activity_time=*/base::Time::Now(), is_capturing_camera, + is_capturing_microphone, is_capturing_screen, title, + /*url=*/GURL(url)); +} + // Verifies the information of `ReturnToAppButton`. void VerifyReturnToAppButtonInfo( ash::video_conference::ReturnToAppButton* button, @@ -113,18 +126,14 @@ TEST_F(ReturnToAppPanelTest, MultipleApps) { controller()->ClearMediaApps(); - controller()->AddMediaApp(crosapi::mojom::VideoConferenceMediaAppInfo::New( - /*id=*/base::UnguessableToken::Create(), - /*last_activity_time=*/base::Time::Now(), + controller()->AddMediaApp(CreateFakeMediaApp( /*is_capturing_camera=*/true, /*is_capturing_microphone=*/false, /*is_capturing_screen=*/false, /*title=*/u"Google Meet", - /*url=*/GURL(kGoogleMeetTestUrl))); - controller()->AddMediaApp(crosapi::mojom::VideoConferenceMediaAppInfo::New( - /*id=*/base::UnguessableToken::Create(), - /*last_activity_time=*/base::Time::Now(), + /*url=*/kGoogleMeetTestUrl)); + controller()->AddMediaApp(CreateFakeMediaApp( /*is_capturing_camera=*/false, /*is_capturing_microphone=*/true, /*is_capturing_screen=*/true, /*title=*/u"Zoom", - /*url=*/absl::nullopt)); + /*url=*/"")); // There should be three children, one representing the summary row and two // for two running media apps. @@ -160,18 +169,14 @@ TEST_F(ReturnToAppPanelTest, ExpandCollapse) { controller()->ClearMediaApps(); - controller()->AddMediaApp(crosapi::mojom::VideoConferenceMediaAppInfo::New( - /*id=*/base::UnguessableToken::Create(), - /*last_activity_time=*/base::Time::Now(), + controller()->AddMediaApp(CreateFakeMediaApp( /*is_capturing_camera=*/true, /*is_capturing_microphone=*/false, /*is_capturing_screen=*/false, /*title=*/u"Google Meet", - /*url=*/GURL(kGoogleMeetTestUrl))); - controller()->AddMediaApp(crosapi::mojom::VideoConferenceMediaAppInfo::New( - /*id=*/base::UnguessableToken::Create(), - /*last_activity_time=*/base::Time::Now(), + /*url=*/kGoogleMeetTestUrl)); + controller()->AddMediaApp(CreateFakeMediaApp( /*is_capturing_camera=*/false, /*is_capturing_microphone=*/true, /*is_capturing_screen=*/true, /*title=*/u"Zoom", - /*url=*/absl::nullopt)); + /*url=*/"")); auto return_to_app_panel = std::make_unique<ReturnToAppPanel>(); auto* summary_row = @@ -211,4 +216,44 @@ EXPECT_FALSE(summary_row->expanded()); } +TEST_F(ReturnToAppPanelTest, MaxCapturingCount) { + // Test the panel's `max_capturing_count_` to make sure the buttons are + // aligned correctly. + controller()->ClearMediaApps(); + controller()->AddMediaApp(CreateFakeMediaApp( + /*is_capturing_camera=*/true, /*is_capturing_microphone=*/false, + /*is_capturing_screen=*/false, /*title=*/u"Google Meet", + /*url=*/kGoogleMeetTestUrl)); + controller()->AddMediaApp(CreateFakeMediaApp( + /*is_capturing_camera=*/false, /*is_capturing_microphone=*/false, + /*is_capturing_screen=*/true, /*title=*/u"Zoom", + /*url=*/"")); + auto return_to_app_panel = std::make_unique<ReturnToAppPanel>(); + EXPECT_EQ(1, return_to_app_panel->max_capturing_count()); + + controller()->ClearMediaApps(); + controller()->AddMediaApp(CreateFakeMediaApp( + /*is_capturing_camera=*/true, /*is_capturing_microphone=*/false, + /*is_capturing_screen=*/false, /*title=*/u"Google Meet", + /*url=*/kGoogleMeetTestUrl)); + controller()->AddMediaApp(CreateFakeMediaApp( + /*is_capturing_camera=*/false, /*is_capturing_microphone=*/true, + /*is_capturing_screen=*/true, /*title=*/u"Zoom", + /*url=*/"")); + return_to_app_panel = std::make_unique<ReturnToAppPanel>(); + EXPECT_EQ(2, return_to_app_panel->max_capturing_count()); + + controller()->ClearMediaApps(); + controller()->AddMediaApp(CreateFakeMediaApp( + /*is_capturing_camera=*/true, /*is_capturing_microphone=*/false, + /*is_capturing_screen=*/false, /*title=*/u"Google Meet", + /*url=*/kGoogleMeetTestUrl)); + controller()->AddMediaApp(CreateFakeMediaApp( + /*is_capturing_camera=*/true, /*is_capturing_microphone=*/true, + /*is_capturing_screen=*/true, /*title=*/u"Zoom", + /*url=*/"")); + return_to_app_panel = std::make_unique<ReturnToAppPanel>(); + EXPECT_EQ(3, return_to_app_panel->max_capturing_count()); +} + } // namespace ash::video_conference \ No newline at end of file
diff --git a/ash/webui/camera_app_ui/resources/js/device/camera3_device_info.ts b/ash/webui/camera_app_ui/resources/js/device/camera3_device_info.ts index fe27724..318341d 100644 --- a/ash/webui/camera_app_ui/resources/js/device/camera3_device_info.ts +++ b/ash/webui/camera_app_ui/resources/js/device/camera3_device_info.ts
@@ -117,14 +117,9 @@ * operator. * * @param deviceInfo Given device info. - * @param videoConfigFilter Filters the available video capability exposed by - * device. * @throws Thrown when the device operation is not supported. */ - static async create( - deviceInfo: MediaDeviceInfo, - videoConfigFilter: (videoConfig: VideoConfig) => boolean): - Promise<Camera3DeviceInfo> { + static async create(deviceInfo: MediaDeviceInfo): Promise<Camera3DeviceInfo> { const deviceId = deviceInfo.deviceId; const deviceOperator = DeviceOperator.getInstance(); @@ -138,12 +133,11 @@ (await deviceOperator.getZoomDefault(deviceId)) !== undefined; const photoResolution = await deviceOperator.getPhotoResolutions(deviceId); const videoConfigs = await deviceOperator.getVideoConfigs(deviceId); - const filteredVideoConfigs = videoConfigs.filter(videoConfigFilter); const supportedFpsRanges = await deviceOperator.getSupportedFpsRanges(deviceId); return new Camera3DeviceInfo( - deviceInfo, facing, photoResolution, filteredVideoConfigs, - supportedFpsRanges, supportPTZ); + deviceInfo, facing, photoResolution, videoConfigs, supportedFpsRanges, + supportPTZ); } }
diff --git a/ash/webui/camera_app_ui/resources/js/device/stream_manager.ts b/ash/webui/camera_app_ui/resources/js/device/stream_manager.ts index b5f70ba8..d4feb2c 100644 --- a/ash/webui/camera_app_ui/resources/js/device/stream_manager.ts +++ b/ash/webui/camera_app_ui/resources/js/device/stream_manager.ts
@@ -8,7 +8,7 @@ import * as loadTimeData from '../models/load_time_data.js'; import {DeviceOperator} from '../mojo/device_operator.js'; import {speak} from '../spoken_msg.js'; -import {ErrorLevel, ErrorType, Facing, VideoConfig} from '../type.js'; +import {ErrorLevel, ErrorType, Facing} from '../type.js'; import {sleep} from '../util.js'; import {WaitableEvent} from '../waitable_event.js'; @@ -82,18 +82,7 @@ */ private waitVirtualRemoved: WaitableEvent|null = null; - /** - * Filter out lagging 720p on grunt. See https://crbug.com/1122852. - */ - private readonly videoConfigFilter: (config: VideoConfig) => boolean; - private constructor() { - this.videoConfigFilter = (() => { - const board = loadTimeData.getBoard(); - return board === 'grunt' ? ({height}: VideoConfig) => height < 720 : - () => true; - })(); - navigator.mediaDevices.addEventListener( 'devicechange', () => this.deviceUpdate()); } @@ -272,9 +261,7 @@ return Promise.all(deviceInfos.map( async (d) => ({ v1Info: d, - v3Info: isV3Supported ? - (await Camera3DeviceInfo.create(d, this.videoConfigFilter)) : - null, + v3Info: isV3Supported ? (await Camera3DeviceInfo.create(d)) : null, }))); }
diff --git a/ash/webui/camera_app_ui/resources/strings/camera_strings_en-GB.xtb b/ash/webui/camera_app_ui/resources/strings/camera_strings_en-GB.xtb index 9f855c6..8a1a702e 100644 --- a/ash/webui/camera_app_ui/resources/strings/camera_strings_en-GB.xtb +++ b/ash/webui/camera_app_ui/resources/strings/camera_strings_en-GB.xtb
@@ -100,6 +100,7 @@ <translation id="4649291346448517080">Unable to save the file</translation> <translation id="4695379108709712600">Moving in top direction</translation> <translation id="4705093842003735294">Full resolution</translation> +<translation id="4864143361253542638">Scanned page list</translation> <translation id="4890010094662541459">3 x 3</translation> <translation id="491895758387112773">Multistream video recording</translation> <translation id="4984613436295737187">Quad HD (1440p)</translation>
diff --git a/ash/webui/camera_app_ui/resources/strings/camera_strings_pt-PT.xtb b/ash/webui/camera_app_ui/resources/strings/camera_strings_pt-PT.xtb index f9c2d0f..7c6818a 100644 --- a/ash/webui/camera_app_ui/resources/strings/camera_strings_pt-PT.xtb +++ b/ash/webui/camera_app_ui/resources/strings/camera_strings_pt-PT.xtb
@@ -100,6 +100,7 @@ <translation id="4649291346448517080">Não foi possível guardar o ficheiro.</translation> <translation id="4695379108709712600">A mover para cima</translation> <translation id="4705093842003735294">Resolução total</translation> +<translation id="4864143361253542638">Lista de páginas digitalizadas</translation> <translation id="4890010094662541459">3 x 3</translation> <translation id="491895758387112773">Gravação de vídeo multistream</translation> <translation id="4984613436295737187">Quad HD (1440p)</translation>
diff --git a/ash/webui/camera_app_ui/resources/strings/camera_strings_zh-HK.xtb b/ash/webui/camera_app_ui/resources/strings/camera_strings_zh-HK.xtb index 323b4c1d..6bdcb49 100644 --- a/ash/webui/camera_app_ui/resources/strings/camera_strings_zh-HK.xtb +++ b/ash/webui/camera_app_ui/resources/strings/camera_strings_zh-HK.xtb
@@ -100,6 +100,7 @@ <translation id="4649291346448517080">無法儲存檔案</translation> <translation id="4695379108709712600">向上移</translation> <translation id="4705093842003735294">全解像度</translation> +<translation id="4864143361253542638">已掃瞄的頁面清單</translation> <translation id="4890010094662541459">3 x 3</translation> <translation id="491895758387112773">以多流功能錄製影片</translation> <translation id="4984613436295737187">四倍高清 (1440p)</translation>
diff --git a/ash/webui/common/resources/BUILD.gn b/ash/webui/common/resources/BUILD.gn index 2f6c0d5..4bdade8 100644 --- a/ash/webui/common/resources/BUILD.gn +++ b/ash/webui/common/resources/BUILD.gn
@@ -196,7 +196,10 @@ } preprocess_if_expr("preprocess_ts_generated") { - deps = [ "hotspot:build_ts" ] + deps = [ + "hotspot:build_ts", + "typescript_utils:build_ts", + ] in_folder = "$target_gen_dir" out_folder = "$target_gen_dir/$preprocessed_dir" out_manifest = "$target_gen_dir/$preprocessed_generated_manifest" @@ -204,10 +207,11 @@ "hotspot/cros_hotspot_config.js", "hotspot/fake_hotspot_config.js", "hotspot/cros_hotspot_config.mojom-webui.js", + "typescript_utils/strict_query.js", ] } -copy("copy_generated_dts_files") { +copy("copy_generated_dts_files_hotspot") { deps = [ "hotspot:build_ts" ] sources = [ "$target_gen_dir/hotspot/cros_hotspot_config.d.ts", @@ -217,6 +221,21 @@ outputs = [ "$target_gen_dir/$preprocessed_dir/hotspot/{{source_file_part}}" ] } +copy("copy_generated_dts_files_typescript_utils") { + deps = [ "typescript_utils:build_ts" ] + sources = [ "$target_gen_dir/typescript_utils/strict_query.d.ts" ] + outputs = [ + "$target_gen_dir/$preprocessed_dir/typescript_utils/{{source_file_part}}", + ] +} + +group("copy_generated_dts_files") { + deps = [ + ":copy_generated_dts_files_hotspot", + ":copy_generated_dts_files_typescript_utils", + ] +} + html_to_wrapper("html_wrapper_files") { deps = [ ":preprocess" ] in_folder = "$target_gen_dir/$preprocessed_dir"
diff --git a/ash/webui/common/resources/typescript_utils/.gitignore b/ash/webui/common/resources/typescript_utils/.gitignore new file mode 100644 index 0000000..79f93fdd --- /dev/null +++ b/ash/webui/common/resources/typescript_utils/.gitignore
@@ -0,0 +1,2 @@ +# Generated from ash/webui/personalization_app/tools/gen_tsconfig.py +tsconfig.json \ No newline at end of file
diff --git a/ash/webui/common/resources/typescript_utils/BUILD.gn b/ash/webui/common/resources/typescript_utils/BUILD.gn new file mode 100644 index 0000000..ffefbc2 --- /dev/null +++ b/ash/webui/common/resources/typescript_utils/BUILD.gn
@@ -0,0 +1,36 @@ +# Copyright 2023 The Chromium Authors +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. +import("//build/config/chromeos/ui_mode.gni") +import("//tools/grit/grit_rule.gni") +import("//tools/grit/preprocess_if_expr.gni") +import("//tools/typescript/ts_library.gni") + +assert(is_chromeos_ash) + +preprocessed_dir = "preprocessed" + +ts_files = [ "strict_query.ts" ] + +preprocess_if_expr("preprocess") { + in_folder = "." + in_files = ts_files + out_folder = "$target_gen_dir/$preprocessed_dir" +} + +ts_library("build_ts") { + root_dir = "$target_gen_dir/$preprocessed_dir" + out_dir = "$target_gen_dir" + tsconfig_base = "tsconfig_base.json" + in_files = ts_files + composite = true + deps = [ + "//third_party/polymer/v3_0:library", + "//ui/webui/resources:library", + "//ui/webui/resources/mojo:library", + ] + extra_deps = [ + ":preprocess", + "//ash/webui/common/resources:copy_checked_in_dts_files", + ] +}
diff --git a/ash/webui/common/resources/typescript_utils/OWNERS b/ash/webui/common/resources/typescript_utils/OWNERS new file mode 100644 index 0000000..481945a --- /dev/null +++ b/ash/webui/common/resources/typescript_utils/OWNERS
@@ -0,0 +1 @@ +jimmyxgong@chromium.org \ No newline at end of file
diff --git a/ash/webui/common/resources/typescript_utils/strict_query.ts b/ash/webui/common/resources/typescript_utils/strict_query.ts new file mode 100644 index 0000000..a626654 --- /dev/null +++ b/ash/webui/common/resources/typescript_utils/strict_query.ts
@@ -0,0 +1,21 @@ +// Copyright 2023 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. +import {assert} from 'chrome://resources/js/assert_ts.js'; + +/** + * Queries |selector| on |root| and returns the first matching element. Throws + * exception if there is no resulting element or if element is not of type + * |type|. + */ +export function strictQuery<T>( + selector: string, root: Element|ShadowRoot|null, type: Constructor<T>): T { + const element = root!.querySelector(selector); + assert(element, 'Queried element is not defined.'); + assert( + element instanceof type, 'Queried element is not an instance of type T.'); + return element; +} + +/** Helper type used in {@link strictQuery}. */ +type Constructor<T> = new (...args: any[]) => T; \ No newline at end of file
diff --git a/ash/webui/common/resources/typescript_utils/tsconfig_base.json b/ash/webui/common/resources/typescript_utils/tsconfig_base.json new file mode 100644 index 0000000..6694dbd6 --- /dev/null +++ b/ash/webui/common/resources/typescript_utils/tsconfig_base.json
@@ -0,0 +1,3 @@ +{ + "extends": "../../../../../tools/typescript/tsconfig_base.json" +} \ No newline at end of file
diff --git a/ash/webui/shortcut_customization_ui/backend/accelerator_configuration_provider.cc b/ash/webui/shortcut_customization_ui/backend/accelerator_configuration_provider.cc index db7bf66..31d6688 100644 --- a/ash/webui/shortcut_customization_ui/backend/accelerator_configuration_provider.cc +++ b/ash/webui/shortcut_customization_ui/backend/accelerator_configuration_provider.cc
@@ -15,6 +15,7 @@ #include "ash/public/mojom/accelerator_info.mojom-shared.h" #include "ash/shell.h" #include "ash/webui/shortcut_customization_ui/mojom/shortcut_customization.mojom.h" +#include "base/check.h" #include "base/containers/fixed_flat_map.h" #include "base/containers/flat_map.h" #include "base/strings/string_split.h" @@ -296,6 +297,21 @@ return alias_infos; } +std::vector<mojom::AcceleratorInfoPtr> CreateAcceleratorInfos( + std::vector<ui::Accelerator> accelerators) { + std::vector<mojom::AcceleratorInfoPtr> infos_mojom; + for (const auto& accelerator : accelerators) { + // Get the alias acceleratorInfos by doing F-keys remapping and + // six-pack-keys remapping if applicable. + std::vector<mojom::AcceleratorInfoPtr> infos = + CreateAcceleratorInfoVariants(accelerator); + for (auto& info : infos) { + infos_mojom.push_back(std::move(info)); + } + } + return infos_mojom; +} + } // namespace namespace shortcut_ui { @@ -419,21 +435,24 @@ mojom::TextAcceleratorPropertiesPtr AcceleratorConfigurationProvider::CreateTextAcceleratorProperties( const NonConfigurableAcceleratorDetails& details) { + DCHECK(details.replacements.has_value()); + DCHECK(details.message_id.has_value()); // Contains the start points of the replaced strings. std::vector<size_t> offsets; const std::vector<std::u16string> empty_string_replacements( - details.replacements.size()); + details.replacements.value().size()); // Pass an array of empty strings to get the offsets of the replacements. The // return string has the placeholders removed. const auto replaced_string = l10n_util::GetStringFUTF16( - details.message_id, empty_string_replacements, &offsets); + details.message_id.value(), empty_string_replacements, &offsets); // Sort the offsets and split the string on the offsets. sort(offsets.begin(), offsets.end()); const auto plain_text_parts = SplitStringOnOffsets(replaced_string, offsets); auto text_accelerator_parts = GenerateTextAcceleratorParts( - plain_text_parts, details.replacements, offsets, replaced_string.size()); + plain_text_parts, details.replacements.value(), offsets, + replaced_string.size()); return mojom::TextAcceleratorProperties::New( std::move(text_accelerator_parts)); } @@ -459,35 +478,37 @@ base::flat_map<AcceleratorActionId, std::vector<mojom::AcceleratorInfoPtr>> accelerators_mojom; for (const auto& [action_id, accelerators] : id_to_accelerators) { - std::vector<mojom::AcceleratorInfoPtr> infos_mojom; - for (const auto& accelerator : accelerators) { - // Get the alias acceleratorInfos by doing F-keys remapping and - // six-pack-keys remapping if applicable. - std::vector<mojom::AcceleratorInfoPtr> infos = - CreateAcceleratorInfoVariants(accelerator); - for (auto& info : infos) { - infos_mojom.push_back(std::move(info)); - } - } - accelerators_mojom.emplace(action_id, std::move(infos_mojom)); + accelerators_mojom.emplace(action_id, + CreateAcceleratorInfos(accelerators)); } accelerator_config.emplace(source, std::move(accelerators_mojom)); } // Add non-configuarable accelerators. - for (const auto& [ambient_action_id, accelerator_text_details] : + ActionIdToAcceleratorsInfoMap non_configurable_accelerators; + for (const auto& [ambient_action_id, accelerators_details] : non_configurable_actions_mapping_) { - ActionIdToAcceleratorsInfoMap non_configurable_accelerators; - // For text based layout accelerators, we always expect this to be a vector - // with a single element. - std::vector<mojom::AcceleratorInfoPtr> text_accelerators_info; - text_accelerators_info.push_back( - CreateTextAcceleratorInfo(accelerator_text_details)); - non_configurable_accelerators.emplace(ambient_action_id, - std::move(text_accelerators_info)); - accelerator_config.emplace(mojom::AcceleratorSource::kAmbient, - std::move(non_configurable_accelerators)); + if (accelerators_details.IsStandardAccelerator()) { + // These properties should only be set for text based layout accelerators + DCHECK(!accelerators_details.replacements.has_value()); + DCHECK(!accelerators_details.message_id.has_value()); + non_configurable_accelerators.emplace( + ambient_action_id, + CreateAcceleratorInfos(accelerators_details.accelerators.value())); + } else { + // This property should only be set for standard accelerators + DCHECK(!accelerators_details.accelerators.has_value()); + // For text-based layout accelerators, we always expect this to be a + // vector with a single element. + std::vector<mojom::AcceleratorInfoPtr> text_accelerators_info; + text_accelerators_info.push_back( + CreateTextAcceleratorInfo(accelerators_details)); + non_configurable_accelerators.emplace(ambient_action_id, + std::move(text_accelerators_info)); + } } + accelerator_config.emplace(mojom::AcceleratorSource::kAmbient, + std::move(non_configurable_accelerators)); return accelerator_config; }
diff --git a/ash/webui/shortcut_customization_ui/backend/accelerator_configuration_provider.h b/ash/webui/shortcut_customization_ui/backend/accelerator_configuration_provider.h index b66426d..f1d13bd 100644 --- a/ash/webui/shortcut_customization_ui/backend/accelerator_configuration_provider.h +++ b/ash/webui/shortcut_customization_ui/backend/accelerator_configuration_provider.h
@@ -85,6 +85,10 @@ void InitializeNonConfigurableAccelerators(NonConfigurableActionsMap); + const NonConfigurableActionsMap& GetNonConfigurableAcceleratorsForTesting() { + return non_configurable_actions_mapping_; + } + mojom::AcceleratorInfoPtr CreateTextAcceleratorInfo( const NonConfigurableAcceleratorDetails& details);
diff --git a/ash/webui/shortcut_customization_ui/backend/accelerator_configuration_provider_unittest.cc b/ash/webui/shortcut_customization_ui/backend/accelerator_configuration_provider_unittest.cc index 7a5f672..026a9d2b 100644 --- a/ash/webui/shortcut_customization_ui/backend/accelerator_configuration_provider_unittest.cc +++ b/ash/webui/shortcut_customization_ui/backend/accelerator_configuration_provider_unittest.cc
@@ -82,11 +82,8 @@ int num_times_notified_ = 0; }; -bool CompareAccelerators(const ash::AcceleratorData& expected_data, - const mojom::AcceleratorInfoPtr& actual_info) { - ui::Accelerator expected_accelerator(expected_data.keycode, - expected_data.modifiers); - +bool AreAcceleratorsEqual(const ui::Accelerator& expected_accelerator, + const mojom::AcceleratorInfoPtr& actual_info) { const bool accelerator_equals = expected_accelerator == actual_info->layout_properties->get_standard_accelerator()->accelerator; @@ -96,6 +93,18 @@ return accelerator_equals && key_display_equals; } +bool CompareAccelerators(const ash::AcceleratorData& expected_data, + const mojom::AcceleratorInfoPtr& actual_info) { + ui::Accelerator expected_accelerator(expected_data.keycode, + expected_data.modifiers); + return AreAcceleratorsEqual(expected_accelerator, actual_info); +} + +bool CompareAccelerators(const ui::Accelerator& expected_accelerator, + const mojom::AcceleratorInfoPtr& actual_info) { + return AreAcceleratorsEqual(expected_accelerator, actual_info); +} + void CompareInputDevices(const ui::InputDevice& expected, const ui::InputDevice& actual) { EXPECT_EQ(expected.type, actual.type); @@ -151,12 +160,24 @@ } } -void ValidateTextAccelerator(const TextAcceleratorPart& lhs, - const mojom::TextAcceleratorPartPtr& rhs) { +void ValidateTextAccelerators(const TextAcceleratorPart& lhs, + const mojom::TextAcceleratorPartPtr& rhs) { EXPECT_EQ(lhs.text, rhs->text); EXPECT_EQ(lhs.type, rhs->type); } +std::vector<mojom::TextAcceleratorPartPtr> RemovePlainTextParts( + const std::vector<mojom::TextAcceleratorPartPtr>& parts) { + std::vector<mojom::TextAcceleratorPartPtr> res; + for (const auto& part : parts) { + if (part->type == mojom::TextAcceleratorPartType::kPlainText) { + continue; + } + res.push_back(mojo::Clone(part)); + } + return res; +} + } // namespace namespace shortcut_ui { @@ -201,6 +222,8 @@ AshTestBase::SetUp(); provider_ = std::make_unique<AcceleratorConfigurationProvider>(); + non_configurable_actions_map_ = + provider_->GetNonConfigurableAcceleratorsForTesting(); base::RunLoop().RunUntilIdle(); } @@ -222,7 +245,21 @@ base::RunLoop().RunUntilIdle(); } + const std::vector<ui::Accelerator>& GetAcceleratorsForAction(int action_id) { + return non_configurable_actions_map_ + .find(static_cast<ash::NonConfigurableActions>(action_id)) + ->second.accelerators.value(); + } + + const std::vector<TextAcceleratorPart>& GetReplacementsForAction( + int action_id) { + return non_configurable_actions_map_ + .find(static_cast<ash::NonConfigurableActions>(action_id)) + ->second.replacements.value(); + } + std::unique_ptr<AcceleratorConfigurationProvider> provider_; + NonConfigurableActionsMap non_configurable_actions_map_; base::test::ScopedFeatureList scoped_feature_list_; // Test global singleton. Delete is handled by InputMethodManager::Shutdown(). base::raw_ptr<TestInputMethodManager> input_method_manager_; @@ -562,6 +599,43 @@ EXPECT_EQ(u"space", GetKeyDisplay(ui::VKEY_SPACE)); } +TEST_F(AcceleratorConfigurationProviderTest, NonConfigurableActions) { + FakeAcceleratorsUpdatedObserver observer; + SetUpObserver(&observer); + base::RunLoop().RunUntilIdle(); + // Reinitialize the non-configurable accelerators to trigger the observer. + provider_->InitializeNonConfigurableAccelerators( + non_configurable_actions_map_); + base::RunLoop().RunUntilIdle(); + auto config = observer.config(); + for (const auto& [id, accel_infos] : + config[mojom::AcceleratorSource::kAmbient]) { + for (const auto& info : accel_infos) { + if (info->layout_properties->is_standard_accelerator()) { + bool found_match = false; + for (const auto& expected_data : GetAcceleratorsForAction(id)) { + found_match = CompareAccelerators(expected_data, mojo::Clone(info)); + if (found_match) { + break; + } + } + // Matching Accelerator was found. + EXPECT_TRUE(found_match); + } else { + // We're only concerned with validating the replacements + // (keys/modifiers). Validating the plain text parts is handled by the + // paramaterized tests below. + const auto& text_accel_parts = RemovePlainTextParts( + info->layout_properties->get_text_accelerator()->text_accelerator); + const auto& replacement_parts = GetReplacementsForAction(id); + for (size_t i = 0; i < replacement_parts.size(); i++) { + ValidateTextAccelerators(replacement_parts[i], text_accel_parts[i]); + } + } + } + } +} + using FlagsKeyboardCodesVariant = std::variant<ui::EventFlags, ui::KeyboardCode>; using FlagsKeyboardCodeStringVariant = @@ -686,7 +760,7 @@ {FAKE_RESOURCE_ID, replacements_}); EXPECT_EQ(expected_parts_.size(), parts->text_accelerator.size()); for (size_t i = 0; i < expected_parts_.size(); i++) { - ValidateTextAccelerator(expected_parts_[i], parts->text_accelerator[i]); + ValidateTextAccelerators(expected_parts_[i], parts->text_accelerator[i]); } }
diff --git a/base/strings/string_util.cc b/base/strings/string_util.cc index 8776b02..16cd98d 100644 --- a/base/strings/string_util.cc +++ b/base/strings/string_util.cc
@@ -29,6 +29,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/third_party/icu/icu_utf.h" #include "build/build_config.h" +#include "third_party/abseil-cpp/absl/types/optional.h" namespace base { @@ -391,13 +392,29 @@ StringPiece16 format_string, const std::vector<std::u16string>& subst, std::vector<size_t>* offsets) { - return internal::DoReplaceStringPlaceholders(format_string, subst, offsets); + absl::optional<std::u16string> replacement = + internal::DoReplaceStringPlaceholders( + format_string, subst, + /*placeholder_prefix*/ u'$', + /*should_escape_multiple_placeholder_prefixes*/ true, + /*is_strict_mode*/ false, offsets); + + DCHECK(replacement); + return replacement.value(); } std::string ReplaceStringPlaceholders(StringPiece format_string, const std::vector<std::string>& subst, std::vector<size_t>* offsets) { - return internal::DoReplaceStringPlaceholders(format_string, subst, offsets); + absl::optional<std::string> replacement = + internal::DoReplaceStringPlaceholders( + format_string, subst, + /*placeholder_prefix*/ '$', + /*should_escape_multiple_placeholder_prefixes*/ true, + /*is_strict_mode*/ false, offsets); + + DCHECK(replacement); + return replacement.value(); } std::u16string ReplaceStringPlaceholders(const std::u16string& format_string,
diff --git a/base/strings/string_util_impl_helpers.h b/base/strings/string_util_impl_helpers.h index dbe3897..f046eed 100644 --- a/base/strings/string_util_impl_helpers.h +++ b/base/strings/string_util_impl_helpers.h
@@ -14,6 +14,7 @@ #include "base/ranges/algorithm.h" #include "base/strings/string_piece.h" #include "base/third_party/icu/icu_utf.h" +#include "third_party/abseil-cpp/absl/types/optional.h" namespace base::internal { @@ -494,56 +495,90 @@ return result; } +// Replaces placeholders in `format_string` with values from `subst`. +// * `placeholder_prefix`: Allows using a specific character as the placeholder +// prefix. `base::ReplaceStringPlaceholders` uses '$'. +// * `should_escape_multiple_placeholder_prefixes`: +// * If this parameter is `true`, which is the case with +// `base::ReplaceStringPlaceholders`, `placeholder_prefix` characters are +// replaced by that number less one. Eg $$->$, $$$->$$, etc. +// * If this parameter is `false`, each literal `placeholder_prefix` character +// in `format_string` is escaped with another `placeholder_prefix`. For +// instance, with `%` as the `placeholder_prefix`: %%->%, %%%%->%%, etc. +// * `is_strict_mode`: +// * If this parameter is `true`, error handling is stricter. The function +// returns `absl::nullopt` if: +// * a placeholder %N is encountered where N > substitutions.size(). +// * a literal `%` is not escaped with a `%`. template <typename T, typename CharT = typename T::value_type> -std::basic_string<CharT> DoReplaceStringPlaceholders( +absl::optional<std::basic_string<CharT>> DoReplaceStringPlaceholders( T format_string, const std::vector<std::basic_string<CharT>>& subst, + const CharT placeholder_prefix, + const bool should_escape_multiple_placeholder_prefixes, + const bool is_strict_mode, std::vector<size_t>* offsets) { size_t substitutions = subst.size(); DCHECK_LT(substitutions, 11U); size_t sub_length = 0; - for (const auto& cur : subst) + for (const auto& cur : subst) { sub_length += cur.length(); + } std::basic_string<CharT> formatted; formatted.reserve(format_string.length() + sub_length); std::vector<ReplacementOffset> r_offsets; for (auto i = format_string.begin(); i != format_string.end(); ++i) { - if ('$' == *i) { + if (placeholder_prefix == *i) { if (i + 1 != format_string.end()) { ++i; - if ('$' == *i) { - while (i != format_string.end() && '$' == *i) { - formatted.push_back('$'); + if (placeholder_prefix == *i) { + do { + formatted.push_back(placeholder_prefix); ++i; - } + } while (should_escape_multiple_placeholder_prefixes && + i != format_string.end() && placeholder_prefix == *i); --i; } else { if (*i < '1' || *i > '9') { - DLOG(ERROR) << "Invalid placeholder: $" - << std::basic_string<CharT>(1, *i); + if (is_strict_mode) { + DLOG(ERROR) << "Invalid placeholder after placeholder prefix: " + << std::basic_string<CharT>(1, placeholder_prefix) + << std::basic_string<CharT>(1, *i); + return absl::nullopt; + } + continue; } - size_t index = static_cast<size_t>(*i - '1'); + const size_t index = static_cast<size_t>(*i - '1'); if (offsets) { ReplacementOffset r_offset(index, formatted.size()); r_offsets.insert( ranges::upper_bound(r_offsets, r_offset, &CompareParameter), r_offset); } - if (index < substitutions) + if (index < substitutions) { formatted.append(subst.at(index)); + } else if (is_strict_mode) { + DLOG(ERROR) << "index out of range: " << index << ": " + << substitutions; + return absl::nullopt; + } } + } else if (is_strict_mode) { + DLOG(ERROR) << "unexpected placeholder prefix at end of string"; + return absl::nullopt; } } else { formatted.push_back(*i); } } if (offsets) { - for (const auto& cur : r_offsets) + for (const auto& cur : r_offsets) { offsets->push_back(cur.offset); + } } return formatted; }
diff --git a/base/strings/string_util_win.cc b/base/strings/string_util_win.cc index b5ee1a9..ce0069c5 100644 --- a/base/strings/string_util_win.cc +++ b/base/strings/string_util_win.cc
@@ -6,6 +6,7 @@ #include "base/ranges/algorithm.h" #include "base/strings/string_util_impl_helpers.h" +#include "third_party/abseil-cpp/absl/types/optional.h" namespace base { @@ -128,7 +129,15 @@ std::wstring ReplaceStringPlaceholders(WStringPiece format_string, const std::vector<std::wstring>& subst, std::vector<size_t>* offsets) { - return internal::DoReplaceStringPlaceholders(format_string, subst, offsets); + absl::optional<std::wstring> replacement = + internal::DoReplaceStringPlaceholders( + format_string, subst, + /*placeholder_prefix*/ L'$', + /*should_escape_multiple_placeholder_prefixes*/ true, + /*is_strict_mode*/ false, offsets); + + DCHECK(replacement); + return replacement.value(); } } // namespace base
diff --git a/base/test/task_environment.cc b/base/test/task_environment.cc index 58841a3..70dd416 100644 --- a/base/test/task_environment.cc +++ b/base/test/task_environment.cc
@@ -344,8 +344,9 @@ private: SEQUENCE_CHECKER(sequence_checker_); - raw_ptr<internal::ThreadPoolImpl> thread_pool_ = nullptr; - raw_ptr<const TestTaskTracker> thread_pool_task_tracker_ = nullptr; + raw_ptr<internal::ThreadPoolImpl, DanglingUntriaged> thread_pool_ = nullptr; + raw_ptr<const TestTaskTracker, DanglingUntriaged> thread_pool_task_tracker_ = + nullptr; const raw_ptr<sequence_manager::internal::SequenceManagerImpl, DanglingUntriaged>
diff --git a/build/fuchsia/linux_internal.sdk.sha1 b/build/fuchsia/linux_internal.sdk.sha1 index ba8e5bd9..46d931e 100644 --- a/build/fuchsia/linux_internal.sdk.sha1 +++ b/build/fuchsia/linux_internal.sdk.sha1
@@ -1 +1 @@ -11.20230106.2.1 +11.20230106.3.2
diff --git a/build/install-build-deps-android.sh b/build/install-build-deps-android.sh deleted file mode 100755 index 56257c14..0000000 --- a/build/install-build-deps-android.sh +++ /dev/null
@@ -1,37 +0,0 @@ -#!/bin/bash - -# Copyright 2012 The Chromium Authors -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -# Script to install everything needed to build chromium on android, including -# items requiring sudo privileges. -# See https://www.chromium.org/developers/how-tos/android-build-instructions - -args="$@" - -if ! uname -m | egrep -q "i686|x86_64"; then - echo "Only x86 architectures are currently supported" >&2 - exit -fi - -# Exit if any commands fail. -set -e - -lsb_release=$(lsb_release --codename --short) - -# Install first the default Linux build deps. -"$(dirname "${BASH_SOURCE[0]}")/install-build-deps.sh" \ - --no-syms --lib32 --no-arm --no-chromeos-fonts --no-nacl --no-prompt "${args}" - -# Fix deps -sudo apt-get -f install - -# common -sudo apt-get -y install lib32z1 lighttpd xvfb x11-utils - -# Some binaries in the Android SDK require 32-bit libraries on the host. -# See https://developer.android.com/sdk/installing/index.html?pkg=tools -sudo apt-get -y install libncurses5:i386 libstdc++6:i386 zlib1g:i386 - -echo "install-build-deps-android.sh complete."
diff --git a/build/install-build-deps.sh b/build/install-build-deps.sh index 796cbc3..a16efc4 100755 --- a/build/install-build-deps.sh +++ b/build/install-build-deps.sh
@@ -5,13 +5,16 @@ # found in the LICENSE file. # Script to install everything needed to build chromium (well, ideally, anyway) +# including items requiring sudo privileges. # See https://chromium.googlesource.com/chromium/src/+/main/docs/linux/build_instructions.md +# and https://chromium.googlesource.com/chromium/src/+/HEAD/docs/android_build_instructions.md usage() { echo "Usage: $0 [--options]" echo "Options:" echo "--[no-]syms: enable or disable installation of debugging symbols" echo "--lib32: enable installation of 32-bit libraries, e.g. for V8 snapshot" + echo "--[no-]android: enable or disable installation of android dependencies" echo "--[no-]arm: enable or disable installation of arm cross toolchain" echo "--[no-]chromeos-fonts: enable or disable installation of Chrome OS"\ "fonts" @@ -58,6 +61,7 @@ do_inst_arm=0 do_inst_nacl=0 +do_inst_android=0 while [ "$1" != "" ] do @@ -65,6 +69,8 @@ --syms) do_inst_syms=1;; --no-syms) do_inst_syms=0;; --lib32) do_inst_lib32=1;; + --android) do_inst_android=1;; + --no-android) do_inst_android=0;; --arm) do_inst_arm=1;; --no-arm) do_inst_arm=0;; --chromeos-fonts) do_inst_chromeos_fonts=1;; @@ -88,6 +94,10 @@ do_inst_lib32=1 fi +if [ "$do_inst_android" = "1" ]; then + do_inst_lib32=1 +fi + # Check for lsb_release command in $PATH if ! which lsb_release > /dev/null; then echo "ERROR: lsb_release not found in \$PATH" >&2 @@ -110,6 +120,7 @@ exit 1 fi +# Check system architecture if ! uname -m | egrep -q "i686|x86_64"; then echo "Only x86 architectures are currently supported" >&2 exit @@ -189,6 +200,7 @@ libxss-dev libxt-dev libxtst-dev + lighttpd locales openbox p7zip @@ -225,6 +237,7 @@ # List of required run-time libraries common_lib_list="\ + lib32z1 libasound2 libatk1.0-0 libatspi2.0-0 @@ -273,6 +286,8 @@ libxrandr2 libxrender1 libxtst6 + x11-utils + xvfb zlib1g " @@ -294,6 +309,8 @@ lib32_list="linux-libc-dev:i386 libpci3:i386" # 32-bit libraries needed for a 32-bit build +# includes some 32-bit libraries required by the Android SDK +# See https://developer.android.com/sdk/installing/index.html?pkg=tools lib32_list="$lib32_list libasound2:i386 libatk-bridge2.0-0:i386 @@ -301,14 +318,17 @@ libatspi2.0-0:i386 libdbus-1-3:i386 libglib2.0-0:i386 + libncurses5:i386 libnss3:i386 libpango-1.0-0:i386 + libstdc++6:i386 libx11-xcb1:i386 libxcomposite1:i386 libxdamage1:i386 libxkbcommon0:i386 libxrandr2:i386 libxtst6:i386 + zlib1g:i386 " # Packages that have been removed from this script. Regardless of configuration @@ -643,6 +663,12 @@ lib32_list= fi +if [ "$do_inst_android" = "1" ]; then + echo "Including Android dependencies." +else + echo "Skipping Android dependencies." +fi + if [ "$do_inst_arm" = "1" ]; then echo "Including ARM cross toolchain." else
diff --git a/cc/animation/animation_host.cc b/cc/animation/animation_host.cc index f4c9ab84..4ccda6e 100644 --- a/cc/animation/animation_host.cc +++ b/cc/animation/animation_host.cc
@@ -9,9 +9,9 @@ #include <utility> #include "base/auto_reset.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/ptr_util.h" #include "base/ranges/algorithm.h" #include "base/trace_event/trace_event.h"
diff --git a/cc/base/delayed_unique_notifier.cc b/cc/base/delayed_unique_notifier.cc index fc74c81..42b78ed3 100644 --- a/cc/base/delayed_unique_notifier.cc +++ b/cc/base/delayed_unique_notifier.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/task/sequenced_task_runner.h"
diff --git a/cc/base/delayed_unique_notifier.h b/cc/base/delayed_unique_notifier.h index 4a989e94..edb56048 100644 --- a/cc/base/delayed_unique_notifier.h +++ b/cc/base/delayed_unique_notifier.h
@@ -5,7 +5,7 @@ #ifndef CC_BASE_DELAYED_UNIQUE_NOTIFIER_H_ #define CC_BASE_DELAYED_UNIQUE_NOTIFIER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/threading/thread_checker.h"
diff --git a/cc/base/delayed_unique_notifier_unittest.cc b/cc/base/delayed_unique_notifier_unittest.cc index 31b43cd..0b0514a 100644 --- a/cc/base/delayed_unique_notifier_unittest.cc +++ b/cc/base/delayed_unique_notifier_unittest.cc
@@ -6,9 +6,9 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/circular_deque.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/test/test_pending_task.h" #include "base/test/test_simple_task_runner.h" #include "base/time/time.h"
diff --git a/cc/base/unique_notifier.cc b/cc/base/unique_notifier.cc index e272ff7..d714237 100644 --- a/cc/base/unique_notifier.cc +++ b/cc/base/unique_notifier.cc
@@ -4,8 +4,8 @@ #include "cc/base/unique_notifier.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/task/sequenced_task_runner.h"
diff --git a/cc/base/unique_notifier.h b/cc/base/unique_notifier.h index 96a664a..3ee078a4 100644 --- a/cc/base/unique_notifier.h +++ b/cc/base/unique_notifier.h
@@ -5,7 +5,7 @@ #ifndef CC_BASE_UNIQUE_NOTIFIER_H_ #define CC_BASE_UNIQUE_NOTIFIER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "cc/base/base_export.h"
diff --git a/cc/base/unique_notifier_unittest.cc b/cc/base/unique_notifier_unittest.cc index 72036db..605e75d0 100644 --- a/cc/base/unique_notifier_unittest.cc +++ b/cc/base/unique_notifier_unittest.cc
@@ -3,8 +3,8 @@ // found in the LICENSE file. #include "cc/base/unique_notifier.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/cc/benchmarks/micro_benchmark.cc b/cc/benchmarks/micro_benchmark.cc index 83c023c..46373b5 100644 --- a/cc/benchmarks/micro_benchmark.cc +++ b/cc/benchmarks/micro_benchmark.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/callback.h" #include "base/check.h" +#include "base/functional/callback.h" #include "base/memory/ptr_util.h" #include "base/task/single_thread_task_runner.h" #include "base/values.h"
diff --git a/cc/benchmarks/micro_benchmark.h b/cc/benchmarks/micro_benchmark.h index e829363..932c17cb 100644 --- a/cc/benchmarks/micro_benchmark.h +++ b/cc/benchmarks/micro_benchmark.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "cc/cc_export.h" namespace base {
diff --git a/cc/benchmarks/micro_benchmark_controller.cc b/cc/benchmarks/micro_benchmark_controller.cc index 22b63e2e..3f86461 100644 --- a/cc/benchmarks/micro_benchmark_controller.cc +++ b/cc/benchmarks/micro_benchmark_controller.cc
@@ -7,8 +7,8 @@ #include <limits> #include <utility> -#include "base/callback.h" #include "base/containers/cxx20_erase.h" +#include "base/functional/callback.h" #include "base/ranges/algorithm.h" #include "base/task/single_thread_task_runner.h" #include "base/values.h"
diff --git a/cc/benchmarks/micro_benchmark_controller.h b/cc/benchmarks/micro_benchmark_controller.h index 66ac8f5..42f5695 100644 --- a/cc/benchmarks/micro_benchmark_controller.h +++ b/cc/benchmarks/micro_benchmark_controller.h
@@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "cc/benchmarks/micro_benchmark.h"
diff --git a/cc/benchmarks/micro_benchmark_controller_impl.cc b/cc/benchmarks/micro_benchmark_controller_impl.cc index fa46cdc5..fcaaeef 100644 --- a/cc/benchmarks/micro_benchmark_controller_impl.cc +++ b/cc/benchmarks/micro_benchmark_controller_impl.cc
@@ -6,8 +6,8 @@ #include <string> -#include "base/callback.h" #include "base/containers/cxx20_erase.h" +#include "base/functional/callback.h" #include "base/values.h" #include "cc/trees/layer_tree_host_impl.h"
diff --git a/cc/benchmarks/micro_benchmark_controller_unittest.cc b/cc/benchmarks/micro_benchmark_controller_unittest.cc index da55e85..728d315 100644 --- a/cc/benchmarks/micro_benchmark_controller_unittest.cc +++ b/cc/benchmarks/micro_benchmark_controller_unittest.cc
@@ -6,9 +6,9 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/run_loop.h" #include "cc/animation/animation_host.h"
diff --git a/cc/benchmarks/micro_benchmark_impl.cc b/cc/benchmarks/micro_benchmark_impl.cc index e3fda896..917d8bb 100644 --- a/cc/benchmarks/micro_benchmark_impl.cc +++ b/cc/benchmarks/micro_benchmark_impl.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/task/single_thread_task_runner.h" #include "base/values.h"
diff --git a/cc/benchmarks/micro_benchmark_impl.h b/cc/benchmarks/micro_benchmark_impl.h index 988cd47..c4d27635 100644 --- a/cc/benchmarks/micro_benchmark_impl.h +++ b/cc/benchmarks/micro_benchmark_impl.h
@@ -5,7 +5,7 @@ #ifndef CC_BENCHMARKS_MICRO_BENCHMARK_IMPL_H_ #define CC_BENCHMARKS_MICRO_BENCHMARK_IMPL_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "cc/cc_export.h"
diff --git a/cc/benchmarks/rasterize_and_record_benchmark.cc b/cc/benchmarks/rasterize_and_record_benchmark.cc index c948b464..5e4de2c 100644 --- a/cc/benchmarks/rasterize_and_record_benchmark.cc +++ b/cc/benchmarks/rasterize_and_record_benchmark.cc
@@ -10,7 +10,7 @@ #include <limits> #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "cc/benchmarks/rasterize_and_record_benchmark_impl.h" #include "cc/layers/content_layer_client.h"
diff --git a/cc/benchmarks/unittest_only_benchmark.cc b/cc/benchmarks/unittest_only_benchmark.cc index 2e4d4083..4154e81 100644 --- a/cc/benchmarks/unittest_only_benchmark.cc +++ b/cc/benchmarks/unittest_only_benchmark.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/task/single_thread_task_runner.h" #include "base/values.h"
diff --git a/cc/input/scrollbar_animation_controller.cc b/cc/input/scrollbar_animation_controller.cc index ff30f58..34f09dc 100644 --- a/cc/input/scrollbar_animation_controller.cc +++ b/cc/input/scrollbar_animation_controller.cc
@@ -7,8 +7,8 @@ #include <algorithm> #include <memory> -#include "base/bind.h" #include "base/cxx17_backports.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/time/time.h" #include "cc/trees/layer_tree_impl.h"
diff --git a/cc/layers/layer.h b/cc/layers/layer.h index 503ee5e..e76a228 100644 --- a/cc/layers/layer.h +++ b/cc/layers/layer.h
@@ -14,7 +14,7 @@ #include <vector> #include "base/auto_reset.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "cc/base/protected_sequence_synchronizer.h"
diff --git a/cc/layers/layer_unittest.cc b/cc/layers/layer_unittest.cc index 2943daf..640e390b 100644 --- a/cc/layers/layer_unittest.cc +++ b/cc/layers/layer_unittest.cc
@@ -9,8 +9,8 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/task/single_thread_task_runner.h" #include "cc/animation/animation_host.h" #include "cc/animation/animation_id_provider.h"
diff --git a/cc/layers/surface_layer_impl.h b/cc/layers/surface_layer_impl.h index 64f2026..cc93445 100644 --- a/cc/layers/surface_layer_impl.h +++ b/cc/layers/surface_layer_impl.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/synchronization/waitable_event.h" #include "cc/cc_export.h"
diff --git a/cc/layers/texture_layer.cc b/cc/layers/texture_layer.cc index f7c6b66..034d642 100644 --- a/cc/layers/texture_layer.cc +++ b/cc/layers/texture_layer.cc
@@ -7,9 +7,9 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/cxx20_erase.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/synchronization/lock.h" #include "base/task/sequenced_task_runner.h"
diff --git a/cc/layers/texture_layer.h b/cc/layers/texture_layer.h index 1e4f6d15..51b6e3bb 100644 --- a/cc/layers/texture_layer.h +++ b/cc/layers/texture_layer.h
@@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/synchronization/lock.h"
diff --git a/cc/layers/texture_layer_impl.h b/cc/layers/texture_layer_impl.h index 8ca34ade..ecb996c 100644 --- a/cc/layers/texture_layer_impl.h +++ b/cc/layers/texture_layer_impl.h
@@ -9,8 +9,8 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/containers/flat_map.h" +#include "base/functional/callback.h" #include "base/memory/ptr_util.h" #include "cc/cc_export.h" #include "cc/layers/layer_impl.h"
diff --git a/cc/layers/texture_layer_impl_unittest.cc b/cc/layers/texture_layer_impl_unittest.cc index 85355f59..f9f3cbb 100644 --- a/cc/layers/texture_layer_impl_unittest.cc +++ b/cc/layers/texture_layer_impl_unittest.cc
@@ -6,7 +6,7 @@ #include <stddef.h> -#include "base/bind.h" +#include "base/functional/bind.h" #include "cc/test/fake_layer_tree_frame_sink.h" #include "cc/test/layer_tree_impl_test_base.h" #include "cc/trees/layer_tree_frame_sink.h"
diff --git a/cc/layers/texture_layer_unittest.cc b/cc/layers/texture_layer_unittest.cc index 7b5aed9..7f7c587 100644 --- a/cc/layers/texture_layer_unittest.cc +++ b/cc/layers/texture_layer_unittest.cc
@@ -12,8 +12,8 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h"
diff --git a/cc/layers/video_layer.h b/cc/layers/video_layer.h index f48fc84..5bbdc83 100644 --- a/cc/layers/video_layer.h +++ b/cc/layers/video_layer.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "cc/cc_export.h" #include "cc/layers/layer.h"
diff --git a/cc/layers/video_layer_impl.cc b/cc/layers/video_layer_impl.cc index a5593d3..c636873 100644 --- a/cc/layers/video_layer_impl.cc +++ b/cc/layers/video_layer_impl.cc
@@ -9,8 +9,8 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "cc/base/features.h" #include "cc/layers/video_frame_provider_client_impl.h"
diff --git a/cc/layers/video_layer_impl_unittest.cc b/cc/layers/video_layer_impl_unittest.cc index 4245ab28..355ee69 100644 --- a/cc/layers/video_layer_impl_unittest.cc +++ b/cc/layers/video_layer_impl_unittest.cc
@@ -6,7 +6,7 @@ #include <stddef.h> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "cc/layers/video_frame_provider_client_impl.h" #include "cc/test/fake_video_frame_provider.h" #include "cc/test/layer_tree_impl_test_base.h"
diff --git a/cc/metrics/dropped_frame_counter.cc b/cc/metrics/dropped_frame_counter.cc index 5bc8533..1610f66 100644 --- a/cc/metrics/dropped_frame_counter.cc +++ b/cc/metrics/dropped_frame_counter.cc
@@ -8,7 +8,7 @@ #include <cmath> #include <iterator> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/field_trial_params.h" #include "base/metrics/histogram.h" #include "base/metrics/histogram_macros.h"
diff --git a/cc/metrics/dropped_frame_counter.h b/cc/metrics/dropped_frame_counter.h index 285eeab..b1de1c23 100644 --- a/cc/metrics/dropped_frame_counter.h +++ b/cc/metrics/dropped_frame_counter.h
@@ -11,8 +11,8 @@ #include <utility> #include <vector> -#include "base/callback_forward.h" #include "base/containers/ring_buffer.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/time/time.h" #include "cc/cc_export.h"
diff --git a/cc/metrics/events_metrics_manager.cc b/cc/metrics/events_metrics_manager.cc index 501276ab..db4ed7d 100644 --- a/cc/metrics/events_metrics_manager.cc +++ b/cc/metrics/events_metrics_manager.cc
@@ -6,9 +6,9 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" namespace cc {
diff --git a/cc/metrics/events_metrics_manager.h b/cc/metrics/events_metrics_manager.h index 383104b..e422366 100644 --- a/cc/metrics/events_metrics_manager.h +++ b/cc/metrics/events_metrics_manager.h
@@ -8,7 +8,7 @@ #include <memory> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "cc/cc_export.h" #include "cc/metrics/event_metrics.h"
diff --git a/cc/metrics/events_metrics_manager_unittest.cc b/cc/metrics/events_metrics_manager_unittest.cc index c4c4be9c..2692020 100644 --- a/cc/metrics/events_metrics_manager_unittest.cc +++ b/cc/metrics/events_metrics_manager_unittest.cc
@@ -7,7 +7,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/test/simple_test_tick_clock.h" #include "cc/metrics/event_metrics.h" #include "testing/gmock/include/gmock/gmock.h"
diff --git a/cc/metrics/frame_sequence_metrics.h b/cc/metrics/frame_sequence_metrics.h index ee945cd0..043281fd 100644 --- a/cc/metrics/frame_sequence_metrics.h +++ b/cc/metrics/frame_sequence_metrics.h
@@ -9,8 +9,8 @@ #include <cmath> #include <memory> -#include "base/callback.h" #include "base/check.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/trace_event/traced_value.h" #include "cc/cc_export.h"
diff --git a/cc/metrics/frame_sequence_tracker.cc b/cc/metrics/frame_sequence_tracker.cc index 67fffe4..7d00a386 100644 --- a/cc/metrics/frame_sequence_tracker.cc +++ b/cc/metrics/frame_sequence_tracker.cc
@@ -9,9 +9,9 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/containers/contains.h" #include "base/containers/cxx20_erase.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/metrics/histogram.h" #include "base/metrics/histogram_macros.h"
diff --git a/cc/metrics/frame_sequence_tracker_collection.h b/cc/metrics/frame_sequence_tracker_collection.h index 0cbd8fb4..f2b412e 100644 --- a/cc/metrics/frame_sequence_tracker_collection.h +++ b/cc/metrics/frame_sequence_tracker_collection.h
@@ -9,8 +9,8 @@ #include <utility> #include <vector> -#include "base/callback.h" #include "base/containers/flat_map.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "cc/cc_export.h" #include "cc/metrics/frame_sequence_metrics.h"
diff --git a/cc/metrics/frame_sorter.h b/cc/metrics/frame_sorter.h index b33dfd7..71561659 100644 --- a/cc/metrics/frame_sorter.h +++ b/cc/metrics/frame_sorter.h
@@ -9,8 +9,8 @@ #include <map> -#include "base/callback.h" #include "base/containers/circular_deque.h" +#include "base/functional/callback.h" #include "cc/cc_export.h" #include "components/viz/common/frame_sinks/begin_frame_args.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/cc/metrics/frame_sorter_unittest.cc b/cc/metrics/frame_sorter_unittest.cc index b23eed4c..018e78b4 100644 --- a/cc/metrics/frame_sorter_unittest.cc +++ b/cc/metrics/frame_sorter_unittest.cc
@@ -8,7 +8,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/string_number_conversions.h" #include "cc/metrics/frame_info.h" #include "cc/test/fake_frame_info.h"
diff --git a/cc/metrics/jank_injector.cc b/cc/metrics/jank_injector.cc index 41d15bdb..7409c6a 100644 --- a/cc/metrics/jank_injector.cc +++ b/cc/metrics/jank_injector.cc
@@ -9,9 +9,9 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/debug/alias.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/metrics/field_trial_params.h" #include "base/no_destructor.h" #include "base/ranges/algorithm.h"
diff --git a/cc/metrics/video_playback_roughness_reporter.cc b/cc/metrics/video_playback_roughness_reporter.cc index 13a25d3..2ce94ae 100644 --- a/cc/metrics/video_playback_roughness_reporter.cc +++ b/cc/metrics/video_playback_roughness_reporter.cc
@@ -6,9 +6,9 @@ #include <algorithm> -#include "base/callback_helpers.h" #include "base/containers/adapters.h" #include "base/cxx17_backports.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/histogram_macros.h" #include "base/numerics/safe_conversions.h" #include "components/viz/common/quads/compositor_frame_metadata.h"
diff --git a/cc/metrics/video_playback_roughness_reporter.h b/cc/metrics/video_playback_roughness_reporter.h index 20d1e07..c967596 100644 --- a/cc/metrics/video_playback_roughness_reporter.h +++ b/cc/metrics/video_playback_roughness_reporter.h
@@ -5,9 +5,9 @@ #ifndef CC_METRICS_VIDEO_PLAYBACK_ROUGHNESS_REPORTER_H_ #define CC_METRICS_VIDEO_PLAYBACK_ROUGHNESS_REPORTER_H_ -#include "base/callback.h" #include "base/containers/circular_deque.h" #include "base/containers/flat_set.h" +#include "base/functional/callback.h" #include "base/time/time.h" #include "cc/cc_export.h" #include "media/base/video_frame.h"
diff --git a/cc/metrics/video_playback_roughness_reporter_unittest.cc b/cc/metrics/video_playback_roughness_reporter_unittest.cc index 9864345a..1767017 100644 --- a/cc/metrics/video_playback_roughness_reporter_unittest.cc +++ b/cc/metrics/video_playback_roughness_reporter_unittest.cc
@@ -9,7 +9,7 @@ #include <random> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/test/bind.h" #include "base/time/time.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/cc/mojo_embedder/async_layer_tree_frame_sink.cc b/cc/mojo_embedder/async_layer_tree_frame_sink.cc index 029471a..2a9172a 100644 --- a/cc/mojo_embedder/async_layer_tree_frame_sink.cc +++ b/cc/mojo_embedder/async_layer_tree_frame_sink.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/histogram.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h"
diff --git a/cc/mojo_embedder/async_layer_tree_frame_sink_unittest.cc b/cc/mojo_embedder/async_layer_tree_frame_sink_unittest.cc index 8358b74..aa9f403 100644 --- a/cc/mojo_embedder/async_layer_tree_frame_sink_unittest.cc +++ b/cc/mojo_embedder/async_layer_tree_frame_sink_unittest.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/run_loop.h"
diff --git a/cc/paint/image_provider.h b/cc/paint/image_provider.h index 88f7b47..de41e84 100644 --- a/cc/paint/image_provider.h +++ b/cc/paint/image_provider.h
@@ -5,7 +5,7 @@ #ifndef CC_PAINT_IMAGE_PROVIDER_H_ #define CC_PAINT_IMAGE_PROVIDER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/types/optional_util.h" #include "cc/paint/decoded_draw_image.h" #include "cc/paint/draw_image.h"
diff --git a/cc/paint/image_transfer_cache_entry.cc b/cc/paint/image_transfer_cache_entry.cc index fef98ab..913cbc7 100644 --- a/cc/paint/image_transfer_cache_entry.cc +++ b/cc/paint/image_transfer_cache_entry.cc
@@ -8,7 +8,7 @@ #include <type_traits> #include <utility> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/notreached.h" #include "base/numerics/checked_math.h"
diff --git a/cc/paint/oop_pixeltest.cc b/cc/paint/oop_pixeltest.cc index 9e7975e..87eb25a 100644 --- a/cc/paint/oop_pixeltest.cc +++ b/cc/paint/oop_pixeltest.cc
@@ -6,9 +6,9 @@ #include <tuple> #include <vector> -#include "base/bind.h" #include "base/command_line.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/path_service.h" #include "base/test/test_switches.h"
diff --git a/cc/paint/paint_op.h b/cc/paint/paint_op.h index 1f3da8c..19958d3 100644 --- a/cc/paint/paint_op.h +++ b/cc/paint/paint_op.h
@@ -14,10 +14,10 @@ #include <utility> #include <vector> -#include "base/callback.h" #include "base/check_op.h" #include "base/containers/stack_container.h" #include "base/debug/alias.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/notreached.h"
diff --git a/cc/paint/paint_op_buffer.h b/cc/paint/paint_op_buffer.h index f6fd881..4a3f01648 100644 --- a/cc/paint/paint_op_buffer.h +++ b/cc/paint/paint_op_buffer.h
@@ -10,9 +10,9 @@ #include <utility> #include <vector> -#include "base/callback.h" #include "base/check_op.h" #include "base/debug/alias.h" +#include "base/functional/callback.h" #include "base/memory/aligned_memory.h" #include "base/memory/raw_ptr.h" #include "base/memory/raw_ptr_exclusion.h"
diff --git a/cc/paint/paint_op_buffer_serializer.cc b/cc/paint/paint_op_buffer_serializer.cc index 59ad4aa3..53f19c0 100644 --- a/cc/paint/paint_op_buffer_serializer.cc +++ b/cc/paint/paint_op_buffer_serializer.cc
@@ -9,7 +9,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/trace_event/trace_event.h" #include "cc/paint/clear_for_opaque_raster.h" #include "cc/paint/paint_op_buffer_iterator.h"
diff --git a/cc/paint/paint_op_buffer_unittest.cc b/cc/paint/paint_op_buffer_unittest.cc index a429744..5c1724c 100644 --- a/cc/paint/paint_op_buffer_unittest.cc +++ b/cc/paint/paint_op_buffer_unittest.cc
@@ -7,7 +7,7 @@ #include <algorithm> #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/strings/stringprintf.h"
diff --git a/cc/paint/paint_worklet_layer_painter.h b/cc/paint/paint_worklet_layer_painter.h index fdc20e8..b6f3733 100644 --- a/cc/paint/paint_worklet_layer_painter.h +++ b/cc/paint/paint_worklet_layer_painter.h
@@ -5,7 +5,7 @@ #ifndef CC_PAINT_PAINT_WORKLET_LAYER_PAINTER_H_ #define CC_PAINT_PAINT_WORKLET_LAYER_PAINTER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "cc/paint/paint_export.h" #include "cc/paint/paint_record.h" #include "cc/paint/paint_worklet_job.h"
diff --git a/cc/paint/scoped_raster_flags_unittest.cc b/cc/paint/scoped_raster_flags_unittest.cc index fdd14be..b58c6aa 100644 --- a/cc/paint/scoped_raster_flags_unittest.cc +++ b/cc/paint/scoped_raster_flags_unittest.cc
@@ -5,8 +5,8 @@ #include "cc/paint/scoped_raster_flags.h" #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "cc/paint/paint_op.h" #include "cc/paint/paint_shader.h" #include "cc/test/skia_common.h"
diff --git a/cc/paint/skia_paint_canvas.cc b/cc/paint/skia_paint_canvas.cc index b9cad71..ec3bf64 100644 --- a/cc/paint/skia_paint_canvas.cc +++ b/cc/paint/skia_paint_canvas.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/notreached.h" #include "base/trace_event/trace_event.h" #include "cc/paint/display_item_list.h"
diff --git a/cc/paint/skottie_mru_resource_provider_unittest.cc b/cc/paint/skottie_mru_resource_provider_unittest.cc index 9d2d1afe..4d3995e 100644 --- a/cc/paint/skottie_mru_resource_provider_unittest.cc +++ b/cc/paint/skottie_mru_resource_provider_unittest.cc
@@ -6,9 +6,9 @@ #include <utility> -#include "base/bind.h" #include "base/containers/flat_map.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/strings/string_piece.h" #include "cc/paint/paint_image.h"
diff --git a/cc/paint/skottie_serialization_history.cc b/cc/paint/skottie_serialization_history.cc index 5a5607a6..2515c3a3 100644 --- a/cc/paint/skottie_serialization_history.cc +++ b/cc/paint/skottie_serialization_history.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "cc/paint/skottie_wrapper.h"
diff --git a/cc/paint/skottie_wrapper.h b/cc/paint/skottie_wrapper.h index 1e5e4c16..e6d0b4d 100644 --- a/cc/paint/skottie_wrapper.h +++ b/cc/paint/skottie_wrapper.h
@@ -8,9 +8,9 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/containers/flat_set.h" #include "base/containers/span.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "cc/paint/paint_export.h" #include "cc/paint/skottie_color_map.h"
diff --git a/cc/paint/skottie_wrapper_impl.cc b/cc/paint/skottie_wrapper_impl.cc index 7fe6cea..012d162 100644 --- a/cc/paint/skottie_wrapper_impl.cc +++ b/cc/paint/skottie_wrapper_impl.cc
@@ -9,9 +9,9 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" #include "base/containers/flat_map.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/hash/hash.h" #include "base/logging.h" #include "base/notreached.h"
diff --git a/cc/paint/skottie_wrapper_unittest.cc b/cc/paint/skottie_wrapper_unittest.cc index 9c75dae..d54df0c 100644 --- a/cc/paint/skottie_wrapper_unittest.cc +++ b/cc/paint/skottie_wrapper_unittest.cc
@@ -8,9 +8,9 @@ #include <string> #include <vector> -#include "base/bind.h" #include "base/containers/span.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/memory/scoped_refptr.h" #include "cc/paint/skottie_mru_resource_provider.h" #include "cc/paint/skottie_resource_metadata.h"
diff --git a/cc/raster/paint_worklet_image_provider.cc b/cc/raster/paint_worklet_image_provider.cc index fca5f63..01104969 100644 --- a/cc/raster/paint_worklet_image_provider.cc +++ b/cc/raster/paint_worklet_image_provider.cc
@@ -5,7 +5,7 @@ #include "cc/raster/paint_worklet_image_provider.h" #include <utility> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" namespace cc {
diff --git a/cc/raster/playback_image_provider.cc b/cc/raster/playback_image_provider.cc index 3f28eb6..220ba65 100644 --- a/cc/raster/playback_image_provider.cc +++ b/cc/raster/playback_image_provider.cc
@@ -5,7 +5,7 @@ #include "cc/raster/playback_image_provider.h" #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "cc/tiles/image_decode_cache.h" #include "gpu/command_buffer/common/mailbox.h"
diff --git a/cc/raster/raster_buffer_provider_unittest.cc b/cc/raster/raster_buffer_provider_unittest.cc index c274c87d..88ec383 100644 --- a/cc/raster/raster_buffer_provider_unittest.cc +++ b/cc/raster/raster_buffer_provider_unittest.cc
@@ -15,10 +15,10 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/cancelable_callback.h" #include "base/check.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h"
diff --git a/cc/raster/staging_buffer_pool.cc b/cc/raster/staging_buffer_pool.cc index 8df0569..1b7de8c 100644 --- a/cc/raster/staging_buffer_pool.cc +++ b/cc/raster/staging_buffer_pool.cc
@@ -8,8 +8,8 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/ranges/algorithm.h" #include "base/strings/stringprintf.h" #include "base/task/single_thread_task_runner.h"
diff --git a/cc/resources/resource_pool.cc b/cc/resources/resource_pool.cc index c18adef..57297ae 100644 --- a/cc/resources/resource_pool.cc +++ b/cc/resources/resource_pool.cc
@@ -14,9 +14,9 @@ #include <utility> #include "base/atomic_sequence_num.h" -#include "base/bind.h" #include "base/containers/contains.h" #include "base/format_macros.h" +#include "base/functional/bind.h" #include "base/ranges/algorithm.h" #include "base/strings/stringprintf.h" #include "base/task/single_thread_task_runner.h"
diff --git a/cc/resources/scoped_ui_resource.cc b/cc/resources/scoped_ui_resource.cc index 294f781..eade70da4 100644 --- a/cc/resources/scoped_ui_resource.cc +++ b/cc/resources/scoped_ui_resource.cc
@@ -4,7 +4,7 @@ #include "cc/resources/scoped_ui_resource.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "cc/resources/ui_resource_manager.h"
diff --git a/cc/resources/ui_resource_client.h b/cc/resources/ui_resource_client.h index 84a6610..9447a6c 100644 --- a/cc/resources/ui_resource_client.h +++ b/cc/resources/ui_resource_client.h
@@ -5,7 +5,7 @@ #ifndef CC_RESOURCES_UI_RESOURCE_CLIENT_H_ #define CC_RESOURCES_UI_RESOURCE_CLIENT_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "cc/cc_export.h" namespace cc {
diff --git a/cc/scheduler/scheduler.cc b/cc/scheduler/scheduler.cc index 70d85187..6d3f5f3 100644 --- a/cc/scheduler/scheduler.cc +++ b/cc/scheduler/scheduler.cc
@@ -9,8 +9,8 @@ #include <vector> #include "base/auto_reset.h" -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/metrics/histogram_macros.h" #include "base/task/delay_policy.h"
diff --git a/cc/scheduler/scheduler_unittest.cc b/cc/scheduler/scheduler_unittest.cc index 0a99ddc..ae55ae3 100644 --- a/cc/scheduler/scheduler_unittest.cc +++ b/cc/scheduler/scheduler_unittest.cc
@@ -12,8 +12,8 @@ #include <vector> #include "base/auto_reset.h" -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/notreached.h"
diff --git a/cc/test/fake_layer_tree_frame_sink.cc b/cc/test/fake_layer_tree_frame_sink.cc index 8cea77c..d3f2070 100644 --- a/cc/test/fake_layer_tree_frame_sink.cc +++ b/cc/test/fake_layer_tree_frame_sink.cc
@@ -4,9 +4,9 @@ #include "cc/test/fake_layer_tree_frame_sink.h" -#include "base/bind.h" #include "base/containers/contains.h" #include "base/containers/cxx20_erase.h" +#include "base/functional/bind.h" #include "base/memory/scoped_refptr.h" #include "base/task/single_thread_task_runner.h" #include "cc/tiles/image_decode_cache_utils.h"
diff --git a/cc/test/fake_layer_tree_frame_sink.h b/cc/test/fake_layer_tree_frame_sink.h index b166852..8322ffe 100644 --- a/cc/test/fake_layer_tree_frame_sink.h +++ b/cc/test/fake_layer_tree_frame_sink.h
@@ -11,8 +11,8 @@ #include <utility> #include <vector> -#include "base/callback.h" #include "base/check.h" +#include "base/functional/callback.h" #include "base/memory/ptr_util.h" #include "base/memory/read_only_shared_memory_region.h" #include "base/memory/weak_ptr.h"
diff --git a/cc/test/fake_ui_resource_layer_tree_host_impl.cc b/cc/test/fake_ui_resource_layer_tree_host_impl.cc index 47f1adec..29cf576 100644 --- a/cc/test/fake_ui_resource_layer_tree_host_impl.cc +++ b/cc/test/fake_ui_resource_layer_tree_host_impl.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "cc/resources/ui_resource_bitmap.h" #include "cc/test/fake_layer_tree_host_impl.h"
diff --git a/cc/test/layer_tree_pixel_test.cc b/cc/test/layer_tree_pixel_test.cc index dd05d08..21e5e92d 100644 --- a/cc/test/layer_tree_pixel_test.cc +++ b/cc/test/layer_tree_pixel_test.cc
@@ -7,8 +7,8 @@ #include <stddef.h> #include <stdint.h> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/path_service.h" #include "base/test/test_switches.h" #include "cc/layers/solid_color_layer.h"
diff --git a/cc/test/layer_tree_test.cc b/cc/test/layer_tree_test.cc index 0216c48..2c87c59 100644 --- a/cc/test/layer_tree_test.cc +++ b/cc/test/layer_tree_test.cc
@@ -7,9 +7,9 @@ #include <memory> #include <string> -#include "base/bind.h" #include "base/cfi_buildflags.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h"
diff --git a/cc/test/mock_layer_tree_mutator.h b/cc/test/mock_layer_tree_mutator.h index aafa3b1..2377c676 100644 --- a/cc/test/mock_layer_tree_mutator.h +++ b/cc/test/mock_layer_tree_mutator.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "cc/trees/layer_tree_mutator.h" #include "testing/gmock/include/gmock/gmock.h"
diff --git a/cc/test/pixel_test.cc b/cc/test/pixel_test.cc index 7e70d49..ea04b88 100644 --- a/cc/test/pixel_test.cc +++ b/cc/test/pixel_test.cc
@@ -7,9 +7,9 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/read_only_shared_memory_region.h" #include "base/memory/shared_memory_mapping.h" #include "base/path_service.h"
diff --git a/cc/test/pixel_test_output_surface.cc b/cc/test/pixel_test_output_surface.cc index 594da62f..ec73f39 100644 --- a/cc/test/pixel_test_output_surface.cc +++ b/cc/test/pixel_test_output_surface.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/single_thread_task_runner.h" #include "components/viz/service/display/output_surface_client.h" #include "components/viz/service/display/output_surface_frame.h"
diff --git a/cc/test/render_pass_test_utils.cc b/cc/test/render_pass_test_utils.cc index e73c0d0c..125c822 100644 --- a/cc/test/render_pass_test_utils.cc +++ b/cc/test/render_pass_test_utils.cc
@@ -11,8 +11,8 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "components/viz/client/client_resource_provider.h" #include "components/viz/common/quads/aggregated_render_pass_draw_quad.h" #include "components/viz/common/quads/compositor_render_pass_draw_quad.h"
diff --git a/cc/test/resource_provider_test_utils.cc b/cc/test/resource_provider_test_utils.cc index 0d96a2f5..586720f 100644 --- a/cc/test/resource_provider_test_utils.cc +++ b/cc/test/resource_provider_test_utils.cc
@@ -7,7 +7,7 @@ #include <unordered_map> #include <vector> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" namespace cc {
diff --git a/cc/test/run_all_perftests.cc b/cc/test/run_all_perftests.cc index ba8b6b53..a68447a 100644 --- a/cc/test/run_all_perftests.cc +++ b/cc/test/run_all_perftests.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 "base/bind.h" +#include "base/functional/bind.h" #include "base/test/launcher/unit_test_launcher.h" #include "base/test/test_suite.h" #include "cc/test/cc_test_suite.h"
diff --git a/cc/test/run_all_unittests.cc b/cc/test/run_all_unittests.cc index d28cf1e..a97abd0bd 100644 --- a/cc/test/run_all_unittests.cc +++ b/cc/test/run_all_unittests.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 "base/bind.h" +#include "base/functional/bind.h" #include "base/test/launcher/unit_test_launcher.h" #include "cc/test/cc_test_suite.h" #include "mojo/core/embedder/embedder.h"
diff --git a/cc/test/task_graph_runner_test_template.h b/cc/test/task_graph_runner_test_template.h index 3000e95..cb2d4ded 100644 --- a/cc/test/task_graph_runner_test_template.h +++ b/cc/test/task_graph_runner_test_template.h
@@ -9,7 +9,7 @@ #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/synchronization/lock.h" #include "base/threading/simple_thread.h"
diff --git a/cc/test/test_layer_tree_frame_sink.cc b/cc/test/test_layer_tree_frame_sink.cc index d805262..f024890 100644 --- a/cc/test/test_layer_tree_frame_sink.cc +++ b/cc/test/test_layer_tree_frame_sink.cc
@@ -10,7 +10,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/single_thread_task_runner.h" #include "cc/trees/layer_tree_frame_sink_client.h" #include "cc/trees/single_thread_proxy.h"
diff --git a/cc/tiles/checker_image_tracker.cc b/cc/tiles/checker_image_tracker.cc index 5ab9d25..6840b07c 100644 --- a/cc/tiles/checker_image_tracker.cc +++ b/cc/tiles/checker_image_tracker.cc
@@ -10,7 +10,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "base/notreached.h" #include "base/trace_event/trace_event.h"
diff --git a/cc/tiles/checker_image_tracker_unittest.cc b/cc/tiles/checker_image_tracker_unittest.cc index 8d91d9a8..f43905f 100644 --- a/cc/tiles/checker_image_tracker_unittest.cc +++ b/cc/tiles/checker_image_tracker_unittest.cc
@@ -8,7 +8,7 @@ #include <unordered_set> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h" #include "cc/paint/paint_image_builder.h"
diff --git a/cc/tiles/decoded_image_tracker.h b/cc/tiles/decoded_image_tracker.h index 8d4e11d..958ead1 100644 --- a/cc/tiles/decoded_image_tracker.h +++ b/cc/tiles/decoded_image_tracker.h
@@ -9,7 +9,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/time/tick_clock.h" #include "base/time/time.h"
diff --git a/cc/tiles/decoded_image_tracker_unittest.cc b/cc/tiles/decoded_image_tracker_unittest.cc index e505bbb..0a659b3 100644 --- a/cc/tiles/decoded_image_tracker_unittest.cc +++ b/cc/tiles/decoded_image_tracker_unittest.cc
@@ -7,8 +7,8 @@ #include <unordered_map> #include <vector> -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/ranges/algorithm.h" #include "base/test/test_mock_time_task_runner.h" #include "cc/paint/paint_image_builder.h"
diff --git a/cc/tiles/gpu_image_decode_cache.cc b/cc/tiles/gpu_image_decode_cache.cc index 7ef6156..298adf3 100644 --- a/cc/tiles/gpu_image_decode_cache.cc +++ b/cc/tiles/gpu_image_decode_cache.cc
@@ -11,11 +11,11 @@ #include <string> #include "base/auto_reset.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/containers/span.h" #include "base/debug/alias.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/hash/hash.h" #include "base/logging.h" #include "base/memory/discardable_memory_allocator.h"
diff --git a/cc/tiles/image_controller.cc b/cc/tiles/image_controller.cc index cbfe6c9..7ee975d6 100644 --- a/cc/tiles/image_controller.cc +++ b/cc/tiles/image_controller.cc
@@ -6,9 +6,9 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/task/task_traits.h" #include "base/trace_event/trace_event.h" #include "cc/base/completion_event.h"
diff --git a/cc/tiles/image_controller.h b/cc/tiles/image_controller.h index d10ca93..3dbbff3b 100644 --- a/cc/tiles/image_controller.h +++ b/cc/tiles/image_controller.h
@@ -9,8 +9,8 @@ #include <memory> #include <vector> -#include "base/callback.h" #include "base/containers/flat_map.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h"
diff --git a/cc/tiles/image_controller_unittest.cc b/cc/tiles/image_controller_unittest.cc index b5ceb5a..7d3d944 100644 --- a/cc/tiles/image_controller_unittest.cc +++ b/cc/tiles/image_controller_unittest.cc
@@ -7,8 +7,8 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/synchronization/condition_variable.h" #include "base/task/sequenced_task_runner.h"
diff --git a/cc/tiles/picture_layer_tiling_unittest.cc b/cc/tiles/picture_layer_tiling_unittest.cc index 0c59868d..dff128d 100644 --- a/cc/tiles/picture_layer_tiling_unittest.cc +++ b/cc/tiles/picture_layer_tiling_unittest.cc
@@ -9,7 +9,7 @@ #include <limits> #include <set> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "cc/base/math_util.h" #include "cc/test/fake_output_surface_client.h"
diff --git a/cc/tiles/software_image_decode_cache.cc b/cc/tiles/software_image_decode_cache.cc index b551485..a482f8dc 100644 --- a/cc/tiles/software_image_decode_cache.cc +++ b/cc/tiles/software_image_decode_cache.cc
@@ -10,9 +10,9 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/debug/stack_trace.h" #include "base/format_macros.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/memory/raw_ref.h" #include "base/metrics/histogram_macros.h"
diff --git a/cc/tiles/software_image_decode_cache_utils.cc b/cc/tiles/software_image_decode_cache_utils.cc index 1e02f36c..6ad9df8 100644 --- a/cc/tiles/software_image_decode_cache_utils.cc +++ b/cc/tiles/software_image_decode_cache_utils.cc
@@ -9,7 +9,7 @@ #include <utility> #include "base/atomic_sequence_num.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/hash/hash.h" #include "base/memory/discardable_memory_allocator.h" #include "base/metrics/histogram_macros.h"
diff --git a/cc/tiles/software_image_decode_cache_utils.h b/cc/tiles/software_image_decode_cache_utils.h index 5873d23..7507159a 100644 --- a/cc/tiles/software_image_decode_cache_utils.h +++ b/cc/tiles/software_image_decode_cache_utils.h
@@ -9,7 +9,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/discardable_memory.h" #include "base/memory/scoped_refptr.h" #include "cc/cc_export.h"
diff --git a/cc/tiles/tile_manager.cc b/cc/tiles/tile_manager.cc index 6f08a92..a39e057 100644 --- a/cc/tiles/tile_manager.cc +++ b/cc/tiles/tile_manager.cc
@@ -10,8 +10,8 @@ #include <limits> #include <string> -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/json/json_writer.h" #include "base/logging.h" #include "base/memory/raw_ptr.h"
diff --git a/cc/tiles/tile_manager_unittest.cc b/cc/tiles/tile_manager_unittest.cc index 6a741b54..0ad6e8367 100644 --- a/cc/tiles/tile_manager_unittest.cc +++ b/cc/tiles/tile_manager_unittest.cc
@@ -7,10 +7,10 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/test/scoped_feature_list.h"
diff --git a/cc/trees/image_animation_controller.cc b/cc/trees/image_animation_controller.cc index 4bfa715d..f53e48e1 100644 --- a/cc/trees/image_animation_controller.cc +++ b/cc/trees/image_animation_controller.cc
@@ -7,7 +7,7 @@ #include <algorithm> #include <sstream> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "base/notreached.h" #include "base/trace_event/trace_event.h"
diff --git a/cc/trees/image_animation_controller_unittest.cc b/cc/trees/image_animation_controller_unittest.cc index 6403fb5..35135f4 100644 --- a/cc/trees/image_animation_controller_unittest.cc +++ b/cc/trees/image_animation_controller_unittest.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h"
diff --git a/cc/trees/layer_tree_frame_sink.cc b/cc/trees/layer_tree_frame_sink.cc index d3b7626..fbc38ccb 100644 --- a/cc/trees/layer_tree_frame_sink.cc +++ b/cc/trees/layer_tree_frame_sink.cc
@@ -7,7 +7,7 @@ #include <stdint.h> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/threading/thread_task_runner_handle.h" #include "base/trace_event/trace_event.h"
diff --git a/cc/trees/layer_tree_frame_sink_client.h b/cc/trees/layer_tree_frame_sink_client.h index 7c886a12..78815c59 100644 --- a/cc/trees/layer_tree_frame_sink_client.h +++ b/cc/trees/layer_tree_frame_sink_client.h
@@ -7,7 +7,7 @@ #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "cc/cc_export.h" #include "components/viz/common/resources/returned_resource.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/cc/trees/layer_tree_host.cc b/cc/trees/layer_tree_host.cc index e804767..ef29667 100644 --- a/cc/trees/layer_tree_host.cc +++ b/cc/trees/layer_tree_host.cc
@@ -13,10 +13,10 @@ #include "base/atomic_sequence_num.h" #include "base/auto_reset.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/containers/adapters.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/memory/ptr_util.h"
diff --git a/cc/trees/layer_tree_host.h b/cc/trees/layer_tree_host.h index 77eb975a..0a24838 100644 --- a/cc/trees/layer_tree_host.h +++ b/cc/trees/layer_tree_host.h
@@ -16,10 +16,10 @@ #include <utility> #include <vector> -#include "base/callback_forward.h" #include "base/cancelable_callback.h" #include "base/containers/flat_map.h" #include "base/containers/flat_set.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/read_only_shared_memory_region.h" #include "base/memory/ref_counted.h"
diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc index 8d30474..5dce2b3f 100644 --- a/cc/trees/layer_tree_host_impl.cc +++ b/cc/trees/layer_tree_host_impl.cc
@@ -15,7 +15,6 @@ #include <vector> #include "base/auto_reset.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/compiler_specific.h" #include "base/containers/adapters.h" @@ -25,6 +24,7 @@ #include "base/debug/crash_logging.h" #include "base/debug/dump_without_crashing.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/ptr_util.h" #include "base/memory/read_only_shared_memory_region.h"
diff --git a/cc/trees/layer_tree_host_impl.h b/cc/trees/layer_tree_host_impl.h index 568c240..52647d0a 100644 --- a/cc/trees/layer_tree_host_impl.h +++ b/cc/trees/layer_tree_host_impl.h
@@ -14,10 +14,10 @@ #include <utility> #include <vector> -#include "base/callback.h" #include "base/containers/flat_map.h" #include "base/containers/flat_set.h" #include "base/containers/lru_cache.h" +#include "base/functional/callback.h" #include "base/memory/memory_pressure_listener.h" #include "base/memory/shared_memory_mapping.h" #include "base/rand_util.h"
diff --git a/cc/trees/layer_tree_host_impl_unittest.cc b/cc/trees/layer_tree_host_impl_unittest.cc index 39bea8b..3439776 100644 --- a/cc/trees/layer_tree_host_impl_unittest.cc +++ b/cc/trees/layer_tree_host_impl_unittest.cc
@@ -10,8 +10,8 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/memory_pressure_listener.h" #include "base/memory/ptr_util.h" #include "base/ranges/algorithm.h"
diff --git a/cc/trees/layer_tree_host_perftest.cc b/cc/trees/layer_tree_host_perftest.cc index d578817..e1c54a74 100644 --- a/cc/trees/layer_tree_host_perftest.cc +++ b/cc/trees/layer_tree_host_perftest.cc
@@ -6,9 +6,9 @@ #include <sstream> -#include "base/bind.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/path_service.h" #include "base/strings/string_piece.h"
diff --git a/cc/trees/layer_tree_host_pixeltest_readback.cc b/cc/trees/layer_tree_host_pixeltest_readback.cc index e9054ea..b1ec940 100644 --- a/cc/trees/layer_tree_host_pixeltest_readback.cc +++ b/cc/trees/layer_tree_host_pixeltest_readback.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 "base/bind.h" +#include "base/functional/bind.h" #include "build/build_config.h" #include "cc/layers/solid_color_layer.h" #include "cc/layers/texture_layer.h"
diff --git a/cc/trees/layer_tree_host_unittest.cc b/cc/trees/layer_tree_host_unittest.cc index acb8dda..e9615a1 100644 --- a/cc/trees/layer_tree_host_unittest.cc +++ b/cc/trees/layer_tree_host_unittest.cc
@@ -11,10 +11,10 @@ #include <memory> #include "base/auto_reset.h" -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/synchronization/lock.h"
diff --git a/cc/trees/layer_tree_host_unittest_animation.cc b/cc/trees/layer_tree_host_unittest_animation.cc index d4f459f8..98b51e3 100644 --- a/cc/trees/layer_tree_host_unittest_animation.cc +++ b/cc/trees/layer_tree_host_unittest_animation.cc
@@ -7,7 +7,7 @@ #include <stdint.h> #include <climits> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/statistics_recorder.h" #include "base/time/time.h" #include "build/build_config.h"
diff --git a/cc/trees/layer_tree_host_unittest_context.cc b/cc/trees/layer_tree_host_unittest_context.cc index 1993b690..d5be96a 100644 --- a/cc/trees/layer_tree_host_unittest_context.cc +++ b/cc/trees/layer_tree_host_unittest_context.cc
@@ -5,7 +5,7 @@ #include <stddef.h> #include <stdint.h> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "build/build_config.h" #include "cc/layers/heads_up_display_layer.h"
diff --git a/cc/trees/layer_tree_host_unittest_copyrequest.cc b/cc/trees/layer_tree_host_unittest_copyrequest.cc index c7aec1ec..eed3188 100644 --- a/cc/trees/layer_tree_host_unittest_copyrequest.cc +++ b/cc/trees/layer_tree_host_unittest_copyrequest.cc
@@ -4,7 +4,7 @@ #include <stddef.h> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/synchronization/waitable_event.h"
diff --git a/cc/trees/layer_tree_host_unittest_damage.cc b/cc/trees/layer_tree_host_unittest_damage.cc index 961efa5..8943e4f6 100644 --- a/cc/trees/layer_tree_host_unittest_damage.cc +++ b/cc/trees/layer_tree_host_unittest_damage.cc
@@ -4,8 +4,8 @@ #include "cc/trees/layer_tree_host.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/time/time.h" #include "cc/layers/solid_color_layer.h"
diff --git a/cc/trees/layer_tree_host_unittest_picture.cc b/cc/trees/layer_tree_host_unittest_picture.cc index 495e4da4..baf3a7516 100644 --- a/cc/trees/layer_tree_host_unittest_picture.cc +++ b/cc/trees/layer_tree_host_unittest_picture.cc
@@ -4,7 +4,7 @@ #include "cc/trees/layer_tree_host.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/time/time.h" #include "cc/test/fake_content_layer_client.h" #include "cc/test/fake_picture_layer.h"
diff --git a/cc/trees/layer_tree_host_unittest_proxy.cc b/cc/trees/layer_tree_host_unittest_proxy.cc index ec7c45e..b66ca72 100644 --- a/cc/trees/layer_tree_host_unittest_proxy.cc +++ b/cc/trees/layer_tree_host_unittest_proxy.cc
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/bind.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" #include "cc/test/fake_content_layer_client.h" #include "cc/test/fake_picture_layer.h" #include "cc/test/layer_tree_test.h"
diff --git a/cc/trees/layer_tree_host_unittest_scroll.cc b/cc/trees/layer_tree_host_unittest_scroll.cc index 9276401e..59d0401 100644 --- a/cc/trees/layer_tree_host_unittest_scroll.cc +++ b/cc/trees/layer_tree_host_unittest_scroll.cc
@@ -5,7 +5,7 @@ #include "base/memory/raw_ptr.h" #include "cc/trees/layer_tree_host.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/weak_ptr.h" #include "base/task/single_thread_task_runner.h"
diff --git a/cc/trees/layer_tree_mutator.h b/cc/trees/layer_tree_mutator.h index ba46cd1..73d1a4ca 100644 --- a/cc/trees/layer_tree_mutator.h +++ b/cc/trees/layer_tree_mutator.h
@@ -10,8 +10,8 @@ #include <unordered_map> #include <vector> -#include "base/callback_forward.h" #include "base/check.h" +#include "base/functional/callback_forward.h" #include "base/time/time.h" #include "cc/cc_export.h" #include "cc/trees/animation_effect_timings.h"
diff --git a/cc/trees/presentation_time_callback_buffer.h b/cc/trees/presentation_time_callback_buffer.h index fa062d9..58dbdefd 100644 --- a/cc/trees/presentation_time_callback_buffer.h +++ b/cc/trees/presentation_time_callback_buffer.h
@@ -6,8 +6,8 @@ #include <vector> -#include "base/callback_forward.h" #include "base/containers/circular_deque.h" +#include "base/functional/callback_forward.h" #include "base/sequence_checker.h" #include "base/time/time.h" #include "cc/cc_export.h"
diff --git a/cc/trees/presentation_time_callback_buffer_unittest.cc b/cc/trees/presentation_time_callback_buffer_unittest.cc index db8d389d..cccdc8b5 100644 --- a/cc/trees/presentation_time_callback_buffer_unittest.cc +++ b/cc/trees/presentation_time_callback_buffer_unittest.cc
@@ -4,8 +4,8 @@ #include "cc/trees/presentation_time_callback_buffer.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "testing/gtest/include/gtest/gtest.h" namespace {
diff --git a/cc/trees/property_tree.h b/cc/trees/property_tree.h index 43f9ba5..0870a77 100644 --- a/cc/trees/property_tree.h +++ b/cc/trees/property_tree.h
@@ -14,9 +14,9 @@ #include <utility> #include <vector> -#include "base/callback.h" #include "base/containers/flat_map.h" #include "base/containers/flat_set.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/raw_ref.h" #include "base/memory/weak_ptr.h"
diff --git a/cc/trees/proxy_impl.cc b/cc/trees/proxy_impl.cc index 70d94f53..bb24de5 100644 --- a/cc/trees/proxy_impl.cc +++ b/cc/trees/proxy_impl.cc
@@ -13,8 +13,8 @@ #include <vector> #include "base/auto_reset.h" -#include "base/bind.h" #include "base/debug/crash_logging.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/notreached.h" #include "base/trace_event/trace_event.h"
diff --git a/cc/trees/proxy_main.cc b/cc/trees/proxy_main.cc index cb09d75..f7702ee0 100644 --- a/cc/trees/proxy_main.cc +++ b/cc/trees/proxy_main.cc
@@ -10,7 +10,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/notreached.h" #include "base/synchronization/waitable_event.h" #include "base/trace_event/trace_event.h"
diff --git a/cc/trees/single_thread_proxy.cc b/cc/trees/single_thread_proxy.cc index 9227d901..8d65181 100644 --- a/cc/trees/single_thread_proxy.cc +++ b/cc/trees/single_thread_proxy.cc
@@ -9,7 +9,7 @@ #include <vector> #include "base/auto_reset.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/notreached.h" #include "base/synchronization/waitable_event.h"
diff --git a/cc/view_transition/view_transition_request.cc b/cc/view_transition/view_transition_request.cc index 70030766..b7b24b9 100644 --- a/cc/view_transition/view_transition_request.cc +++ b/cc/view_transition/view_transition_request.cc
@@ -10,8 +10,8 @@ #include <utility> #include <vector> -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/ranges/algorithm.h" #include "cc/view_transition/view_transition_shared_element_id.h"
diff --git a/cc/view_transition/view_transition_request.h b/cc/view_transition/view_transition_request.h index 9a476df3..6ff8490 100644 --- a/cc/view_transition/view_transition_request.h +++ b/cc/view_transition/view_transition_request.h
@@ -11,7 +11,7 @@ #include <utility> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "cc/cc_export.h" #include "cc/view_transition/view_transition_shared_element_id.h" #include "components/viz/common/quads/compositor_frame_transition_directive.h"
diff --git a/chrome/VERSION b/chrome/VERSION index ed5c214..508f51e 100644 --- a/chrome/VERSION +++ b/chrome/VERSION
@@ -1,4 +1,4 @@ MAJOR=111 MINOR=0 -BUILD=5524 +BUILD=5526 PATCH=0
diff --git a/chrome/app/resources/generated_resources_af.xtb b/chrome/app/resources/generated_resources_af.xtb index f934942..b4639b6c 100644 --- a/chrome/app/resources/generated_resources_af.xtb +++ b/chrome/app/resources/generated_resources_af.xtb
@@ -3868,7 +3868,6 @@ <translation id="4513872120116766993">Skryfvoorspelling</translation> <translation id="4513946894732546136">Terugvoer</translation> <translation id="451407183922382411">Aangedryf deur <ph name="COMPANY_NAME" /></translation> -<translation id="4514610446763173167">Wissel video tussen speel en laat wag</translation> <translation id="451515744433878153">Verwyder</translation> <translation id="4515872537870654449">Kontak Dell vir diens. Die dok sal afskakel as die waaier nie werk nie.</translation> <translation id="4518840066030486079">Shift-sleutelmodusstyl</translation>
diff --git a/chrome/app/resources/generated_resources_am.xtb b/chrome/app/resources/generated_resources_am.xtb index e77dc6c9..daef5899 100644 --- a/chrome/app/resources/generated_resources_am.xtb +++ b/chrome/app/resources/generated_resources_am.xtb
@@ -3854,7 +3854,6 @@ <translation id="4513872120116766993">ግምታዊ አጻጻፍ</translation> <translation id="4513946894732546136">ግብረ መልስ</translation> <translation id="451407183922382411">በ<ph name="COMPANY_NAME" /> የተጎላበተ</translation> -<translation id="4514610446763173167">ቪዲዮን ለማጫወት ወይም ባለበት ለማቆም ቀያይር</translation> <translation id="451515744433878153">አስወግድ</translation> <translation id="4515872537870654449">ለጥገና አገልግሎት Dell ን ያነጋግሩ። አየር ማርገብገቢያው የማይሠራ ከሆነ መትከያው ይዘጋል።</translation> <translation id="4518840066030486079">የShift ቁልፍ ሁነታ ቅጥ</translation>
diff --git a/chrome/app/resources/generated_resources_ar.xtb b/chrome/app/resources/generated_resources_ar.xtb index 40f5c37..f4991297 100644 --- a/chrome/app/resources/generated_resources_ar.xtb +++ b/chrome/app/resources/generated_resources_ar.xtb
@@ -3851,7 +3851,6 @@ <translation id="4513872120116766993">اقتراحات نصية توقّعية</translation> <translation id="4513946894732546136">ملاحظات</translation> <translation id="451407183922382411">تم التشغيل من قبل <ph name="COMPANY_NAME" /></translation> -<translation id="4514610446763173167">تبديل الفيديو لتشغيله أو إيقافه مؤقتًا</translation> <translation id="451515744433878153">إزالة</translation> <translation id="4515872537870654449">يُرجي التواصل مع فريق دعم Dell للحصول على الخدمة. ستتوقف محطة الإرساء عن العمل في حال توقفت مروحة التبريد عن العمل.</translation> <translation id="4518840066030486079">نمط وضع استخدام مفتاح Shift</translation>
diff --git a/chrome/app/resources/generated_resources_as.xtb b/chrome/app/resources/generated_resources_as.xtb index 20e7079..49f962379 100644 --- a/chrome/app/resources/generated_resources_as.xtb +++ b/chrome/app/resources/generated_resources_as.xtb
@@ -2745,6 +2745,7 @@ <translation id="3469583217479686109">বাছনি কৰাৰ সঁজুলি</translation> <translation id="3470392222765168737">ছাইটটো ফ’ল’ কৰক</translation> <translation id="3471876058939596279">ভিডিঅ’ৰ বাবে HDMI আৰু ইউএছবি Type-C প’ৰ্টসমূহ একে সময়তে ব্যৱহাৰ কৰিব নোৱাৰি। বেলেগ এটা ভিডিঅ’ প’ৰ্ট ব্যৱহাৰ কৰক।</translation> +<translation id="3472469028191701821">নতুন টেবত খোলে</translation> <translation id="3473241910002674503">টেবলেট ম’ডত বুটামৰ জৰিয়তে গৃহপৃষ্ঠালৈ নেভিগে’ট কৰক, উভতি যাওক আৰু এপ্সমূহ সলনি কৰক।</translation> <translation id="3473479545200714844">স্ক্ৰীন বিৱৰ্ধক</translation> <translation id="3474218480460386727">নতুন শব্দবোৰৰ বাবে ৯৯ টা অথবা তাতকৈ কম আখৰ ব্যৱহাৰ কৰক</translation> @@ -3132,6 +3133,7 @@ <translation id="3820749202859700794">SECG elliptic curve secp521r1 (aka NIST P-521)</translation> <translation id="3821074617718452587">Phone Hubৰ জাননী</translation> <translation id="3821372858277557370">{NUM_EXTENSIONS,plural, =1{এটা এক্সটেনশ্বনত অনুমোদন জনোৱা হৈছে}one{# টা এক্সটেনশ্বনত অনুমোদন জনোৱা হৈছে}other{# টা এক্সটেনশ্বনত অনুমোদন জনোৱা হৈছে}}</translation> +<translation id="3823019343150397277">IBAN</translation> <translation id="3823310065043511710">Linuxৰ বাবে অতি কমেও <ph name="INSTALL_SIZE" /> ঠাই থকাটো চুপাৰিছ কৰা হয়।</translation> <translation id="3824621460022590830">ডিভাইচৰ পঞ্জীয়নৰ ট’কেনটো অমান্য। অনুগ্ৰহ কৰি আপোনাৰ ডিভাইচৰ গৰাকী অথবা প্ৰশাসকৰ সৈতে যোগাযোগ কৰক। আসোঁৱাহ ক’ড: <ph name="ERROR_CODE" />।</translation> <translation id="3825041664272812989">{FILE_TYPE_COUNT,plural, =1{ফাইলৰ এই ধৰণটোৰ বাবে মোৰ পচন্দ মনত ৰাখক: <ph name="FILE_TYPES" />}one{ফাইলৰ এই ধৰণসমূহৰ বাবে মোৰ পচন্দ মনত ৰাখক: <ph name="FILE_TYPES" />}other{ফাইলৰ এই ধৰণসমূহৰ বাবে মোৰ পচন্দ মনত ৰাখক: <ph name="FILE_TYPES" />}}</translation> @@ -3863,7 +3865,6 @@ <translation id="4513872120116766993">পূৰ্বানুমানৰ ভিত্তি লিখা</translation> <translation id="4513946894732546136">মতামত</translation> <translation id="451407183922382411"><ph name="COMPANY_NAME" />ৰ দ্বাৰা সঞ্চালিত</translation> -<translation id="4514610446763173167">প্লে' বা পজ কৰিবলৈ ভিডিঅ' ট'গল কৰক</translation> <translation id="451515744433878153">আঁতৰ কৰক</translation> <translation id="4515872537870654449">ছাৰ্ভিছিঙৰ বাবে Dellৰ সৈতে যোগাযোগ কৰক। ফেনখনে যদি কাম কৰা নাই ড’কটো বন্ধ হৈ যাব।</translation> <translation id="4518840066030486079">শ্বিফ্ট কীৰ ম’ডৰ শৈলী</translation> @@ -4050,6 +4051,7 @@ <translation id="4675828034887792601">ছাইট সন্ধান কৰিবৰ বাবে শ্বৰ্টকাট সৃষ্টি কৰক আৰু আপোনাৰ সন্ধান ইঞ্জিন পৰিচালনা কৰক</translation> <translation id="4676595058027112862">ফ’ন হাব, অধিক জানক</translation> <translation id="4677772697204437347">GPU মেম’ৰী</translation> +<translation id="4678848110205818817">ক্ৰেডিট/ডেবিট কাৰ্ড</translation> <translation id="4680105648806843642">এই পৃষ্ঠাটোত শব্দ মিউট কৰা হৈছে</translation> <translation id="4680112532510845139">ইয়ালৈ প্ৰতিচ্ছবি এখন টানি আনি এৰক</translation> <translation id="4681453295291708042">Nearby Share সুবিধাটো অক্ষম কৰক</translation>
diff --git a/chrome/app/resources/generated_resources_az.xtb b/chrome/app/resources/generated_resources_az.xtb index a37ae0dc..3716622 100644 --- a/chrome/app/resources/generated_resources_az.xtb +++ b/chrome/app/resources/generated_resources_az.xtb
@@ -3849,7 +3849,6 @@ <translation id="4513872120116766993">Proqnozlaşdırıcı yazı</translation> <translation id="4513946894732546136">Geri əlaqə</translation> <translation id="451407183922382411"><ph name="COMPANY_NAME" /> tərəfindən dəstəklənir</translation> -<translation id="4514610446763173167">Oxutmaq və ya dayandırmaq üçün videonu aktiv edin</translation> <translation id="451515744433878153">Silin</translation> <translation id="4515872537870654449">Texniki baxış üçün Dell ilə əlaqə saxlayın. Ventilyasiya işləmirsə, dok sönəcək.</translation> <translation id="4518840066030486079">Shift Düymə Rejimi Üslubu</translation>
diff --git a/chrome/app/resources/generated_resources_be.xtb b/chrome/app/resources/generated_resources_be.xtb index b308968..8e6acb6 100644 --- a/chrome/app/resources/generated_resources_be.xtb +++ b/chrome/app/resources/generated_resources_be.xtb
@@ -3850,7 +3850,6 @@ <translation id="4513872120116766993">Прагнастычныя падказкі пры напісанні тэксту</translation> <translation id="4513946894732546136">Водгук</translation> <translation id="451407183922382411">На платформе <ph name="COMPANY_NAME" /></translation> -<translation id="4514610446763173167">Прайграванне або прыпыненне відэа</translation> <translation id="451515744433878153">Выдаліць</translation> <translation id="4515872537870654449">Звярніцеся ў службу тэхпадтрымкі Dell. Калі вентылятар не працуе, док-станцыя выключыцца.</translation> <translation id="4518840066030486079">Стыль рэжыму клавішы Shift</translation>
diff --git a/chrome/app/resources/generated_resources_bg.xtb b/chrome/app/resources/generated_resources_bg.xtb index 5eb2720..7abb51b 100644 --- a/chrome/app/resources/generated_resources_bg.xtb +++ b/chrome/app/resources/generated_resources_bg.xtb
@@ -3862,7 +3862,6 @@ <translation id="4513872120116766993">Предвиждащо писане</translation> <translation id="4513946894732546136">Отзиви</translation> <translation id="451407183922382411">Предоставено от <ph name="COMPANY_NAME" /></translation> -<translation id="4514610446763173167">Превключвател за възпроизвеждане или поставяне на пауза на видеоклипа</translation> <translation id="451515744433878153">Премахване</translation> <translation id="4515872537870654449">Обърнете се към Dell за обслужване. Докинг станцията ще се изключи, ако вентилаторът не работи.</translation> <translation id="4518840066030486079">Стил на режимa за клавиша Shift</translation>
diff --git a/chrome/app/resources/generated_resources_bn.xtb b/chrome/app/resources/generated_resources_bn.xtb index 9be8e543..9d4d5ab 100644 --- a/chrome/app/resources/generated_resources_bn.xtb +++ b/chrome/app/resources/generated_resources_bn.xtb
@@ -2748,6 +2748,7 @@ <translation id="3469583217479686109">বেছে নেওয়ার টুল</translation> <translation id="3470392222765168737">সাইট ফলো করুন</translation> <translation id="3471876058939596279">ভিডিওর জন্য একসাথে HDMI এবং USB টাইপ-সি পোর্ট ব্যবহার করা যাবে না। অন্য ভিডিও পোর্ট ব্যবহার করুন।</translation> +<translation id="3472469028191701821">নতুন ট্যাবে খোলে</translation> <translation id="3473241910002674503">ট্যাবলেট মোডে বোতাম ব্যবহার করে হোম পেজে যান, ফিরে আসুন এবং একটি অ্যাপ থেকে আরেকটি অ্যাপে যান।</translation> <translation id="3473479545200714844">স্ক্রিন ম্যাগনিফায়ার</translation> <translation id="3474218480460386727">নতুন শব্দের জন্য ৯৯টি অথবা তার চেয়ে কম বর্ণ ব্যবহার করুন</translation> @@ -3135,6 +3136,7 @@ <translation id="3820749202859700794">SECG এলিপ্টিক কার্ভ secp521r1 (ওরফে NIST P-521)</translation> <translation id="3821074617718452587">ফোন হাব সম্পর্কিত বিজ্ঞপ্তি</translation> <translation id="3821372858277557370">{NUM_EXTENSIONS,plural, =1{একটি এক্সটেনশনে অনুমোদন দেওয়া হয়েছে}one{#টি এক্সটেনশনে অনুমোদন দেওয়া হয়েছে}other{#টি এক্সটেনশনে অনুমোদন দেওয়া হয়েছে}}</translation> +<translation id="3823019343150397277">IBAN</translation> <translation id="3823310065043511710">Linux-এর জন্য কমপক্ষে <ph name="INSTALL_SIZE" /> জায়গা খালি রাখার জন্য সাজেস্ট করা হচ্ছে।</translation> <translation id="3824621460022590830">ডিভাইস এনরোলমেন্ট টোকেনটি সঠিক নয়। আপনার ডিভাইসের মালিক বা অ্যাডমিনিস্ট্রেটরের সাথে যোগাযোগ করুন। সমস্যার কোড: <ph name="ERROR_CODE" /></translation> <translation id="3825041664272812989">{FILE_TYPE_COUNT,plural, =1{এই ধরনের ফাইলের জন্য আমার পছন্দ মনে রাখুন: <ph name="FILE_TYPES" />}one{এই ধরনের সমস্ত ফাইলের জন্য আমার পছন্দ মনে রাখুন: <ph name="FILE_TYPES" />}other{এই ধরনের সমস্ত ফাইলের জন্য আমার পছন্দ মনে রাখুন: <ph name="FILE_TYPES" />}}</translation> @@ -3867,7 +3869,6 @@ <translation id="4513872120116766993">লেখার সাজেশন</translation> <translation id="4513946894732546136">প্রতিক্রিয়া</translation> <translation id="451407183922382411"><ph name="COMPANY_NAME" /> এর দ্বারা চালিত</translation> -<translation id="4514610446763173167">ভিডিও চালাতে বা থামানোর জন্য টগল করুন</translation> <translation id="451515744433878153">সরান</translation> <translation id="4515872537870654449">সার্ভিসিংয়ের জন্য Dell-এর সাথে যোগাযোগ করুন। ফ্যান কাজ না করলে ডকিং স্টেশন বন্ধ হয়ে যাবে।</translation> <translation id="4518840066030486079">Shift কী মোড স্টাইল</translation> @@ -4055,6 +4056,7 @@ <translation id="4675828034887792601">সাইট সার্চ করতে এবং আপনার সার্চ ইঞ্জিন ম্যানেজ করার জন্য শর্টকাট তৈরি করুন</translation> <translation id="4676595058027112862">ফোন হাব, আরও জানুন</translation> <translation id="4677772697204437347">GPU মেমোরি</translation> +<translation id="4678848110205818817">ক্রেডিট/ডেবিট কার্ড</translation> <translation id="4680105648806843642">এই পৃষ্ঠায় সাউন্ড মিউট করা আছে</translation> <translation id="4680112532510845139">এখানে কোনও ছবি রাখুন</translation> <translation id="4681453295291708042">'নিয়ারবাই শেয়ার' ফিচারটি বন্ধ করে দিন</translation>
diff --git a/chrome/app/resources/generated_resources_bs.xtb b/chrome/app/resources/generated_resources_bs.xtb index 6ae1f10..8418ba3d 100644 --- a/chrome/app/resources/generated_resources_bs.xtb +++ b/chrome/app/resources/generated_resources_bs.xtb
@@ -3867,7 +3867,6 @@ <translation id="4513872120116766993">Predvidljivo pisanje</translation> <translation id="4513946894732546136">Povratne informacije</translation> <translation id="451407183922382411">Omogućuje <ph name="COMPANY_NAME" /></translation> -<translation id="4514610446763173167">Reproduciraj ili pauziraj videozapis</translation> <translation id="451515744433878153">Ukloni</translation> <translation id="4515872537870654449">Kontaktirajte Dell za podršku. Priključna stanica će se isključiti ukoliko ventilator ne radi.</translation> <translation id="4518840066030486079">Stil načina rada s tipkom Shift</translation>
diff --git a/chrome/app/resources/generated_resources_ca.xtb b/chrome/app/resources/generated_resources_ca.xtb index c06da9e..b6307f28 100644 --- a/chrome/app/resources/generated_resources_ca.xtb +++ b/chrome/app/resources/generated_resources_ca.xtb
@@ -3848,7 +3848,6 @@ <translation id="4513872120116766993">Escriptura predictiva</translation> <translation id="4513946894732546136">Comentaris</translation> <translation id="451407183922382411">Amb la tecnologia de: <ph name="COMPANY_NAME" /></translation> -<translation id="4514610446763173167">Reprodueix o posa en pausa el vídeo</translation> <translation id="451515744433878153">Suprimeix</translation> <translation id="4515872537870654449">Contacta amb Dell per obtenir assistència tècnica. La base s'apagarà si el ventilador no funciona.</translation> <translation id="4518840066030486079">Estil del mode de la tecla Maj</translation>
diff --git a/chrome/app/resources/generated_resources_cs.xtb b/chrome/app/resources/generated_resources_cs.xtb index 62f6698a..f85dde7c 100644 --- a/chrome/app/resources/generated_resources_cs.xtb +++ b/chrome/app/resources/generated_resources_cs.xtb
@@ -3850,7 +3850,6 @@ <translation id="4513872120116766993">Předvídání psaní</translation> <translation id="4513946894732546136">Zpětná vazba</translation> <translation id="451407183922382411">Založeno na technologii <ph name="COMPANY_NAME" /></translation> -<translation id="4514610446763173167">Přepnout mezi přehráváním a pozastavením videa</translation> <translation id="451515744433878153">Odstranit</translation> <translation id="4515872537870654449">Požádejte společnost Dell o servis. Pokud nefunguje větrák, dok se vypne.</translation> <translation id="4518840066030486079">Styl režimu klávesy Shift</translation>
diff --git a/chrome/app/resources/generated_resources_cy.xtb b/chrome/app/resources/generated_resources_cy.xtb index ffe86f9..8a1c224 100644 --- a/chrome/app/resources/generated_resources_cy.xtb +++ b/chrome/app/resources/generated_resources_cy.xtb
@@ -3866,7 +3866,6 @@ <translation id="4513872120116766993">Ysgrifennu rhagfynegol</translation> <translation id="4513946894732546136">Adborth</translation> <translation id="451407183922382411">Pwerir gan <ph name="COMPANY_NAME" /></translation> -<translation id="4514610446763173167">Toglo fideo i chwarae neu seibio</translation> <translation id="451515744433878153">Tynnu</translation> <translation id="4515872537870654449">Cysylltwch â Dell i gael gwasanaeth. Bydd y doc yn cau os nad yw'r ffan yn gweithio.</translation> <translation id="4518840066030486079">Arddull Modd Bysell Shift</translation>
diff --git a/chrome/app/resources/generated_resources_da.xtb b/chrome/app/resources/generated_resources_da.xtb index 8834048..0ac30e7 100644 --- a/chrome/app/resources/generated_resources_da.xtb +++ b/chrome/app/resources/generated_resources_da.xtb
@@ -3864,7 +3864,6 @@ <translation id="4513872120116766993">Skriveforslag</translation> <translation id="4513946894732546136">Feedback</translation> <translation id="451407183922382411">Leveret af <ph name="COMPANY_NAME" /></translation> -<translation id="4514610446763173167">Afspil eller sæt video på pause</translation> <translation id="451515744433878153">Fjern</translation> <translation id="4515872537870654449">Kontakt Dell for at få service. Dockingstationen slukker, hvis blæseren ikke fungerer.</translation> <translation id="4518840066030486079">Stilart for tilstand for Shift-tast</translation>
diff --git a/chrome/app/resources/generated_resources_de.xtb b/chrome/app/resources/generated_resources_de.xtb index 717aa3e..064eeb0 100644 --- a/chrome/app/resources/generated_resources_de.xtb +++ b/chrome/app/resources/generated_resources_de.xtb
@@ -2729,6 +2729,7 @@ <translation id="3469583217479686109">Auswahltool</translation> <translation id="3470392222765168737">Website folgen</translation> <translation id="3471876058939596279">HDMI- und USB-Typ-C-Ports können nicht gleichzeitig für den Anschluss an Bildschirme verwendet werden. Verwende einen anderen Videoport.</translation> +<translation id="3472469028191701821">Wird in neuem Tab geöffnet</translation> <translation id="3473241910002674503">Mit den Schaltflächen im Tablet-Modus zum Launcher, zurück und zwischen Apps wechseln.</translation> <translation id="3473479545200714844">Lupe</translation> <translation id="3474218480460386727">Neue Wörter dürfen maximal 99 Buchstaben lang sein</translation> @@ -3116,6 +3117,7 @@ <translation id="3820749202859700794">Elliptische SECG-Kurve secp521r1 (NIST P-521)</translation> <translation id="3821074617718452587">Phone Hub-Benachrichtigungen</translation> <translation id="3821372858277557370">{NUM_EXTENSIONS,plural, =1{Eine Erweiterung wurde genehmigt}other{# Erweiterungen wurden genehmigt}}</translation> +<translation id="3823019343150397277">IBAN</translation> <translation id="3823310065043511710">Für Linux sind mindestens <ph name="INSTALL_SIZE" /> freier Speicherplatz erforderlich.</translation> <translation id="3824621460022590830">Geräteregistrierungstoken ist ungültig. Bitte an den Eigentümer des Geräts oder an den Administrator wenden. Fehlercode: <ph name="ERROR_CODE" />.</translation> <translation id="3825041664272812989">{FILE_TYPE_COUNT,plural, =1{Meine Auswahl für diesen Dateityp merken: <ph name="FILE_TYPES" />}other{Meine Auswahl für diese Dateitypen merken: <ph name="FILE_TYPES" />}}</translation> @@ -3847,7 +3849,6 @@ <translation id="4513872120116766993">Wortvorschläge</translation> <translation id="4513946894732546136">Feedback</translation> <translation id="451407183922382411">Powered by <ph name="COMPANY_NAME" /></translation> -<translation id="4514610446763173167">Video wiedergeben oder pausieren</translation> <translation id="451515744433878153">Entfernen</translation> <translation id="4515872537870654449">Wende dich für eine Reparatur an Dell. Wenn der Lüfter nicht funktioniert, wird das Dock ausgeschaltet.</translation> <translation id="4518840066030486079">Modusstil der Umschalttaste</translation> @@ -4034,6 +4035,7 @@ <translation id="4675828034887792601">Du kannst Kürzel für die Suche auf Websites und die Verwaltung deiner Suchmaschinen festlegen</translation> <translation id="4676595058027112862">Phone Hub, weitere Informationen</translation> <translation id="4677772697204437347">GPU-Speicher</translation> +<translation id="4678848110205818817">Kredit-/Debitkarte</translation> <translation id="4680105648806843642">Der Ton wurde für diese Seite stummgeschaltet</translation> <translation id="4680112532510845139">Bild hierher ziehen</translation> <translation id="4681453295291708042">Nearby Share deaktivieren</translation>
diff --git a/chrome/app/resources/generated_resources_el.xtb b/chrome/app/resources/generated_resources_el.xtb index 9cf9c45f..4d234e5b 100644 --- a/chrome/app/resources/generated_resources_el.xtb +++ b/chrome/app/resources/generated_resources_el.xtb
@@ -3866,7 +3866,6 @@ <translation id="4513872120116766993">Πρόβλεψη γραφής</translation> <translation id="4513946894732546136">Σχόλια</translation> <translation id="451407183922382411">Με την υποστήριξη της <ph name="COMPANY_NAME" /></translation> -<translation id="4514610446763173167">Εναλλαγή αναπαραγωγής ή παύσης βίντεο</translation> <translation id="451515744433878153">Κατάργηση</translation> <translation id="4515872537870654449">Επικοινωνήστε με την Dell για επισκευή. Η βάση σύνδεσης θα απενεργοποιηθεί εάν ο ανεμιστήρας δεν λειτουργεί.</translation> <translation id="4518840066030486079">Στιλ λειτουργίας πλήκτρου Shift</translation>
diff --git a/chrome/app/resources/generated_resources_en-GB.xtb b/chrome/app/resources/generated_resources_en-GB.xtb index 9b77a84..cc25740 100644 --- a/chrome/app/resources/generated_resources_en-GB.xtb +++ b/chrome/app/resources/generated_resources_en-GB.xtb
@@ -928,6 +928,7 @@ <translation id="1819721979226826163">Tap App notifications > Google Play services.</translation> <translation id="1820028137326691631">Enter admin-provided password</translation> <translation id="1822140782238030981">Already a Chrome user? Sign in</translation> +<translation id="1823781806707127806">Add existing browsing data to managed profile</translation> <translation id="18245044880483936">Backup data will not count toward your child's Drive storage quota.</translation> <translation id="1825565032302550710">Port must be between 1024 and 65535</translation> <translation id="182577151972096764">recently viewed recipes</translation> @@ -1089,6 +1090,7 @@ <translation id="1963976881984600709">Standard protection</translation> <translation id="1965624977906726414">Has no special permissions.</translation> <translation id="1966649499058910679">Highlight each word as it is spoken</translation> +<translation id="1967970931040389207">Turn on hotspot</translation> <translation id="1969654639948595766">WebRTC text logs (<ph name="WEBRTC_TEXT_LOG_COUNT" />)</translation> <translation id="1972325230031091483">You’ll browse faster because content is proactively loaded based on your current web page visit</translation> <translation id="197288927597451399">Keep</translation> @@ -1177,6 +1179,7 @@ <translation id="2048554637254265991">Error starting the container manager. Please try again.</translation> <translation id="2048653237708779538">Action not available</translation> <translation id="2050339315714019657">Portrait</translation> +<translation id="2051555741181591333">Automatically disable hotspot</translation> <translation id="2052572566310583903">Installed on your other devices</translation> <translation id="2053105195397337973">We’re exploring ways to restrict tracking while enabling sites to stop ad spam and fraud.</translation> <translation id="2053312383184521053">Idle State Data</translation> @@ -1285,6 +1288,7 @@ <translation id="2137128126782078222">Don't allow notifications from <ph name="WEBSITE" /></translation> <translation id="2139919072249842737">Set up button</translation> <translation id="2140788884185208305">Battery health</translation> +<translation id="2140902257485550046">Select to block all extensions on this site</translation> <translation id="2142328300403846845">Open Link as</translation> <translation id="2142582065325732898">Turn on <ph name="LINK1_BEGIN" />Chrome Sync<ph name="LINK1_END" /> to view recent Chrome tabs. <ph name="LINK2_BEGIN" />Learn more<ph name="LINK2_END" /></translation> <translation id="2143765403545170146">Always Show Toolbar in Full Screen</translation> @@ -2019,6 +2023,7 @@ <translation id="2778471504622896352">Add remote apps to the ChromeOS launcher</translation> <translation id="2781120507965857989">Turn on sync to get your bookmarks, passwords, history and more on this device and anywhere else that you're syncing. Google may use your history to personalise Search and other Google services.</translation> <translation id="2781692009645368755">Google Pay</translation> +<translation id="2781800772148653810">Extensions are allowed on this site</translation> <translation id="2782104745158847185">Error installing Linux application</translation> <translation id="2783298271312924866">Downloaded</translation> <translation id="2783321960289401138">Create shortcut...</translation> @@ -3222,6 +3227,7 @@ <translation id="3898233949376129212">Device language</translation> <translation id="3898327728850887246"><ph name="SITE_NAME" /> wants to: <ph name="FIRST_PERMISSION" /> and <ph name="SECOND_PERMISSION" /></translation> <translation id="3898743717925399322">Your password for <ph name="WEBSITE" /> is saved on this device and to your Google Account. Which one do you want to delete?</translation> +<translation id="3898768766145818464">Play or pause video</translation> <translation id="389901847090970821">Select keyboard</translation> <translation id="3900966090527141178">Export passwords</translation> <translation id="3902789559055749153">Choose how you want to create a passkey for <ph name="APP_NAME" /></translation> @@ -3843,6 +3849,7 @@ <translation id="449126573531210296">Encrypt synced passwords with your Google Account</translation> <translation id="449232563137139956">Sites usually show images to provide illustration, like photos for online stores or news articles</translation> <translation id="4492698018379445570">Find what you added to shopping baskets and check out when you're ready</translation> +<translation id="4493167769966437077">Remove <ph name="LANGUAGE_NAME" /> from never offer translation languages</translation> <translation id="4493468155686877504">Recommended (<ph name="INSTALL_SIZE" />)</translation> <translation id="4495002167047709180">Allow this extension on <ph name="SITE" />?</translation> <translation id="4495419450179050807">Don't show on this page</translation> @@ -3868,7 +3875,6 @@ <translation id="4513872120116766993">Predictive writing</translation> <translation id="4513946894732546136">Feedback</translation> <translation id="451407183922382411">Powered by <ph name="COMPANY_NAME" /></translation> -<translation id="4514610446763173167">Toggle video to play or pause</translation> <translation id="451515744433878153">Remove</translation> <translation id="4515872537870654449">Contact Dell for service. The dock will shut down if the fan isn't working.</translation> <translation id="4518840066030486079">Shift key mode style</translation> @@ -4415,6 +4421,7 @@ <translation id="5026874946691314267">Don't show this again</translation> <translation id="5027550639139316293">Email Certificate</translation> <translation id="5027562294707732951">Add extension</translation> +<translation id="5028445315206872221">Extensions are blocked on this site</translation> <translation id="5029568752722684782">Clear copy</translation> <translation id="5029873138381728058">Failed to check VMs</translation> <translation id="503155457707535043">Apps downloading</translation> @@ -4978,6 +4985,7 @@ <translation id="5554866693883022680">Select an app on your <ph name="DEVICE_TYPE" /> to open this link</translation> <translation id="5555363196923735206">Flip camera</translation> <translation id="5555525474779371165">Choose your Safe Browsing protection</translation> +<translation id="5555639311269196631">Turn off hotspot</translation> <translation id="5556459405103347317">Reload</translation> <translation id="5558129378926964177">Zoom &In</translation> <translation id="55601339223879446">Adjust the boundaries of your desktop within the display</translation> @@ -6638,6 +6646,7 @@ <translation id="7088960765736518739">Switch Access</translation> <translation id="7089253021944603172">Tab active again</translation> <translation id="7090160970140261931">You can add additional accounts to your <ph name="DEVICE_TYPE" /> to use with websites and Android apps. You can also control which accounts are used with Android apps.</translation> +<translation id="7090714929377281710">Automatically turn off hotspot</translation> <translation id="7093220653036489319">Quick Answers</translation> <translation id="7093416310351037609">For data safety and security, your organisation requires all eligible downloads to be saved to your organisation's <ph name="WEB_DRIVE" /> account.</translation> <translation id="7093866338626856921">Exchange data with the devices named: <ph name="HOSTNAMES" /></translation> @@ -7258,6 +7267,7 @@ <translation id="7684718995427157417">To create and test your apps, enable the Android Debug Bridge (ADB). Note that this action allows installation of Android apps that haven't been verified by Google, and requires a factory reset to disable.</translation> <translation id="7685049629764448582">JavaScript memory</translation> <translation id="7685087414635069102">PIN required</translation> +<translation id="7686581688229391955">Select to allow extensions on this site</translation> <translation id="7686938547853266130"><ph name="FRIENDLY_NAME" /> (<ph name="DEVICE_PATH" />)</translation> <translation id="7690294790491645610">Confirm new password</translation> <translation id="7690378713476594306">Choose from list</translation> @@ -8071,6 +8081,7 @@ <translation id="8416730306157376817"><ph name="BATTERY_PERCENTAGE" />% (case)</translation> <translation id="8417548266957501132">Parent password</translation> <translation id="8418445294933751433">&Show as tab</translation> +<translation id="8418675848396538775">Add <ph name="LANGUAGE_NAME" /></translation> <translation id="8419098111404128271">Search results for '<ph name="SEARCH_TEXT" />'</translation> <translation id="8420308167132684745">Edit dictionary entries</translation> <translation id="8421361468937925547">Live Caption (English only)</translation> @@ -8841,6 +8852,7 @@ <translation id="9121814364785106365">Open as pinned tab</translation> <translation id="9123287046453017203">Your device is not up to date</translation> <translation id="9124003689441359348">Saved passwords will appear here</translation> +<translation id="9125910124977405374">Remove <ph name="LANGUAGE_NAME" /> from automatically translated languages</translation> <translation id="9126149354162942022">Cursor colour</translation> <translation id="9128317794749765148">Setup couldn't complete</translation> <translation id="9128335130883257666">Open settings page for <ph name="INPUT_METHOD_NAME" /></translation>
diff --git a/chrome/app/resources/generated_resources_es-419.xtb b/chrome/app/resources/generated_resources_es-419.xtb index b3f2ff1..31da439 100644 --- a/chrome/app/resources/generated_resources_es-419.xtb +++ b/chrome/app/resources/generated_resources_es-419.xtb
@@ -3011,7 +3011,7 @@ <translation id="3739254215541673094">¿Abrir <ph name="APPLICATION" />?</translation> <translation id="3741056951918180319">Puedes hacer clic en la extensión en cualquier momento para usarla en el sitio que desees</translation> <translation id="3742235229730461951">Disposición del teclado coreano</translation> -<translation id="3742666961763734085">No se encontró ninguna unidad organizacional con ese nombre. Vuelve a intentarlo.</translation> +<translation id="3742666961763734085">No se encontró ninguna unidad organizativa con ese nombre. Vuelve a intentarlo.</translation> <translation id="3743842571276656710">Ingresa el PIN para vincular con <ph name="DEVICE_NAME" /></translation> <translation id="3747077776423672805">Para quitar apps, ve a Configuración > Google Play Store > Administrar preferencias de Android > Apps o Administrador de aplicaciones. Luego, presiona la app que quieras desinstalar (es posible que debas deslizar el dedo hacia la derecha o la izquierda para encontrarla). A continuación, presiona Desinstalar o Inhabilitar.</translation> <translation id="3747603683749989726">¿Quieres activar la seguridad mejorada?</translation> @@ -3844,7 +3844,6 @@ <translation id="4513872120116766993">Escritura predictiva</translation> <translation id="4513946894732546136">Comentario</translation> <translation id="451407183922382411">Con la tecnología de <ph name="COMPANY_NAME" /></translation> -<translation id="4514610446763173167">Reproduce o pausa el video</translation> <translation id="451515744433878153">Quitar</translation> <translation id="4515872537870654449">Comunícate con Dell para obtener asistencia. El conector se apagará si el ventilador no funciona.</translation> <translation id="4518840066030486079">Cambiar el estilo del modo de la tecla</translation> @@ -6229,7 +6228,7 @@ <translation id="6762833852331690540">Sí</translation> <translation id="676560328519657314">Tus formas de pago de Google Pay</translation> <translation id="6767566652486411142">Elegir otro idioma…</translation> -<translation id="6767639283522617719">No se puede unir al dominio. Asegúrate de que sea correcta la configuración de la unidad organizacional.</translation> +<translation id="6767639283522617719">No se puede unir al dominio. Asegúrate de que sea correcta la configuración de la unidad organizativa.</translation> <translation id="6768034047581882264">No puede mostrar contenido no seguro</translation> <translation id="6770042910635026163">Los sitios que visitas y definen tus intereses</translation> <translation id="6770602306803890733">Mejora la seguridad para ti y todos los usuarios de la Web</translation>
diff --git a/chrome/app/resources/generated_resources_es.xtb b/chrome/app/resources/generated_resources_es.xtb index 5f1c2ae..3ec3cdd8 100644 --- a/chrome/app/resources/generated_resources_es.xtb +++ b/chrome/app/resources/generated_resources_es.xtb
@@ -3847,7 +3847,6 @@ <translation id="4513872120116766993">Escritura predictiva</translation> <translation id="4513946894732546136">Comentarios</translation> <translation id="451407183922382411">Con la tecnología de <ph name="COMPANY_NAME" /></translation> -<translation id="4514610446763173167">Reproducir o pausar el video</translation> <translation id="451515744433878153">Quitar</translation> <translation id="4515872537870654449">Ponte en contacto con Dell para obtener ayuda. La base se apagará si el ventilador no funciona.</translation> <translation id="4518840066030486079">Estilo del modo de la tecla Mayús</translation>
diff --git a/chrome/app/resources/generated_resources_et.xtb b/chrome/app/resources/generated_resources_et.xtb index 8f59f9a6..6e9648f 100644 --- a/chrome/app/resources/generated_resources_et.xtb +++ b/chrome/app/resources/generated_resources_et.xtb
@@ -1240,6 +1240,7 @@ <translation id="2105809836724866556"><ph name="MODULE_TITLE" /> on peidetud</translation> <translation id="2108349519800154983">{COUNT,plural, =1{Telefoninumber}other{# telefoninumbrit}}</translation> <translation id="2110941575868943054">Lubatakse Bluetooth-seadmeid otsida</translation> +<translation id="2111158890826137380">Kahjuks läks midagi valesti. Tagasiside esitamiseks lisage kirjeldusse teemaviide #bruschetta. Veakood on <ph name="ERROR" /></translation> <translation id="211144231511833662">Kustuta tüübid</translation> <translation id="2111670510994270194">Uus vaheleht paremale</translation> <translation id="2112554630428445878">Tere tulemast, <ph name="USERNAME" /></translation> @@ -1784,6 +1785,7 @@ <translation id="2575713839157415345">{YEARS,plural, =1{See seade salvestatakse üheks aastaks ja saate järgmine kord ilma koodita ühendada. Selle seadistab teie administraator.}other{See seade salvestatakse {YEARS} aastaks ja saate järgmine kord ilma koodita ühendada. Selle seadistab teie administraator.}}</translation> <translation id="257779572837908839">Seadista seadmena Chromebox koosolekutele</translation> <translation id="2579309488038515659">Kuumkoha lubamine</translation> +<translation id="2579596474754516455">Skannige PDF-kujutised, et tekst vajaduse korral ekraanilugeja jaoks teisendada</translation> <translation id="2580889980133367162">Luba alati hostil <ph name="HOST" /> laadida alla mitu faili</translation> <translation id="258095186877893873">Pikk</translation> <translation id="2582253231918033891"><ph name="PRODUCT_NAME" /> <ph name="PRODUCT_VERSION" /> (platvorm <ph name="PLATFORM_VERSION" />), <ph name="DEVICE_SERIAL_NUMBER" /></translation> @@ -2885,6 +2887,7 @@ <translation id="3616113530831147358">Heli</translation> <translation id="3616741288025931835">Kustuta sirvi&mise andmed...</translation> <translation id="3617891479562106823">Taustad pole saadaval. Proovige hiljem uuesti</translation> +<translation id="3618286417582819036">Kahjuks tekkis viga</translation> <translation id="3619115746895587757">Cappuccino</translation> <translation id="3620136223548713675">Asukoha määramine</translation> <translation id="362023940451053340">Konto <ph name="ACCOUNT" /> parooli värskendatakse teie Google'i kontol</translation> @@ -3855,7 +3858,6 @@ <translation id="4513872120116766993">Ennustamisega sisestamine</translation> <translation id="4513946894732546136">Tagasiside</translation> <translation id="451407183922382411">Toetab <ph name="COMPANY_NAME" /></translation> -<translation id="4514610446763173167">Käivitab/peatab video</translation> <translation id="451515744433878153">Eemalda</translation> <translation id="4515872537870654449">Hooldusteenuse saamiseks võtke ühendust Delliga. Kui ventilaator ei tööta, siis lülitub dokk välja.</translation> <translation id="4518840066030486079">Tõstuklahvi režiimi stiil</translation> @@ -6677,6 +6679,7 @@ <translation id="7149839598364933473">Teisendage see seade operatsioonisüsteemiga <ph name="DEVICE_OS" /> seadmeks.</translation> <translation id="7149893636342594995">Viimased 24 tundi</translation> <translation id="7152478047064750137">Selle laienduse jaoks pole erilube vaja</translation> +<translation id="7153309176431047193">Kujutiste teisendamine tekstiks</translation> <translation id="7154130902455071009">Määrake avaleheks <ph name="START_PAGE" /></translation> <translation id="7156231244155528270">Pildi konvertimine tekstiks</translation> <translation id="7159953856712257647">Installitud vaikimisi</translation>
diff --git a/chrome/app/resources/generated_resources_eu.xtb b/chrome/app/resources/generated_resources_eu.xtb index 952bba3..fbd2cc8 100644 --- a/chrome/app/resources/generated_resources_eu.xtb +++ b/chrome/app/resources/generated_resources_eu.xtb
@@ -3847,7 +3847,6 @@ <translation id="4513872120116766993">Idazketa iragarlea</translation> <translation id="4513946894732546136">Iritzia</translation> <translation id="451407183922382411">Garatzailea: <ph name="COMPANY_NAME" /></translation> -<translation id="4514610446763173167">Erreproduzitu edo pausatu bideoa</translation> <translation id="451515744433878153">Kendu</translation> <translation id="4515872537870654449">Jarri Dell-ekin harremanetan laguntza teknikoa lortzeko. Oinarria itzali egingo da haizagailuak funtzionatzen ez badu.</translation> <translation id="4518840066030486079">Aldatu tekla moduaren estiloa</translation>
diff --git a/chrome/app/resources/generated_resources_fa.xtb b/chrome/app/resources/generated_resources_fa.xtb index 25ec317..b8b21fb 100644 --- a/chrome/app/resources/generated_resources_fa.xtb +++ b/chrome/app/resources/generated_resources_fa.xtb
@@ -2742,6 +2742,7 @@ <translation id="3469583217479686109">ابزار انتخاب</translation> <translation id="3470392222765168737">دنبال کردن سایت</translation> <translation id="3471876058939596279">نمیتوان بهطور همزمان از درگاههای HDMI و USB نوع C برای ویدیو استفاده کرد. از درگاه ویدیوی دیگری استفاده کنید.</translation> +<translation id="3472469028191701821">در برگه جدید باز میشود</translation> <translation id="3473241910002674503">با دکمههای «حالت رایانه لوحی» به صفحه اصلی پیمایش کنید، به صفحه قبل برگردید، و بین برنامهها جابهجا شوید.</translation> <translation id="3473479545200714844">ذرهبین صفحه</translation> <translation id="3474218480460386727">واژه جدید حداکثر ۹۹ حرف میتواند داشته باشد</translation> @@ -3128,6 +3129,7 @@ <translation id="3820749202859700794">منحنی بیضوی SECG مدل secp521r1 (به نام NIST P-521)</translation> <translation id="3821074617718452587">اعلانهای «مرکز کنترل تلفن»</translation> <translation id="3821372858277557370">{NUM_EXTENSIONS,plural, =1{یک افزونه تأیید شد}one{# افزونه تأیید شد}other{# افزونه تأیید شد}}</translation> +<translation id="3823019343150397277">IBAN</translation> <translation id="3823310065043511710">توصیه میشود حداقل <ph name="INSTALL_SIZE" /> فضا برای Linux داشته باشید.</translation> <translation id="3824621460022590830">کد ثبتنام دستگاه نامعتبر است. لطفاً با مالک یا سرپرست دستگاه تماس بگیرید. کد خطا: <ph name="ERROR_CODE" />.</translation> <translation id="3825041664272812989">{FILE_TYPE_COUNT,plural, =1{انتخاب من برای این نوع فایل بهخاطر سپرده شود: <ph name="FILE_TYPES" />}one{انتخاب من برای این نوع فایل بهخاطر سپرده شود: <ph name="FILE_TYPES" />}other{انتخاب من برای این نوع فایلها بهخاطر سپرده شود: <ph name="FILE_TYPES" />}}</translation> @@ -3860,7 +3862,6 @@ <translation id="4513872120116766993">نوشتن پیشگویانه</translation> <translation id="4513946894732546136">بازخورد</translation> <translation id="451407183922382411">ارائهشده توسط <ph name="COMPANY_NAME" /></translation> -<translation id="4514610446763173167">تغییر وضعیت بین پخش یا مکث ویدیو</translation> <translation id="451515744433878153">پاک کردن</translation> <translation id="4515872537870654449">برای سرویس با Dell تماس بگیرید. اگر پنکه کار نکند، پایه اتصال خاموش میشود.</translation> <translation id="4518840066030486079">سبک حالت کلید تبدیل</translation> @@ -4047,6 +4048,7 @@ <translation id="4675828034887792601">ایجاد میانبر برای جستجوی سایتها و مدیریت موتور جستجو</translation> <translation id="4676595058027112862">«مرکز کنترل تلفن»، بیشتر بدانید</translation> <translation id="4677772697204437347">حافظه GPU</translation> +<translation id="4678848110205818817">کارت اعتباری/نقدی</translation> <translation id="4680105648806843642">این صفحه بیصدا شده است</translation> <translation id="4680112532510845139">تصویر را به اینجا بکشید</translation> <translation id="4681453295291708042">غیرفعال کردن «همرسانی با اطراف»</translation>
diff --git a/chrome/app/resources/generated_resources_fi.xtb b/chrome/app/resources/generated_resources_fi.xtb index 2fc2974..2d5e557 100644 --- a/chrome/app/resources/generated_resources_fi.xtb +++ b/chrome/app/resources/generated_resources_fi.xtb
@@ -3864,7 +3864,6 @@ <translation id="4513872120116766993">Ennakoiva tekstinsyöttö</translation> <translation id="4513946894732546136">Palaute</translation> <translation id="451407183922382411">Palvelun tarjoaa <ph name="COMPANY_NAME" />.</translation> -<translation id="4514610446763173167">Valitse videon toisto tai keskeytys</translation> <translation id="451515744433878153">Poista</translation> <translation id="4515872537870654449">Ota yhteyttä Delliin. Teline sammuu, jos tuuletin ei toimi.</translation> <translation id="4518840066030486079">Vaihtonäppäintilan tyyli</translation>
diff --git a/chrome/app/resources/generated_resources_fil.xtb b/chrome/app/resources/generated_resources_fil.xtb index ccdec5d..ac81902 100644 --- a/chrome/app/resources/generated_resources_fil.xtb +++ b/chrome/app/resources/generated_resources_fil.xtb
@@ -3869,7 +3869,6 @@ <translation id="4513872120116766993">Paghula sa pagsusulat</translation> <translation id="4513946894732546136">Feedback</translation> <translation id="451407183922382411">Pinapagana ng <ph name="COMPANY_NAME" /></translation> -<translation id="4514610446763173167">I-toggle ang video para mag-play o mag-pause</translation> <translation id="451515744433878153">Alisin</translation> <translation id="4515872537870654449">Makipag-ugnayan sa Dell para sa serbisyo. Magsa-shut down ang dock kung hindi gumagana ang fan.</translation> <translation id="4518840066030486079">Shift Key Mode Style</translation>
diff --git a/chrome/app/resources/generated_resources_fr-CA.xtb b/chrome/app/resources/generated_resources_fr-CA.xtb index 95d4422..7262900 100644 --- a/chrome/app/resources/generated_resources_fr-CA.xtb +++ b/chrome/app/resources/generated_resources_fr-CA.xtb
@@ -3851,7 +3851,6 @@ <translation id="4513872120116766993">Rédaction prédictive</translation> <translation id="4513946894732546136">Commentaires</translation> <translation id="451407183922382411">Optimisé par <ph name="COMPANY_NAME" /></translation> -<translation id="4514610446763173167">Faire jouer la vidéo ou la mettre en pause</translation> <translation id="451515744433878153">Supprimer</translation> <translation id="4515872537870654449">Communiquez avec Dell pour faire réparer votre appareil. La station d'accueil s'éteindra si le ventilateur ne fonctionne pas.</translation> <translation id="4518840066030486079">Style de mode de la touche Maj</translation>
diff --git a/chrome/app/resources/generated_resources_fr.xtb b/chrome/app/resources/generated_resources_fr.xtb index e106182..28ad63c 100644 --- a/chrome/app/resources/generated_resources_fr.xtb +++ b/chrome/app/resources/generated_resources_fr.xtb
@@ -2731,6 +2731,7 @@ <translation id="3469583217479686109">Outil Sélection</translation> <translation id="3470392222765168737">Suivre le site</translation> <translation id="3471876058939596279">Les ports HDMI et USB Type-C ne peuvent pas être utilisés simultanément pour de la vidéo. Utilisez un autre port vidéo.</translation> +<translation id="3472469028191701821">S'ouvre dans un nouvel onglet</translation> <translation id="3473241910002674503">Utilisez les boutons pour accéder à la page d'accueil, revenir en arrière et changer d'application en mode tablette.</translation> <translation id="3473479545200714844">Loupe</translation> <translation id="3474218480460386727">Les nouveaux termes ne doivent pas contenir plus de 99 lettres</translation> @@ -3117,6 +3118,7 @@ <translation id="3820749202859700794">Courbe elliptique SECG secp521r1 (également appelée "NIST P-521")</translation> <translation id="3821074617718452587">Notifications Phone Hub</translation> <translation id="3821372858277557370">{NUM_EXTENSIONS,plural, =1{Une extension a été approuvée}one{# extension a été approuvée}other{# extensions ont été approuvées}}</translation> +<translation id="3823019343150397277">IBAN</translation> <translation id="3823310065043511710">Espace libre recommandé pour Linux : <ph name="INSTALL_SIZE" />.</translation> <translation id="3824621460022590830">Le jeton d'enregistrement de l'appareil n'est pas valide. Veuillez contacter le propriétaire ou l'administrateur de l'appareil. Code d'erreur : <ph name="ERROR_CODE" />.</translation> <translation id="3825041664272812989">{FILE_TYPE_COUNT,plural, =1{Mémoriser mon choix pour ce type de fichier : <ph name="FILE_TYPES" />}one{Mémoriser mon choix pour ce type de fichier : <ph name="FILE_TYPES" />}other{Mémoriser mes choix pour ces types de fichiers : <ph name="FILE_TYPES" />}}</translation> @@ -3848,7 +3850,6 @@ <translation id="4513872120116766993">Saisie prédictive</translation> <translation id="4513946894732546136">Commentaires</translation> <translation id="451407183922382411">Fourni par <ph name="COMPANY_NAME" /></translation> -<translation id="4514610446763173167">Activer/Désactiver la lecture ou la mise en pause de la vidéo</translation> <translation id="451515744433878153">Supprimer</translation> <translation id="4515872537870654449">Contactez Dell pour faire réparer votre équipement. La station d'accueil ne peut pas fonctionner si le ventilateur n'est pas en état de marche.</translation> <translation id="4518840066030486079">Style du mode de la touche Maj</translation> @@ -4035,6 +4036,7 @@ <translation id="4675828034887792601">Créez des raccourcis pour effectuer des recherches dans des sites et gérez votre moteur de recherche</translation> <translation id="4676595058027112862">Phone Hub, en savoir plus</translation> <translation id="4677772697204437347">Mémoire du processeur graphique</translation> +<translation id="4678848110205818817">Carte de crédit/débit</translation> <translation id="4680105648806843642">Le son a été désactivé sur cette page</translation> <translation id="4680112532510845139">Déposez une image ici</translation> <translation id="4681453295291708042">Désactiver le Partage à proximité</translation>
diff --git a/chrome/app/resources/generated_resources_gl.xtb b/chrome/app/resources/generated_resources_gl.xtb index 151ab8a..c69c10cc 100644 --- a/chrome/app/resources/generated_resources_gl.xtb +++ b/chrome/app/resources/generated_resources_gl.xtb
@@ -3846,7 +3846,6 @@ <translation id="4513872120116766993">Escritura preditiva</translation> <translation id="4513946894732546136">Dános a túa opinión</translation> <translation id="451407183922382411">Con tecnoloxía de <ph name="COMPANY_NAME" /></translation> -<translation id="4514610446763173167">Alternar a reprodución ou pausa do vídeo</translation> <translation id="451515744433878153">Eliminar</translation> <translation id="4515872537870654449">Ponte en contacto con Dell para recibir asistencia técnica. A base apagarase se o ventilador non funciona.</translation> <translation id="4518840066030486079">Estilo do modo da tecla Maiúsculas</translation>
diff --git a/chrome/app/resources/generated_resources_gu.xtb b/chrome/app/resources/generated_resources_gu.xtb index 40f33de..e5ac647 100644 --- a/chrome/app/resources/generated_resources_gu.xtb +++ b/chrome/app/resources/generated_resources_gu.xtb
@@ -3850,7 +3850,6 @@ <translation id="4513872120116766993">પૂર્વાનુમાનિત લેખન</translation> <translation id="4513946894732546136">પ્રતિસાદ</translation> <translation id="451407183922382411"><ph name="COMPANY_NAME" /> દ્વારા સંચાલિત</translation> -<translation id="4514610446763173167">વીડિઓ ચલાવવા અથવા થોભાવવા માટે તેને ટૉગલ કરો</translation> <translation id="451515744433878153">દૂર કરો</translation> <translation id="4515872537870654449">સર્વિસ માટે Dellનો સંપર્ક કરો. જો પંખો ચાલી રહ્યો ન હોય તો ડૉક શટ ડાઉન થઈ જશે.</translation> <translation id="4518840066030486079">શિફ્ટ કી મોડ શૈલી</translation>
diff --git a/chrome/app/resources/generated_resources_hi.xtb b/chrome/app/resources/generated_resources_hi.xtb index c3a701c..6be0860c 100644 --- a/chrome/app/resources/generated_resources_hi.xtb +++ b/chrome/app/resources/generated_resources_hi.xtb
@@ -3863,7 +3863,6 @@ <translation id="4513872120116766993">टाइप करने पर, शब्दों का अनुमान दिखाने की सुविधा</translation> <translation id="4513946894732546136">सुझाव/राय दें</translation> <translation id="451407183922382411"><ph name="COMPANY_NAME" /> के उपयोग से</translation> -<translation id="4514610446763173167">वीडियो को 'चलाएं' या 'रोकें' पर टॉगल करें</translation> <translation id="451515744433878153">हटाएं</translation> <translation id="4515872537870654449">मरम्मत के लिए Dell से संपर्क करें. अगर पंखा काम नहीं कर रहा है, तो डॉक बंद हो जाएगा.</translation> <translation id="4518840066030486079">Shift बटन मोड स्टाइल</translation>
diff --git a/chrome/app/resources/generated_resources_hr.xtb b/chrome/app/resources/generated_resources_hr.xtb index be03f278..0cca0455 100644 --- a/chrome/app/resources/generated_resources_hr.xtb +++ b/chrome/app/resources/generated_resources_hr.xtb
@@ -3850,7 +3850,6 @@ <translation id="4513872120116766993">Prediktivno pisanje</translation> <translation id="4513946894732546136">Povratne informacije</translation> <translation id="451407183922382411">Omogućuje <ph name="COMPANY_NAME" /></translation> -<translation id="4514610446763173167">Reproduciraj ili pauziraj videozapis</translation> <translation id="451515744433878153">Ukloni</translation> <translation id="4515872537870654449">Za servis se obratite Dellu. Priključna stanica isključit će se ako ventilator ne radi.</translation> <translation id="4518840066030486079">Stil načina tipke Shift</translation>
diff --git a/chrome/app/resources/generated_resources_hu.xtb b/chrome/app/resources/generated_resources_hu.xtb index 4068c39b..3f05888 100644 --- a/chrome/app/resources/generated_resources_hu.xtb +++ b/chrome/app/resources/generated_resources_hu.xtb
@@ -3866,7 +3866,6 @@ <translation id="4513872120116766993">Prediktív írás</translation> <translation id="4513946894732546136">Visszajelzés</translation> <translation id="451407183922382411">A(z) <ph name="COMPANY_NAME" /> segítségével</translation> -<translation id="4514610446763173167">Váltás a videó lejátszása és szüneteltetése között</translation> <translation id="451515744433878153">Eltávolítás</translation> <translation id="4515872537870654449">Szervizelés ügyében vegye fel a kapcsolatot a Dell ügyfélszolgálatával. A dokk leáll, ha a ventilátor nem működik.</translation> <translation id="4518840066030486079">Shift billentyűmód stílusa</translation>
diff --git a/chrome/app/resources/generated_resources_hy.xtb b/chrome/app/resources/generated_resources_hy.xtb index bcc48ec..3fa8e97a 100644 --- a/chrome/app/resources/generated_resources_hy.xtb +++ b/chrome/app/resources/generated_resources_hy.xtb
@@ -2732,6 +2732,7 @@ <translation id="3469583217479686109">«Ընտրություն» գործիք</translation> <translation id="3470392222765168737">Հետևել կայքին</translation> <translation id="3471876058939596279">HDMI և USB Type-C միացքները միաժամանակ չեն կարող օգտագործվել տեսապատկերի համար։ Օգտագործեք այլ տեսամիացք։</translation> +<translation id="3472469028191701821">Բացվում է նոր ներդիրում</translation> <translation id="3473241910002674503">Պլանշետի ռեժիմում կոճակների օգնությամբ անցեք սկիզբ, հետ և մի հավելվածից մյուսը։</translation> <translation id="3473479545200714844">Էկրանի խոշորացույց</translation> <translation id="3474218480460386727">Նոր բառերում տառերի առավելագույն քանակը՝ 99</translation> @@ -3118,6 +3119,7 @@ <translation id="3820749202859700794">SECG օվալաձև կոր secp521r1 (հայտնի է նաև որպես NIST P-521)</translation> <translation id="3821074617718452587">Հեռախոսի կառավարման կենտրոնի ծանուցումներ</translation> <translation id="3821372858277557370">{NUM_EXTENSIONS,plural, =1{Ընդլայնումը հաստատվեց}one{# ընդլայնում հաստատվեց}other{# ընդլայնում հաստատվեց}}</translation> +<translation id="3823019343150397277">IBAN</translation> <translation id="3823310065043511710">Լինուքսը տեղադրելու համար խորհուրդ է տրվում ունենալ նվազագույնը <ph name="INSTALL_SIZE" /> ազատ տարածք։</translation> <translation id="3824621460022590830">Սարքերի գրանցման թոքենն անվավեր է։ Կապվեք սարքի սեփականատիրոջ կամ ադմինիստրատորի հետ։ Սխալի կոդը՝ <ph name="ERROR_CODE" />։</translation> <translation id="3825041664272812989">{FILE_TYPE_COUNT,plural, =1{Հիշել իմ ընտրությունը ֆայլի այս տեսակի համար՝ <ph name="FILE_TYPES" />}one{Հիշել իմ ընտրությունը ֆայլերի այս տեսակների համար՝ <ph name="FILE_TYPES" />}other{Հիշել իմ ընտրությունը ֆայլերի այս տեսակների համար՝ <ph name="FILE_TYPES" />}}</translation> @@ -3849,7 +3851,6 @@ <translation id="4513872120116766993">Տեքստի կանխատեսում</translation> <translation id="4513946894732546136">Հետադարձ կապ</translation> <translation id="451407183922382411">Մշակող՝ <ph name="COMPANY_NAME" /></translation> -<translation id="4514610446763173167">Նվագարկել կամ դադարեցնել տեսանյութը</translation> <translation id="451515744433878153">Հեռացնել</translation> <translation id="4515872537870654449">Կապվեք Dell-ի սպասարկման ծառայության հետ։ Եթե հովացումը չաշխատի, դոկ-կայանը կանջատվի:</translation> <translation id="4518840066030486079">Shift ստեղնի ռեժիմի ոճ</translation> @@ -4036,6 +4037,7 @@ <translation id="4675828034887792601">Ստեղծեք դյուրանցումներ՝ կայքերում որոնում կատարելու համար, և կառավարեք ձեր որոնողական համակարգը։</translation> <translation id="4676595058027112862">Հեռախոսի կառավարման կենտրոն, Իմանալ ավելին</translation> <translation id="4677772697204437347">GPU հիշողություն</translation> +<translation id="4678848110205818817">Վարկային/դեբետային քարտ</translation> <translation id="4680105648806843642">Այս էջում ձայնն անջատված է</translation> <translation id="4680112532510845139">Քաշեք պատկերն այստեղ</translation> <translation id="4681453295291708042">Անջատել մոտակա սարքերի հետ փոխանակումը</translation>
diff --git a/chrome/app/resources/generated_resources_id.xtb b/chrome/app/resources/generated_resources_id.xtb index 9892ed50..7ed600b 100644 --- a/chrome/app/resources/generated_resources_id.xtb +++ b/chrome/app/resources/generated_resources_id.xtb
@@ -3868,7 +3868,6 @@ <translation id="4513872120116766993">Penulisan prediktif</translation> <translation id="4513946894732546136">Masukan</translation> <translation id="451407183922382411">Diberdayakan oleh <ph name="COMPANY_NAME" /></translation> -<translation id="4514610446763173167">Tombol putar atau jeda video</translation> <translation id="451515744433878153">Hapus</translation> <translation id="4515872537870654449">Hubungi Dell untuk perbaikan. Dok akan mati jika kipas tidak berfungsi.</translation> <translation id="4518840066030486079">Gaya Mode Tombol Shift</translation>
diff --git a/chrome/app/resources/generated_resources_is.xtb b/chrome/app/resources/generated_resources_is.xtb index c611469..f7e91c84 100644 --- a/chrome/app/resources/generated_resources_is.xtb +++ b/chrome/app/resources/generated_resources_is.xtb
@@ -3867,7 +3867,6 @@ <translation id="4513872120116766993">Textatillögur</translation> <translation id="4513946894732546136">Ábendingar</translation> <translation id="451407183922382411">Knúið af <ph name="COMPANY_NAME" /></translation> -<translation id="4514610446763173167">Skipt á milli spilunar og hlés á myndskeiði</translation> <translation id="451515744433878153">Fjarlægja</translation> <translation id="4515872537870654449">Hafðu samband við Dell til að fá aðstoð. Dokkan slekkur á sér ef viftan virkar ekki.</translation> <translation id="4518840066030486079">Stillingastíll Shift-lykils</translation>
diff --git a/chrome/app/resources/generated_resources_it.xtb b/chrome/app/resources/generated_resources_it.xtb index e47ee369..689a32bf 100644 --- a/chrome/app/resources/generated_resources_it.xtb +++ b/chrome/app/resources/generated_resources_it.xtb
@@ -3847,7 +3847,6 @@ <translation id="4513872120116766993">Scrittura predittiva</translation> <translation id="4513946894732546136">Feedback</translation> <translation id="451407183922382411">Con tecnologia <ph name="COMPANY_NAME" /></translation> -<translation id="4514610446763173167">Attiva/disattiva il video per riprodurre o mettere in pausa</translation> <translation id="451515744433878153">Rimuovi</translation> <translation id="4515872537870654449">Per assistenza, contatta Dell. Il dock si spegne se la ventola non funziona.</translation> <translation id="4518840066030486079">Stile della modalità tasto Maiusc</translation>
diff --git a/chrome/app/resources/generated_resources_iw.xtb b/chrome/app/resources/generated_resources_iw.xtb index 8b8981d..627e4eb6 100644 --- a/chrome/app/resources/generated_resources_iw.xtb +++ b/chrome/app/resources/generated_resources_iw.xtb
@@ -3868,7 +3868,6 @@ <translation id="4513872120116766993">השלמה אוטומטית</translation> <translation id="4513946894732546136">משוב</translation> <translation id="451407183922382411">מופעל על-ידי <ph name="COMPANY_NAME" /></translation> -<translation id="4514610446763173167">הפעלת וידאו או הפסקת הפעולה</translation> <translation id="451515744433878153">הסרה</translation> <translation id="4515872537870654449">יש לפנות אל Dell כדי לקבל סיוע. אביזר העגינה יכבה אם המאוורר לא פועל.</translation> <translation id="4518840066030486079">הסגנון של מקש Shift</translation>
diff --git a/chrome/app/resources/generated_resources_ja.xtb b/chrome/app/resources/generated_resources_ja.xtb index c2ed55e..34a5c65 100644 --- a/chrome/app/resources/generated_resources_ja.xtb +++ b/chrome/app/resources/generated_resources_ja.xtb
@@ -3841,7 +3841,6 @@ <translation id="4513872120116766993">予測入力</translation> <translation id="4513946894732546136">フィードバック</translation> <translation id="451407183922382411">Powered by <ph name="COMPANY_NAME" /></translation> -<translation id="4514610446763173167">動画の再生と一時停止を切り替え</translation> <translation id="451515744433878153">削除</translation> <translation id="4515872537870654449">サポートについては、Dell にお問い合わせください。ファンが動作しない場合、ドックはシャットダウンされます。</translation> <translation id="4518840066030486079">Shift キーモードのスタイル</translation>
diff --git a/chrome/app/resources/generated_resources_ka.xtb b/chrome/app/resources/generated_resources_ka.xtb index 406d241..d648f825 100644 --- a/chrome/app/resources/generated_resources_ka.xtb +++ b/chrome/app/resources/generated_resources_ka.xtb
@@ -3849,7 +3849,6 @@ <translation id="4513872120116766993">პროგნოზირებული წერა</translation> <translation id="4513946894732546136">უკუკავშირი</translation> <translation id="451407183922382411">უზრუნველყოფს <ph name="COMPANY_NAME" /></translation> -<translation id="4514610446763173167">ვიდეოს დაკვრა ან დაპაუზება</translation> <translation id="451515744433878153">ამოშლა</translation> <translation id="4515872537870654449">მომსახურების მისაღებად დაუკავშირდით Dell-ს. სამაგრი გამოირთვება, თუ ვენტილატორი არ იმუშავებს.</translation> <translation id="4518840066030486079">Shift კლავიშის რეჟიმის სტილი</translation>
diff --git a/chrome/app/resources/generated_resources_kk.xtb b/chrome/app/resources/generated_resources_kk.xtb index afb5454..09461b6 100644 --- a/chrome/app/resources/generated_resources_kk.xtb +++ b/chrome/app/resources/generated_resources_kk.xtb
@@ -3847,7 +3847,6 @@ <translation id="4513872120116766993">Көмексөздер</translation> <translation id="4513946894732546136">Пікір жіберу</translation> <translation id="451407183922382411"><ph name="COMPANY_NAME" /> технологиясы</translation> -<translation id="4514610446763173167">Бейнені ойнату/кідірту</translation> <translation id="451515744433878153">Өшіру</translation> <translation id="4515872537870654449">Dell қолдау қызметіне хабарласыңыз. Желдеткіш жұмыс істемесе, қондыру станциясы өшіп қалады.</translation> <translation id="4518840066030486079">Shift пернесі режимінің стилі</translation>
diff --git a/chrome/app/resources/generated_resources_km.xtb b/chrome/app/resources/generated_resources_km.xtb index 67acdadc..214d9ad 100644 --- a/chrome/app/resources/generated_resources_km.xtb +++ b/chrome/app/resources/generated_resources_km.xtb
@@ -3868,7 +3868,6 @@ <translation id="4513872120116766993">ការសរសេរតាមការទស្សន៍ទាយ</translation> <translation id="4513946894732546136">មតិ</translation> <translation id="451407183922382411">ដោយមានជំនួយពី <ph name="COMPANY_NAME" /></translation> -<translation id="4514610446763173167">បិទ/បើកវីដេអូដើម្បីលេង ឬផ្អាក</translation> <translation id="451515744433878153">លុបចេញ</translation> <translation id="4515872537870654449">សូមទាក់ទង Dell ដើម្បីទទួលបានសេវាកម្ម។ ឧបករណ៍ភ្ជាប់នឹងបិទ ប្រសិនបើកង្ហារមិនដំណើរការ។</translation> <translation id="4518840066030486079">រចនាប័ទ្មមុខងារគ្រាប់ចុច Shift</translation>
diff --git a/chrome/app/resources/generated_resources_kn.xtb b/chrome/app/resources/generated_resources_kn.xtb index 0caa727..43ee618 100644 --- a/chrome/app/resources/generated_resources_kn.xtb +++ b/chrome/app/resources/generated_resources_kn.xtb
@@ -1242,6 +1242,7 @@ <translation id="2105809836724866556"><ph name="MODULE_TITLE" /> ಮರೆ ಮಾಡಲಾಗಿದೆ</translation> <translation id="2108349519800154983">{COUNT,plural, =1{ಫೋನ್ ಸಂಖ್ಯೆ}one{# ಫೋನ್ ಸಂಖ್ಯೆಗಳು}other{# ಫೋನ್ ಸಂಖ್ಯೆಗಳು}}</translation> <translation id="2110941575868943054">ಬ್ಲೂಟೂತ್ ಸಾಧನಗಳನ್ನು ಹುಡುಕುವ ಅನುಮತಿಯಿದೆ</translation> +<translation id="2111158890826137380">ಕ್ಷಮಿಸಿ, ಏನೋ ತಪ್ಪಾಗಿದೆ. ವಿವರಣೆಯಲ್ಲಿ #bruschetta ಜೊತೆಗೆ ಪ್ರತಿಕ್ರಿಯೆಯನ್ನು ಸಲ್ಲಿಸಿ. ದೋಷ ಕೋಡ್ <ph name="ERROR" /></translation> <translation id="211144231511833662">ಪ್ರಕಾರಗಳನ್ನು ತೆರವುಗೊಳಿಸಿ</translation> <translation id="2111670510994270194">ಬಲಭಾಗದಲ್ಲಿ ಹೊಸ ಟ್ಯಾಬ್ ತೆರೆಯಿರಿ</translation> <translation id="2112554630428445878">ಸುಸ್ವಾಗತ, <ph name="USERNAME" /></translation> @@ -1786,6 +1787,7 @@ <translation id="2575713839157415345">{YEARS,plural, =1{ಈ ಸಾಧನವನ್ನು 1 ವರ್ಷಕ್ಕಾಗಿ ಉಳಿಸಲಾಗುತ್ತದೆ ಹಾಗೂ ಮುಂದಿನ ಬಾರಿ ನೀವು ಕೋಡ್ ಇಲ್ಲದೆಯೇ ಕನೆಕ್ಟ್ ಮಾಡಬಹುದು. ಇದನ್ನು ನಿಮ್ಮ ನಿರ್ವಾಹಕರು ಸೆಟ್ ಮಾಡಿದ್ದಾರೆ.}one{ಈ ಸಾಧನವನ್ನು {YEARS} ವರ್ಷಗಳಿಗಾಗಿ ಉಳಿಸಲಾಗುತ್ತದೆ ಹಾಗೂ ಮುಂದಿನ ಬಾರಿ ನೀವು ಕೋಡ್ ಇಲ್ಲದೆಯೇ ಕನೆಕ್ಟ್ ಮಾಡಬಹುದು. ಇದನ್ನು ನಿಮ್ಮ ನಿರ್ವಾಹಕರು ಸೆಟ್ ಮಾಡಿದ್ದಾರೆ.}other{ಈ ಸಾಧನವನ್ನು {YEARS} ವರ್ಷಗಳಿಗಾಗಿ ಉಳಿಸಲಾಗುತ್ತದೆ ಹಾಗೂ ಮುಂದಿನ ಬಾರಿ ನೀವು ಕೋಡ್ ಇಲ್ಲದೆಯೇ ಕನೆಕ್ಟ್ ಮಾಡಬಹುದು. ಇದನ್ನು ನಿಮ್ಮ ನಿರ್ವಾಹಕರು ಸೆಟ್ ಮಾಡಿದ್ದಾರೆ.}}</translation> <translation id="257779572837908839">ಸಭೆಗಳಿಗಾಗಿ Chromebox ಅನ್ನು ಸೆಟಪ್ ಮಾಡಿ</translation> <translation id="2579309488038515659">ಹಾಟ್ಸ್ಪಾಟ್ ಸಕ್ರಿಯಗೊಳಿಸಿ</translation> +<translation id="2579596474754516455">ಅಗತ್ಯವಿದ್ದಾಗ ಸ್ಕ್ರೀನ್ ರೀಡರ್ಗಾಗಿ ಪಠ್ಯವನ್ನು ಪರಿವರ್ತಿಸಲು PDF ಚಿತ್ರಗಳನ್ನು ಸ್ಕ್ಯಾನ್ ಮಾಡಿ</translation> <translation id="2580889980133367162">ಬಹು ಫೈಲ್ಗಳನ್ನು ಡೌನ್ಲೋಡ್ ಮಾಡಲು <ph name="HOST" /> ಗೆ ಎಲ್ಲಾ ಸಮಯದಲ್ಲೂ ಅನುಮತಿ ನೀಡಿ</translation> <translation id="258095186877893873">ದೀರ್ಘ</translation> <translation id="2582253231918033891"><ph name="PRODUCT_NAME" /><ph name="PRODUCT_VERSION" /> (ಪ್ಲ್ಯಾಟ್ಫಾರ್ಮ್ <ph name="PLATFORM_VERSION" />) <ph name="DEVICE_SERIAL_NUMBER" /></translation> @@ -2738,6 +2740,7 @@ <translation id="3469583217479686109">ಆಯ್ಕೆ ಟೂಲ್</translation> <translation id="3470392222765168737">ಸೈಟ್ ಅನ್ನು ಫಾಲೋ ಮಾಡಿ</translation> <translation id="3471876058939596279">HDMI ಮತ್ತು USB ಟೈಪ್-C ಪೋರ್ಟ್ಗಳನ್ನು ವೀಡಿಯೊಗಾಗಿ ಒಂದೇ ಸಮಯದಲ್ಲಿ ಬಳಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ. ಬೇರೆ ವೀಡಿಯೊ ಪೋರ್ಟ್ ಬಳಸಿ.</translation> +<translation id="3472469028191701821">ಹೊಸ ಟ್ಯಾಬ್ನಲ್ಲಿ ತೆರೆಯುತ್ತದೆ</translation> <translation id="3473241910002674503">ಟ್ಯಾಬ್ಲೆಟ್ ಮೋಡ್ನಲ್ಲಿ, ಹೋಮ್ಗೆ ನ್ಯಾವಿಗೇಟ್ ಮಾಡಲು, ಹಿಂತಿರುಗಲು ಮತ್ತು ಆ್ಯಪ್ಗಳನ್ನು ಬದಲಾಯಿಸಲು ಬಟನ್ಗಳನ್ನು ಬಳಸಿ.</translation> <translation id="3473479545200714844">ಪರದೆ ವರ್ಧಕ</translation> <translation id="3474218480460386727">ಹೊಸ ಪದಗಳಿಗಾಗಿ 99 ಅಥವಾ ಕಡಿಮೆ ಅಕ್ಷರಗಳನ್ನು ಬಳಸಿ</translation> @@ -2886,6 +2889,7 @@ <translation id="3616113530831147358">ಆಡಿಯೋ</translation> <translation id="3616741288025931835">ಬ್ರೌಸಿಂಗ್ ಡೇಟಾವನ್ನು &ತೆರವುಗೊಳಿಸಿ...</translation> <translation id="3617891479562106823">ಹಿನ್ನೆಲೆಗಳ ಕಸ್ಟಮೈಸೇಶನ್ ಲಭ್ಯವಿಲ್ಲ. ನಂತರ ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ.</translation> +<translation id="3618286417582819036">ಕ್ಷಮಿಸಿ, ದೋಷ ಸಂಭವಿಸಿದೆ</translation> <translation id="3619115746895587757">ಕ್ಯಾಪಚಿನೊ</translation> <translation id="3620136223548713675">ಜಿಯೋಲೊಕೇಶನ್</translation> <translation id="362023940451053340"><ph name="ACCOUNT" /> ಗಾಗಿ, ನಿಮ್ಮ Google ಖಾತೆಯಲ್ಲಿ</translation> @@ -3125,6 +3129,7 @@ <translation id="3820749202859700794">SECG ಎಲಿಪ್ಟಿಕ್ ಕರ್ವ್ secp521r1 (aka NIST P-521)</translation> <translation id="3821074617718452587">ಫೋನ್ ಹಬ್ ಅಧಿಸೂಚನೆಗಳು</translation> <translation id="3821372858277557370">{NUM_EXTENSIONS,plural, =1{ಒಂದು ವಿಸ್ತರಣೆಯನ್ನು ಅನುಮೋದಿಸಲಾಗಿದೆ}one{# ವಿಸ್ತರಣೆಗಳನ್ನು ಅನುಮೋದಿಸಲಾಗಿದೆ}other{# ವಿಸ್ತರಣೆಗಳನ್ನು ಅನುಮೋದಿಸಲಾಗಿದೆ}}</translation> +<translation id="3823019343150397277">IBAN</translation> <translation id="3823310065043511710">Linux ಗಾಗಿ ಕನಿಷ್ಠ <ph name="INSTALL_SIZE" /> ಸ್ಥಳಾವಕಾಶವನ್ನು ಶಿಫಾರಸು ಮಾಡಲಾಗಿದೆ.</translation> <translation id="3824621460022590830">ಸಾಧನ ನೋಂದಣಿ ಟೋಕನ್ ಅಮಾನ್ಯವಾಗಿದೆ. ನಿಮ್ಮ ಸಾಧನದ ಮಾಲೀಕರು ಅಥವಾ ನಿರ್ವಾಹಕರನ್ನು ಸಂಪರ್ಕಿಸಿ. ದೋಷ ಕೋಡ್: <ph name="ERROR_CODE" />.</translation> <translation id="3825041664272812989">{FILE_TYPE_COUNT,plural, =1{ಈ ಫೈಲ್ ಪ್ರಕಾರಕ್ಕಾಗಿ ನನ್ನ ಆಯ್ಕೆಯನ್ನು ನೆನಪಿಟ್ಟುಕೊಳ್ಳಿ: <ph name="FILE_TYPES" />}one{ಈ ಫೈಲ್ ಪ್ರಕಾರಗಳಿಗಾಗಿ ನನ್ನ ಆಯ್ಕೆಯನ್ನು ನೆನಪಿಟ್ಟುಕೊಳ್ಳಿ: <ph name="FILE_TYPES" />}other{ಈ ಫೈಲ್ ಪ್ರಕಾರಗಳಿಗಾಗಿ ನನ್ನ ಆಯ್ಕೆಯನ್ನು ನೆನಪಿಟ್ಟುಕೊಳ್ಳಿ: <ph name="FILE_TYPES" />}}</translation> @@ -3856,7 +3861,6 @@ <translation id="4513872120116766993">ಮುನ್ಸೂಚಕ ಬರವಣಿಗೆ</translation> <translation id="4513946894732546136">ಪ್ರತಿಕ್ರಿಯೆ</translation> <translation id="451407183922382411"><ph name="COMPANY_NAME" /> ಮೂಲಕ ಸಂಚಾಲಿತಗೊಂಡಿದೆ</translation> -<translation id="4514610446763173167">ಪ್ಲೇ ಮಾಡಲು ಅಥವಾ ವಿರಾಮಗೊಳಿಸಲು ವೀಡಿಯೊವನ್ನು ಟಾಗಲ್ ಮಾಡಿ</translation> <translation id="451515744433878153">ತೆಗೆದುಹಾಕು</translation> <translation id="4515872537870654449">ದುರಸ್ತಿಗಾಗಿ ಡೆಲ್ ಅನ್ನು ಸಂಪರ್ಕಿಸಿ. ಫ್ಯಾನ್ ಕೆಲಸ ಮಾಡದಿದ್ದರೆ ಡಾಕ್ ಸ್ಥಗಿತಗೊಳ್ಳುತ್ತದೆ.</translation> <translation id="4518840066030486079">Shift ಕೀ ಮೋಡ್ ಸ್ಟೈಲ್</translation> @@ -4043,6 +4047,7 @@ <translation id="4675828034887792601">ಸೈಟ್ಗಳನ್ನು ಹುಡುಕಲು ಶಾರ್ಟ್ಕಟ್ಗಳನ್ನು ರಚಿಸಿ ಹಾಗೂ ನಿಮ್ಮ ಹುಡುಕಾಟ ಎಂಜಿನ್ ಅನ್ನು ನಿರ್ವಹಿಸಿ</translation> <translation id="4676595058027112862">ಫೋನ್ ಹಬ್, ಇನ್ನಷ್ಟು ತಿಳಿಯಿರಿ</translation> <translation id="4677772697204437347">GPU ಮೆಮೊರಿ</translation> +<translation id="4678848110205818817">ಕ್ರೆಡಿಟ್/ಡೆಬಿಟ್ ಕಾರ್ಡ್</translation> <translation id="4680105648806843642">ಈ ಪುಟದಲ್ಲಿ ಧ್ವನಿಯನ್ನು ಮ್ಯೂಟ್ ಮಾಡಲಾಗಿದೆ</translation> <translation id="4680112532510845139">ಚಿತ್ರವನ್ನು ಇಲ್ಲಿಗೆ ಡ್ರ್ಯಾಗ್ ಮಾಡಿ</translation> <translation id="4681453295291708042">Nearby ಶೇರ್ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ</translation> @@ -6682,6 +6687,7 @@ <translation id="7149839598364933473">ಈ ಸಾಧನವನ್ನು <ph name="DEVICE_OS" /> ಸಾಧನವನ್ನಾಗಿ ಪರಿವರ್ತಿಸಿ.</translation> <translation id="7149893636342594995">ಕಳೆದ 24 ಗಂಟೆಗಳು</translation> <translation id="7152478047064750137">ಈ ವಿಸ್ತರಣೆಗೆ ಯಾವುದೇ ವಿಶೇಷ ಅನುಮತಿಗಳ ಅಗತ್ಯವಿಲ್ಲ</translation> +<translation id="7153309176431047193">ಚಿತ್ರಗಳನ್ನು ಪಠ್ಯಕ್ಕೆ ಪರಿವರ್ತಿಸಿ</translation> <translation id="7154130902455071009">ನಿಮ್ಮ ಪ್ರಾರಂಭ ಪುಟವನ್ನು ಇದಕ್ಕೆ ಬದಲಾಯಿಸಿ: <ph name="START_PAGE" /></translation> <translation id="7156231244155528270">ಚಿತ್ರವನ್ನು ಪಠ್ಯಕ್ಕೆ ಪರಿವರ್ತಿಸಿ</translation> <translation id="7159953856712257647">ಡಿಫಾಲ್ಟ್ ಆಗಿ ಇನ್ಸ್ಟಾಲ್ ಮಾಡಲಾಗಿದೆ</translation>
diff --git a/chrome/app/resources/generated_resources_ko.xtb b/chrome/app/resources/generated_resources_ko.xtb index 699a8455a..ae7f022 100644 --- a/chrome/app/resources/generated_resources_ko.xtb +++ b/chrome/app/resources/generated_resources_ko.xtb
@@ -3865,7 +3865,6 @@ <translation id="4513872120116766993">예측 입력</translation> <translation id="4513946894732546136">문제 신고</translation> <translation id="451407183922382411"><ph name="COMPANY_NAME" /> 제공</translation> -<translation id="4514610446763173167">동영상 재생 또는 일시중지 전환</translation> <translation id="451515744433878153">제거</translation> <translation id="4515872537870654449">Dell에 문의하여 서비스를 받으세요. 팬이 작동하지 않으면 도크가 종료됩니다.</translation> <translation id="4518840066030486079">Shift 키 모드 스타일</translation>
diff --git a/chrome/app/resources/generated_resources_ky.xtb b/chrome/app/resources/generated_resources_ky.xtb index c6a0538..b0f3663 100644 --- a/chrome/app/resources/generated_resources_ky.xtb +++ b/chrome/app/resources/generated_resources_ky.xtb
@@ -3866,7 +3866,6 @@ <translation id="4513872120116766993">Сунуштар</translation> <translation id="4513946894732546136">Пикир билдирүү</translation> <translation id="451407183922382411"><ph name="COMPANY_NAME" /> аркылуу иштетилүүдө</translation> -<translation id="4514610446763173167">Видеону ойнотуу же тындыруу үчүн баскычты басуу</translation> <translation id="451515744433878153">Алып салуу</translation> <translation id="4515872537870654449">Аны оңдоо үчүн Dell менен байланышыңыз. Эгер желдеткич иштебей жатса, док бекет жабылат.</translation> <translation id="4518840066030486079">Shift баскычынын режиминин стили</translation>
diff --git a/chrome/app/resources/generated_resources_lo.xtb b/chrome/app/resources/generated_resources_lo.xtb index 85402ab..a6f00b04 100644 --- a/chrome/app/resources/generated_resources_lo.xtb +++ b/chrome/app/resources/generated_resources_lo.xtb
@@ -3865,7 +3865,6 @@ <translation id="4513872120116766993">ການຂຽນແບບຄາດເດົາ</translation> <translation id="4513946894732546136">ຄໍາຄິດເຫັນ</translation> <translation id="451407183922382411">ສະໜອງໃຫ້ໂດຍ <ph name="COMPANY_NAME" /></translation> -<translation id="4514610446763173167">ເປີດປິດວິດີໂອເພື່ອຫຼິ້ນ ຫຼື ຢຸດໄວ້ຊົ່ວຄາວ</translation> <translation id="451515744433878153">ລຶບ</translation> <translation id="4515872537870654449">ຕິດຕໍ່ Dell ສຳລັບການບໍລິການ. ແທ່ນສາກຈະປິດເຄື່ອງຖ້າພັດລົມໃຊ້ບໍ່ໄດ້.</translation> <translation id="4518840066030486079">ຮູບແບບໂໝດປຸ່ມ Shift</translation>
diff --git a/chrome/app/resources/generated_resources_lt.xtb b/chrome/app/resources/generated_resources_lt.xtb index 213218c..a5818bb 100644 --- a/chrome/app/resources/generated_resources_lt.xtb +++ b/chrome/app/resources/generated_resources_lt.xtb
@@ -3871,7 +3871,6 @@ <translation id="4513872120116766993">Numatomi rašymo pasiūlymai</translation> <translation id="4513946894732546136">Atsiliepimai</translation> <translation id="451407183922382411">Parėmė „<ph name="COMPANY_NAME" />“</translation> -<translation id="4514610446763173167">Perjunkite mygtuką, kad paleistumėte ar pristabdytumėte vaizdo įrašą</translation> <translation id="451515744433878153">Pašalinti</translation> <translation id="4515872537870654449">Susisiekite su „Dell“ dėl techninės priežiūros paslaugų. Jei ventiliatorius neveikia, dokas išsijungs.</translation> <translation id="4518840066030486079">Klavišo „Shift“ režimo stilius</translation>
diff --git a/chrome/app/resources/generated_resources_lv.xtb b/chrome/app/resources/generated_resources_lv.xtb index 248323b5..460f05e 100644 --- a/chrome/app/resources/generated_resources_lv.xtb +++ b/chrome/app/resources/generated_resources_lv.xtb
@@ -3849,7 +3849,6 @@ <translation id="4513872120116766993">Rakstīšanas prognozēšana</translation> <translation id="4513946894732546136">Atsauksmes</translation> <translation id="451407183922382411">Nodrošina <ph name="COMPANY_NAME" /></translation> -<translation id="4514610446763173167">Izmantojiet video pogu, lai atskaņotu vai pārtrauktu atskaņošanu</translation> <translation id="451515744433878153">Noņemt</translation> <translation id="4515872537870654449">Sazinieties ar Dell klientu apkalpošanas dienestu. Ja ventilators nedarbosies, doks izslēgsies.</translation> <translation id="4518840066030486079">Pārslēgšanas taustiņa režīma stils</translation>
diff --git a/chrome/app/resources/generated_resources_mk.xtb b/chrome/app/resources/generated_resources_mk.xtb index f399f9f..80ae5b1b 100644 --- a/chrome/app/resources/generated_resources_mk.xtb +++ b/chrome/app/resources/generated_resources_mk.xtb
@@ -3869,7 +3869,6 @@ <translation id="4513872120116766993">Предвидливо пишување</translation> <translation id="4513946894732546136">Повратни информации</translation> <translation id="451407183922382411">Овозможено од <ph name="COMPANY_NAME" /></translation> -<translation id="4514610446763173167">Копче за пуштање или паузирање видео</translation> <translation id="451515744433878153">Отстрани</translation> <translation id="4515872537870654449">Контактирајте со Dell за сервисирање. Приклучокот ќе се исклучи ако вентилаторот не работи.</translation> <translation id="4518840066030486079">Стил на режим на копчето Shift</translation>
diff --git a/chrome/app/resources/generated_resources_ml.xtb b/chrome/app/resources/generated_resources_ml.xtb index d93c77d8..e941fbee 100644 --- a/chrome/app/resources/generated_resources_ml.xtb +++ b/chrome/app/resources/generated_resources_ml.xtb
@@ -1236,6 +1236,7 @@ <translation id="2105809836724866556"><ph name="MODULE_TITLE" /> മറച്ചിരിക്കുന്നു</translation> <translation id="2108349519800154983">{COUNT,plural, =1{ഫോൺ നമ്പർ}other{# ഫോൺ നമ്പറുകൾ}}</translation> <translation id="2110941575868943054">Bluetooth ഉപകരണങ്ങൾ തിരയാൻ അനുമതി നൽകിയിരിക്കുന്നു</translation> +<translation id="2111158890826137380">ക്ഷമിക്കണം, എന്തോ കുഴപ്പമുണ്ട്. വിവരണത്തിൽ #bruschetta എന്ന് നൽകി ഫീഡ്ബാക്ക് ഫയൽ ചെയ്യുക. പിശക് കോഡ് <ph name="ERROR" /> ആണ്</translation> <translation id="211144231511833662">തരങ്ങൾ മായ്ക്കുക</translation> <translation id="2111670510994270194">പുതിയ ടാബ് വലതുവശത്തേക്ക്</translation> <translation id="2112554630428445878">സ്വാഗതം, <ph name="USERNAME" /></translation> @@ -1777,6 +1778,7 @@ <translation id="2575713839157415345">{YEARS,plural, =1{ഈ ഉപകരണം 1 വർഷം വരെ സംരക്ഷിക്കും, അടുത്ത തവണ നിങ്ങൾക്ക് ഒരു കോഡ് ഇല്ലാതെ തന്നെ കണക്റ്റ് ചെയ്യാം. ഇത് നിങ്ങളുടെ അഡ്മിൻ സജ്ജീകരിച്ചതാണ്.}other{ഈ ഉപകരണം {YEARS} വർഷം വരെ സംരക്ഷിക്കും, അടുത്ത തവണ നിങ്ങൾക്ക് ഒരു കോഡ് ഇല്ലാതെ തന്നെ കണക്റ്റ് ചെയ്യാം. ഇത് നിങ്ങളുടെ അഡ്മിൻ സജ്ജീകരിച്ചതാണ്.}}</translation> <translation id="257779572837908839">മീറ്റിംഗിനുള്ള Chromebox സജ്ജമാക്കുക</translation> <translation id="2579309488038515659">ഹോട്ട്സ്പോട്ട് പ്രവർത്തനക്ഷമമാക്കുക</translation> +<translation id="2579596474754516455">ആവശ്യമുള്ളപ്പോൾ, സ്ക്രീൻ റീഡറിനായി ടെക്സ്റ്റ് പരിവർത്തനം ചെയ്യാൻ PDF ചിത്രങ്ങൾ സ്കാൻ ചെയ്യുക</translation> <translation id="2580889980133367162">എല്ലായ്പ്പോഴും ഒന്നിലധികം ഫയലുകൾ ഡൗൺലോഡ് ചെയ്യാൻ <ph name="HOST" />-നെ അനുവദിക്കുക</translation> <translation id="258095186877893873">ദൈർഘ്യമേറിയ</translation> <translation id="2582253231918033891"><ph name="PRODUCT_NAME" /> <ph name="PRODUCT_VERSION" /> (പ്ലാറ്റ്ഫോം <ph name="PLATFORM_VERSION" />) <ph name="DEVICE_SERIAL_NUMBER" /></translation> @@ -2878,6 +2880,7 @@ <translation id="3616113530831147358">ഓഡിയോ</translation> <translation id="3616741288025931835">&ബ്രൌസിംഗ് ഡാറ്റ ഇല്ലാതാക്കുക...</translation> <translation id="3617891479562106823">പശ്ചാത്തലങ്ങൾ ലഭ്യമല്ല. പിന്നീട് വീണ്ടും ശ്രമിക്കുക.</translation> +<translation id="3618286417582819036">ക്ഷമിക്കൂ, ഒരു പിശക് സംഭവിച്ചു</translation> <translation id="3619115746895587757">കാപ്പുചീനോ</translation> <translation id="3620136223548713675">ജിയോലൊക്കേഷൻ</translation> <translation id="362023940451053340"><ph name="ACCOUNT" /> എന്നതിനായി നിങ്ങളുടെ Google അക്കൗണ്ടിൽ</translation> @@ -3847,7 +3850,6 @@ <translation id="4513872120116766993">എഴുത്ത് പ്രവചിക്കൽ</translation> <translation id="4513946894732546136">ഫീഡ്ബാക്ക്</translation> <translation id="451407183922382411"><ph name="COMPANY_NAME" /> നൽകുന്നത്</translation> -<translation id="4514610446763173167">പ്ലേ ചെയ്യാനോ താൽക്കാലികമായി നിർത്താനോ വീഡിയോ മാറ്റുക</translation> <translation id="451515744433878153">നീക്കംചെയ്യുക</translation> <translation id="4515872537870654449">സർവീസ് ചെയ്യാൻ Dell-നെ ബന്ധപ്പെടുക. ഫാൻ പ്രവർത്തിക്കുന്നില്ലെങ്കിൽ ഡോക്ക് ഷട്ട് ഡൗൺ ആകും.</translation> <translation id="4518840066030486079">Shift കീ മോഡ് സ്റ്റൈൽ</translation> @@ -6671,6 +6673,7 @@ <translation id="7149839598364933473">ഈ ഉപകരണം ഒരു <ph name="DEVICE_OS" /> ഉപകരണമായി പരിവർത്തനം ചെയ്യുക.</translation> <translation id="7149893636342594995">അവസാന 24 മണിക്കൂർ</translation> <translation id="7152478047064750137">ഈ വിപുലീകരണത്തിന് പ്രത്യേക അനുമതികളൊന്നും ആവശ്യമില്ല</translation> +<translation id="7153309176431047193">ചിത്രങ്ങൾ ടെക്സ്റ്റ് ആയി പരിവർത്തനം ചെയ്യുക</translation> <translation id="7154130902455071009">നിങ്ങളുടെ ആരംഭ പേജ് ഇതായി മാറ്റുക: <ph name="START_PAGE" /></translation> <translation id="7156231244155528270">ചിത്രം ടെക്സ്റ്റ് ആയി പരിവർത്തനം ചെയ്യുക</translation> <translation id="7159953856712257647">ഡിഫോൾട്ട് ആയി ഇൻസ്റ്റാൾ ചെയ്തത്</translation>
diff --git a/chrome/app/resources/generated_resources_mn.xtb b/chrome/app/resources/generated_resources_mn.xtb index 2e725f6..acc3a6b 100644 --- a/chrome/app/resources/generated_resources_mn.xtb +++ b/chrome/app/resources/generated_resources_mn.xtb
@@ -3863,7 +3863,6 @@ <translation id="4513872120116766993">Бичих үгсийг урьдчилан санал болгох</translation> <translation id="4513946894732546136">Санал дүгнэлт</translation> <translation id="451407183922382411"><ph name="COMPANY_NAME" />-р хүргэсэн</translation> -<translation id="4514610446763173167">Видеог тоглуулах эсвэл түр зогсоохын тулд асаах/унтраах</translation> <translation id="451515744433878153">Устгах</translation> <translation id="4515872537870654449">Үйлчилгээ авахын тулд Dell-тэй холбоо барина уу. Сэнс ажиллахгүй байвал холбогч унтрах болно.</translation> <translation id="4518840066030486079">Shift товчлуурын горимын загвар</translation>
diff --git a/chrome/app/resources/generated_resources_mr.xtb b/chrome/app/resources/generated_resources_mr.xtb index 860a92a..94ee535 100644 --- a/chrome/app/resources/generated_resources_mr.xtb +++ b/chrome/app/resources/generated_resources_mr.xtb
@@ -3860,7 +3860,6 @@ <translation id="4513872120116766993">अंदाजानुसार लिखाण</translation> <translation id="4513946894732546136">फीडबॅक</translation> <translation id="451407183922382411"><ph name="COMPANY_NAME" /> द्वारे प्रायोजित</translation> -<translation id="4514610446763173167">प्ले करण्यासाठी किंवा थांबवण्यासाठी व्हिडिओ टॉगल करा</translation> <translation id="451515744433878153">काढून टाका</translation> <translation id="4515872537870654449">सेवेसाठी Dell शी संपर्क साधा. फॅन काम करत नसल्यास डॉक बंद होईल.</translation> <translation id="4518840066030486079">शिफ्ट की मोड शैली</translation>
diff --git a/chrome/app/resources/generated_resources_ms.xtb b/chrome/app/resources/generated_resources_ms.xtb index 1505d19..c7fdb75 100644 --- a/chrome/app/resources/generated_resources_ms.xtb +++ b/chrome/app/resources/generated_resources_ms.xtb
@@ -3863,7 +3863,6 @@ <translation id="4513872120116766993">Penulisan ramalan</translation> <translation id="4513946894732546136">Maklum balas</translation> <translation id="451407183922382411">Dikuasakan oleh <ph name="COMPANY_NAME" /></translation> -<translation id="4514610446763173167">Togol video kepada main atau jeda</translation> <translation id="451515744433878153">Alih keluar</translation> <translation id="4515872537870654449">Hubungi Dell untuk penyelenggaraan. Dok akan dimatikan jika kipas tidak berfungsi.</translation> <translation id="4518840066030486079">Gaya Mod Kekunci Shift</translation>
diff --git a/chrome/app/resources/generated_resources_my.xtb b/chrome/app/resources/generated_resources_my.xtb index 0310952..06c2468 100644 --- a/chrome/app/resources/generated_resources_my.xtb +++ b/chrome/app/resources/generated_resources_my.xtb
@@ -3860,7 +3860,6 @@ <translation id="4513872120116766993">ခန့်မှန်းရေးသားမှု</translation> <translation id="4513946894732546136">အကြံပြုချက်</translation> <translation id="451407183922382411"><ph name="COMPANY_NAME" /> က ပံ့ပိုးပေးထားပါသည်</translation> -<translation id="4514610446763173167">ဗီဒီယိုကို ဖွင့်ရန် သို့မဟုတ် ခေတ္တရပ်ရန် ခလုတ်နှိပ်ပါ</translation> <translation id="451515744433878153">ဖယ်ရှားရန်</translation> <translation id="4515872537870654449">ဝန်ဆောင်မှုအတွက် Dell ကို ဆက်သွယ်ပါ။ ပန်ကာအလုပ်မလုပ်လျှင် အထိုင်ပိတ်သွားပါမည်။</translation> <translation id="4518840066030486079">Shift ကီးမုဒ် ပုံစံ</translation>
diff --git a/chrome/app/resources/generated_resources_ne.xtb b/chrome/app/resources/generated_resources_ne.xtb index 5c8fb49..ca607cd 100644 --- a/chrome/app/resources/generated_resources_ne.xtb +++ b/chrome/app/resources/generated_resources_ne.xtb
@@ -1234,6 +1234,7 @@ <translation id="2105809836724866556"><ph name="MODULE_TITLE" /> वटा कन्सोल म्यासेज लुकाइएका छन्</translation> <translation id="2108349519800154983">{COUNT,plural, =1{फोन नम्बर}other{# वटा फोन नम्बर}}</translation> <translation id="2110941575868943054">ब्लुटुथ डिभाइसहरू खोज्ने अनुमति दिइएका साइटहरू</translation> +<translation id="2111158890826137380">माफ गर्नुहोला, केही चिज गडबड भयो। कृपया वर्णनमा #bruschetta समावेश गरी प्रतिक्रिया पठाउनुहोस्। त्रुटिको कोड <ph name="ERROR" /> हो</translation> <translation id="211144231511833662">प्रकारहरू हटाउनुहोस्</translation> <translation id="2111670510994270194">दायाँपट्टि नयाँ ट्याब</translation> <translation id="2112554630428445878">स्वागत छ, <ph name="USERNAME" /></translation> @@ -1775,6 +1776,7 @@ <translation id="2575713839157415345">{YEARS,plural, =1{यो डिभाइससम्बन्धी जानकारी १ वर्षका लागि सेभ गरिने छ र तपाईं अर्को पटक कोड प्रयोग नगरिकन कनेक्ट गर्न सक्नुहुन्छ। तपाईंका एड्मिनले यो सेटिङ तय गर्नुहुन्छ।}other{यो डिभाइससम्बन्धी जानकारी {YEARS} वर्षका लागि सेभ गरिने छ र तपाईं अर्को पटक कोड प्रयोग नगरिकन कनेक्ट गर्न सक्नुहुन्छ। तपाईंका एड्मिनले यो सेटिङ तय गर्नुहुन्छ।}}</translation> <translation id="257779572837908839">बैठकहरूका लागि क्रोमबक्सको रूपमा सेटअप गर्नुहोस्</translation> <translation id="2579309488038515659">हटस्पट अन गर्ने टगल</translation> +<translation id="2579596474754516455">स्क्रिन रिडरको प्रयोजनका लागि आवश्यक परेका अवस्थामा फोटोलाई रूपान्तरण गरी टेक्स्ट बनाइयोस्</translation> <translation id="2580889980133367162"><ph name="HOST" /> लाई धेरै फाइलहरू डाउनलोड गर्ने अनुमति सँधै दिनुहोस्</translation> <translation id="258095186877893873">लामो</translation> <translation id="2582253231918033891"><ph name="PRODUCT_NAME" /> <ph name="PRODUCT_VERSION" /> (मञ्च <ph name="PLATFORM_VERSION" />) <ph name="DEVICE_SERIAL_NUMBER" /></translation> @@ -2877,6 +2879,7 @@ <translation id="3616113530831147358">अडियो</translation> <translation id="3616741288025931835">&ब्राउजिङ लगत खालि गर्नुहोस्...</translation> <translation id="3617891479562106823">पृष्ठभूमिहरू उपलब्ध छैनन्। पछि फेरि प्रयास गर्नुहोस्।</translation> +<translation id="3618286417582819036">माफ गर्नुहोला, कुनै त्रुटि भयो</translation> <translation id="3619115746895587757">कापाचिनो</translation> <translation id="3620136223548713675">भूस्थान</translation> <translation id="362023940451053340">तपाईंको Google खातामा <ph name="ACCOUNT" /> को पासवर्ड</translation> @@ -3846,7 +3849,6 @@ <translation id="4513872120116766993">पूर्वानुमानयुक्त लेखन</translation> <translation id="4513946894732546136">पृष्ठपोषण</translation> <translation id="451407183922382411"><ph name="COMPANY_NAME" /> द्वारा संचालित</translation> -<translation id="4514610446763173167">भिडियो प्ले वा पज गर्न टगल गर्नुहोस्</translation> <translation id="451515744433878153">हटाउनुहोस्</translation> <translation id="4515872537870654449">मर्मतका लागि Dell मा सम्पर्क गर्नुहोस्। पङ्खाले काम गरिरहेको छैन भने डक बन्द हुने छ।</translation> <translation id="4518840066030486079">सिफ्ट की मोडको शैली</translation> @@ -6667,6 +6669,7 @@ <translation id="7149839598364933473">यो डिभाइसमा <ph name="DEVICE_OS" /> चलाउनुहोस्।</translation> <translation id="7149893636342594995">पछिल्ला २४ घन्टा</translation> <translation id="7152478047064750137">यस विस्तारलाई कुनै विशेष अनुमति चाहिँदैन</translation> +<translation id="7153309176431047193">फोटोलाई रूपान्तरण गरी टेक्स्ट बनाइयोस्</translation> <translation id="7154130902455071009">आफ्नो सुरुवात पृष्ठलाई यसमा परिवर्तन गर्नुहोस्: <ph name="START_PAGE" /></translation> <translation id="7156231244155528270">फोटो रूपान्तरण गरेर टेक्स्ट बनाउनुहोस्</translation> <translation id="7159953856712257647">स्वतः इन्स्टल गरिएको</translation>
diff --git a/chrome/app/resources/generated_resources_nl.xtb b/chrome/app/resources/generated_resources_nl.xtb index 0940f349..6e86b01 100644 --- a/chrome/app/resources/generated_resources_nl.xtb +++ b/chrome/app/resources/generated_resources_nl.xtb
@@ -1237,6 +1237,7 @@ <translation id="2105809836724866556"><ph name="MODULE_TITLE" /> is verborgen</translation> <translation id="2108349519800154983">{COUNT,plural, =1{Telefoonnummer}other{# telefoonnummers}}</translation> <translation id="2110941575868943054">Toestemming om naar bluetooth-apparaten te zoeken</translation> +<translation id="2111158890826137380">Er is iets misgegaan. Dien je feedback in met #bruschetta in de beschrijving. De foutcode is <ph name="ERROR" />.</translation> <translation id="211144231511833662">Typen wissen</translation> <translation id="2111670510994270194">Nieuw tabblad aan de rechterkant</translation> <translation id="2112554630428445878">Welkom, <ph name="USERNAME" /></translation> @@ -1778,6 +1779,7 @@ <translation id="2575713839157415345">{YEARS,plural, =1{Dit apparaat wordt 1 jaar bewaard en je kunt de volgende keer verbinding maken zonder een code. Dit wordt ingesteld door je beheerder.}other{Dit apparaat wordt {YEARS} jaar bewaard en je kunt de volgende keer verbinding maken zonder een code. Dit wordt ingesteld door je beheerder.}}</translation> <translation id="257779572837908839">Instellen als Chromebox for meetings</translation> <translation id="2579309488038515659">Hotspot aanzetten</translation> +<translation id="2579596474754516455">Scan pdf-afbeeldingen om tekst te converteren voor schermlezers als dat nodig is</translation> <translation id="2580889980133367162"><ph name="HOST" /> altijd toestaan meerdere bestanden te downloaden</translation> <translation id="258095186877893873">Lang</translation> <translation id="2582253231918033891"><ph name="PRODUCT_NAME" /> <ph name="PRODUCT_VERSION" /> (Platform <ph name="PLATFORM_VERSION" />) <ph name="DEVICE_SERIAL_NUMBER" /></translation> @@ -2878,6 +2880,7 @@ <translation id="3616113530831147358">Audio</translation> <translation id="3616741288025931835">&Browsegegevens wissen</translation> <translation id="3617891479562106823">Achtergronden zijn niet beschikbaar. Probeer het later opnieuw.</translation> +<translation id="3618286417582819036">Er is een fout opgetreden</translation> <translation id="3619115746895587757">Cappuccino</translation> <translation id="3620136223548713675">Geolocatie</translation> <translation id="362023940451053340">In je Google-account, voor <ph name="ACCOUNT" /></translation> @@ -3846,7 +3849,6 @@ <translation id="4513872120116766993">Voorspellend schrijven</translation> <translation id="4513946894732546136">Feedback</translation> <translation id="451407183922382411">Mogelijk gemaakt door <ph name="COMPANY_NAME" /></translation> -<translation id="4514610446763173167">Video schakelen tussen afspelen en pauzeren</translation> <translation id="451515744433878153">Verwijderen</translation> <translation id="4515872537870654449">Neem contact op met Dell voor service. Het dock wordt uitgezet als de ventilator niet werkt.</translation> <translation id="4518840066030486079">Modusstijl Shift-toets</translation> @@ -6661,6 +6663,7 @@ <translation id="7149839598364933473">Zet dit apparaat om in een <ph name="DEVICE_OS" />-apparaat.</translation> <translation id="7149893636342594995">Afgelopen 24 uur</translation> <translation id="7152478047064750137">De extensie vereist geen speciale rechten</translation> +<translation id="7153309176431047193">Afbeeldingen converteren naar tekst</translation> <translation id="7154130902455071009">Je homepage wijzigen in: <ph name="START_PAGE" /></translation> <translation id="7156231244155528270">Afbeelding converteren naar tekst</translation> <translation id="7159953856712257647">Standaard geïnstalleerd</translation>
diff --git a/chrome/app/resources/generated_resources_no.xtb b/chrome/app/resources/generated_resources_no.xtb index 8b5926b..d58d483 100644 --- a/chrome/app/resources/generated_resources_no.xtb +++ b/chrome/app/resources/generated_resources_no.xtb
@@ -2741,6 +2741,7 @@ <translation id="3469583217479686109">Utvalgsverktøy</translation> <translation id="3470392222765168737">Følg nettstedet</translation> <translation id="3471876058939596279">HDMI- og USB-C-porter kan ikke brukes til video samtidig. Bruk en annen videoport.</translation> +<translation id="3472469028191701821">Åpnes i en ny fane</translation> <translation id="3473241910002674503">Bruk knapper til å navigere hjem og tilbake samt bytte app i nettbrettmodus.</translation> <translation id="3473479545200714844">Skjermforstørrer</translation> <translation id="3474218480460386727">Bruk 99 eller færre bokstaver for nye ord</translation> @@ -3128,6 +3129,7 @@ <translation id="3820749202859700794">SECG elliptisk kurve secp521r1 (også kjent som NIST P-521)</translation> <translation id="3821074617718452587">Telefonstyring-varsler</translation> <translation id="3821372858277557370">{NUM_EXTENSIONS,plural, =1{En utvidelse er godkjent}other{# utvidelser er godkjent}}</translation> +<translation id="3823019343150397277">IBAN</translation> <translation id="3823310065043511710">Det anbefales minst <ph name="INSTALL_SIZE" /> ledig plass for Linux.</translation> <translation id="3824621460022590830">Tokenet for registrering av enheten er ugyldig. Kontakt eieren eller administratoren av enheten. Feilkode: <ph name="ERROR_CODE" />.</translation> <translation id="3825041664272812989">{FILE_TYPE_COUNT,plural, =1{Husk valget mitt for denne filtypen: <ph name="FILE_TYPES" />}other{Husk valget mitt for disse filtypene: <ph name="FILE_TYPES" />}}</translation> @@ -3857,7 +3859,6 @@ <translation id="4513872120116766993">Prediktiv skriving</translation> <translation id="4513946894732546136">Google Feedback</translation> <translation id="451407183922382411">Levert av <ph name="COMPANY_NAME" /></translation> -<translation id="4514610446763173167">Spill av videoen eller sett den på pause</translation> <translation id="451515744433878153">Fjern</translation> <translation id="4515872537870654449">Kontakt Dell for service. Dokken slår seg av hvis viften ikke virker.</translation> <translation id="4518840066030486079">Type modus for Shift-tast</translation> @@ -4044,6 +4045,7 @@ <translation id="4675828034887792601">Opprett snarveier for å søke på nettsteder, og administrer søkemotoren din</translation> <translation id="4676595058027112862">Telefonstyring – finn ut mer</translation> <translation id="4677772697204437347">GPU-minne</translation> +<translation id="4678848110205818817">Kreditt-/debetkort</translation> <translation id="4680105648806843642">Lyden er kuttet på denne siden</translation> <translation id="4680112532510845139">Slipp et bilde her</translation> <translation id="4681453295291708042">Slå av nærdeling</translation>
diff --git a/chrome/app/resources/generated_resources_or.xtb b/chrome/app/resources/generated_resources_or.xtb index 58c30715..e7ad9d2f 100644 --- a/chrome/app/resources/generated_resources_or.xtb +++ b/chrome/app/resources/generated_resources_or.xtb
@@ -3845,7 +3845,6 @@ <translation id="4513872120116766993">ପୂର୍ବାନୁମାନ ଲିଖିତ ପରାମର୍ଶ</translation> <translation id="4513946894732546136">Feedback</translation> <translation id="451407183922382411"><ph name="COMPANY_NAME" /> ଦ୍ୱାରା ସମର୍ଥିତ</translation> -<translation id="4514610446763173167">ଭିଡିଓକୁ ଚଲାଇବା କିମ୍ବା ବିରତ କରିବା ପାଇଁ ଟୋଗଲ୍ କରନ୍ତୁ</translation> <translation id="451515744433878153">କାଢ଼ିଦିଅନ୍ତୁ</translation> <translation id="4515872537870654449">ସେବା ପାଇଁ Dell ସହିତ ଯୋଗାଯୋଗ କରନ୍ତୁ। ଯଦି ଫ୍ୟାନ୍ କାମ କରୁ ନାହିଁ, ତେବେ ଡକ୍ ବନ୍ଦ ହୋଇଯିବ।</translation> <translation id="4518840066030486079">Shift କୀ ମୋଡ ଷ୍ଟାଇଲ</translation>
diff --git a/chrome/app/resources/generated_resources_pa.xtb b/chrome/app/resources/generated_resources_pa.xtb index 3948544..c85c6cb 100644 --- a/chrome/app/resources/generated_resources_pa.xtb +++ b/chrome/app/resources/generated_resources_pa.xtb
@@ -3863,7 +3863,6 @@ <translation id="4513872120116766993">ਲਿਖਣ ਵੇਲੇ ਸ਼ਬਦਾਂ ਦਾ ਪੂਰਵ-ਅਨੁਮਾਨ</translation> <translation id="4513946894732546136">ਵਿਚਾਰ</translation> <translation id="451407183922382411"><ph name="COMPANY_NAME" /> ਵੱਲੋਂ ਸੰਚਾਲਿਤ</translation> -<translation id="4514610446763173167">ਵੀਡੀਓ ਨੂੰ ਚਲਾਉਣ ਜਾਂ ਰੋਕਣ ਲਈ ਟੌਗਲ ਕਰੋ</translation> <translation id="451515744433878153">ਹਟਾਓ</translation> <translation id="4515872537870654449">ਸੇਵਾ ਲਈ Dell ਨੂੰ ਸੰਪਰਕ ਕਰੋ। ਇਹ ਡੌਕ, ਪੱਖੇ ਦੇ ਕੰਮ ਨਾ ਕਰਨ 'ਤੇ ਬੰਦ ਹੋ ਜਾਵੇਗਾ।</translation> <translation id="4518840066030486079">Shift ਕੁੰਜੀ ਮੋਡ ਸਟਾਈਲ</translation>
diff --git a/chrome/app/resources/generated_resources_pl.xtb b/chrome/app/resources/generated_resources_pl.xtb index d7d4181..2b51455 100644 --- a/chrome/app/resources/generated_resources_pl.xtb +++ b/chrome/app/resources/generated_resources_pl.xtb
@@ -3839,7 +3839,6 @@ <translation id="4513872120116766993">Przewidywanie tekstu podczas pisania</translation> <translation id="4513946894732546136">Twoja opinia</translation> <translation id="451407183922382411">Technologia <ph name="COMPANY_NAME" /></translation> -<translation id="4514610446763173167">Przełącz, by odtworzyć lub wstrzymać wideo</translation> <translation id="451515744433878153">Usuń</translation> <translation id="4515872537870654449">Skontaktuj się z serwisem firmy Dell. Jeśli wentylator nie działa, stacja dokująca się wyłączy.</translation> <translation id="4518840066030486079">Styl trybu klawisza Shift</translation>
diff --git a/chrome/app/resources/generated_resources_pt-BR.xtb b/chrome/app/resources/generated_resources_pt-BR.xtb index e5a9bad..e169ab3 100644 --- a/chrome/app/resources/generated_resources_pt-BR.xtb +++ b/chrome/app/resources/generated_resources_pt-BR.xtb
@@ -3870,7 +3870,6 @@ <translation id="4513872120116766993">Escrita preditiva</translation> <translation id="4513946894732546136">Comentários</translation> <translation id="451407183922382411">Tecnologia da <ph name="COMPANY_NAME" /></translation> -<translation id="4514610446763173167">Alternar vídeo entre reproduzir e pausar</translation> <translation id="451515744433878153">Remover</translation> <translation id="4515872537870654449">Fale com a Dell para consertar. A base será desligada se a ventilação não estiver funcionando.</translation> <translation id="4518840066030486079">Estilo do modo da tecla Shift</translation>
diff --git a/chrome/app/resources/generated_resources_pt-PT.xtb b/chrome/app/resources/generated_resources_pt-PT.xtb index 74e0bb0..1698c537 100644 --- a/chrome/app/resources/generated_resources_pt-PT.xtb +++ b/chrome/app/resources/generated_resources_pt-PT.xtb
@@ -917,6 +917,7 @@ <translation id="1819721979226826163">Toque em Notificações da aplicação > Serviços do Google Play.</translation> <translation id="1820028137326691631">Introduzir a palavra-passe fornecida pelo administrador</translation> <translation id="1822140782238030981">Já é um utilizador do Chrome? Inicie sessão.</translation> +<translation id="1823781806707127806">Adicionar dados de navegação existentes ao perfil gerido</translation> <translation id="18245044880483936">Os dados da cópia de segurança não são contabilizados para a quota do armazenamento do Drive da criança.</translation> <translation id="1825565032302550710">A porta tem de ser entre 1024 e 65535.</translation> <translation id="182577151972096764">receitas visualizadas recentemente</translation> @@ -1077,6 +1078,7 @@ <translation id="1963976881984600709">Proteção padrão</translation> <translation id="1965624977906726414">Não tem permissões especiais.</translation> <translation id="1966649499058910679">Realçar cada palavra conforme é falada</translation> +<translation id="1967970931040389207">Ativar zona Wi-Fi</translation> <translation id="1969654639948595766">Registos de texto WebRTC (<ph name="WEBRTC_TEXT_LOG_COUNT" />)</translation> <translation id="1972325230031091483">Irá navegar mais depressa porque os conteúdos são carregados proativamente com base na página Web que está a visitar</translation> <translation id="197288927597451399">Manter</translation> @@ -1165,6 +1167,7 @@ <translation id="2048554637254265991">Erro ao iniciar o gestor de contentores. Tente novamente.</translation> <translation id="2048653237708779538">Ação não disponível</translation> <translation id="2050339315714019657">Vertical</translation> +<translation id="2051555741181591333">Desativar zona Wi-Fi automaticamente</translation> <translation id="2052572566310583903">Instalada nos seus outros dispositivos</translation> <translation id="2053105195397337973">Estamos a explorar formas de restringir a monitorização enquanto permitimos que os sites acabem com as fraudes e o spam de anúncios.</translation> <translation id="2053312383184521053">Dados do estado inativo</translation> @@ -1273,6 +1276,7 @@ <translation id="2137128126782078222">Não permitir notificações de <ph name="WEBSITE" /></translation> <translation id="2139919072249842737">Botão de configuração</translation> <translation id="2140788884185208305">Condição da bateria</translation> +<translation id="2140902257485550046">Selecionar para bloquear todas as extensões neste site</translation> <translation id="2142328300403846845">Abrir link como</translation> <translation id="2142582065325732898">Ative a <ph name="LINK1_BEGIN" />Sincronização do Chrome<ph name="LINK1_END" /> para ver separadores recentes do Chrome. <ph name="LINK2_BEGIN" />Saiba mais<ph name="LINK2_END" /></translation> <translation id="2143765403545170146">Mostrar sempre a barra de ferramentas no modo de ecrã inteiro</translation> @@ -2004,6 +2008,7 @@ <translation id="2778471504622896352">Adicionar apps remotas ao Launcher do Chrome OS</translation> <translation id="2781120507965857989">Ative a sincronização para obter os seus marcadores, palavras-passe, histórico e muito mais neste dispositivo e em qualquer outro que esteja a sincronizar. A Google pode usar o seu histórico para personalizar a Pesquisa e outros serviços Google.</translation> <translation id="2781692009645368755">Google Pay</translation> +<translation id="2781800772148653810">As extensões são permitidas neste site</translation> <translation id="2782104745158847185">Ocorreu um erro ao instalar a aplicação para Linux.</translation> <translation id="2783298271312924866">Transferido</translation> <translation id="2783321960289401138">Criar atalho...</translation> @@ -3829,6 +3834,7 @@ <translation id="449126573531210296">Encriptar palavras-passe sincronizadas com a sua Conta Google</translation> <translation id="449232563137139956">Normalmente, os sites mostram imagens para fornecer ilustrações, como fotos de lojas online ou artigos de notícias.</translation> <translation id="4492698018379445570">Saiba o que adicionou aos carrinhos de compras e efetue o pagamento quando tiver tudo pronto.</translation> +<translation id="4493167769966437077">Remover <ph name="LANGUAGE_NAME" /> dos idiomas da opção Nunca disponibilizar tradução</translation> <translation id="4493468155686877504">Recomendado (<ph name="INSTALL_SIZE" />)</translation> <translation id="4495002167047709180">Permitir esta extensão em <ph name="SITE" />?</translation> <translation id="4495419450179050807">Não mostrar nesta página</translation> @@ -3853,7 +3859,6 @@ <translation id="4513872120116766993">Escrita preditiva</translation> <translation id="4513946894732546136">Comentários</translation> <translation id="451407183922382411">Com tecnologia da <ph name="COMPANY_NAME" /></translation> -<translation id="4514610446763173167">Ativar/desativar vídeo para reprodução ou pausa.</translation> <translation id="451515744433878153">Remover</translation> <translation id="4515872537870654449">Contacte a Dell para obter assistência. A estação de ancoragem será encerrada se a ventoinha não estiver a funcionar.</translation> <translation id="4518840066030486079">Estilo do modo com tecla Shift</translation> @@ -4400,6 +4405,7 @@ <translation id="5026874946691314267">Não voltar a mostrar</translation> <translation id="5027550639139316293">Certificado de email</translation> <translation id="5027562294707732951">Adicionar extensão</translation> +<translation id="5028445315206872221">As extensões estão bloqueadas neste site</translation> <translation id="5029568752722684782">Limpar cópia</translation> <translation id="5029873138381728058">Falha ao verificar VMs</translation> <translation id="503155457707535043">A transferir aplicações…</translation> @@ -4963,6 +4969,7 @@ <translation id="5554866693883022680">Selecione uma app no dispositivo <ph name="DEVICE_TYPE" /> para abrir este link</translation> <translation id="5555363196923735206">Inverter câmara</translation> <translation id="5555525474779371165">Escolha a sua proteção de Navegação segura</translation> +<translation id="5555639311269196631">Desativar zona Wi-Fi</translation> <translation id="5556459405103347317">Recarregar</translation> <translation id="5558129378926964177">Amp&liar</translation> <translation id="55601339223879446">Ajustar os limites do seu ambiente de trabalho no ecrã</translation> @@ -6624,6 +6631,7 @@ <translation id="7088960765736518739">Acesso por comutador</translation> <translation id="7089253021944603172">Separador novamente ativo</translation> <translation id="7090160970140261931">Pode adicionar mais contas ao seu dispositivo <ph name="DEVICE_TYPE" /> para utilizar com Websites e apps Android. Também pode controlar as contas que são utilizadas com as apps Android.</translation> +<translation id="7090714929377281710">Desativar zona Wi-Fi automaticamente</translation> <translation id="7093220653036489319">Respostas rápidas</translation> <translation id="7093416310351037609">Para segurança e proteção dos dados, a sua entidade exige que todas as transferências elegíveis sejam guardadas na conta do <ph name="WEB_DRIVE" /> da sua entidade.</translation> <translation id="7093866338626856921">Trocar dados com os seguintes dispositivos: <ph name="HOSTNAMES" /></translation> @@ -7244,6 +7252,7 @@ <translation id="7684718995427157417">Para criar e testar aplicações, ative o Bridge de depuração do Android (adb). Tenha em atenção que esta ação permite a instalação de aplicações para Android que não foram validadas pela Google. Além disso, se pretender desativar o adb, terá de efetuar uma reposição de dados de fábrica.</translation> <translation id="7685049629764448582">Memória JavaScript</translation> <translation id="7685087414635069102">PIN necessário</translation> +<translation id="7686581688229391955">Selecionar para permitir extensões neste site</translation> <translation id="7686938547853266130"><ph name="FRIENDLY_NAME" /> (<ph name="DEVICE_PATH" />)</translation> <translation id="7690294790491645610">Confirmar a nova palavra-passe</translation> <translation id="7690378713476594306">Escolher na lista</translation> @@ -8057,6 +8066,7 @@ <translation id="8416730306157376817"><ph name="BATTERY_PERCENTAGE" />% (caixa)</translation> <translation id="8417548266957501132">Palavra-passe do Pai ou Mãe</translation> <translation id="8418445294933751433">Mo&strar como separador</translation> +<translation id="8418675848396538775">Adicionar <ph name="LANGUAGE_NAME" /></translation> <translation id="8419098111404128271">Resultados da pesquisa para "<ph name="SEARCH_TEXT" />"</translation> <translation id="8420308167132684745">Editar entradas do dicionário</translation> <translation id="8421361468937925547">Legendas instantâneas (apenas em inglês)</translation> @@ -8827,6 +8837,7 @@ <translation id="9121814364785106365">Abrir como separador fixo</translation> <translation id="9123287046453017203">O dispositivo não está atualizado</translation> <translation id="9124003689441359348">As palavras-passe guardadas aparecem aqui</translation> +<translation id="9125910124977405374">Remover <ph name="LANGUAGE_NAME" /> dos idiomas traduzidos automaticamente</translation> <translation id="9126149354162942022">Cor do cursor</translation> <translation id="9128317794749765148">Não foi possível concluir a configuração</translation> <translation id="9128335130883257666">Abrir página de definições para <ph name="INPUT_METHOD_NAME" /></translation>
diff --git a/chrome/app/resources/generated_resources_ro.xtb b/chrome/app/resources/generated_resources_ro.xtb index 1967c164..6786501 100644 --- a/chrome/app/resources/generated_resources_ro.xtb +++ b/chrome/app/resources/generated_resources_ro.xtb
@@ -3853,7 +3853,6 @@ <translation id="4513872120116766993">Scriere predictivă</translation> <translation id="4513946894732546136">Feedback</translation> <translation id="451407183922382411">Cu tehnologia <ph name="COMPANY_NAME" /></translation> -<translation id="4514610446763173167">Redă sau întrerupe videoclipul</translation> <translation id="451515744433878153">Elimină</translation> <translation id="4515872537870654449">Contactează Dell pentru service. Dispozitivul de andocare se va închide dacă ventilatorul nu funcționează.</translation> <translation id="4518840066030486079">Stilul modului pentru tasta Shift</translation>
diff --git a/chrome/app/resources/generated_resources_ru.xtb b/chrome/app/resources/generated_resources_ru.xtb index 84b74fb..02059fd 100644 --- a/chrome/app/resources/generated_resources_ru.xtb +++ b/chrome/app/resources/generated_resources_ru.xtb
@@ -3852,7 +3852,6 @@ <translation id="4513872120116766993">Подсказки</translation> <translation id="4513946894732546136">Отзыв</translation> <translation id="451407183922382411">Технологии <ph name="COMPANY_NAME" /></translation> -<translation id="4514610446763173167">Запустить или приостановить видео</translation> <translation id="451515744433878153">Удалить</translation> <translation id="4515872537870654449">Обратитесь в службу поддержки Dell. Если вентилятор не заработает, док-станция будет выключена.</translation> <translation id="4518840066030486079">Стиль режима клавиши Shift</translation>
diff --git a/chrome/app/resources/generated_resources_si.xtb b/chrome/app/resources/generated_resources_si.xtb index b991f60..724c672 100644 --- a/chrome/app/resources/generated_resources_si.xtb +++ b/chrome/app/resources/generated_resources_si.xtb
@@ -3852,7 +3852,6 @@ <translation id="4513872120116766993">පුරෝකථනමය ලිවීම</translation> <translation id="4513946894732546136">ප්රතිපෝෂණ</translation> <translation id="451407183922382411">බල ගැන්වූයේ <ph name="COMPANY_NAME" /></translation> -<translation id="4514610446763173167">වාදනයට හෝ විරාම ගැන්වීමට වීඩියෝව ටොගල් කරන්න</translation> <translation id="451515744433878153">ඉවත් කරන්න</translation> <translation id="4515872537870654449">සේවය සඳහා Dell සම්බන්ධ කර ගන්න. විදුලි පංකාව ක්රියා නොකරන්නේ නම්, ඩොක් එක වැසේ.</translation> <translation id="4518840066030486079">Shift යතුරු ප්රකාර විලාසය</translation>
diff --git a/chrome/app/resources/generated_resources_sk.xtb b/chrome/app/resources/generated_resources_sk.xtb index 911bbf2..9a17584 100644 --- a/chrome/app/resources/generated_resources_sk.xtb +++ b/chrome/app/resources/generated_resources_sk.xtb
@@ -3852,7 +3852,6 @@ <translation id="4513872120116766993">Predvídanie písania</translation> <translation id="4513946894732546136">Spätná väzba</translation> <translation id="451407183922382411">Používa technológiu <ph name="COMPANY_NAME" /></translation> -<translation id="4514610446763173167">Prepnutím prehráte alebo pozastavíte video</translation> <translation id="451515744433878153">Odstrániť</translation> <translation id="4515872537870654449">Ak potrebujete servis, kontaktujte spoločnosť Dell. Ak ventilátor nefunguje, dok sa vypne.</translation> <translation id="4518840066030486079">Štýl režimu klávesa Shift</translation>
diff --git a/chrome/app/resources/generated_resources_sl.xtb b/chrome/app/resources/generated_resources_sl.xtb index 74c8ab2..b48982e1 100644 --- a/chrome/app/resources/generated_resources_sl.xtb +++ b/chrome/app/resources/generated_resources_sl.xtb
@@ -3866,7 +3866,6 @@ <translation id="4513872120116766993">Predvidevanje besedila</translation> <translation id="4513946894732546136">Povratne informacije</translation> <translation id="451407183922382411">Uporablja tehnologijo <ph name="COMPANY_NAME" /></translation> -<translation id="4514610446763173167">Preklop med predvajanjem in zaustavitvijo videa</translation> <translation id="451515744433878153">Odstrani</translation> <translation id="4515872537870654449">Če potrebujete servisne storitve, se obrnite na družbo Dell. Če ventilator ne deluje, se bo priklopna postaja izklopila.</translation> <translation id="4518840066030486079">Slog načina tipke Shift</translation>
diff --git a/chrome/app/resources/generated_resources_sq.xtb b/chrome/app/resources/generated_resources_sq.xtb index 0f631db2..5ff7ed34 100644 --- a/chrome/app/resources/generated_resources_sq.xtb +++ b/chrome/app/resources/generated_resources_sq.xtb
@@ -3845,7 +3845,6 @@ <translation id="4513872120116766993">Parashikimi i shkrimit</translation> <translation id="4513946894732546136">Komente</translation> <translation id="451407183922382411">Mundësuar nga <ph name="COMPANY_NAME" /></translation> -<translation id="4514610446763173167">Ndrysho videon për të luajtur ose vendosur në pauzë</translation> <translation id="451515744433878153">Hiqe</translation> <translation id="4515872537870654449">Kontakto me Dell për shërbim. Stacioni do të mbyllet nëse ventilatori nuk funksionon.</translation> <translation id="4518840066030486079">Stili i modalitetit të tastit "Shift"</translation>
diff --git a/chrome/app/resources/generated_resources_sr-Latn.xtb b/chrome/app/resources/generated_resources_sr-Latn.xtb index d2c784b..9d0bc2e 100644 --- a/chrome/app/resources/generated_resources_sr-Latn.xtb +++ b/chrome/app/resources/generated_resources_sr-Latn.xtb
@@ -3851,7 +3851,6 @@ <translation id="4513872120116766993">Pisanje sa predviđanjem</translation> <translation id="4513946894732546136">Povratne informacije</translation> <translation id="451407183922382411">Omogućava <ph name="COMPANY_NAME" /></translation> -<translation id="4514610446763173167">Pušta ili pauzira video</translation> <translation id="451515744433878153">Ukloni</translation> <translation id="4515872537870654449">Obratite se Dell-u za uslugu. Bazna stanica će se isključiti ako ventilator ne radi.</translation> <translation id="4518840066030486079">Režim stila tastera Shift</translation>
diff --git a/chrome/app/resources/generated_resources_sr.xtb b/chrome/app/resources/generated_resources_sr.xtb index 19bc03e..a43ba008 100644 --- a/chrome/app/resources/generated_resources_sr.xtb +++ b/chrome/app/resources/generated_resources_sr.xtb
@@ -3851,7 +3851,6 @@ <translation id="4513872120116766993">Писање са предвиђањем</translation> <translation id="4513946894732546136">Повратне информације</translation> <translation id="451407183922382411">Омогућава <ph name="COMPANY_NAME" /></translation> -<translation id="4514610446763173167">Пушта или паузира видео</translation> <translation id="451515744433878153">Уклони</translation> <translation id="4515872537870654449">Обратите се Dell-у за услугу. Базна станица ће се искључити ако вентилатор не ради.</translation> <translation id="4518840066030486079">Режим стила тастера Shift</translation>
diff --git a/chrome/app/resources/generated_resources_sv.xtb b/chrome/app/resources/generated_resources_sv.xtb index 1605ed16..f48d2ad 100644 --- a/chrome/app/resources/generated_resources_sv.xtb +++ b/chrome/app/resources/generated_resources_sv.xtb
@@ -3865,7 +3865,6 @@ <translation id="4513872120116766993">Skrivförslag</translation> <translation id="4513946894732546136">Feedback</translation> <translation id="451407183922382411">Tekniken kommer från <ph name="COMPANY_NAME" /></translation> -<translation id="4514610446763173167">Växla mellan att spela upp och pausa video</translation> <translation id="451515744433878153">Ta bort</translation> <translation id="4515872537870654449">Kontakta Dell för service. Dockningsstationen stängs av om fläkten inte fungerar.</translation> <translation id="4518840066030486079">Format för skifttangentsläget</translation>
diff --git a/chrome/app/resources/generated_resources_sw.xtb b/chrome/app/resources/generated_resources_sw.xtb index abd9866..0de7fdd 100644 --- a/chrome/app/resources/generated_resources_sw.xtb +++ b/chrome/app/resources/generated_resources_sw.xtb
@@ -3858,7 +3858,6 @@ <translation id="4513872120116766993">Utabiri wa maandishi</translation> <translation id="4513946894732546136">Mwitiko</translation> <translation id="451407183922382411">Inaendeshwa na <ph name="COMPANY_NAME" /></translation> -<translation id="4514610446763173167">Geuza video ili ucheze au usimamishe</translation> <translation id="451515744433878153">Ondoa</translation> <translation id="4515872537870654449">Wasiliana na Dell ili upate huduma. Kituo kitajifunga ikiwa feni haifanyi kazi.</translation> <translation id="4518840066030486079">Mtindo wa Hali ya Kitufe cha Shift</translation>
diff --git a/chrome/app/resources/generated_resources_ta.xtb b/chrome/app/resources/generated_resources_ta.xtb index 783755ee..78fdc3d 100644 --- a/chrome/app/resources/generated_resources_ta.xtb +++ b/chrome/app/resources/generated_resources_ta.xtb
@@ -1249,6 +1249,7 @@ <translation id="2105809836724866556"><ph name="MODULE_TITLE" /> மறைக்கப்பட்டன</translation> <translation id="2108349519800154983">{COUNT,plural, =1{ஃபோன் எண்}other{# ஃபோன் எண்கள்}}</translation> <translation id="2110941575868943054">புளூடூத் சாதனங்களைத் தேட அனுமதிக்கப்பட்டுள்ள தளங்கள்</translation> +<translation id="2111158890826137380">ஏதோ தவறாகிவிட்டது. விளக்கத்தில் #bruschetta உடன் கருத்தைச் சமர்ப்பிக்கவும். பிழைக் குறியீடு: <ph name="ERROR" /></translation> <translation id="211144231511833662">வகைகளை அழி</translation> <translation id="2111670510994270194">வலதுபக்கத்தில் புதிய தாவல்</translation> <translation id="2112554630428445878">வணக்கம், <ph name="USERNAME" /></translation> @@ -1793,6 +1794,7 @@ <translation id="2575713839157415345">{YEARS,plural, =1{இந்தச் சாதனம் 1 ஆண்டிற்குச் சேமிக்கப்படும் என்பதால் அடுத்த முறை நீங்கள் குறியீடு இல்லாமல் இணைக்க முடியும். இது உங்கள் நிர்வாகியால் அமைக்கப்பட்டது.}other{இந்தச் சாதனம் {YEARS} ஆண்டுகளுக்குச் சேமிக்கப்படும் என்பதால் அடுத்த முறை நீங்கள் குறியீடு இல்லாமல் இணைக்க முடியும். இது உங்கள் நிர்வாகியால் அமைக்கப்பட்டது.}}</translation> <translation id="257779572837908839">மீட்டிங்குகளுக்கான Chromebox சாதனமாக அமை</translation> <translation id="2579309488038515659">ஹாட்ஸ்பாட்டை இயக்கும்</translation> +<translation id="2579596474754516455">தேவைப்படும்போது PDF படங்களை ஸ்கேன் செய்து ஸ்கிரீன் ரீடருக்கு வார்த்தைகளாக மாற்றும்</translation> <translation id="2580889980133367162">பல ஃபைல்களைப் பதிவிறக்க எப்போதும் <ph name="HOST" /> ஐ அனுமதி</translation> <translation id="258095186877893873">நீண்ட</translation> <translation id="2582253231918033891"><ph name="PRODUCT_NAME" /> <ph name="PRODUCT_VERSION" /> (இயங்குதளம் <ph name="PLATFORM_VERSION" />) <ph name="DEVICE_SERIAL_NUMBER" /></translation> @@ -2894,6 +2896,7 @@ <translation id="3616113530831147358">ஆடியோ</translation> <translation id="3616741288025931835">உலாவிய தரவை &சுத்தமாக்கு...</translation> <translation id="3617891479562106823">பின்னணிகள் கிடைக்கவில்லை. பின்னர் மீண்டும் முயலவும்.</translation> +<translation id="3618286417582819036">பிழை ஏற்பட்டது</translation> <translation id="3619115746895587757">காப்பச்சினோ</translation> <translation id="3620136223548713675">புவி இருப்பிடம்</translation> <translation id="362023940451053340"><ph name="ACCOUNT" />க்காக உங்கள் Google கணக்கில்</translation> @@ -3865,7 +3868,6 @@ <translation id="4513872120116766993">சொல் கணிப்புகள்</translation> <translation id="4513946894732546136">கருத்து</translation> <translation id="451407183922382411"><ph name="COMPANY_NAME" /> வழங்குவது</translation> -<translation id="4514610446763173167">இயக்க அல்லது இடைநிறுத்த, வீடியோவை நிலைமாற்றவும்</translation> <translation id="451515744433878153">அகற்று</translation> <translation id="4515872537870654449">சிக்கலை சரிசெய்ய Dell நிறுவனத்தைத் தொடர்பு கொள்ளவும். ஃபேன் வேலை செய்யவில்லை எனில் டாக்கின் இயக்கம் நிறுத்தப்படும்.</translation> <translation id="4518840066030486079">Shift பட்டன் பயன்முறை ஸ்டைல்</translation> @@ -6688,6 +6690,7 @@ <translation id="7149839598364933473">இந்தச் சாதனத்தை <ph name="DEVICE_OS" /> சாதனமாக மாற்றலாம்.</translation> <translation id="7149893636342594995">கடந்த 24 மணிநேரம்</translation> <translation id="7152478047064750137">இந்த நீட்டிப்பிற்குச் சிறப்பு அனுமதிகள் தேவையில்லை</translation> +<translation id="7153309176431047193">படங்களை வார்த்தைகளாக மாற்றும்</translation> <translation id="7154130902455071009">உங்கள் தொடக்கப் பக்கத்தை இதற்கு மாற்றவும்: <ph name="START_PAGE" /></translation> <translation id="7156231244155528270">படத்தை வார்த்தைகளாக மாற்று</translation> <translation id="7159953856712257647">இயல்பாக நிறுவப்பட்டது</translation>
diff --git a/chrome/app/resources/generated_resources_te.xtb b/chrome/app/resources/generated_resources_te.xtb index ebaf6f8..714e7f9 100644 --- a/chrome/app/resources/generated_resources_te.xtb +++ b/chrome/app/resources/generated_resources_te.xtb
@@ -2746,6 +2746,7 @@ <translation id="3469583217479686109">ఎంపిక టూల్</translation> <translation id="3470392222765168737">సైట్ను ఫాలో చేయండి</translation> <translation id="3471876058939596279">వీడియో కోసం HDMIని, USB రకం-C పోర్ట్లను ఒకే సమయంలో ఉపయోగించకూడదు. వేరే వీడియో పోర్ట్ను ఉపయోగించండి.</translation> +<translation id="3472469028191701821">కొత్త ట్యాబ్లో తెరవబడుతుంది</translation> <translation id="3473241910002674503">టాబ్లెట్ మోడ్లో బటన్లతో హోమ్, వెనుకకు, స్విచ్ యాప్లను నావిగేట్ చేయండి.</translation> <translation id="3473479545200714844">స్క్రీన్ మాగ్నిఫైయర్</translation> <translation id="3474218480460386727">కొత్త పదాలకు 99 అక్షరాలు లేదా తక్కువ ఉపయోగించండి</translation> @@ -3133,6 +3134,7 @@ <translation id="3820749202859700794">SECG దీర్ఘవృత్తాకార వక్రం secp521r1 (NIST P-521గా కూడా పిలువబడుతుంది)</translation> <translation id="3821074617718452587">ఫోన్ హబ్ నోటిఫికేషన్లు</translation> <translation id="3821372858277557370">{NUM_EXTENSIONS,plural, =1{ఒక ఎక్స్టెన్షన్ ఆమోదించబడింది}other{# ఎక్స్టెన్షన్లు ఆమోదించబడ్డాయి}}</translation> +<translation id="3823019343150397277">IBAN</translation> <translation id="3823310065043511710">Linux కోసం కనీసం <ph name="INSTALL_SIZE" /> స్పేస్ కావాలి.</translation> <translation id="3824621460022590830">పరికర ఎన్రోల్మెంట్ టోకెన్ చెల్లదు. మీ పరికర ఓనర్ను లేదా అడ్మినిస్ట్రేటర్ను దయచేసి సంప్రదించండి. ఎర్రర్ కోడ్: <ph name="ERROR_CODE" />.</translation> <translation id="3825041664272812989">{FILE_TYPE_COUNT,plural, =1{ఈ ఫైల్ రకానికి సంబంధించి నా ఎంపికను గుర్తుంచుకోండి: <ph name="FILE_TYPES" />}other{ఈ ఫైల్ రకానికి సంబంధించి నా ఎంపికను గుర్తుంచుకోండి: <ph name="FILE_TYPES" />}}</translation> @@ -3865,7 +3867,6 @@ <translation id="4513872120116766993">సూచనాత్మక వ్రాత</translation> <translation id="4513946894732546136">ఫీడ్బ్యాక్</translation> <translation id="451407183922382411"><ph name="COMPANY_NAME" /> అందిస్తోంది</translation> -<translation id="4514610446763173167">ప్లే లేదా పాజ్ చేయడానికి వీడియోని టోగుల్ చేయండి</translation> <translation id="451515744433878153">తీసివేయండి</translation> <translation id="4515872537870654449">సేవ పొందడానికి డెల్ను సంప్రదించండి. ఫ్యాన్ పని చేయలేదంటే, ఈ డాక్ షట్ డౌన్ అవుతుంది.</translation> <translation id="4518840066030486079">Shift కీ మోడ్ స్టయిల్</translation> @@ -4052,6 +4053,7 @@ <translation id="4675828034887792601">సైట్లను సెర్చ్ చేయడానికి, మీ సెర్చ్ ఇంజిన్ను మేనేజ్ చేయడానికి షార్ట్కట్లను క్రియేట్ చేయండి</translation> <translation id="4676595058027112862">ఫోన్ హబ్, మరింత తెలుసుకోండి</translation> <translation id="4677772697204437347">GPU మెమరీ</translation> +<translation id="4678848110205818817">క్రెడిట్/డెబిట్ కార్డ్</translation> <translation id="4680105648806843642">ఈ పేజీలో ధ్వని మ్యూట్ చేయబడింది</translation> <translation id="4680112532510845139">ఇమేజ్ను ఇక్కడ డ్రాప్ చేయండి</translation> <translation id="4681453295291708042">సమీప షేరింగ్ను డిజేబుల్ చేయండి</translation>
diff --git a/chrome/app/resources/generated_resources_th.xtb b/chrome/app/resources/generated_resources_th.xtb index 3be58c4..e89e496e 100644 --- a/chrome/app/resources/generated_resources_th.xtb +++ b/chrome/app/resources/generated_resources_th.xtb
@@ -3850,7 +3850,6 @@ <translation id="4513872120116766993">การเขียนแบบช่วยคาดเดา</translation> <translation id="4513946894732546136">ข้อเสนอแนะ</translation> <translation id="451407183922382411">ขับเคลื่อนโดย <ph name="COMPANY_NAME" /></translation> -<translation id="4514610446763173167">สลับปุ่มควบคุมวิดีโอเพื่อเล่นหรือหยุดชั่วคราว</translation> <translation id="451515744433878153">นำออก</translation> <translation id="4515872537870654449">ติดต่อ Dell เพื่อส่งซ่อม แท่นชาร์จจะปิดหากพัดลมไม่ทำงาน</translation> <translation id="4518840066030486079">รูปแบบโหมดแป้น Shift</translation>
diff --git a/chrome/app/resources/generated_resources_tr.xtb b/chrome/app/resources/generated_resources_tr.xtb index 03ae425..bf1cb5c 100644 --- a/chrome/app/resources/generated_resources_tr.xtb +++ b/chrome/app/resources/generated_resources_tr.xtb
@@ -3848,7 +3848,6 @@ <translation id="4513872120116766993">Tahmine dayalı yazım</translation> <translation id="4513946894732546136">Geri Bildirim</translation> <translation id="451407183922382411"><ph name="COMPANY_NAME" /> tarafından destekleniyor</translation> -<translation id="4514610446763173167">Oynatmak veya duraklatmak için videoyu aç/kapat</translation> <translation id="451515744433878153">Kaldır</translation> <translation id="4515872537870654449">Servis için Dell ile iletişime geçin. Fan çalışmıyorsa yuva kapanır.</translation> <translation id="4518840066030486079">Üst Karakter Tuşu Mod Stili</translation>
diff --git a/chrome/app/resources/generated_resources_uk.xtb b/chrome/app/resources/generated_resources_uk.xtb index e3a57c32..7499c473 100644 --- a/chrome/app/resources/generated_resources_uk.xtb +++ b/chrome/app/resources/generated_resources_uk.xtb
@@ -3869,7 +3869,6 @@ <translation id="4513872120116766993">Передбачення тексту</translation> <translation id="4513946894732546136">Відгуки</translation> <translation id="451407183922382411">Технологія <ph name="COMPANY_NAME" /></translation> -<translation id="4514610446763173167">Відтворити або призупинити відео</translation> <translation id="451515744433878153">Видалити</translation> <translation id="4515872537870654449">Зверніться в Dell за обслуговуванням. Док-станція припинить роботу, якщо вентилятор не працює.</translation> <translation id="4518840066030486079">Стиль режиму клавіші Shift</translation>
diff --git a/chrome/app/resources/generated_resources_ur.xtb b/chrome/app/resources/generated_resources_ur.xtb index 79cdf55..3cb91651 100644 --- a/chrome/app/resources/generated_resources_ur.xtb +++ b/chrome/app/resources/generated_resources_ur.xtb
@@ -2734,6 +2734,7 @@ <translation id="3469583217479686109">انتخاب کرنے کا ٹول</translation> <translation id="3470392222765168737">سائٹ کی پیروی کریں</translation> <translation id="3471876058939596279">ویڈیو کیلئے HDMI اور USB ٹائپ سی پورٹس کا ایک ہی وقت پر استعمال نہیں کیا جا سکتا۔ کوئی مختلف ویڈیو پورٹ استعمال کریں۔</translation> +<translation id="3472469028191701821">نئے ٹیب میں کھلتا ہے</translation> <translation id="3473241910002674503">ٹیبلیٹ موڈ میں بٹنز کے ساتھ ہوم پر جائیں، واپس جائیں اور ایپس سوئچ کریں۔</translation> <translation id="3473479545200714844">اسکرین میگنیفائر</translation> <translation id="3474218480460386727">نئے الفاظ کے لیے 99 حروف یا کم استعمال کریں</translation> @@ -3121,6 +3122,7 @@ <translation id="3820749202859700794">SECG elliptic curve secp521r1 (المعروف NIST P-521)</translation> <translation id="3821074617718452587">فون ہب کی اطلاعات</translation> <translation id="3821372858277557370">{NUM_EXTENSIONS,plural, =1{ایک ایکسٹینشن کی منظوری دی گئی ہے}other{# ایکسٹینشنز کی منظوری دی گئی ہے}}</translation> +<translation id="3823019343150397277">IBAN</translation> <translation id="3823310065043511710">کم از کم <ph name="INSTALL_SIZE" /> خالی جگہ Linux کے لیے تجویز کی جاتی ہے۔</translation> <translation id="3824621460022590830">آلہ کے اندراج کا ٹوکن غلط ہے۔ براہ کرم اپنے آلہ کے مالک یا منتظم سے رابطہ کریں۔ خرابی کا کوڈ: <ph name="ERROR_CODE" />۔</translation> <translation id="3825041664272812989">{FILE_TYPE_COUNT,plural, =1{فائل کی اس قسم کے لیے میرا انتخاب یاد رکھیں: <ph name="FILE_TYPES" />}other{فائل کی ان اقسام کے لیے میرا انتخاب یاد رکھیں: <ph name="FILE_TYPES" />}}</translation> @@ -3852,7 +3854,6 @@ <translation id="4513872120116766993">لکھنے میں لفظ کی پیشین گوئی</translation> <translation id="4513946894732546136">تاثرات</translation> <translation id="451407183922382411"><ph name="COMPANY_NAME" /> کی جانب سے تقویت یافتہ</translation> -<translation id="4514610446763173167">چلانے یا روکنے کیلئے ویڈیو ٹوگل کریں</translation> <translation id="451515744433878153">ہٹائیں</translation> <translation id="4515872537870654449">سروس کیلئے Dell سے رابطہ کریں۔ پنکھے کے کام نہ کرنے کی صورت میں ڈاک بند ہو جائے گا۔</translation> <translation id="4518840066030486079">شفٹ کلید موڈ اسٹائل</translation> @@ -4039,6 +4040,7 @@ <translation id="4675828034887792601">تلاش کرنے والی سائٹس کا شارٹ کٹس بنائیں اور اپنے سرچ انجن کا نظم کریں</translation> <translation id="4676595058027112862">فون ہب، مزید جانیں</translation> <translation id="4677772697204437347">GPU میموری</translation> +<translation id="4678848110205818817">کریڈٹ/ڈیبٹ کارڈ</translation> <translation id="4680105648806843642">آواز اس صفحہ پر بند تھی</translation> <translation id="4680112532510845139">کوئی تصویر یہاں ڈراپ کریں</translation> <translation id="4681453295291708042">قریبی آلات کے ساتھ اشتراک غیر فعال کریں</translation>
diff --git a/chrome/app/resources/generated_resources_uz.xtb b/chrome/app/resources/generated_resources_uz.xtb index 48ddf2e..37cac9e5 100644 --- a/chrome/app/resources/generated_resources_uz.xtb +++ b/chrome/app/resources/generated_resources_uz.xtb
@@ -3852,7 +3852,6 @@ <translation id="4513872120116766993">Matn kiritishda takliflar</translation> <translation id="4513946894732546136">Fikr-mulohaza</translation> <translation id="451407183922382411"><ph name="COMPANY_NAME" /> asosida ishlaydi</translation> -<translation id="4514610446763173167">Videoni ijro yoki pauza qilish</translation> <translation id="451515744433878153">Olib tashlash</translation> <translation id="4515872537870654449">Yordam uchun Dell kompaniyasiga murojaat qiling. Ventilyator ishlamasa, dok avtomatik oʻchadi.</translation> <translation id="4518840066030486079">Shift tugmasi modifikatori uslubi</translation>
diff --git a/chrome/app/resources/generated_resources_vi.xtb b/chrome/app/resources/generated_resources_vi.xtb index 40c5682b..b48f1f8 100644 --- a/chrome/app/resources/generated_resources_vi.xtb +++ b/chrome/app/resources/generated_resources_vi.xtb
@@ -3866,7 +3866,6 @@ <translation id="4513872120116766993">Gợi ý khi viết</translation> <translation id="4513946894732546136">Phản hồi</translation> <translation id="451407183922382411">Do <ph name="COMPANY_NAME" /> cung cấp</translation> -<translation id="4514610446763173167">Bật/tắt video để phát hoặc tạm dừng</translation> <translation id="451515744433878153">Xóa</translation> <translation id="4515872537870654449">Hãy liên hệ với Dell để được bảo dưỡng. Đế sạc sẽ tắt nếu quạt không hoạt động.</translation> <translation id="4518840066030486079">Kiểu chế độ phím Shift</translation> @@ -4567,7 +4566,7 @@ <translation id="5177549709747445269">Bạn đang sử dụng dữ liệu di động</translation> <translation id="5178667623289523808">Tìm Trước</translation> <translation id="5181140330217080051">Đang tải xuống</translation> -<translation id="5181172023548002891">Vào Trình quản lý mật khẩu của Google cho <ph name="ACCOUNT" /></translation> +<translation id="5181172023548002891">Lưu mật khẩu của <ph name="ACCOUNT" /> vào Trình quản lý mật khẩu của Google</translation> <translation id="5184063094292164363">Bảng điều khiển &JavaScript</translation> <translation id="5184209580557088469">Phiếu có tên người dùng này đã tồn tại</translation> <translation id="5184662919967270437">Đang cập nhật thiết bị của bạn</translation>
diff --git a/chrome/app/resources/generated_resources_zh-CN.xtb b/chrome/app/resources/generated_resources_zh-CN.xtb index 8f41a9b8..c116345b 100644 --- a/chrome/app/resources/generated_resources_zh-CN.xtb +++ b/chrome/app/resources/generated_resources_zh-CN.xtb
@@ -3838,7 +3838,6 @@ <translation id="4513872120116766993">预测性撰写</translation> <translation id="4513946894732546136">反馈</translation> <translation id="451407183922382411">由 <ph name="COMPANY_NAME" /> 提供技术支持</translation> -<translation id="4514610446763173167">在播放视频和暂停视频之间切换</translation> <translation id="451515744433878153">移除</translation> <translation id="4515872537870654449">请联系戴尔以获取帮助。如果风扇停止工作，基座将会关闭。</translation> <translation id="4518840066030486079">Shift 键模式样式</translation>
diff --git a/chrome/app/resources/generated_resources_zh-HK.xtb b/chrome/app/resources/generated_resources_zh-HK.xtb index 1d6f2e7..3c9f8c5 100644 --- a/chrome/app/resources/generated_resources_zh-HK.xtb +++ b/chrome/app/resources/generated_resources_zh-HK.xtb
@@ -927,6 +927,7 @@ <translation id="1819721979226826163">輕按 [應用程式通知] > [Google Play 服務]。</translation> <translation id="1820028137326691631">輸入管理員提供的密碼</translation> <translation id="1822140782238030981">已是 Chrome 使用者嗎？請登入</translation> +<translation id="1823781806707127806">將現有的瀏覽資料加入至受管理的設定檔</translation> <translation id="18245044880483936">備份資料將不會佔用您子女的「雲端硬碟」儲存空間配額。</translation> <translation id="1825565032302550710">連接埠必須介乎 1024 和 65535 之間</translation> <translation id="182577151972096764">最近查看過的食譜</translation> @@ -1089,6 +1090,7 @@ <translation id="1963976881984600709">標準保護功能</translation> <translation id="1965624977906726414">沒有特殊權限。</translation> <translation id="1966649499058910679">突顯每個朗讀的字詞</translation> +<translation id="1967970931040389207">開啟熱點</translation> <translation id="1969654639948595766">WebRTC 文字記錄 (<ph name="WEBRTC_TEXT_LOG_COUNT" /> 項)</translation> <translation id="1972325230031091483">系統會根據您目前瀏覽的網頁主動載入內容，助您加快瀏覽速度</translation> <translation id="197288927597451399">保留</translation> @@ -1177,6 +1179,7 @@ <translation id="2048554637254265991">啟動容器管理員時發生錯誤。請再試一次。</translation> <translation id="2048653237708779538">無法執行操作</translation> <translation id="2050339315714019657">直向</translation> +<translation id="2051555741181591333">自動停用熱點</translation> <translation id="2052572566310583903">您在其他裝置上安裝的應用程式</translation> <translation id="2053105195397337973">我們正在探索方法，讓網站阻止垃圾廣告和欺詐行為，同時限制追蹤功能。</translation> <translation id="2053312383184521053">閒置狀態數據</translation> @@ -1285,6 +1288,7 @@ <translation id="2137128126782078222">唔批准接收嚟自 <ph name="WEBSITE" /> 嘅通知</translation> <translation id="2139919072249842737">設定按鈕</translation> <translation id="2140788884185208305">電池壽命</translation> +<translation id="2140902257485550046">揀嚟封鎖呢個網站上嘅所有擴充程式</translation> <translation id="2142328300403846845">以其他身分開啟連結</translation> <translation id="2142582065325732898">開啟 <ph name="LINK1_BEGIN" />Chrome 同步功能<ph name="LINK1_END" />即可查看最近開啟的 Chrome 分頁。<ph name="LINK2_BEGIN" />瞭解詳情<ph name="LINK2_END" /></translation> <translation id="2143765403545170146">在全螢幕模式下永遠顯示工具列</translation> @@ -2019,6 +2023,7 @@ <translation id="2778471504622896352">將遠端應用程式新增至 Chrome OS 啟動器</translation> <translation id="2781120507965857989">開啟同步功能後，您便可在此裝置及任何其他保持同步的位置上取得書籤、密碼、記錄等等。Google 可能會使用您的記錄，為您提供個人化的搜尋服務和其他 Google 服務。</translation> <translation id="2781692009645368755">Google Pay</translation> +<translation id="2781800772148653810">系統已允許此網站上的擴充程式</translation> <translation id="2782104745158847185">安裝 Linux 應用程式時發生錯誤</translation> <translation id="2783298271312924866">已下載</translation> <translation id="2783321960289401138">建立捷徑…</translation> @@ -3222,6 +3227,7 @@ <translation id="3898233949376129212">裝置語言</translation> <translation id="3898327728850887246"><ph name="SITE_NAME" /> 需要你批准：<ph name="FIRST_PERMISSION" />同埋<ph name="SECOND_PERMISSION" /></translation> <translation id="3898743717925399322">您已將 <ph name="WEBSITE" /> 的密碼儲存在此裝置和 Google 帳戶中。您要刪除哪一個密碼？</translation> +<translation id="3898768766145818464">播放或者暫停影片</translation> <translation id="389901847090970821">選取鍵盤</translation> <translation id="3900966090527141178">匯出密碼</translation> <translation id="3902789559055749153">選擇為 <ph name="APP_NAME" /> 建立密鑰的方式</translation> @@ -3843,6 +3849,7 @@ <translation id="449126573531210296">使用您的 Google 帳戶為已同步處理的密碼加密</translation> <translation id="449232563137139956">網站通常會顯示圖片以提供插圖，例如網上商店或新聞報導的相片</translation> <translation id="4492698018379445570">查看已加入購物車的商品，並在方便時結帳</translation> +<translation id="4493167769966437077">將<ph name="LANGUAGE_NAME" />由一律唔翻譯嘅語言移除</translation> <translation id="4493468155686877504">建議大小 (<ph name="INSTALL_SIZE" />)</translation> <translation id="4495002167047709180">要在 <ph name="SITE" /> 允許這個擴充程式嗎？</translation> <translation id="4495419450179050807">不要在這個網頁上顯示</translation> @@ -3868,7 +3875,6 @@ <translation id="4513872120116766993">預測輸入內容</translation> <translation id="4513946894732546136">意見反映</translation> <translation id="451407183922382411">由 <ph name="COMPANY_NAME" /> 提供</translation> -<translation id="4514610446763173167">喺播放同暫停影片之間切換</translation> <translation id="451515744433878153">移除</translation> <translation id="4515872537870654449">請聯絡 Dell 以取得支援服務。風扇故障時，插座會停止運作。</translation> <translation id="4518840066030486079">Shift 鍵模式樣式</translation> @@ -4415,6 +4421,7 @@ <translation id="5026874946691314267">不要再顯示這則通知</translation> <translation id="5027550639139316293">電郵憑證</translation> <translation id="5027562294707732951">新增擴充程式</translation> +<translation id="5028445315206872221">系統已封鎖此網站上的擴充程式</translation> <translation id="5029568752722684782">清除副本</translation> <translation id="5029873138381728058">無法檢查虛擬機器</translation> <translation id="503155457707535043">正在下載應用程式</translation> @@ -4978,6 +4985,7 @@ <translation id="5554866693883022680">在 <ph name="DEVICE_TYPE" /> 上選取應用程式以開啟此連結</translation> <translation id="5555363196923735206">切換相機</translation> <translation id="5555525474779371165">選取您的「安全瀏覽」功能</translation> +<translation id="5555639311269196631">關閉熱點</translation> <translation id="5556459405103347317">重新載入</translation> <translation id="5558129378926964177">放大(&I)</translation> <translation id="55601339223879446">調整顯示屏內的桌面邊界</translation> @@ -6636,6 +6644,7 @@ <translation id="7088960765736518739">按鈕控制</translation> <translation id="7089253021944603172">讓分頁恢復「使用中」狀態</translation> <translation id="7090160970140261931">您可新增其他帳戶至「<ph name="DEVICE_TYPE" />」，以便透過帳戶使用網站或 Android 應用程式。您亦可控制要透過哪個帳戶使用 Android 應用程式。</translation> +<translation id="7090714929377281710">自動關閉熱點</translation> <translation id="7093220653036489319">快速解答</translation> <translation id="7093416310351037609">為了保護資料和系統安全，您的機構要求將所有符合資格的下載項目儲存到機構的「<ph name="WEB_DRIVE" />」帳戶。</translation> <translation id="7093866338626856921">與名稱為「<ph name="HOSTNAMES" />」的裝置交換數據</translation> @@ -7256,6 +7265,7 @@ <translation id="7684718995427157417">如要建立並測試您的應用程式，請啟用「Android 偵錯橋接器」(ADB)。請注意，此操作允許安裝未經 Google 驗證的 Android 應用程式，並且需要恢復原廠設定才能停用。</translation> <translation id="7685049629764448582">JavaScript 記憶體使用量</translation> <translation id="7685087414635069102">必須提供 PIN</translation> +<translation id="7686581688229391955">揀嚟允許呢個網站上嘅擴充程式</translation> <translation id="7686938547853266130"><ph name="FRIENDLY_NAME" /> (<ph name="DEVICE_PATH" />)</translation> <translation id="7690294790491645610">確認新密碼</translation> <translation id="7690378713476594306">從清單中選擇</translation> @@ -8069,6 +8079,7 @@ <translation id="8416730306157376817"><ph name="BATTERY_PERCENTAGE" />% (充電盒)</translation> <translation id="8417548266957501132">家長密碼</translation> <translation id="8418445294933751433">顯示為分頁(&S)</translation> +<translation id="8418675848396538775">加入<ph name="LANGUAGE_NAME" /></translation> <translation id="8419098111404128271">「<ph name="SEARCH_TEXT" />」嘅搜尋結果</translation> <translation id="8420308167132684745">編輯字典條目</translation> <translation id="8421361468937925547">即時字幕 (僅支援英文)</translation> @@ -8839,6 +8850,7 @@ <translation id="9121814364785106365">在固定分頁中開啟</translation> <translation id="9123287046453017203">您的裝置不是最新版本</translation> <translation id="9124003689441359348">已儲存的密碼將會在這裡顯示</translation> +<translation id="9125910124977405374">將<ph name="LANGUAGE_NAME" />由自動翻譯嘅語言移除</translation> <translation id="9126149354162942022">游標顏色</translation> <translation id="9128317794749765148">無法完成設定</translation> <translation id="9128335130883257666">打開<ph name="INPUT_METHOD_NAME" />嘅設定頁面</translation>
diff --git a/chrome/app/resources/generated_resources_zh-TW.xtb b/chrome/app/resources/generated_resources_zh-TW.xtb index 1d59f8a..b8d31e7 100644 --- a/chrome/app/resources/generated_resources_zh-TW.xtb +++ b/chrome/app/resources/generated_resources_zh-TW.xtb
@@ -3851,7 +3851,6 @@ <translation id="4513872120116766993">預測書寫建議</translation> <translation id="4513946894732546136">意見回饋</translation> <translation id="451407183922382411">技術提供：<ph name="COMPANY_NAME" /></translation> -<translation id="4514610446763173167">在播放和暫停影片之間切換</translation> <translation id="451515744433878153">移除</translation> <translation id="4515872537870654449">請聯絡 Dell 以取得支援服務。風扇故障時，座架將會停止運作。</translation> <translation id="4518840066030486079">Shift 鍵模式樣式</translation>
diff --git a/chrome/app/resources/generated_resources_zu.xtb b/chrome/app/resources/generated_resources_zu.xtb index 47924da..55ad857 100644 --- a/chrome/app/resources/generated_resources_zu.xtb +++ b/chrome/app/resources/generated_resources_zu.xtb
@@ -1249,6 +1249,7 @@ <translation id="2105809836724866556"><ph name="MODULE_TITLE" /> okufihliwe</translation> <translation id="2108349519800154983">{COUNT,plural, =1{Inombolo yefoni}one{Izinombolo zefoni ezingu-#}other{Izinombolo zefoni ezingu-#}}</translation> <translation id="2110941575868943054">Ivunyelwe ukubheka amadivayisi e-Bluetooth</translation> +<translation id="2111158890826137380">Uxolo, kukhona okungahambanga kahle. Sicela uthumele impendulo nge-#bruschetta encazelweni. Ikhodi yephutha ithi <ph name="ERROR" /></translation> <translation id="211144231511833662">Sula Izinhlobo</translation> <translation id="2111670510994270194">Ithebhu entsha kwesokudla</translation> <translation id="2112554630428445878">Siyakwamukela, <ph name="USERNAME" /></translation> @@ -1794,6 +1795,7 @@ <translation id="2575713839157415345">{YEARS,plural, =1{Le divayisi izolondolozwa unyaka o-1 futhi ungakwazi ukuxhuma ngaphandle kwekhodi esikhathini esizayo. Lokhu kusetshwa ngumlawuli wakho.}one{Le divayisi izolondolozwa iminyaka engu-{YEARS} futhi ungakwazi ukuxhuma ngaphandle kwekhodi esikhathini esizayo. Lokhu kusetshwa ngumlawuli wakho.}other{Le divayisi izolondolozwa iminyaka engu-{YEARS} futhi ungakwazi ukuxhuma ngaphandle kwekhodi esikhathini esizayo. Lokhu kusetshwa ngumlawuli wakho.}}</translation> <translation id="257779572837908839">Setha njenge-Chromebox yemihlangano</translation> <translation id="2579309488038515659">I-hotspot inikwe amandla</translation> +<translation id="2579596474754516455">Skena imifanekiso ye-PDF ukuze uguqule umbhalo wesifundi sesikrini uma kudingekile</translation> <translation id="2580889980133367162">Vumela njalo i-<ph name="HOST" /> ukuthi ilande amafayela amaningi</translation> <translation id="258095186877893873">Yide</translation> <translation id="2582253231918033891"><ph name="PRODUCT_NAME" /> <ph name="PRODUCT_VERSION" /> (Ipulatifomu engu-<ph name="PLATFORM_VERSION" />) <ph name="DEVICE_SERIAL_NUMBER" /></translation> @@ -2894,6 +2896,7 @@ <translation id="3616113530831147358">Umsindo</translation> <translation id="3616741288025931835">Sula idatha yokudlulisa amehlo...</translation> <translation id="3617891479562106823">Ingemuva alitholakali. Zama futhi kamuva.</translation> +<translation id="3618286417582819036">Uxolo, kwenzeke iphutha</translation> <translation id="3619115746895587757">I-Cappuccino</translation> <translation id="3620136223548713675">I-geolocation</translation> <translation id="362023940451053340">Ku-akhawunti yakho ye-Google, ye-<ph name="ACCOUNT" /></translation> @@ -3863,7 +3866,6 @@ <translation id="4513872120116766993">Ukubhala kokubikezela</translation> <translation id="4513946894732546136">Impendulo</translation> <translation id="451407183922382411">Kunikwe amandla yi-<ph name="COMPANY_NAME" /></translation> -<translation id="4514610446763173167">Shintsha ividiyo ukuthi idlale noma ime kancane</translation> <translation id="451515744433878153">Susa</translation> <translation id="4515872537870654449">Xhumana ne-Dell ukuze uthole isevisi. Idokhu izovala uma ifeni ingasebenzi.</translation> <translation id="4518840066030486079">Isitayela Semodi Yokhiye We-Shift</translation> @@ -6689,6 +6691,7 @@ <translation id="7149839598364933473">Guqulela le divayisi kudivayisi ye-<ph name="DEVICE_OS" />.</translation> <translation id="7149893636342594995">Amahora angu-24 okugcina</translation> <translation id="7152478047064750137">Lesi sandiso asidingi izimvume ezibalulekile</translation> +<translation id="7153309176431047193">Guqula imifanekiso ibe umbhalo</translation> <translation id="7154130902455071009">Guqula ikhasi lakho lokuqala ulenze i-: <ph name="START_PAGE" /></translation> <translation id="7156231244155528270">Guqula umfanekiso ube umbhalo</translation> <translation id="7159953856712257647">Kufakwe ngokuzenzakalelayo</translation>
diff --git a/chrome/app/resources/google_chrome_strings_vi.xtb b/chrome/app/resources/google_chrome_strings_vi.xtb index 2b7e93f..926e201 100644 --- a/chrome/app/resources/google_chrome_strings_vi.xtb +++ b/chrome/app/resources/google_chrome_strings_vi.xtb
@@ -348,7 +348,7 @@ <translation id="7930071585467473040">Google Chrome đang cố gắng sao chép mật khẩu.</translation> <translation id="7951272445806340501">Bạn cần khởi động lại ChromeOS Flex để áp dụng bản cập nhật.</translation> <translation id="7962410387636238736">Máy tính này sẽ không còn nhận được bản cập nhật Google Chrome do Windows XP và Windows Vista không còn được hỗ trợ</translation> -<translation id="8005666035647241369">Vào Trình quản lý mật khẩu của Google trên thiết bị này</translation> +<translation id="8005666035647241369">Lưu mật khẩu vào Trình quản lý mật khẩu của Google trên thiết bị này</translation> <translation id="8008534537613507642">Cài đặt lại Chrome</translation> <translation id="8013993649590906847">Chrome sẽ cố gắng mô tả cho bạn những hình ảnh không có nội dung mô tả hữu ích. Để tạo nội dung mô tả, các hình ảnh sẽ được gửi đến Google.</translation> <translation id="80471789339884597">Cảm ơn bạn đã cài đặt. Bạn phải khởi động lại tất cả trình duyệt trước khi sử dụng <ph name="BUNDLE_NAME" />.</translation>
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc index 4b0b4452..2dd0ee24 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc
@@ -17,10 +17,10 @@ #include "ash/public/cpp/app_list/app_list_switches.h" #include "ash/public/cpp/keyboard/keyboard_switches.h" #include "base/base_switches.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/i18n/base_i18n_switches.h" #include "base/memory/singleton.h" #include "base/metrics/histogram_functions.h"
diff --git a/chrome/browser/accessibility/accessibility_extension_api_chromeos.cc b/chrome/browser/accessibility/accessibility_extension_api_chromeos.cc index c0f4ebb..e42dc045 100644 --- a/chrome/browser/accessibility/accessibility_extension_api_chromeos.cc +++ b/chrome/browser/accessibility/accessibility_extension_api_chromeos.cc
@@ -15,8 +15,8 @@ #include "ash/public/cpp/accessibility_focus_ring_info.h" #include "ash/public/cpp/event_rewriter_controller.h" #include "ash/public/cpp/window_tree_host_lookup.h" -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/json/json_writer.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/accessibility/accessibility_ui.cc b/chrome/browser/accessibility/accessibility_ui.cc index b49d7402..737959b 100644 --- a/chrome/browser/accessibility/accessibility_ui.cc +++ b/chrome/browser/accessibility/accessibility_ui.cc
@@ -9,9 +9,9 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/json/json_writer.h" #include "base/notreached.h" #include "base/strings/escape.h"
diff --git a/chrome/browser/accessibility/caption_settings_dialog_win.cc b/chrome/browser/accessibility/caption_settings_dialog_win.cc index 39709c8..3807d7cc 100644 --- a/chrome/browser/accessibility/caption_settings_dialog_win.cc +++ b/chrome/browser/accessibility/caption_settings_dialog_win.cc
@@ -7,7 +7,7 @@ #include <windows.h> #include <shellapi.h> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/thread_pool.h" namespace {
diff --git a/chrome/browser/accessibility/image_annotation_browsertest.cc b/chrome/browser/accessibility/image_annotation_browsertest.cc index 6ffda55f..3da613a 100644 --- a/chrome/browser/accessibility/image_annotation_browsertest.cc +++ b/chrome/browser/accessibility/image_annotation_browsertest.cc
@@ -4,10 +4,10 @@ #include <map> -#include "base/callback_helpers.h" #include "base/check.h" #include "base/containers/contains.h" #include "base/feature_list.h" +#include "base/functional/callback_helpers.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" #include "base/test/scoped_feature_list.h"
diff --git a/chrome/browser/accessibility/live_caption_controller_browsertest.cc b/chrome/browser/accessibility/live_caption_controller_browsertest.cc index d151305..573c076 100644 --- a/chrome/browser/accessibility/live_caption_controller_browsertest.cc +++ b/chrome/browser/accessibility/live_caption_controller_browsertest.cc
@@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/callback_forward.h" #include "base/feature_list.h" #include "base/files/file_path.h" +#include "base/functional/callback_forward.h" #include "base/ranges/ranges.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/accessibility/live_caption_speech_recognition_host.cc b/chrome/browser/accessibility/live_caption_speech_recognition_host.cc index ab03f94..9ae4d9f 100644 --- a/chrome/browser/accessibility/live_caption_speech_recognition_host.cc +++ b/chrome/browser/accessibility/live_caption_speech_recognition_host.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "build/build_config.h" #include "chrome/browser/accessibility/caption_bubble_context_browser.h" #include "chrome/browser/accessibility/live_caption_controller_factory.h"
diff --git a/chrome/browser/accessibility/soda_installer_impl.cc b/chrome/browser/accessibility/soda_installer_impl.cc index 638712b..4a3c46e9 100644 --- a/chrome/browser/accessibility/soda_installer_impl.cc +++ b/chrome/browser/accessibility/soda_installer_impl.cc
@@ -8,13 +8,13 @@ #include <string> #include <vector> -#include "base/bind.h" #include "base/check_op.h" #include "base/containers/contains.h" #include "base/containers/flat_set.h" #include "base/cxx17_backports.h" #include "base/feature_list.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "base/notreached.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/after_startup_task_utils.h b/chrome/browser/after_startup_task_utils.h index 4da640c..90dfba9745 100644 --- a/chrome/browser/after_startup_task_utils.h +++ b/chrome/browser/after_startup_task_utils.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_AFTER_STARTUP_TASK_UTILS_H_ #define CHROME_BROWSER_AFTER_STARTUP_TASK_UTILS_H_ -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/memory/ref_counted.h"
diff --git a/chrome/browser/after_startup_task_utils_unittest.cc b/chrome/browser/after_startup_task_utils_unittest.cc index 6495865..651fa17 100644 --- a/chrome/browser/after_startup_task_utils_unittest.cc +++ b/chrome/browser/after_startup_task_utils_unittest.cc
@@ -7,8 +7,8 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ref_counted.h" #include "base/run_loop.h" #include "base/task/sequenced_task_runner.h"
diff --git a/chrome/browser/android/background_sync_launcher_android.cc b/chrome/browser/android/background_sync_launcher_android.cc index 7cd4f49..937910d 100644 --- a/chrome/browser/android/background_sync_launcher_android.cc +++ b/chrome/browser/android/background_sync_launcher_android.cc
@@ -8,8 +8,8 @@ #include "base/android/callback_android.h" #include "base/barrier_closure.h" -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "chrome/android/chrome_jni_headers/BackgroundSyncBackgroundTaskScheduler_jni.h" #include "chrome/android/chrome_jni_headers/BackgroundSyncBackgroundTask_jni.h" #include "chrome/android/chrome_jni_headers/GooglePlayServicesChecker_jni.h"
diff --git a/chrome/browser/android/background_task_scheduler/proxy_native_task.cc b/chrome/browser/android/background_task_scheduler/proxy_native_task.cc index 553de5e..f8157da 100644 --- a/chrome/browser/android/background_task_scheduler/proxy_native_task.cc +++ b/chrome/browser/android/background_task_scheduler/proxy_native_task.cc
@@ -6,7 +6,7 @@ #include "base/android/callback_android.h" #include "base/android/jni_string.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/android/chrome_jni_headers/ProxyNativeTask_jni.h" #include "chrome/browser/android/background_task_scheduler/chrome_background_task_factory.h" #include "chrome/browser/android/profile_key_util.h"
diff --git a/chrome/browser/android/bookmarks/partner_bookmarks_reader.cc b/chrome/browser/android/bookmarks/partner_bookmarks_reader.cc index c3d3ee9..eb75472 100644 --- a/chrome/browser/android/bookmarks/partner_bookmarks_reader.cc +++ b/chrome/browser/android/bookmarks/partner_bookmarks_reader.cc
@@ -8,7 +8,7 @@ #include "base/android/jni_android.h" #include "base/android/jni_string.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/guid.h" #include "base/logging.h" #include "base/synchronization/waitable_event.h"
diff --git a/chrome/browser/android/bottombar/overlay_panel_content.cc b/chrome/browser/android/bottombar/overlay_panel_content.cc index 7a45df2..ae0e2c5 100644 --- a/chrome/browser/android/bottombar/overlay_panel_content.cc +++ b/chrome/browser/android/bottombar/overlay_panel_content.cc
@@ -8,8 +8,8 @@ #include <set> #include "base/android/jni_string.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/task/single_thread_task_runner.h" #include "base/time/time.h"
diff --git a/chrome/browser/android/browsing_data/browsing_data_bridge.cc b/chrome/browser/android/browsing_data/browsing_data_bridge.cc index dfab981c..99ffa82 100644 --- a/chrome/browser/android/browsing_data/browsing_data_bridge.cc +++ b/chrome/browser/android/browsing_data/browsing_data_bridge.cc
@@ -15,8 +15,8 @@ #include "base/android/jni_array.h" #include "base/android/jni_string.h" #include "base/android/jni_weak_ref.h" -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "base/trace_event/trace_event.h" #include "base/values.h"
diff --git a/chrome/browser/android/browsing_data/browsing_data_counter_bridge.cc b/chrome/browser/android/browsing_data/browsing_data_counter_bridge.cc index 766a13a..1c6c90a 100644 --- a/chrome/browser/android/browsing_data/browsing_data_counter_bridge.cc +++ b/chrome/browser/android/browsing_data/browsing_data_counter_bridge.cc
@@ -5,7 +5,7 @@ #include "chrome/browser/android/browsing_data/browsing_data_counter_bridge.h" #include "base/android/jni_string.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/trace_event/trace_event.h" #include "chrome/android/chrome_jni_headers/BrowsingDataCounterBridge_jni.h" #include "chrome/browser/browsing_data/counters/browsing_data_counter_factory.h"
diff --git a/chrome/browser/android/browsing_data/url_filter_bridge.h b/chrome/browser/android/browsing_data/url_filter_bridge.h index a596feed..06d6a65 100644 --- a/chrome/browser/android/browsing_data/url_filter_bridge.h +++ b/chrome/browser/android/browsing_data/url_filter_bridge.h
@@ -7,7 +7,7 @@ #include "base/android/jni_weak_ref.h" #include "base/android/scoped_java_ref.h" -#include "base/callback.h" +#include "base/functional/callback.h" class GURL;
diff --git a/chrome/browser/android/chrome_backup_watcher.cc b/chrome/browser/android/chrome_backup_watcher.cc index 520b28f..f8fd59f2 100644 --- a/chrome/browser/android/chrome_backup_watcher.cc +++ b/chrome/browser/android/chrome_backup_watcher.cc
@@ -3,7 +3,7 @@ // found in the LICENSE file. #include "chrome/browser/android/chrome_backup_watcher.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/android/chrome_jni_headers/ChromeBackupWatcher_jni.h" #include "chrome/browser/android/chrome_backup_agent.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/android/chrome_entry_point.cc b/chrome/browser/android/chrome_entry_point.cc index d509d70..563aa1f 100644 --- a/chrome/browser/android/chrome_entry_point.cc +++ b/chrome/browser/android/chrome_entry_point.cc
@@ -5,7 +5,7 @@ #include "base/android/jni_android.h" #include "base/android/jni_utils.h" #include "base/android/library_loader/library_loader_hooks.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/trace_event/trace_event.h" #include "chrome/android/chrome_jni_registration_generated.h" #include "chrome/app/android/chrome_jni_onload.h"
diff --git a/chrome/browser/android/chrome_entry_point_for_test.cc b/chrome/browser/android/chrome_entry_point_for_test.cc index 258aead..16e6248 100644 --- a/chrome/browser/android/chrome_entry_point_for_test.cc +++ b/chrome/browser/android/chrome_entry_point_for_test.cc
@@ -5,7 +5,7 @@ #include "base/android/jni_android.h" #include "base/android/jni_utils.h" #include "base/android/library_loader/library_loader_hooks.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/test/test_support_android.h" #include "chrome/android/chrome_jni_for_test_registration_generated.h" #include "chrome/app/android/chrome_jni_onload.h"
diff --git a/chrome/browser/android/compositor/compositor_view.cc b/chrome/browser/android/compositor/compositor_view.cc index acb473b44..cb48abd 100644 --- a/chrome/browser/android/compositor/compositor_view.cc +++ b/chrome/browser/android/compositor/compositor_view.cc
@@ -11,9 +11,9 @@ #include "base/android/build_info.h" #include "base/android/jni_android.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/containers/id_map.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "base/rand_util.h" #include "base/trace_event/trace_event.h"
diff --git a/chrome/browser/android/compositor/layer_title_cache.h b/chrome/browser/android/compositor/layer_title_cache.h index 136eb0e..213fa75 100644 --- a/chrome/browser/android/compositor/layer_title_cache.h +++ b/chrome/browser/android/compositor/layer_title_cache.h
@@ -9,8 +9,8 @@ #include "base/android/jni_android.h" #include "base/android/jni_weak_ref.h" -#include "base/bind.h" #include "base/containers/id_map.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "cc/resources/ui_resource_client.h" #include "ui/gfx/geometry/size.h"
diff --git a/chrome/browser/android/compositor/tab_content_manager.cc b/chrome/browser/android/compositor/tab_content_manager.cc index 3b3bb18..f6a75cf 100644 --- a/chrome/browser/android/compositor/tab_content_manager.cc +++ b/chrome/browser/android/compositor/tab_content_manager.cc
@@ -15,9 +15,9 @@ #include "base/android/jni_android.h" #include "base/android/jni_string.h" #include "base/android/scoped_java_ref.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/cxx17_backports.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/field_trial_params.h" #include "cc/layers/layer.h" #include "chrome/android/chrome_jni_headers/TabContentManager_jni.h"
diff --git a/chrome/browser/android/contextualsearch/contextual_search_manager.cc b/chrome/browser/android/contextualsearch/contextual_search_manager.cc index 08dc588f..235e080 100644 --- a/chrome/browser/android/contextualsearch/contextual_search_manager.cc +++ b/chrome/browser/android/contextualsearch/contextual_search_manager.cc
@@ -9,8 +9,8 @@ #include "base/android/jni_array.h" #include "base/android/jni_string.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/supports_user_data.h" #include "base/time/time.h"
diff --git a/chrome/browser/android/contextualsearch/contextual_search_tab_helper.cc b/chrome/browser/android/contextualsearch/contextual_search_tab_helper.cc index da4598c..14b7ae4a 100644 --- a/chrome/browser/android/contextualsearch/contextual_search_tab_helper.cc +++ b/chrome/browser/android/contextualsearch/contextual_search_tab_helper.cc
@@ -6,7 +6,7 @@ #include "base/android/jni_android.h" #include "base/android/jni_string.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "build/build_config.h" #include "chrome/android/chrome_jni_headers/ContextualSearchTabHelper_jni.h" #include "chrome/browser/android/contextualsearch/unhandled_tap_web_contents_observer.h"
diff --git a/chrome/browser/android/cookies/cookies_fetcher_util.cc b/chrome/browser/android/cookies/cookies_fetcher_util.cc index 892ddf43..749130a 100644 --- a/chrome/browser/android/cookies/cookies_fetcher_util.cc +++ b/chrome/browser/android/cookies/cookies_fetcher_util.cc
@@ -4,8 +4,8 @@ #include "base/android/jni_android.h" #include "base/android/jni_string.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/time/time.h" #include "chrome/browser/profiles/android/jni_headers/CookiesFetcher_jni.h" #include "chrome/browser/profiles/profile_manager.h"
diff --git a/chrome/browser/android/customtabs/custom_tabs_connection.cc b/chrome/browser/android/customtabs/custom_tabs_connection.cc index 47f4bf0..bcdefac1 100644 --- a/chrome/browser/android/customtabs/custom_tabs_connection.cc +++ b/chrome/browser/android/customtabs/custom_tabs_connection.cc
@@ -5,8 +5,8 @@ #include "base/android/jni_android.h" #include "base/android/jni_string.h" #include "base/android/scoped_java_ref.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "chrome/android/chrome_jni_headers/CustomTabsConnection_jni.h" #include "chrome/browser/android/customtabs/client_data_header_web_contents_observer.h" #include "chrome/browser/android/customtabs/detached_resource_request.h"
diff --git a/chrome/browser/android/customtabs/detached_resource_request.cc b/chrome/browser/android/customtabs/detached_resource_request.cc index 9438697..ed633131 100644 --- a/chrome/browser/android/customtabs/detached_resource_request.cc +++ b/chrome/browser/android/customtabs/detached_resource_request.cc
@@ -7,7 +7,7 @@ #include <cstdlib> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h"
diff --git a/chrome/browser/android/customtabs/detached_resource_request.h b/chrome/browser/android/customtabs/detached_resource_request.h index ab3d8e14..1f391c54 100644 --- a/chrome/browser/android/customtabs/detached_resource_request.h +++ b/chrome/browser/android/customtabs/detached_resource_request.h
@@ -9,8 +9,8 @@ #include <string> #include <vector> -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/time/time.h" #include "net/url_request/referrer_policy.h" #include "services/network/public/mojom/url_response_head.mojom-forward.h"
diff --git a/chrome/browser/android/customtabs/detached_resource_request_unittest.cc b/chrome/browser/android/customtabs/detached_resource_request_unittest.cc index 30ed969..66cb9f22 100644 --- a/chrome/browser/android/customtabs/detached_resource_request_unittest.cc +++ b/chrome/browser/android/customtabs/detached_resource_request_unittest.cc
@@ -6,8 +6,8 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/android/customtabs/tab_interaction_recorder_android.cc b/chrome/browser/android/customtabs/tab_interaction_recorder_android.cc index 43947c7..7795ffe21 100644 --- a/chrome/browser/android/customtabs/tab_interaction_recorder_android.cc +++ b/chrome/browser/android/customtabs/tab_interaction_recorder_android.cc
@@ -7,7 +7,7 @@ #include <memory> #include "base/android/jni_android.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "chrome/android/chrome_jni_headers/TabInteractionRecorder_jni.h" #include "chrome/browser/android/customtabs/custom_tab_session_state_tracker.h"
diff --git a/chrome/browser/android/customtabs/tab_interaction_recorder_android.h b/chrome/browser/android/customtabs/tab_interaction_recorder_android.h index 93fe512..633bb9e 100644 --- a/chrome/browser/android/customtabs/tab_interaction_recorder_android.h +++ b/chrome/browser/android/customtabs/tab_interaction_recorder_android.h
@@ -6,8 +6,8 @@ #define CHROME_BROWSER_ANDROID_CUSTOMTABS_TAB_INTERACTION_RECORDER_ANDROID_H_ #include "base/android/jni_android.h" -#include "base/bind.h" -#include "base/callback_forward.h" +#include "base/functional/bind.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "components/autofill/core/browser/autofill_manager.h"
diff --git a/chrome/browser/android/devtools_manager_delegate_android.cc b/chrome/browser/android/devtools_manager_delegate_android.cc index e2b1441..5251b72 100644 --- a/chrome/browser/android/devtools_manager_delegate_android.cc +++ b/chrome/browser/android/devtools_manager_delegate_android.cc
@@ -7,7 +7,7 @@ #include <map> #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/android/devtools_server.cc b/chrome/browser/android/devtools_server.cc index 7c0ad84..b16e0b04 100644 --- a/chrome/browser/android/devtools_server.cc +++ b/chrome/browser/android/devtools_server.cc
@@ -9,11 +9,11 @@ #include <utility> #include "base/android/jni_string.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" #include "base/compiler_specific.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/android/explore_sites/block_site_task.cc b/chrome/browser/android/explore_sites/block_site_task.cc index 801dd453..3c2ffc9 100644 --- a/chrome/browser/android/explore_sites/block_site_task.cc +++ b/chrome/browser/android/explore_sites/block_site_task.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/android/explore_sites/block_site_task.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "chrome/browser/android/explore_sites/explore_sites_schema.h" #include "components/offline_pages/core/offline_clock.h"
diff --git a/chrome/browser/android/explore_sites/block_site_task_unittest.cc b/chrome/browser/android/explore_sites/block_site_task_unittest.cc index 8bc154e..b421551 100644 --- a/chrome/browser/android/explore_sites/block_site_task_unittest.cc +++ b/chrome/browser/android/explore_sites/block_site_task_unittest.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/test/bind.h" #include "base/test/mock_callback.h" #include "chrome/browser/android/explore_sites/explore_sites_schema.h"
diff --git a/chrome/browser/android/explore_sites/clear_activities_task.cc b/chrome/browser/android/explore_sites/clear_activities_task.cc index 034f139c..867edb32a7 100644 --- a/chrome/browser/android/explore_sites/clear_activities_task.cc +++ b/chrome/browser/android/explore_sites/clear_activities_task.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/android/explore_sites/clear_activities_task.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/android/explore_sites/explore_sites_schema.h" #include "sql/database.h" #include "sql/statement.h"
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 d07839f..a60de43c 100644 --- a/chrome/browser/android/explore_sites/clear_activities_task_unittest.cc +++ b/chrome/browser/android/explore_sites/clear_activities_task_unittest.cc
@@ -6,7 +6,7 @@ #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/test/bind.h" #include "base/test/mock_callback.h" #include "base/time/time.h"
diff --git a/chrome/browser/android/explore_sites/clear_catalog_task.cc b/chrome/browser/android/explore_sites/clear_catalog_task.cc index a08a991..97023db 100644 --- a/chrome/browser/android/explore_sites/clear_catalog_task.cc +++ b/chrome/browser/android/explore_sites/clear_catalog_task.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/android/explore_sites/clear_catalog_task.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/android/explore_sites/explore_sites_schema.h" #include "sql/database.h" #include "sql/meta_table.h"
diff --git a/chrome/browser/android/explore_sites/clear_catalog_task_unittest.cc b/chrome/browser/android/explore_sites/clear_catalog_task_unittest.cc index b5842368..f9e7161 100644 --- a/chrome/browser/android/explore_sites/clear_catalog_task_unittest.cc +++ b/chrome/browser/android/explore_sites/clear_catalog_task_unittest.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/test/bind.h" #include "base/test/mock_callback.h" #include "chrome/browser/android/explore_sites/explore_sites_schema.h"
diff --git a/chrome/browser/android/explore_sites/explore_sites_bridge.cc b/chrome/browser/android/explore_sites/explore_sites_bridge.cc index a3ff9f9..e625a77 100644 --- a/chrome/browser/android/explore_sites/explore_sites_bridge.cc +++ b/chrome/browser/android/explore_sites/explore_sites_bridge.cc
@@ -11,7 +11,7 @@ #include "base/android/jni_android.h" #include "base/android/jni_string.h" #include "base/android/scoped_java_ref.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "chrome/browser/android/explore_sites/explore_sites_bridge.h" #include "chrome/browser/android/explore_sites/explore_sites_feature.h"
diff --git a/chrome/browser/android/explore_sites/explore_sites_fetcher.cc b/chrome/browser/android/explore_sites/explore_sites_fetcher.cc index a412be9..bc98d0a 100644 --- a/chrome/browser/android/explore_sites/explore_sites_fetcher.cc +++ b/chrome/browser/android/explore_sites/explore_sites_fetcher.cc
@@ -7,7 +7,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/ptr_util.h" #include "base/metrics/field_trial_params.h"
diff --git a/chrome/browser/android/explore_sites/explore_sites_fetcher.h b/chrome/browser/android/explore_sites/explore_sites_fetcher.h index 9ebf7650..a3fd3566 100644 --- a/chrome/browser/android/explore_sites/explore_sites_fetcher.h +++ b/chrome/browser/android/explore_sites/explore_sites_fetcher.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/android/explore_sites/explore_sites_types.h" #include "net/base/backoff_entry.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 95a9c15..9da473b 100644 --- a/chrome/browser/android/explore_sites/explore_sites_fetcher_unittest.cc +++ b/chrome/browser/android/explore_sites/explore_sites_fetcher_unittest.cc
@@ -6,7 +6,7 @@ #include <map> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/mock_callback.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 7764fe7..35cd8b8 100644 --- a/chrome/browser/android/explore_sites/explore_sites_service_impl.cc +++ b/chrome/browser/android/explore_sites/explore_sites_service_impl.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/android/explore_sites/explore_sites_service_impl.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/ptr_util.h" #include "base/metrics/field_trial_params.h"
diff --git a/chrome/browser/android/explore_sites/explore_sites_service_impl_unittest.cc b/chrome/browser/android/explore_sites/explore_sites_service_impl_unittest.cc index b5eb1cf..ba0387e 100644 --- a/chrome/browser/android/explore_sites/explore_sites_service_impl_unittest.cc +++ b/chrome/browser/android/explore_sites/explore_sites_service_impl_unittest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/android/explore_sites/explore_sites_service_impl.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/mock_entropy_provider.h"
diff --git a/chrome/browser/android/explore_sites/explore_sites_store.cc b/chrome/browser/android/explore_sites/explore_sites_store.cc index b6e7526..deaabc9 100644 --- a/chrome/browser/android/explore_sites/explore_sites_store.cc +++ b/chrome/browser/android/explore_sites/explore_sites_store.cc
@@ -6,9 +6,9 @@ #include <utility> -#include "base/bind.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/metrics/histogram_macros.h" #include "base/task/sequenced_task_runner.h"
diff --git a/chrome/browser/android/explore_sites/explore_sites_store.h b/chrome/browser/android/explore_sites/explore_sites_store.h index 9949970..0d5d6cc 100644 --- a/chrome/browser/android/explore_sites/explore_sites_store.h +++ b/chrome/browser/android/explore_sites/explore_sites_store.h
@@ -5,9 +5,9 @@ #ifndef CHROME_BROWSER_ANDROID_EXPLORE_SITES_EXPLORE_SITES_STORE_H_ #define CHROME_BROWSER_ANDROID_EXPLORE_SITES_EXPLORE_SITES_STORE_H_ -#include "base/bind.h" -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/task/sequenced_task_runner.h" #include "base/threading/thread_task_runner_handle.h" #include "components/offline_pages/task/sql_store_base.h"
diff --git a/chrome/browser/android/explore_sites/explore_sites_store_unittest.cc b/chrome/browser/android/explore_sites/explore_sites_store_unittest.cc index d37cc202..a85001c 100644 --- a/chrome/browser/android/explore_sites/explore_sites_store_unittest.cc +++ b/chrome/browser/android/explore_sites/explore_sites_store_unittest.cc
@@ -8,9 +8,9 @@ #include <memory> -#include "base/bind.h" #include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/android/explore_sites/explore_sites_types.h b/chrome/browser/android/explore_sites/explore_sites_types.h index 441965b..0f1ce6dd 100644 --- a/chrome/browser/android/explore_sites/explore_sites_types.h +++ b/chrome/browser/android/explore_sites/explore_sites_types.h
@@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "third_party/skia/include/core/SkBitmap.h" #include "url/gurl.h"
diff --git a/chrome/browser/android/explore_sites/get_catalog_task.cc b/chrome/browser/android/explore_sites/get_catalog_task.cc index 4c51b99..e159950 100644 --- a/chrome/browser/android/explore_sites/get_catalog_task.cc +++ b/chrome/browser/android/explore_sites/get_catalog_task.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/android/explore_sites/get_catalog_task.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "chrome/browser/android/explore_sites/explore_sites_schema.h" #include "sql/database.h"
diff --git a/chrome/browser/android/explore_sites/get_catalog_task_unittest.cc b/chrome/browser/android/explore_sites/get_catalog_task_unittest.cc index 22c7ead1..62e39bc 100644 --- a/chrome/browser/android/explore_sites/get_catalog_task_unittest.cc +++ b/chrome/browser/android/explore_sites/get_catalog_task_unittest.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/test/bind.h" #include "base/test/mock_callback.h" #include "chrome/browser/android/explore_sites/block_site_task.h"
diff --git a/chrome/browser/android/explore_sites/get_images_task.cc b/chrome/browser/android/explore_sites/get_images_task.cc index 8d9fe0b..a207b300 100644 --- a/chrome/browser/android/explore_sites/get_images_task.cc +++ b/chrome/browser/android/explore_sites/get_images_task.cc
@@ -6,7 +6,7 @@ #include <tuple> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "chrome/browser/android/explore_sites/explore_sites_schema.h" #include "sql/database.h"
diff --git a/chrome/browser/android/explore_sites/get_images_task_unittest.cc b/chrome/browser/android/explore_sites/get_images_task_unittest.cc index 0897c4d9..65c73e09 100644 --- a/chrome/browser/android/explore_sites/get_images_task_unittest.cc +++ b/chrome/browser/android/explore_sites/get_images_task_unittest.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/test/bind.h" #include "base/test/mock_callback.h" #include "chrome/browser/android/explore_sites/explore_sites_schema.h"
diff --git a/chrome/browser/android/explore_sites/get_version_task.cc b/chrome/browser/android/explore_sites/get_version_task.cc index cb5ec12..49891bf 100644 --- a/chrome/browser/android/explore_sites/get_version_task.cc +++ b/chrome/browser/android/explore_sites/get_version_task.cc
@@ -7,7 +7,7 @@ #include <string> #include <tuple> -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/android/explore_sites/explore_sites_schema.h" #include "sql/database.h" #include "sql/meta_table.h"
diff --git a/chrome/browser/android/explore_sites/get_version_task.h b/chrome/browser/android/explore_sites/get_version_task.h index 7617f271a2..9e3e402 100644 --- a/chrome/browser/android/explore_sites/get_version_task.h +++ b/chrome/browser/android/explore_sites/get_version_task.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_ANDROID_EXPLORE_SITES_GET_VERSION_TASK_H_ #define CHROME_BROWSER_ANDROID_EXPLORE_SITES_GET_VERSION_TASK_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/android/explore_sites/explore_sites_store.h" #include "chrome/browser/android/explore_sites/explore_sites_types.h"
diff --git a/chrome/browser/android/explore_sites/get_version_task_unittest.cc b/chrome/browser/android/explore_sites/get_version_task_unittest.cc index b2b1cf8c..f555760 100644 --- a/chrome/browser/android/explore_sites/get_version_task_unittest.cc +++ b/chrome/browser/android/explore_sites/get_version_task_unittest.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/test/bind.h" #include "base/test/mock_callback.h" #include "chrome/browser/android/explore_sites/explore_sites_schema.h"
diff --git a/chrome/browser/android/explore_sites/history_statistics_reporter.cc b/chrome/browser/android/explore_sites/history_statistics_reporter.cc index 145816c..6c2dda0 100644 --- a/chrome/browser/android/explore_sites/history_statistics_reporter.cc +++ b/chrome/browser/android/explore_sites/history_statistics_reporter.cc
@@ -6,7 +6,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "base/task/single_thread_task_runner.h" #include "base/time/time.h"
diff --git a/chrome/browser/android/explore_sites/image_helper.cc b/chrome/browser/android/explore_sites/image_helper.cc index 629e649..d3500c5 100644 --- a/chrome/browser/android/explore_sites/image_helper.cc +++ b/chrome/browser/android/explore_sites/image_helper.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/android/explore_sites/image_helper.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/metrics/histogram_macros.h"
diff --git a/chrome/browser/android/explore_sites/image_helper_unittest.cc b/chrome/browser/android/explore_sites/image_helper_unittest.cc index 201b2e5..d65abf1 100644 --- a/chrome/browser/android/explore_sites/image_helper_unittest.cc +++ b/chrome/browser/android/explore_sites/image_helper_unittest.cc
@@ -7,7 +7,7 @@ #include <memory> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/task_environment.h"
diff --git a/chrome/browser/android/explore_sites/import_catalog_task.cc b/chrome/browser/android/explore_sites/import_catalog_task.cc index dc3fb3d9..b03714f 100644 --- a/chrome/browser/android/explore_sites/import_catalog_task.cc +++ b/chrome/browser/android/explore_sites/import_catalog_task.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/android/explore_sites/import_catalog_task.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "chrome/browser/android/explore_sites/explore_sites_schema.h" #include "sql/database.h"
diff --git a/chrome/browser/android/explore_sites/import_catalog_task_unittest.cc b/chrome/browser/android/explore_sites/import_catalog_task_unittest.cc index baa35557..f8660821 100644 --- a/chrome/browser/android/explore_sites/import_catalog_task_unittest.cc +++ b/chrome/browser/android/explore_sites/import_catalog_task_unittest.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/test/bind.h" #include "base/test/mock_callback.h" #include "chrome/browser/android/explore_sites/catalog.pb.h"
diff --git a/chrome/browser/android/explore_sites/increment_shown_count_task.cc b/chrome/browser/android/explore_sites/increment_shown_count_task.cc index 48088b3..c97c9d6 100644 --- a/chrome/browser/android/explore_sites/increment_shown_count_task.cc +++ b/chrome/browser/android/explore_sites/increment_shown_count_task.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/android/explore_sites/increment_shown_count_task.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/android/explore_sites/explore_sites_schema.h" #include "sql/database.h" #include "sql/meta_table.h"
diff --git a/chrome/browser/android/explore_sites/increment_shown_count_task_unittest.cc b/chrome/browser/android/explore_sites/increment_shown_count_task_unittest.cc index 04e5d84..54ca61b 100644 --- a/chrome/browser/android/explore_sites/increment_shown_count_task_unittest.cc +++ b/chrome/browser/android/explore_sites/increment_shown_count_task_unittest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/android/explore_sites/increment_shown_count_task.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/test/bind.h" #include "chrome/browser/android/explore_sites/explore_sites_schema.h" #include "components/offline_pages/task/task.h"
diff --git a/chrome/browser/android/explore_sites/record_site_click_task.cc b/chrome/browser/android/explore_sites/record_site_click_task.cc index 64d3131..73b31e8 100644 --- a/chrome/browser/android/explore_sites/record_site_click_task.cc +++ b/chrome/browser/android/explore_sites/record_site_click_task.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/android/explore_sites/record_site_click_task.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/android/explore_sites/explore_sites_schema.h" #include "components/offline_pages/core/offline_clock.h" #include "sql/database.h"
diff --git a/chrome/browser/android/explore_sites/record_site_click_task_unittest.cc b/chrome/browser/android/explore_sites/record_site_click_task_unittest.cc index b9f6ed7..64b2fdf4 100644 --- a/chrome/browser/android/explore_sites/record_site_click_task_unittest.cc +++ b/chrome/browser/android/explore_sites/record_site_click_task_unittest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/android/explore_sites/record_site_click_task.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/test/bind.h" #include "base/test/mock_callback.h" #include "chrome/browser/android/explore_sites/explore_sites_schema.h"
diff --git a/chrome/browser/android/favicon_helper.cc b/chrome/browser/android/favicon_helper.cc index 4d3126b..c2b4e80 100644 --- a/chrome/browser/android/favicon_helper.cc +++ b/chrome/browser/android/favicon_helper.cc
@@ -14,7 +14,7 @@ #include "base/android/jni_array.h" #include "base/android/jni_string.h" #include "base/android/scoped_java_ref.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/android/feedback/connectivity_checker.cc b/chrome/browser/android/feedback/connectivity_checker.cc index bf4059e6..b05ec8d 100644 --- a/chrome/browser/android/feedback/connectivity_checker.cc +++ b/chrome/browser/android/feedback/connectivity_checker.cc
@@ -7,7 +7,7 @@ #include "base/android/jni_android.h" #include "base/android/jni_string.h" #include "base/android/scoped_java_ref.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/raw_ref.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/android/feedback/screenshot_task.cc b/chrome/browser/android/feedback/screenshot_task.cc index 4c13530ce..cd754731 100644 --- a/chrome/browser/android/feedback/screenshot_task.cc +++ b/chrome/browser/android/feedback/screenshot_task.cc
@@ -5,7 +5,7 @@ #include <stddef.h> #include "base/android/scoped_java_ref.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted_memory.h" #include "chrome/android/chrome_jni_headers/ScreenshotTask_jni.h" #include "third_party/skia/include/core/SkBitmap.h"
diff --git a/chrome/browser/android/foreign_session_helper.cc b/chrome/browser/android/foreign_session_helper.cc index b1bedfb..0bc14397 100644 --- a/chrome/browser/android/foreign_session_helper.cc +++ b/chrome/browser/android/foreign_session_helper.cc
@@ -8,7 +8,7 @@ #include <stddef.h> #include "base/android/jni_string.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/android/chrome_jni_headers/ForeignSessionHelper_jni.h" #include "chrome/browser/android/tab_android.h" #include "chrome/browser/chrome_notification_types.h"
diff --git a/chrome/browser/android/framebust_intervention/framebust_blocked_delegate_android.h b/chrome/browser/android/framebust_intervention/framebust_blocked_delegate_android.h index 720500d..576639ad 100644 --- a/chrome/browser/android/framebust_intervention/framebust_blocked_delegate_android.h +++ b/chrome/browser/android/framebust_intervention/framebust_blocked_delegate_android.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "components/messages/android/message_enums.h" #include "components/messages/android/message_wrapper.h"
diff --git a/chrome/browser/android/history/browsing_history_bridge.h b/chrome/browser/android/history/browsing_history_bridge.h index b2bb164..4da2b8c1 100644 --- a/chrome/browser/android/history/browsing_history_bridge.h +++ b/chrome/browser/android/history/browsing_history_bridge.h
@@ -9,7 +9,7 @@ #include <vector> #include "base/android/scoped_java_ref.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/history/profile_based_browsing_history_driver.h"
diff --git a/chrome/browser/android/history_report/data_observer.h b/chrome/browser/android/history_report/data_observer.h index 6b7cb788..0a03f41 100644 --- a/chrome/browser/android/history_report/data_observer.h +++ b/chrome/browser/android/history_report/data_observer.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_ANDROID_HISTORY_REPORT_DATA_OBSERVER_H_ #define CHROME_BROWSER_ANDROID_HISTORY_REPORT_DATA_OBSERVER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/scoped_observation.h" #include "base/time/time.h"
diff --git a/chrome/browser/android/history_report/data_observer_unittest.cc b/chrome/browser/android/history_report/data_observer_unittest.cc index 9fbbc5e..745239d 100644 --- a/chrome/browser/android/history_report/data_observer_unittest.cc +++ b/chrome/browser/android/history_report/data_observer_unittest.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/bind.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/time/time.h" #include "chrome/browser/android/history_report/delta_file_service.h" #include "chrome/browser/android/history_report/usage_reports_buffer_service.h"
diff --git a/chrome/browser/android/history_report/data_provider.cc b/chrome/browser/android/history_report/data_provider.cc index 6165377e..92114df 100644 --- a/chrome/browser/android/history_report/data_provider.cc +++ b/chrome/browser/android/history_report/data_provider.cc
@@ -9,7 +9,7 @@ #include <map> #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/raw_ptr.h" #include "base/synchronization/waitable_event.h"
diff --git a/chrome/browser/android/history_report/delta_file_service.cc b/chrome/browser/android/history_report/delta_file_service.cc index 9527b49..4a9166c1 100644 --- a/chrome/browser/android/history_report/delta_file_service.cc +++ b/chrome/browser/android/history_report/delta_file_service.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/android/history_report/delta_file_service.h" -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/synchronization/waitable_event.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/android/history_report/get_all_urls_from_history_task.cc b/chrome/browser/android/history_report/get_all_urls_from_history_task.cc index 63453f9b..2c9394b 100644 --- a/chrome/browser/android/history_report/get_all_urls_from_history_task.cc +++ b/chrome/browser/android/history_report/get_all_urls_from_history_task.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/android/history_report/get_all_urls_from_history_task.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "components/history/core/browser/history_backend.h" #include "components/history/core/browser/history_database.h" #include "components/history/core/browser/history_types.h"
diff --git a/chrome/browser/android/history_report/history_report_jni_bridge.cc b/chrome/browser/android/history_report/history_report_jni_bridge.cc index 78261e6..72194ce 100644 --- a/chrome/browser/android/history_report/history_report_jni_bridge.cc +++ b/chrome/browser/android/history_report/history_report_jni_bridge.cc
@@ -13,7 +13,7 @@ #include "base/android/jni_android.h" #include "base/android/jni_array.h" #include "base/android/jni_string.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/android/chrome_jni_headers/HistoryReportJniBridge_jni.h" #include "chrome/browser/android/history_report/data_observer.h" #include "chrome/browser/android/history_report/data_provider.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 5b924d2..d69e67b 100644 --- a/chrome/browser/android/history_report/usage_reports_buffer_service.cc +++ b/chrome/browser/android/history_report/usage_reports_buffer_service.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/android/history_report/usage_reports_buffer_service.h" -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/synchronization/waitable_event.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/android/httpclient/http_client.h b/chrome/browser/android/httpclient/http_client.h index bb0f56f..bcc8315e 100644 --- a/chrome/browser/android/httpclient/http_client.h +++ b/chrome/browser/android/httpclient/http_client.h
@@ -11,8 +11,8 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/containers/unique_ptr_adapters.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "net/traffic_annotation/network_traffic_annotation.h" #include "url/gurl.h"
diff --git a/chrome/browser/android/httpclient/http_client_unittest.cc b/chrome/browser/android/httpclient/http_client_unittest.cc index 7407779..1bb252e 100644 --- a/chrome/browser/android/httpclient/http_client_unittest.cc +++ b/chrome/browser/android/httpclient/http_client_unittest.cc
@@ -9,7 +9,7 @@ #include <string> #include <type_traits> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/ranges/algorithm.h" #include "base/strings/string_number_conversions.h" #include "content/public/browser/browser_task_traits.h"
diff --git a/chrome/browser/android/metrics/uma_session_stats.cc b/chrome/browser/android/metrics/uma_session_stats.cc index ded15cc..388b2527 100644 --- a/chrome/browser/android/metrics/uma_session_stats.cc +++ b/chrome/browser/android/metrics/uma_session_stats.cc
@@ -6,8 +6,8 @@ #include "base/android/jni_array.h" #include "base/android/jni_string.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h" #include "base/metrics/user_metrics.h"
diff --git a/chrome/browser/android/monochrome_entry_point.cc b/chrome/browser/android/monochrome_entry_point.cc index 222750ae..139658d 100644 --- a/chrome/browser/android/monochrome_entry_point.cc +++ b/chrome/browser/android/monochrome_entry_point.cc
@@ -6,7 +6,7 @@ #include "base/android/base_jni_onload.h" #include "base/android/jni_android.h" #include "base/android/library_loader/library_loader_hooks.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/app/android/chrome_jni_onload.h" #if defined(WEBVIEW_INCLUDES_WEBLAYER)
diff --git a/chrome/browser/android/ntp/most_visited_sites_bridge.cc b/chrome/browser/android/ntp/most_visited_sites_bridge.cc index af7f7bde..9067505e 100644 --- a/chrome/browser/android/ntp/most_visited_sites_bridge.cc +++ b/chrome/browser/android/ntp/most_visited_sites_bridge.cc
@@ -14,7 +14,7 @@ #include "base/android/jni_array.h" #include "base/android/jni_string.h" #include "base/android/scoped_java_ref.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/strings/utf_string_conversions.h" #include "chrome/android/chrome_jni_headers/MostVisitedSitesBridge_jni.h"
diff --git a/chrome/browser/android/omnibox/autocomplete_controller_android.cc b/chrome/browser/android/omnibox/autocomplete_controller_android.cc index f44ffaf56..9ff22ab9 100644 --- a/chrome/browser/android/omnibox/autocomplete_controller_android.cc +++ b/chrome/browser/android/omnibox/autocomplete_controller_android.cc
@@ -13,9 +13,9 @@ #include "base/android/jni_android.h" #include "base/android/jni_array.h" #include "base/android/jni_string.h" -#include "base/bind.h" #include "base/check.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/singleton.h" #include "base/metrics/field_trial_params.h"
diff --git a/chrome/browser/android/oom_intervention/near_oom_monitor.cc b/chrome/browser/android/oom_intervention/near_oom_monitor.cc index 021eadf..1f1eb0a 100644 --- a/chrome/browser/android/oom_intervention/near_oom_monitor.cc +++ b/chrome/browser/android/oom_intervention/near_oom_monitor.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/android/oom_intervention/near_oom_monitor.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/system/sys_info.h" #include "base/task/single_thread_task_runner.h" #include "chrome/android/chrome_jni_headers/NearOomMonitor_jni.h"
diff --git a/chrome/browser/android/oom_intervention/near_oom_monitor.h b/chrome/browser/android/oom_intervention/near_oom_monitor.h index cee1f742..e02ca18 100644 --- a/chrome/browser/android/oom_intervention/near_oom_monitor.h +++ b/chrome/browser/android/oom_intervention/near_oom_monitor.h
@@ -6,8 +6,8 @@ #define CHROME_BROWSER_ANDROID_OOM_INTERVENTION_NEAR_OOM_MONITOR_H_ #include "base/android/jni_android.h" -#include "base/callback.h" #include "base/callback_list.h" +#include "base/functional/callback.h" #include "base/process/process_metrics.h" #include "base/task/sequenced_task_runner.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/android/oom_intervention/near_oom_monitor_unittest.cc b/chrome/browser/android/oom_intervention/near_oom_monitor_unittest.cc index c7094add..6ec55c39 100644 --- a/chrome/browser/android/oom_intervention/near_oom_monitor_unittest.cc +++ b/chrome/browser/android/oom_intervention/near_oom_monitor_unittest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/android/oom_intervention/near_oom_monitor.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/sequenced_task_runner.h" #include "base/test/task_environment.h" #include "base/test/test_mock_time_task_runner.h"
diff --git a/chrome/browser/android/oom_intervention/oom_intervention_decider.cc b/chrome/browser/android/oom_intervention/oom_intervention_decider.cc index 9965ec9..b1fcec1 100644 --- a/chrome/browser/android/oom_intervention/oom_intervention_decider.cc +++ b/chrome/browser/android/oom_intervention/oom_intervention_decider.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/android/oom_intervention/oom_intervention_decider.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/android/oom_intervention/oom_intervention_tab_helper.cc b/chrome/browser/android/oom_intervention/oom_intervention_tab_helper.cc index 186a6ac2..db8d8673 100644 --- a/chrome/browser/android/oom_intervention/oom_intervention_tab_helper.cc +++ b/chrome/browser/android/oom_intervention/oom_intervention_tab_helper.cc
@@ -7,7 +7,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "chrome/browser/android/oom_intervention/oom_intervention_config.h" #include "chrome/browser/android/oom_intervention/oom_intervention_decider.h"
diff --git a/chrome/browser/android/preferences/autofill/autofill_profile_bridge.cc b/chrome/browser/android/preferences/autofill/autofill_profile_bridge.cc index 1eb29620..504a9ec 100644 --- a/chrome/browser/android/preferences/autofill/autofill_profile_bridge.cc +++ b/chrome/browser/android/preferences/autofill/autofill_profile_bridge.cc
@@ -7,7 +7,7 @@ #include "base/android/jni_android.h" #include "base/android/jni_array.h" #include "base/android/jni_string.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "chrome/android/chrome_jni_headers/AutofillProfileBridge_jni.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/android/preferences/clipboard_android.cc b/chrome/browser/android/preferences/clipboard_android.cc index 004e5a1b..fe77689 100644 --- a/chrome/browser/android/preferences/clipboard_android.cc +++ b/chrome/browser/android/preferences/clipboard_android.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/android/preferences/clipboard_android.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/time/time.h" #include "chrome/common/pref_names.h" #include "components/prefs/pref_registry_simple.h"
diff --git a/chrome/browser/android/preferences/pref_change_registrar_android.cc b/chrome/browser/android/preferences/pref_change_registrar_android.cc index 2e6632a..779b440 100644 --- a/chrome/browser/android/preferences/pref_change_registrar_android.cc +++ b/chrome/browser/android/preferences/pref_change_registrar_android.cc
@@ -6,7 +6,7 @@ #include "base/android/jni_android.h" #include "base/android/jni_string.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/preferences/jni_headers/PrefChangeRegistrar_jni.h" #include "chrome/browser/profiles/profile_manager.h"
diff --git a/chrome/browser/android/rlz/rlz_ping_handler.cc b/chrome/browser/android/rlz/rlz_ping_handler.cc index dba6650..40d4532b 100644 --- a/chrome/browser/android/rlz/rlz_ping_handler.cc +++ b/chrome/browser/android/rlz/rlz_ping_handler.cc
@@ -9,7 +9,7 @@ #include "base/android/callback_android.h" #include "base/android/jni_android.h" #include "base/android/jni_string.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/stringprintf.h" #include "chrome/android/chrome_jni_headers/RlzPingHandler_jni.h" #include "chrome/browser/profiles/profile_android.h"
diff --git a/chrome/browser/android/search_permissions/search_permissions_service.cc b/chrome/browser/android/search_permissions/search_permissions_service.cc index 07c6ddd..ba968da 100644 --- a/chrome/browser/android/search_permissions/search_permissions_service.cc +++ b/chrome/browser/android/search_permissions/search_permissions_service.cc
@@ -6,9 +6,9 @@ #include <memory> -#include "base/bind.h" -#include "base/callback.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h"
diff --git a/chrome/browser/android/search_permissions/search_permissions_service.h b/chrome/browser/android/search_permissions/search_permissions_service.h index f19325c2..0b0e72d 100644 --- a/chrome/browser/android/search_permissions/search_permissions_service.h +++ b/chrome/browser/android/search_permissions/search_permissions_service.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" #include "base/memory/singleton.h"
diff --git a/chrome/browser/android/search_permissions/search_permissions_service_unittest.cc b/chrome/browser/android/search_permissions/search_permissions_service_unittest.cc index beb44855..8ba18c22 100644 --- a/chrome/browser/android/search_permissions/search_permissions_service_unittest.cc +++ b/chrome/browser/android/search_permissions/search_permissions_service_unittest.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/strings/utf_string_conversions.h" #include "base/test/metrics/histogram_tester.h"
diff --git a/chrome/browser/android/service_tab_launcher.cc b/chrome/browser/android/service_tab_launcher.cc index 5b1210b..e54e8bb 100644 --- a/chrome/browser/android/service_tab_launcher.cc +++ b/chrome/browser/android/service_tab_launcher.cc
@@ -7,7 +7,7 @@ #include <memory> #include "base/android/jni_string.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/android/chrome_jni_headers/ServiceTabLauncher_jni.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/page_navigator.h"
diff --git a/chrome/browser/android/service_tab_launcher.h b/chrome/browser/android/service_tab_launcher.h index b275c777..daafafa1 100644 --- a/chrome/browser/android/service_tab_launcher.h +++ b/chrome/browser/android/service_tab_launcher.h
@@ -6,8 +6,8 @@ #define CHROME_BROWSER_ANDROID_SERVICE_TAB_LAUNCHER_H_ #include "base/android/jni_android.h" -#include "base/callback_forward.h" #include "base/containers/id_map.h" +#include "base/functional/callback_forward.h" #include "base/memory/singleton.h" namespace content {
diff --git a/chrome/browser/android/shortcut_helper.cc b/chrome/browser/android/shortcut_helper.cc index 99096001..4ae657cb 100644 --- a/chrome/browser/android/shortcut_helper.cc +++ b/chrome/browser/android/shortcut_helper.cc
@@ -12,7 +12,7 @@ #include "base/android/jni_android.h" #include "base/android/jni_array.h" #include "base/android/jni_string.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/guid.h" #include "chrome/android/chrome_jni_headers/ShortcutHelper_jni.h" #include "components/webapps/browser/android/shortcut_info.h"
diff --git a/chrome/browser/android/signin/signin_manager_android.cc b/chrome/browser/android/signin/signin_manager_android.cc index fd258fc..e13803c 100644 --- a/chrome/browser/android/signin/signin_manager_android.cc +++ b/chrome/browser/android/signin/signin_manager_android.cc
@@ -8,9 +8,9 @@ #include <vector> #include "base/android/jni_string.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "chrome/android/chrome_jni_headers/SigninManagerImpl_jni.h" #include "chrome/common/pref_names.h"
diff --git a/chrome/browser/android/signin/signin_manager_android_unittest.cc b/chrome/browser/android/signin/signin_manager_android_unittest.cc index 199443c..1340b86b 100644 --- a/chrome/browser/android/signin/signin_manager_android_unittest.cc +++ b/chrome/browser/android/signin/signin_manager_android_unittest.cc
@@ -7,8 +7,8 @@ #include <memory> #include <set> -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/android/survey/survey_http_client.h b/chrome/browser/android/survey/survey_http_client.h index a7996f0f..b63655c4 100644 --- a/chrome/browser/android/survey/survey_http_client.h +++ b/chrome/browser/android/survey/survey_http_client.h
@@ -11,8 +11,8 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/containers/unique_ptr_adapters.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "chrome/browser/android/survey/http_client_type.h" #include "net/traffic_annotation/network_traffic_annotation.h"
diff --git a/chrome/browser/android/survey/survey_http_client_bridge.h b/chrome/browser/android/survey/survey_http_client_bridge.h index b6961829..baa844b 100644 --- a/chrome/browser/android/survey/survey_http_client_bridge.h +++ b/chrome/browser/android/survey/survey_http_client_bridge.h
@@ -8,7 +8,7 @@ #include <jni.h> #include "base/android/scoped_java_ref.h" -#include "base/callback.h" +#include "base/functional/callback.h" namespace survey {
diff --git a/chrome/browser/android/survey/survey_http_client_unittest.cc b/chrome/browser/android/survey/survey_http_client_unittest.cc index bb99a57..aef73c4 100644 --- a/chrome/browser/android/survey/survey_http_client_unittest.cc +++ b/chrome/browser/android/survey/survey_http_client_unittest.cc
@@ -9,7 +9,7 @@ #include <string> #include <type_traits> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/ranges/algorithm.h" #include "base/strings/string_number_conversions.h" #include "base/test/metrics/histogram_tester.h"
diff --git a/chrome/browser/android/tab_android.cc b/chrome/browser/android/tab_android.cc index d7eb6f933..ad2de788 100644 --- a/chrome/browser/android/tab_android.cc +++ b/chrome/browser/android/tab_android.cc
@@ -12,7 +12,7 @@ #include "base/android/jni_android.h" #include "base/android/jni_string.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/metrics/histogram_macros.h"
diff --git a/chrome/browser/android/tab_web_contents_delegate_android.cc b/chrome/browser/android/tab_web_contents_delegate_android.cc index 5cb2d0d..4947c3f5 100644 --- a/chrome/browser/android/tab_web_contents_delegate_android.cc +++ b/chrome/browser/android/tab_web_contents_delegate_android.cc
@@ -13,8 +13,8 @@ #include "base/android/jni_android.h" #include "base/android/jni_string.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "base/rand_util.h" #include "chrome/android/chrome_jni_headers/TabWebContentsDelegateAndroidImpl_jni.h"
diff --git a/chrome/browser/android/usage_stats/notification_suspender.cc b/chrome/browser/android/usage_stats/notification_suspender.cc index 1441c12..1f6fb692 100644 --- a/chrome/browser/android/usage_stats/notification_suspender.cc +++ b/chrome/browser/android/usage_stats/notification_suspender.cc
@@ -6,8 +6,8 @@ #include "base/android/jni_array.h" #include "base/android/jni_string.h" -#include "base/callback_helpers.h" #include "base/check_op.h" +#include "base/functional/callback_helpers.h" #include "chrome/android/chrome_jni_headers/NotificationSuspender_jni.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_android.h"
diff --git a/chrome/browser/android/usage_stats/usage_stats_database.cc b/chrome/browser/android/usage_stats/usage_stats_database.cc index f7252b49..fea101f 100644 --- a/chrome/browser/android/usage_stats/usage_stats_database.cc +++ b/chrome/browser/android/usage_stats/usage_stats_database.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/strings/safe_sprintf.h" #include "base/strings/strcat.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/android/usage_stats/usage_stats_database.h b/chrome/browser/android/usage_stats/usage_stats_database.h index 0a4b9517..2ae57e8 100644 --- a/chrome/browser/android/usage_stats/usage_stats_database.h +++ b/chrome/browser/android/usage_stats/usage_stats_database.h
@@ -10,9 +10,9 @@ #include <string> #include <vector> -#include "base/callback_forward.h" #include "base/containers/flat_set.h" #include "base/containers/queue.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h" #include "components/leveldb_proto/public/proto_database.h"
diff --git a/chrome/browser/android/usage_stats/usage_stats_database_unittest.cc b/chrome/browser/android/usage_stats/usage_stats_database_unittest.cc index 95903a30..766b7bd 100644 --- a/chrome/browser/android/usage_stats/usage_stats_database_unittest.cc +++ b/chrome/browser/android/usage_stats/usage_stats_database_unittest.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/time/time.h" #include "chrome/browser/android/usage_stats/website_event.pb.h"
diff --git a/chrome/browser/android/vr/android_vsync_helper.h b/chrome/browser/android/vr/android_vsync_helper.h index bd8166e8..160be9e3 100644 --- a/chrome/browser/android/vr/android_vsync_helper.h +++ b/chrome/browser/android/vr/android_vsync_helper.h
@@ -8,7 +8,7 @@ #include <jni.h> #include "base/android/jni_weak_ref.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/time/time.h" namespace vr {
diff --git a/chrome/browser/android/vr/arcore_device/arcore_device_unittest.cc b/chrome/browser/android/vr/arcore_device/arcore_device_unittest.cc index cf5a8a6..38007a2 100644 --- a/chrome/browser/android/vr/arcore_device/arcore_device_unittest.cc +++ b/chrome/browser/android/vr/arcore_device/arcore_device_unittest.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h"
diff --git a/chrome/browser/android/vr/autocomplete_controller.cc b/chrome/browser/android/vr/autocomplete_controller.cc index 310e5f6..bd90a3a8 100644 --- a/chrome/browser/android/vr/autocomplete_controller.cc +++ b/chrome/browser/android/vr/autocomplete_controller.cc
@@ -7,7 +7,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/autocomplete/chrome_autocomplete_provider_client.h"
diff --git a/chrome/browser/android/vr/browser_renderer_factory.cc b/chrome/browser/android/vr/browser_renderer_factory.cc index 0259bcd..13d4d94 100644 --- a/chrome/browser/android/vr/browser_renderer_factory.cc +++ b/chrome/browser/android/vr/browser_renderer_factory.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/single_thread_task_runner.h" #include "chrome/browser/android/vr/cardboard_input_delegate.h" #include "chrome/browser/android/vr/gvr_input_delegate.h"
diff --git a/chrome/browser/android/vr/browser_renderer_factory.h b/chrome/browser/android/vr/browser_renderer_factory.h index 37333c9..f0111a9 100644 --- a/chrome/browser/android/vr/browser_renderer_factory.h +++ b/chrome/browser/android/vr/browser_renderer_factory.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/vr/ui_initial_state.h" #include "chrome/browser/vr/vr_export.h"
diff --git a/chrome/browser/android/vr/gvr_graphics_delegate.cc b/chrome/browser/android/vr/gvr_graphics_delegate.cc index 0de7a63..f32ee5a 100644 --- a/chrome/browser/android/vr/gvr_graphics_delegate.cc +++ b/chrome/browser/android/vr/gvr_graphics_delegate.cc
@@ -6,7 +6,7 @@ #include <algorithm> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/numerics/safe_conversions.h" #include "base/ranges/algorithm.h" #include "base/synchronization/waitable_event.h"
diff --git a/chrome/browser/android/vr/gvr_install_helper.cc b/chrome/browser/android/vr/gvr_install_helper.cc index 9e3f95f..ffeb8910 100644 --- a/chrome/browser/android/vr/gvr_install_helper.cc +++ b/chrome/browser/android/vr/gvr_install_helper.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "chrome/browser/android/vr/vr_module_provider.h" #include "chrome/browser/android/vr/vrcore_install_helper.h"
diff --git a/chrome/browser/android/vr/gvr_install_helper.h b/chrome/browser/android/vr/gvr_install_helper.h index d465ce7e..3cd63a3e 100644 --- a/chrome/browser/android/vr/gvr_install_helper.h +++ b/chrome/browser/android/vr/gvr_install_helper.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/android/vr/vr_module_provider.h" #include "chrome/browser/vr/vr_export.h"
diff --git a/chrome/browser/android/vr/gvr_keyboard_delegate.cc b/chrome/browser/android/vr/gvr_keyboard_delegate.cc index d505158e1..8f65936e 100644 --- a/chrome/browser/android/vr/gvr_keyboard_delegate.cc +++ b/chrome/browser/android/vr/gvr_keyboard_delegate.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/android/vr/gvr_keyboard_delegate.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/ptr_util.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/android/vr/gvr_keyboard_delegate.h b/chrome/browser/android/vr/gvr_keyboard_delegate.h index 0c38f5ed..ce36e4ff 100644 --- a/chrome/browser/android/vr/gvr_keyboard_delegate.h +++ b/chrome/browser/android/vr/gvr_keyboard_delegate.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/vr/keyboard_delegate.h" #include "chrome/browser/vr/keyboard_ui_interface.h"
diff --git a/chrome/browser/android/vr/gvr_scheduler_delegate.cc b/chrome/browser/android/vr/gvr_scheduler_delegate.cc index 1fc6d0f1..240be61 100644 --- a/chrome/browser/android/vr/gvr_scheduler_delegate.cc +++ b/chrome/browser/android/vr/gvr_scheduler_delegate.cc
@@ -9,7 +9,7 @@ #include <vector> #include "base/android/android_hardware_buffer_compat.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/field_trial_params.h" #include "base/threading/thread_task_runner_handle.h" #include "base/trace_event/trace_event.h"
diff --git a/chrome/browser/android/vr/test/run_all_unittests.cc b/chrome/browser/android/vr/test/run_all_unittests.cc index 561f8b1..e6abd909 100644 --- a/chrome/browser/android/vr/test/run_all_unittests.cc +++ b/chrome/browser/android/vr/test/run_all_unittests.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 "base/bind.h" +#include "base/functional/bind.h" #include "base/test/launcher/unit_test_launcher.h" #include "chrome/browser/android/vr/test/ar_test_suite.h"
diff --git a/chrome/browser/android/vr/vr_gl_thread.cc b/chrome/browser/android/vr/vr_gl_thread.cc index 13f1456..4ab0df7 100644 --- a/chrome/browser/android/vr/vr_gl_thread.cc +++ b/chrome/browser/android/vr/vr_gl_thread.cc
@@ -7,7 +7,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/version.h" #include "chrome/browser/android/vr/metrics_util_android.h" #include "chrome/browser/android/vr/ui_factory.h"
diff --git a/chrome/browser/android/vr/vr_input_connection.h b/chrome/browser/android/vr/vr_input_connection.h index 36aea46..c7cc95eb 100644 --- a/chrome/browser/android/vr/vr_input_connection.h +++ b/chrome/browser/android/vr/vr_input_connection.h
@@ -9,7 +9,7 @@ #include <queue> #include "base/android/jni_weak_ref.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/vr/platform_input_handler.h" #include "chrome/browser/vr/text_edit_action.h"
diff --git a/chrome/browser/android/vr/vr_shell.cc b/chrome/browser/android/vr/vr_shell.cc index 6fc8da73..40fc727e 100644 --- a/chrome/browser/android/vr/vr_shell.cc +++ b/chrome/browser/android/vr/vr_shell.cc
@@ -9,8 +9,8 @@ #include <utility> #include "base/android/jni_string.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "base/synchronization/waitable_event.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/android/vr/vr_shell.h b/chrome/browser/android/vr/vr_shell.h index 14684f7..5b53d6b 100644 --- a/chrome/browser/android/vr/vr_shell.h +++ b/chrome/browser/android/vr/vr_shell.h
@@ -11,8 +11,8 @@ #include <string> #include "base/android/scoped_java_ref.h" -#include "base/callback.h" #include "base/cancelable_callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/synchronization/waitable_event.h"
diff --git a/chrome/browser/android/vr/vr_shell_delegate.cc b/chrome/browser/android/vr/vr_shell_delegate.cc index cdc3da7..5326479c 100644 --- a/chrome/browser/android/vr/vr_shell_delegate.cc +++ b/chrome/browser/android/vr/vr_shell_delegate.cc
@@ -7,7 +7,7 @@ #include <utility> #include "base/android/jni_android.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/android/features/vr/split_jni_headers/VrShellDelegate_jni.h" #include "chrome/browser/android/vr/vr_shell.h" #include "chrome/browser/android/vr/vrcore_install_helper.h"
diff --git a/chrome/browser/android/vr/vr_shell_delegate.h b/chrome/browser/android/vr/vr_shell_delegate.h index 3663c5a..daf0790 100644 --- a/chrome/browser/android/vr/vr_shell_delegate.h +++ b/chrome/browser/android/vr/vr_shell_delegate.h
@@ -8,8 +8,8 @@ #include <jni.h> #include "base/android/jni_weak_ref.h" -#include "base/callback.h" #include "base/cancelable_callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "device/vr/android/gvr/gvr_delegate_provider.h" #include "device/vr/public/mojom/vr_service.mojom.h"
diff --git a/chrome/browser/android/vr/vrcore_install_helper.cc b/chrome/browser/android/vr/vrcore_install_helper.cc index 1d77735..99e8451 100644 --- a/chrome/browser/android/vr/vrcore_install_helper.cc +++ b/chrome/browser/android/vr/vrcore_install_helper.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/android/features/vr/split_jni_headers/VrCoreInstallUtils_jni.h" #include "chrome/browser/android/vr/vr_module_provider.h" #include "components/webxr/android/webxr_utils.h"
diff --git a/chrome/browser/android/vr/vrcore_install_helper.h b/chrome/browser/android/vr/vrcore_install_helper.h index 940dfd32..751c48f 100644 --- a/chrome/browser/android/vr/vrcore_install_helper.h +++ b/chrome/browser/android/vr/vrcore_install_helper.h
@@ -7,7 +7,7 @@ #include "base/android/jni_android.h" #include "base/android/scoped_java_ref.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/threading/thread_checker.h" #include "chrome/browser/vr/vr_export.h" #include "content/public/browser/xr_install_helper.h"
diff --git a/chrome/browser/android/webapk/webapk_handler_delegate.h b/chrome/browser/android/webapk/webapk_handler_delegate.h index 31ab0a3..56917a6 100644 --- a/chrome/browser/android/webapk/webapk_handler_delegate.h +++ b/chrome/browser/android/webapk/webapk_handler_delegate.h
@@ -8,7 +8,7 @@ #include <jni.h> #include "base/android/scoped_java_ref.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/android/webapk/webapk_info.h" // Delegate for retrieving installed WebAPKs for display in WebUI.
diff --git a/chrome/browser/android/webapk/webapk_install_coordinator_bridge.cc b/chrome/browser/android/webapk/webapk_install_coordinator_bridge.cc index a3a421ed..8f0dda27 100644 --- a/chrome/browser/android/webapk/webapk_install_coordinator_bridge.cc +++ b/chrome/browser/android/webapk/webapk_install_coordinator_bridge.cc
@@ -9,7 +9,7 @@ #include "base/android/jni_android.h" #include "base/android/jni_array.h" #include "base/android/jni_string.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/bind_post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_traits.h"
diff --git a/chrome/browser/android/webapk/webapk_install_coordinator_bridge.h b/chrome/browser/android/webapk/webapk_install_coordinator_bridge.h index 99236f6..7f6149d 100644 --- a/chrome/browser/android/webapk/webapk_install_coordinator_bridge.h +++ b/chrome/browser/android/webapk/webapk_install_coordinator_bridge.h
@@ -10,7 +10,7 @@ #include "base/android/jni_android.h" #include "base/android/jni_weak_ref.h" #include "base/android/scoped_java_ref.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h" #include "base/task/task_traits.h"
diff --git a/chrome/browser/android/webapk/webapk_install_service.cc b/chrome/browser/android/webapk/webapk_install_service.cc index 9116a65a..719a6bc 100644 --- a/chrome/browser/android/webapk/webapk_install_service.cc +++ b/chrome/browser/android/webapk/webapk_install_service.cc
@@ -8,9 +8,9 @@ #include "base/android/jni_android.h" #include "base/android/jni_string.h" -#include "base/bind.h" #include "base/feature_list.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "chrome/android/chrome_jni_headers/WebApkInstallService_jni.h" #include "chrome/browser/android/shortcut_helper.h"
diff --git a/chrome/browser/android/webapk/webapk_install_service.h b/chrome/browser/android/webapk/webapk_install_service.h index 928c03f..612523c7 100644 --- a/chrome/browser/android/webapk/webapk_install_service.h +++ b/chrome/browser/android/webapk/webapk_install_service.h
@@ -11,7 +11,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "components/keyed_service/core/keyed_service.h"
diff --git a/chrome/browser/android/webapk/webapk_installer.cc b/chrome/browser/android/webapk/webapk_installer.cc index 3866d80..055983a 100644 --- a/chrome/browser/android/webapk/webapk_installer.cc +++ b/chrome/browser/android/webapk/webapk_installer.cc
@@ -14,11 +14,11 @@ #include "base/android/jni_android.h" #include "base/android/jni_string.h" #include "base/android/path_utils.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/android/webapk/webapk_installer.h b/chrome/browser/android/webapk/webapk_installer.h index f1db076..fcb082f 100644 --- a/chrome/browser/android/webapk/webapk_installer.h +++ b/chrome/browser/android/webapk/webapk_installer.h
@@ -11,7 +11,7 @@ #include <string> #include "base/android/scoped_java_ref.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/timer/timer.h"
diff --git a/chrome/browser/android/webapk/webapk_installer_unittest.cc b/chrome/browser/android/webapk/webapk_installer_unittest.cc index 032c65cf..1ee51af 100644 --- a/chrome/browser/android/webapk/webapk_installer_unittest.cc +++ b/chrome/browser/android/webapk/webapk_installer_unittest.cc
@@ -8,10 +8,10 @@ #include <utility> #include "base/android/scoped_java_ref.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/run_loop.h"
diff --git a/chrome/browser/android/webapk/webapk_update_data_fetcher.cc b/chrome/browser/android/webapk/webapk_update_data_fetcher.cc index 3cdd6184..0760bb5e 100644 --- a/chrome/browser/android/webapk/webapk_update_data_fetcher.cc +++ b/chrome/browser/android/webapk/webapk_update_data_fetcher.cc
@@ -12,8 +12,8 @@ #include "base/android/build_info.h" #include "base/android/jni_array.h" #include "base/android/jni_string.h" -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "base/strings/utf_string_conversions.h" #include "chrome/android/chrome_jni_headers/WebApkUpdateDataFetcher_jni.h"
diff --git a/chrome/browser/android/webapk/webapk_update_manager.cc b/chrome/browser/android/webapk/webapk_update_manager.cc index e5ee1523..8a8b227 100644 --- a/chrome/browser/android/webapk/webapk_update_manager.cc +++ b/chrome/browser/android/webapk/webapk_update_manager.cc
@@ -12,8 +12,8 @@ #include "base/android/jni_array.h" #include "base/android/jni_string.h" #include "base/android/scoped_java_ref.h" -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/metrics/field_trial_params.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/android/webapps/webapp_registry.h b/chrome/browser/android/webapps/webapp_registry.h index feba082..56dcef5 100644 --- a/chrome/browser/android/webapps/webapp_registry.h +++ b/chrome/browser/android/webapps/webapp_registry.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_ANDROID_WEBAPPS_WEBAPP_REGISTRY_H_ #define CHROME_BROWSER_ANDROID_WEBAPPS_WEBAPP_REGISTRY_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" class GURL;
diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm index 412920d..c88da9c 100644 --- a/chrome/browser/app_controller_mac.mm +++ b/chrome/browser/app_controller_mac.mm
@@ -13,10 +13,10 @@ #include <vector> #include "base/auto_reset.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/debug/dump_without_crashing.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/mac/foundation_util.h" #include "base/mac/mac_util.h" #include "base/metrics/histogram_macros.h"
diff --git a/chrome/browser/app_controller_mac_browsertest.mm b/chrome/browser/app_controller_mac_browsertest.mm index aae0aa2..06012f7f 100644 --- a/chrome/browser/app_controller_mac_browsertest.mm +++ b/chrome/browser/app_controller_mac_browsertest.mm
@@ -11,9 +11,9 @@ #include <string> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/mac/foundation_util.h" #include "base/mac/scoped_nsobject.h" #include "base/mac/scoped_objc_class_swizzler.h"
diff --git a/chrome/browser/app_controller_mac_unittest.mm b/chrome/browser/app_controller_mac_unittest.mm index cb0a786..46d83d39 100644 --- a/chrome/browser/app_controller_mac_unittest.mm +++ b/chrome/browser/app_controller_mac_unittest.mm
@@ -6,8 +6,8 @@ #import <Cocoa/Cocoa.h> -#include "base/callback_helpers.h" #include "base/files/file_path.h" +#include "base/functional/callback_helpers.h" #include "base/mac/scoped_nsobject.h" #include "base/mac/scoped_objc_class_swizzler.h" #include "base/run_loop.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 164fddf..c2cf0aef 100644 --- a/chrome/browser/apps/app_discovery_service/app_discovery_util.h +++ b/chrome/browser/apps/app_discovery_service/app_discovery_util.h
@@ -7,8 +7,8 @@ #include <vector> -#include "base/callback.h" #include "base/callback_list.h" +#include "base/functional/callback.h" #include "chrome/browser/apps/app_discovery_service/result.h" namespace gfx {
diff --git a/chrome/browser/apps/app_preload_service/app_preload_server_connector.cc b/chrome/browser/apps/app_preload_service/app_preload_server_connector.cc index e03c38f..f5b50d2 100644 --- a/chrome/browser/apps/app_preload_service/app_preload_server_connector.cc +++ b/chrome/browser/apps/app_preload_service/app_preload_server_connector.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/apps/app_preload_service/app_preload_server_connector.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/strings/strcat.h" #include "base/values.h" #include "chrome/browser/apps/app_preload_service/almanac_api_util.h"
diff --git a/chrome/browser/apps/app_preload_service/app_preload_server_connector.h b/chrome/browser/apps/app_preload_service/app_preload_server_connector.h index 64e44bd..a369a2f7 100644 --- a/chrome/browser/apps/app_preload_service/app_preload_server_connector.h +++ b/chrome/browser/apps/app_preload_service/app_preload_server_connector.h
@@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "services/network/public/cpp/shared_url_loader_factory.h"
diff --git a/chrome/browser/apps/app_preload_service/device_info_manager.cc b/chrome/browser/apps/app_preload_service/device_info_manager.cc index 63a0ab0..7779a2c 100644 --- a/chrome/browser/apps/app_preload_service/device_info_manager.cc +++ b/chrome/browser/apps/app_preload_service/device_info_manager.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/apps/app_preload_service/device_info_manager.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "chrome/browser/apps/user_type_filter.h"
diff --git a/chrome/browser/apps/app_preload_service/device_info_manager.h b/chrome/browser/apps/app_preload_service/device_info_manager.h index 7a73ab5..d3dcc4a 100644 --- a/chrome/browser/apps/app_preload_service/device_info_manager.h +++ b/chrome/browser/apps/app_preload_service/device_info_manager.h
@@ -8,7 +8,7 @@ #include <ostream> #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/system/sys_info.h"
diff --git a/chrome/browser/apps/app_preload_service/device_info_manager_unittest.cc b/chrome/browser/apps/app_preload_service/device_info_manager_unittest.cc index 1dc4baf..50d91fe 100644 --- a/chrome/browser/apps/app_preload_service/device_info_manager_unittest.cc +++ b/chrome/browser/apps/app_preload_service/device_info_manager_unittest.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/run_loop.h" #include "chrome/common/channel_info.h" #include "chrome/test/base/testing_profile.h"
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 f1f154bb0..2182cbc 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
@@ -7,10 +7,10 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "base/metrics/histogram_functions.h" #include "base/no_destructor.h"
diff --git a/chrome/browser/apps/app_service/app_icon/app_icon_factory.h b/chrome/browser/apps/app_service/app_icon/app_icon_factory.h index 7dbbbb2..fdb1920 100644 --- a/chrome/browser/apps/app_service/app_icon/app_icon_factory.h +++ b/chrome/browser/apps/app_service/app_icon/app_icon_factory.h
@@ -9,8 +9,8 @@ #include <string> #include <vector> -#include "base/callback_forward.h" #include "base/files/file_path.h" +#include "base/functional/callback_forward.h" #include "build/chromeos_buildflags.h" #include "chrome/browser/apps/app_service/app_icon/app_icon_util.h" #include "chrome/browser/web_applications/web_app_install_info.h"
diff --git a/chrome/browser/apps/app_service/app_icon/app_icon_factory_unittest.cc b/chrome/browser/apps/app_service/app_icon/app_icon_factory_unittest.cc index 6573a087..c26273a 100644 --- a/chrome/browser/apps/app_service/app_icon/app_icon_factory_unittest.cc +++ b/chrome/browser/apps/app_service/app_icon/app_icon_factory_unittest.cc
@@ -6,12 +6,12 @@ #include <vector> #include "base/barrier_callback.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/containers/contains.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/path_service.h" #include "base/run_loop.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 ffe09606..413cdf2 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
@@ -7,11 +7,11 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/containers/contains.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "base/no_destructor.h" #include "base/notreached.h"
diff --git a/chrome/browser/apps/app_service/app_icon/app_icon_loader.h b/chrome/browser/apps/app_service/app_icon/app_icon_loader.h index bd56fbfea..185eff9 100644 --- a/chrome/browser/apps/app_service/app_icon/app_icon_loader.h +++ b/chrome/browser/apps/app_service/app_icon/app_icon_loader.h
@@ -10,8 +10,8 @@ #include <utility> #include <vector> -#include "base/callback_forward.h" #include "base/files/file_path.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/task/cancelable_task_tracker.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/apps/app_service/app_icon/app_icon_source.cc b/chrome/browser/apps/app_service/app_icon/app_icon_source.cc index 11bddda..f942ab4 100644 --- a/chrome/browser/apps/app_service/app_icon/app_icon_source.cc +++ b/chrome/browser/apps/app_service/app_icon/app_icon_source.cc
@@ -6,8 +6,8 @@ #include <string> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted_memory.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h"
diff --git a/chrome/browser/apps/app_service/app_icon/app_icon_test_util.cc b/chrome/browser/apps/app_service/app_icon/app_icon_test_util.cc index e9207e5..015c450 100644 --- a/chrome/browser/apps/app_service/app_icon/app_icon_test_util.cc +++ b/chrome/browser/apps/app_service/app_icon/app_icon_test_util.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/apps/app_service/app_icon/app_icon_test_util.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/run_loop.h" #include "chrome/browser/apps/app_service/app_icon/app_icon_factory.h" #include "extensions/grit/extensions_browser_resources.h"
diff --git a/chrome/browser/apps/app_service/app_icon/arc_activity_adaptive_icon_impl.cc b/chrome/browser/apps/app_service/app_icon/arc_activity_adaptive_icon_impl.cc index a494f25..e381f49 100644 --- a/chrome/browser/apps/app_service/app_icon/arc_activity_adaptive_icon_impl.cc +++ b/chrome/browser/apps/app_service/app_icon/arc_activity_adaptive_icon_impl.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/apps/app_service/app_icon/app_icon_factory.h" #include "components/arc/common/intent_helper/adaptive_icon_delegate.h"
diff --git a/chrome/browser/apps/app_service/app_icon/arc_icon_once_loader.h b/chrome/browser/apps/app_service/app_icon/arc_icon_once_loader.h index 59a5cac..b83bc1c 100644 --- a/chrome/browser/apps/app_service/app_icon/arc_icon_once_loader.h +++ b/chrome/browser/apps/app_service/app_icon/arc_icon_once_loader.h
@@ -11,7 +11,7 @@ #include <string> #include <utility> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "chrome/browser/ash/app_list/arc/arc_app_icon_descriptor.h" #include "chrome/browser/ash/app_list/arc/arc_app_icon_factory.h" #include "chrome/browser/ash/app_list/arc/arc_app_list_prefs.h"
diff --git a/chrome/browser/apps/app_service/app_icon/web_app_icon_unittest.cc b/chrome/browser/apps/app_service/app_icon/web_app_icon_unittest.cc index f55ebc2e..5d17c5a 100644 --- a/chrome/browser/apps/app_service/app_icon/web_app_icon_unittest.cc +++ b/chrome/browser/apps/app_service/app_icon/web_app_icon_unittest.cc
@@ -7,12 +7,12 @@ #include <vector> #include "base/barrier_callback.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/containers/contains.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/path_service.h" #include "base/run_loop.h"
diff --git a/chrome/browser/apps/app_service/app_service_proxy_ash.cc b/chrome/browser/apps/app_service/app_service_proxy_ash.cc index 72bce5b3..466c485 100644 --- a/chrome/browser/apps/app_service/app_service_proxy_ash.cc +++ b/chrome/browser/apps/app_service/app_service_proxy_ash.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/task/single_thread_task_runner.h" #include "chrome/browser/apps/app_service/app_icon/app_icon_factory.h" #include "chrome/browser/apps/app_service/app_icon/app_icon_util.h"
diff --git a/chrome/browser/apps/app_service/app_service_proxy_ash.h b/chrome/browser/apps/app_service/app_service_proxy_ash.h index be24bc4d..e0f8cb9 100644 --- a/chrome/browser/apps/app_service/app_service_proxy_ash.h +++ b/chrome/browser/apps/app_service/app_service_proxy_ash.h
@@ -9,9 +9,9 @@ #include <memory> #include <string> -#include "base/callback.h" #include "base/containers/flat_map.h" #include "base/containers/unique_ptr_adapters.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/scoped_observation.h" #include "chrome/browser/apps/app_service/app_icon/app_icon_reader.h"
diff --git a/chrome/browser/apps/app_service/app_service_proxy_lacros.cc b/chrome/browser/apps/app_service/app_service_proxy_lacros.cc index 6359409..00191ac 100644 --- a/chrome/browser/apps/app_service/app_service_proxy_lacros.cc +++ b/chrome/browser/apps/app_service/app_service_proxy_lacros.cc
@@ -6,11 +6,10 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/contains.h" #include "base/debug/dump_without_crashing.h" #include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/notreached.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/apps/app_service/app_service_proxy_lacros.h b/chrome/browser/apps/app_service/app_service_proxy_lacros.h index 25ac687b..1c549257 100644 --- a/chrome/browser/apps/app_service/app_service_proxy_lacros.h +++ b/chrome/browser/apps/app_service/app_service_proxy_lacros.h
@@ -9,8 +9,8 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/containers/unique_ptr_adapters.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/apps/app_service/app_service_proxy_unittest.cc b/chrome/browser/apps/app_service/app_service_proxy_unittest.cc index ab1bfdf..bd9a191f 100644 --- a/chrome/browser/apps/app_service/app_service_proxy_unittest.cc +++ b/chrome/browser/apps/app_service/app_service_proxy_unittest.cc
@@ -6,7 +6,7 @@ #include <utility> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/test/scoped_feature_list.h"
diff --git a/chrome/browser/apps/app_service/browser_app_instance_registry.h b/chrome/browser/apps/app_service/browser_app_instance_registry.h index 4c4b7c91..1df2110 100644 --- a/chrome/browser/apps/app_service/browser_app_instance_registry.h +++ b/chrome/browser/apps/app_service/browser_app_instance_registry.h
@@ -11,8 +11,8 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/callback_list.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" #include "base/scoped_multi_source_observation.h"
diff --git a/chrome/browser/apps/app_service/browser_app_launcher.h b/chrome/browser/apps/app_service/browser_app_launcher.h index f83c6e8..d5329b0 100644 --- a/chrome/browser/apps/app_service/browser_app_launcher.h +++ b/chrome/browser/apps/app_service/browser_app_launcher.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_APPS_APP_SERVICE_BROWSER_APP_LAUNCHER_H_ #define CHROME_BROWSER_APPS_APP_SERVICE_BROWSER_APP_LAUNCHER_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "build/chromeos_buildflags.h" #include "chrome/browser/apps/app_service/app_launch_params.h"
diff --git a/chrome/browser/apps/app_service/launch_result_type.h b/chrome/browser/apps/app_service/launch_result_type.h index 292dc01..17e0873c 100644 --- a/chrome/browser/apps/app_service/launch_result_type.h +++ b/chrome/browser/apps/app_service/launch_result_type.h
@@ -7,7 +7,7 @@ #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/unguessable_token.h" #include "build/build_config.h"
diff --git a/chrome/browser/apps/app_service/publishers/arc_apps.cc b/chrome/browser/apps/app_service/publishers/arc_apps.cc index 2849776..e22a442 100644 --- a/chrome/browser/apps/app_service/publishers/arc_apps.cc +++ b/chrome/browser/apps/app_service/publishers/arc_apps.cc
@@ -17,12 +17,12 @@ #include "ash/components/arc/session/arc_bridge_service.h" #include "ash/components/arc/session/arc_service_manager.h" #include "ash/public/cpp/app_menu_constants.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/contains.h" #include "base/containers/flat_map.h" #include "base/feature_list.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/histogram_macros.h" #include "chrome/browser/apps/app_service/app_icon/dip_px_util.h" #include "chrome/browser/apps/app_service/app_launch_params.h"
diff --git a/chrome/browser/apps/app_service/publishers/arc_apps.h b/chrome/browser/apps/app_service/publishers/arc_apps.h index 240f41d..3bec817 100644 --- a/chrome/browser/apps/app_service/publishers/arc_apps.h +++ b/chrome/browser/apps/app_service/publishers/arc_apps.h
@@ -16,8 +16,8 @@ #include "ash/components/arc/mojom/privacy_items.mojom.h" #include "ash/public/cpp/message_center/arc_notification_manager_base.h" #include "ash/public/cpp/message_center/arc_notifications_host_initializer.h" -#include "base/callback.h" #include "base/containers/flat_set.h" +#include "base/functional/callback.h" #include "base/gtest_prod_util.h" #include "base/memory/weak_ptr.h" #include "base/scoped_observation.h"
diff --git a/chrome/browser/apps/app_service/publishers/arc_apps_unittest.cc b/chrome/browser/apps/app_service/publishers/arc_apps_unittest.cc index 6229bea..6a19da72 100644 --- a/chrome/browser/apps/app_service/publishers/arc_apps_unittest.cc +++ b/chrome/browser/apps/app_service/publishers/arc_apps_unittest.cc
@@ -11,7 +11,7 @@ #include "ash/components/arc/test/connection_holder_util.h" #include "ash/components/arc/test/fake_app_instance.h" #include "ash/components/arc/test/fake_file_system_instance.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/strings/string_util.h" #include "base/test/bind.h" #include "base/test/scoped_feature_list.h"
diff --git a/chrome/browser/apps/app_service/publishers/borealis_apps.cc b/chrome/browser/apps/app_service/publishers/borealis_apps.cc index 9fb93e8..ccb08f7 100644 --- a/chrome/browser/apps/app_service/publishers/borealis_apps.cc +++ b/chrome/browser/apps/app_service/publishers/borealis_apps.cc
@@ -5,8 +5,8 @@ #include "chrome/browser/apps/app_service/publishers/borealis_apps.h" #include "ash/public/cpp/app_menu_constants.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "chrome/browser/apps/app_service/app_icon/app_icon_factory.h" #include "chrome/browser/apps/app_service/app_launch_params.h" #include "chrome/browser/apps/app_service/app_service_proxy.h"
diff --git a/chrome/browser/apps/app_service/publishers/extension_apps_base.cc b/chrome/browser/apps/app_service/publishers/extension_apps_base.cc index 0643369e..052a22c8 100644 --- a/chrome/browser/apps/app_service/publishers/extension_apps_base.cc +++ b/chrome/browser/apps/app_service/publishers/extension_apps_base.cc
@@ -10,7 +10,7 @@ #include "ash/public/cpp/app_list/app_list_metrics.h" #include "ash/public/cpp/shelf_types.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/metrics/histogram_macros.h" #include "base/one_shot_event.h" #include "base/scoped_observation.h"
diff --git a/chrome/browser/apps/app_service/publishers/extension_apps_chromeos.cc b/chrome/browser/apps/app_service/publishers/extension_apps_chromeos.cc index 397fb47..d2ab3b5c 100644 --- a/chrome/browser/apps/app_service/publishers/extension_apps_chromeos.cc +++ b/chrome/browser/apps/app_service/publishers/extension_apps_chromeos.cc
@@ -15,11 +15,11 @@ #include "ash/public/cpp/app_menu_constants.h" #include "ash/public/cpp/multi_user_window_manager.h" #include "ash/public/cpp/shelf_types.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/containers/contains.h" #include "base/containers/extend.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/metrics/histogram_macros.h" #include "base/scoped_observation.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/apps/app_service/publishers/extension_apps_enable_flow.h b/chrome/browser/apps/app_service/publishers/extension_apps_enable_flow.h index e009bec..5e8ed7f9 100644 --- a/chrome/browser/apps/app_service/publishers/extension_apps_enable_flow.h +++ b/chrome/browser/apps/app_service/publishers/extension_apps_enable_flow.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/ui/extensions/extension_enable_flow_delegate.h"
diff --git a/chrome/browser/apps/app_service/publishers/plugin_vm_apps.cc b/chrome/browser/apps/app_service/publishers/plugin_vm_apps.cc index cacf3232..5367eef 100644 --- a/chrome/browser/apps/app_service/publishers/plugin_vm_apps.cc +++ b/chrome/browser/apps/app_service/publishers/plugin_vm_apps.cc
@@ -8,8 +8,8 @@ #include <vector> #include "ash/public/cpp/app_menu_constants.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/user_metrics.h" #include "base/time/time.h" #include "chrome/browser/apps/app_service/app_icon/app_icon_factory.h"
diff --git a/chrome/browser/apps/app_service/publishers/remote_apps.cc b/chrome/browser/apps/app_service/publishers/remote_apps.cc index d3570ba0..10063c8 100644 --- a/chrome/browser/apps/app_service/publishers/remote_apps.cc +++ b/chrome/browser/apps/app_service/publishers/remote_apps.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/apps/app_service/app_icon/app_icon_factory.h" #include "chrome/browser/apps/app_service/app_launch_params.h" #include "chrome/browser/apps/app_service/app_service_proxy.h"
diff --git a/chrome/browser/apps/app_service/publishers/standalone_browser_apps.cc b/chrome/browser/apps/app_service/publishers/standalone_browser_apps.cc index c53f58d..ac9c61a8 100644 --- a/chrome/browser/apps/app_service/publishers/standalone_browser_apps.cc +++ b/chrome/browser/apps/app_service/publishers/standalone_browser_apps.cc
@@ -7,7 +7,7 @@ #include <utility> #include "ash/public/cpp/app_menu_constants.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "build/branding_buildflags.h" #include "chrome/browser/apps/app_service/app_icon/app_icon_factory.h" #include "chrome/browser/apps/app_service/app_launch_params.h"
diff --git a/chrome/browser/apps/app_service/publishers/standalone_browser_extension_apps.cc b/chrome/browser/apps/app_service/publishers/standalone_browser_extension_apps.cc index d66ebde..1140704 100644 --- a/chrome/browser/apps/app_service/publishers/standalone_browser_extension_apps.cc +++ b/chrome/browser/apps/app_service/publishers/standalone_browser_extension_apps.cc
@@ -7,9 +7,9 @@ #include <utility> #include "ash/public/cpp/app_menu_constants.h" -#include "base/callback_helpers.h" #include "base/check.h" #include "base/feature_list.h" +#include "base/functional/callback_helpers.h" #include "chrome/browser/apps/app_service/app_icon/app_icon_factory.h" #include "chrome/browser/apps/app_service/app_launch_params.h" #include "chrome/browser/apps/app_service/app_service_proxy.h"
diff --git a/chrome/browser/apps/app_service/publishers/web_apps_crosapi.cc b/chrome/browser/apps/app_service/publishers/web_apps_crosapi.cc index 568f38d..851ecd6 100644 --- a/chrome/browser/apps/app_service/publishers/web_apps_crosapi.cc +++ b/chrome/browser/apps/app_service/publishers/web_apps_crosapi.cc
@@ -9,8 +9,8 @@ #include <vector> #include "ash/public/cpp/app_menu_constants.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/logging.h" #include "chrome/browser/apps/app_service/app_launch_params.h"
diff --git a/chrome/browser/apps/app_service/subscriber_crosapi.cc b/chrome/browser/apps/app_service/subscriber_crosapi.cc index e387621..593a6f3 100644 --- a/chrome/browser/apps/app_service/subscriber_crosapi.cc +++ b/chrome/browser/apps/app_service/subscriber_crosapi.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/notreached.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/apps/app_service/uninstall_dialog.h b/chrome/browser/apps/app_service/uninstall_dialog.h index 54aa6543..5a58c0b4 100644 --- a/chrome/browser/apps/app_service/uninstall_dialog.h +++ b/chrome/browser/apps/app_service/uninstall_dialog.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "components/services/app_service/public/cpp/app_types.h"
diff --git a/chrome/browser/apps/app_service/webapk/webapk_install_queue.cc b/chrome/browser/apps/app_service/webapk/webapk_install_queue.cc index a8d3c83..382b091 100644 --- a/chrome/browser/apps/app_service/webapk/webapk_install_queue.cc +++ b/chrome/browser/apps/app_service/webapk/webapk_install_queue.cc
@@ -9,7 +9,7 @@ #include "ash/components/arc/mojom/webapk.mojom.h" #include "ash/components/arc/session/arc_bridge_service.h" #include "ash/components/arc/session/arc_service_manager.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/apps/app_service/webapk/webapk_install_task.cc b/chrome/browser/apps/app_service/webapk/webapk_install_task.cc index ae4e319..1a0722a 100644 --- a/chrome/browser/apps/app_service/webapk/webapk_install_task.cc +++ b/chrome/browser/apps/app_service/webapk/webapk_install_task.cc
@@ -9,8 +9,8 @@ #include "ash/components/arc/mojom/webapk.mojom.h" #include "ash/components/arc/session/arc_bridge_service.h" #include "ash/components/arc/session/arc_service_manager.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/metrics/histogram_functions.h"
diff --git a/chrome/browser/apps/app_service/webapk/webapk_install_task.h b/chrome/browser/apps/app_service/webapk/webapk_install_task.h index e4c46c4..b13450d 100644 --- a/chrome/browser/apps/app_service/webapk/webapk_install_task.h +++ b/chrome/browser/apps/app_service/webapk/webapk_install_task.h
@@ -11,7 +11,7 @@ #include "ash/components/arc/arc_features_parser.h" #include "ash/components/arc/mojom/webapk.mojom.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h" #include "base/timer/timer.h"
diff --git a/chrome/browser/apps/app_service/webapk/webapk_install_task_unittest.cc b/chrome/browser/apps/app_service/webapk/webapk_install_task_unittest.cc index e7bd329..94b9301 100644 --- a/chrome/browser/apps/app_service/webapk/webapk_install_task_unittest.cc +++ b/chrome/browser/apps/app_service/webapk/webapk_install_task_unittest.cc
@@ -11,8 +11,8 @@ #include "ash/components/arc/session/arc_service_manager.h" #include "ash/components/arc/test/fake_webapk_instance.h" #include "ash/constants/ash_features.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "chrome/browser/apps/app_service/app_service_test.h"
diff --git a/chrome/browser/apps/app_service/webapk/webapk_manager.cc b/chrome/browser/apps/app_service/webapk/webapk_manager.cc index 068cb4d..60b892c8 100644 --- a/chrome/browser/apps/app_service/webapk/webapk_manager.cc +++ b/chrome/browser/apps/app_service/webapk/webapk_manager.cc
@@ -6,9 +6,9 @@ #include "ash/components/arc/mojom/app.mojom.h" #include "ash/components/arc/session/connection_holder.h" -#include "base/bind.h" #include "base/check.h" #include "base/containers/flat_set.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/metrics/histogram_functions.h" #include "base/strings/string_util.h"
diff --git a/chrome/browser/apps/app_service/webapk/webapk_policy_browsertest.cc b/chrome/browser/apps/app_service/webapk/webapk_policy_browsertest.cc index 124defa..e3e26ed 100644 --- a/chrome/browser/apps/app_service/webapk/webapk_policy_browsertest.cc +++ b/chrome/browser/apps/app_service/webapk/webapk_policy_browsertest.cc
@@ -10,7 +10,7 @@ #include "ash/components/arc/test/arc_util_test_support.h" #include "ash/components/arc/test/fake_webapk_instance.h" #include "ash/constants/ash_features.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/test/bind.h" #include "chrome/browser/apps/app_service/webapk/webapk_prefs.h" #include "chrome/browser/apps/app_service/webapk/webapk_test_server.h"
diff --git a/chrome/browser/apps/app_service/webapk/webapk_test_server.cc b/chrome/browser/apps/app_service/webapk/webapk_test_server.cc index 2dec873..d969348 100644 --- a/chrome/browser/apps/app_service/webapk/webapk_test_server.cc +++ b/chrome/browser/apps/app_service/webapk/webapk_test_server.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/apps/app_service/webapk/webapk_test_server.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "chrome/common/chrome_switches.h" namespace {
diff --git a/chrome/browser/apps/app_service/webapk/webapk_test_server.h b/chrome/browser/apps/app_service/webapk/webapk_test_server.h index 0d72cb2..55caa4e 100644 --- a/chrome/browser/apps/app_service/webapk/webapk_test_server.h +++ b/chrome/browser/apps/app_service/webapk/webapk_test_server.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "components/webapk/webapk.pb.h" #include "net/test/embedded_test_server/embedded_test_server.h" #include "net/test/embedded_test_server/http_request.h"
diff --git a/chrome/browser/apps/app_service/webapk/webapk_utils.h b/chrome/browser/apps/app_service/webapk/webapk_utils.h index db10c3c..8f1e20e1 100644 --- a/chrome/browser/apps/app_service/webapk/webapk_utils.h +++ b/chrome/browser/apps/app_service/webapk/webapk_utils.h
@@ -9,7 +9,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "build/chromeos_buildflags.h" #include "chromeos/crosapi/mojom/web_app_service.mojom.h" #include "components/webapk/webapk.pb.h"
diff --git a/chrome/browser/apps/app_shim/app_shim_host_bootstrap_mac.cc b/chrome/browser/apps/app_shim/app_shim_host_bootstrap_mac.cc index a72251c..b69c6f0 100644 --- a/chrome/browser/apps/app_shim/app_shim_host_bootstrap_mac.cc +++ b/chrome/browser/apps/app_shim/app_shim_host_bootstrap_mac.cc
@@ -8,7 +8,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/mac/scoped_cftyperef.h" #include "base/strings/sys_string_conversions.h" #include "mojo/public/cpp/bindings/pending_receiver.h"
diff --git a/chrome/browser/apps/app_shim/app_shim_host_mac.cc b/chrome/browser/apps/app_shim/app_shim_host_mac.cc index 37137dc..143d206a 100644 --- a/chrome/browser/apps/app_shim/app_shim_host_mac.cc +++ b/chrome/browser/apps/app_shim/app_shim_host_mac.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "chrome/browser/apps/app_shim/app_shim_host_bootstrap_mac.h" #include "chrome/common/chrome_features.h"
diff --git a/chrome/browser/apps/app_shim/app_shim_host_mac_unittest.cc b/chrome/browser/apps/app_shim/app_shim_host_mac_unittest.cc index d217c25..69c1eec 100644 --- a/chrome/browser/apps/app_shim/app_shim_host_mac_unittest.cc +++ b/chrome/browser/apps/app_shim/app_shim_host_mac_unittest.cc
@@ -11,7 +11,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/memory/weak_ptr.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/apps/app_shim/app_shim_listener.mm b/chrome/browser/apps/app_shim/app_shim_listener.mm index 190e09d..e0614ffc 100644 --- a/chrome/browser/apps/app_shim/app_shim_listener.mm +++ b/chrome/browser/apps/app_shim/app_shim_listener.mm
@@ -7,10 +7,10 @@ #import <Foundation/Foundation.h> #include <unistd.h> -#include "base/bind.h" #include "base/check_op.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/hash/md5.h" #include "base/path_service.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/apps/app_shim/app_shim_listener_browsertest_mac.mm b/chrome/browser/apps/app_shim/app_shim_listener_browsertest_mac.mm index 2b45ecc..e853aa9 100644 --- a/chrome/browser/apps/app_shim/app_shim_listener_browsertest_mac.mm +++ b/chrome/browser/apps/app_shim/app_shim_listener_browsertest_mac.mm
@@ -8,11 +8,11 @@ #include <memory> -#include "base/bind.h" #include "base/check.h" #include "base/check_op.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/mac/foundation_util.h" #include "base/path_service.h" #include "base/run_loop.h"
diff --git a/chrome/browser/apps/app_shim/app_shim_manager_mac.cc b/chrome/browser/apps/app_shim/app_shim_manager_mac.cc index 7591a60..1a8417b3 100644 --- a/chrome/browser/apps/app_shim/app_shim_manager_mac.cc +++ b/chrome/browser/apps/app_shim/app_shim_manager_mac.cc
@@ -11,12 +11,12 @@ #include <utility> #include "apps/app_lifetime_monitor_factory.h" -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/debug/dump_without_crashing.h" #include "base/feature_list.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/hash/sha1.h" #include "base/logging.h" #include "base/mac/bundle_locations.h"
diff --git a/chrome/browser/apps/app_shim/app_shim_manager_mac.h b/chrome/browser/apps/app_shim/app_shim_manager_mac.h index a7a373a7..85b498d 100644 --- a/chrome/browser/apps/app_shim/app_shim_manager_mac.h +++ b/chrome/browser/apps/app_shim/app_shim_manager_mac.h
@@ -14,7 +14,7 @@ #include <vector> #include "apps/app_lifetime_monitor.h" -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/mac/scoped_cftyperef.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/apps/app_shim/app_shim_manager_mac_unittest.cc b/chrome/browser/apps/app_shim/app_shim_manager_mac_unittest.cc index 09df6f03..3c730f4 100644 --- a/chrome/browser/apps/app_shim/app_shim_manager_mac_unittest.cc +++ b/chrome/browser/apps/app_shim/app_shim_manager_mac_unittest.cc
@@ -11,7 +11,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/strings/sys_string_conversions.h" #include "base/test/gmock_callback_support.h"
diff --git a/chrome/browser/apps/app_shim/app_shim_termination_manager.cc b/chrome/browser/apps/app_shim/app_shim_termination_manager.cc index 4701cac..1b85adb3 100644 --- a/chrome/browser/apps/app_shim/app_shim_termination_manager.cc +++ b/chrome/browser/apps/app_shim/app_shim_termination_manager.cc
@@ -4,9 +4,9 @@ #include "chrome/browser/apps/app_shim/app_shim_termination_manager.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/callback_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/no_destructor.h" #include "base/notreached.h"
diff --git a/chrome/browser/apps/app_shim/web_app_shim_manager_delegate_mac.h b/chrome/browser/apps/app_shim/web_app_shim_manager_delegate_mac.h index b51d3de..29b836e 100644 --- a/chrome/browser/apps/app_shim/web_app_shim_manager_delegate_mac.h +++ b/chrome/browser/apps/app_shim/web_app_shim_manager_delegate_mac.h
@@ -7,7 +7,7 @@ #include "chrome/browser/apps/app_shim/app_shim_manager_mac.h" -#include "base/callback.h" +#include "base/functional/callback.h" namespace content { class WebContents;
diff --git a/chrome/browser/apps/app_shim/web_app_shim_manager_delegate_mac_unittest.cc b/chrome/browser/apps/app_shim/web_app_shim_manager_delegate_mac_unittest.cc index 3dd97a3a..6a126c98 100644 --- a/chrome/browser/apps/app_shim/web_app_shim_manager_delegate_mac_unittest.cc +++ b/chrome/browser/apps/app_shim/web_app_shim_manager_delegate_mac_unittest.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/apps/app_shim/web_app_shim_manager_delegate_mac.h" -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/test/bind.h" #include "chrome/browser/apps/app_service/app_launch_params.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/apps/digital_goods/digital_goods_lacros.cc b/chrome/browser/apps/digital_goods/digital_goods_lacros.cc index b7459921..17b059d 100644 --- a/chrome/browser/apps/digital_goods/digital_goods_lacros.cc +++ b/chrome/browser/apps/digital_goods/digital_goods_lacros.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/web_applications/web_app.h" #include "chrome/browser/web_applications/web_app_provider.h"
diff --git a/chrome/browser/apps/guest_view/web_view_browsertest.cc b/chrome/browser/apps/guest_view/web_view_browsertest.cc index a0419aa5..5adf374 100644 --- a/chrome/browser/apps/guest_view/web_view_browsertest.cc +++ b/chrome/browser/apps/guest_view/web_view_browsertest.cc
@@ -6,11 +6,11 @@ #include <set> #include <utility> -#include "base/bind.h" #include "base/command_line.h" #include "base/containers/contains.h" #include "base/feature_list.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/guid.h" #include "base/location.h" #include "base/memory/raw_ptr.h"
diff --git a/chrome/browser/apps/guest_view/web_view_interactive_browsertest.cc b/chrome/browser/apps/guest_view/web_view_interactive_browsertest.cc index 9b00f2f6..1cbab2cf 100644 --- a/chrome/browser/apps/guest_view/web_view_interactive_browsertest.cc +++ b/chrome/browser/apps/guest_view/web_view_interactive_browsertest.cc
@@ -7,7 +7,7 @@ #include <limits> #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h"
diff --git a/chrome/browser/apps/intent_helper/apps_navigation_types.h b/chrome/browser/apps/intent_helper/apps_navigation_types.h index 8757157..7b1406884 100644 --- a/chrome/browser/apps/intent_helper/apps_navigation_types.h +++ b/chrome/browser/apps/intent_helper/apps_navigation_types.h
@@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "ui/base/models/image_model.h" namespace apps {
diff --git a/chrome/browser/apps/intent_helper/chromeos_intent_picker_helpers.cc b/chrome/browser/apps/intent_helper/chromeos_intent_picker_helpers.cc index 06f7f7e8..bce449d3 100644 --- a/chrome/browser/apps/intent_helper/chromeos_intent_picker_helpers.cc +++ b/chrome/browser/apps/intent_helper/chromeos_intent_picker_helpers.cc
@@ -7,8 +7,8 @@ #include <algorithm> #include <utility> -#include "base/bind.h" #include "base/debug/dump_without_crashing.h" +#include "base/functional/bind.h" #include "build/chromeos_buildflags.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/apps/platform_apps/api/media_galleries/blob_data_source_factory.cc b/chrome/browser/apps/platform_apps/api/media_galleries/blob_data_source_factory.cc index 309e29e6..3354e28 100644 --- a/chrome/browser/apps/platform_apps/api/media_galleries/blob_data_source_factory.cc +++ b/chrome/browser/apps/platform_apps/api/media_galleries/blob_data_source_factory.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "content/public/browser/browser_context.h" #include "extensions/browser/blob_reader.h"
diff --git a/chrome/browser/apps/platform_apps/api/media_galleries/media_galleries_api.cc b/chrome/browser/apps/platform_apps/api/media_galleries/media_galleries_api.cc index 2a8fc47..fd8d84e6 100644 --- a/chrome/browser/apps/platform_apps/api/media_galleries/media_galleries_api.cc +++ b/chrome/browser/apps/platform_apps/api/media_galleries/media_galleries_api.cc
@@ -14,8 +14,8 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/lazy_instance.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h"
diff --git a/chrome/browser/apps/platform_apps/api/media_galleries/media_galleries_api.h b/chrome/browser/apps/platform_apps/api/media_galleries/media_galleries_api.h index 8c4ec2b..fc83471 100644 --- a/chrome/browser/apps/platform_apps/api/media_galleries/media_galleries_api.h +++ b/chrome/browser/apps/platform_apps/api/media_galleries/media_galleries_api.h
@@ -14,7 +14,7 @@ #include <string> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/media_galleries/gallery_watch_manager_observer.h"
diff --git a/chrome/browser/apps/platform_apps/api/media_galleries/media_galleries_apitest.cc b/chrome/browser/apps/platform_apps/api/media_galleries/media_galleries_apitest.cc index 21ee31b33..91887dcb 100644 --- a/chrome/browser/apps/platform_apps/api/media_galleries/media_galleries_apitest.cc +++ b/chrome/browser/apps/platform_apps/api/media_galleries/media_galleries_apitest.cc
@@ -7,9 +7,9 @@ #include <memory> #include "base/auto_reset.h" -#include "base/callback.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/callback.h" #include "base/json/json_writer.h" #include "base/numerics/safe_conversions.h" #include "base/path_service.h"
diff --git a/chrome/browser/apps/platform_apps/api/media_galleries/media_galleries_watch_apitest.cc b/chrome/browser/apps/platform_apps/api/media_galleries/media_galleries_watch_apitest.cc index 23cf6413..f8f947e3 100644 --- a/chrome/browser/apps/platform_apps/api/media_galleries/media_galleries_watch_apitest.cc +++ b/chrome/browser/apps/platform_apps/api/media_galleries/media_galleries_watch_apitest.cc
@@ -6,10 +6,10 @@ #include <memory> -#include "base/callback_helpers.h" #include "base/files/file_path.h" #include "base/files/file_path_watcher.h" #include "base/files/file_util.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/apps/platform_apps/api/sync_file_system/sync_file_system_api.cc b/chrome/browser/apps/platform_apps/api/sync_file_system/sync_file_system_api.cc index 694076b..ded55a5 100644 --- a/chrome/browser/apps/platform_apps/api/sync_file_system/sync_file_system_api.cc +++ b/chrome/browser/apps/platform_apps/api/sync_file_system/sync_file_system_api.cc
@@ -8,8 +8,8 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/notreached.h" #include "base/strings/stringprintf.h" #include "chrome/browser/apps/platform_apps/api/sync_file_system/extension_sync_event_observer.h"
diff --git a/chrome/browser/apps/platform_apps/api/sync_file_system/sync_file_system_apitest.cc b/chrome/browser/apps/platform_apps/api/sync_file_system/sync_file_system_apitest.cc index e0425ae6..80b0a58 100644 --- a/chrome/browser/apps/platform_apps/api/sync_file_system/sync_file_system_apitest.cc +++ b/chrome/browser/apps/platform_apps/api/sync_file_system/sync_file_system_apitest.cc
@@ -5,7 +5,7 @@ #include <stdint.h> #include "base/auto_reset.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/task/single_thread_task_runner.h" #include "chrome/browser/extensions/extension_apitest.h"
diff --git a/chrome/browser/apps/platform_apps/api/webstore_widget_private/app_installer.h b/chrome/browser/apps/platform_apps/api/webstore_widget_private/app_installer.h index a0d3e7cc..8fdb095e 100644 --- a/chrome/browser/apps/platform_apps/api/webstore_widget_private/app_installer.h +++ b/chrome/browser/apps/platform_apps/api/webstore_widget_private/app_installer.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "chrome/browser/extensions/webstore_standalone_installer.h"
diff --git a/chrome/browser/apps/platform_apps/api/webstore_widget_private/webstore_widget_private_api.cc b/chrome/browser/apps/platform_apps/api/webstore_widget_private/webstore_widget_private_api.cc index b0f7fc6b..775bd82f 100644 --- a/chrome/browser/apps/platform_apps/api/webstore_widget_private/webstore_widget_private_api.cc +++ b/chrome/browser/apps/platform_apps/api/webstore_widget_private/webstore_widget_private_api.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/apps/platform_apps/api/webstore_widget_private/app_installer.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/apps/platform_apps/api/webstore_widget_private.h"
diff --git a/chrome/browser/apps/platform_apps/app_browsertest.cc b/chrome/browser/apps/platform_apps/app_browsertest.cc index abfbfc8..43f6c39c 100644 --- a/chrome/browser/apps/platform_apps/app_browsertest.cc +++ b/chrome/browser/apps/platform_apps/app_browsertest.cc
@@ -8,12 +8,12 @@ #include "apps/launcher.h" #include "base/auto_reset.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/containers/contains.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.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 5a07a533..92b9b13 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
@@ -12,7 +12,7 @@ #include "apps/app_lifetime_monitor_factory.h" #include "apps/switches.h" #include "base/auto_reset.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/mac/foundation_util.h" #import "base/mac/launch_services_util.h" #include "base/mac/mac_util.h"
diff --git a/chrome/browser/apps/platform_apps/app_shim_quit_interactive_uitest_mac.mm b/chrome/browser/apps/platform_apps/app_shim_quit_interactive_uitest_mac.mm index 651820f4..8ab965d 100644 --- a/chrome/browser/apps/platform_apps/app_shim_quit_interactive_uitest_mac.mm +++ b/chrome/browser/apps/platform_apps/app_shim_quit_interactive_uitest_mac.mm
@@ -12,7 +12,7 @@ #include <vector> #include "apps/switches.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/apps/app_shim/app_shim_host_bootstrap_mac.h" #include "chrome/browser/apps/app_shim/app_shim_host_mac.h" #include "chrome/browser/apps/app_shim/app_shim_listener.h"
diff --git a/chrome/browser/apps/platform_apps/platform_app_navigation_redirector.cc b/chrome/browser/apps/platform_apps/platform_app_navigation_redirector.cc index c8c368e..966e83e 100644 --- a/chrome/browser/apps/platform_apps/platform_app_navigation_redirector.cc +++ b/chrome/browser/apps/platform_apps/platform_app_navigation_redirector.cc
@@ -5,7 +5,7 @@ #include "chrome/browser/apps/platform_apps/platform_app_navigation_redirector.h" #include "apps/launcher.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "chrome/browser/preloading/prefetch/no_state_prefetch/chrome_no_state_prefetch_contents_delegate.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/apps/platform_apps/shortcut_manager.cc b/chrome/browser/apps/platform_apps/shortcut_manager.cc index e687bffd..8fcb906 100644 --- a/chrome/browser/apps/platform_apps/shortcut_manager.cc +++ b/chrome/browser/apps/platform_apps/shortcut_manager.cc
@@ -6,11 +6,10 @@ #include <string> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/functional/callback_helpers.h" #include "base/one_shot_event.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ash/accessibility/accessibility_extension_loader.cc b/chrome/browser/ash/accessibility/accessibility_extension_loader.cc index 92db8c7..e69885ed 100644 --- a/chrome/browser/ash/accessibility/accessibility_extension_loader.cc +++ b/chrome/browser/ash/accessibility/accessibility_extension_loader.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/ash/profiles/profile_helper.h" #include "chrome/browser/extensions/component_loader.h" #include "chrome/browser/extensions/extension_service.h"
diff --git a/chrome/browser/ash/accessibility/accessibility_extension_loader.h b/chrome/browser/ash/accessibility/accessibility_extension_loader.h index 2110652..135a4ca 100644 --- a/chrome/browser/ash/accessibility/accessibility_extension_loader.h +++ b/chrome/browser/ash/accessibility/accessibility_extension_loader.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_ASH_ACCESSIBILITY_ACCESSIBILITY_EXTENSION_LOADER_H_ #define CHROME_BROWSER_ASH_ACCESSIBILITY_ACCESSIBILITY_EXTENSION_LOADER_H_ -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" class Profile;
diff --git a/chrome/browser/ash/accessibility/accessibility_manager.cc b/chrome/browser/ash/accessibility/accessibility_manager.cc index 02864bc6..3c82f8b3 100644 --- a/chrome/browser/ash/accessibility/accessibility_manager.cc +++ b/chrome/browser/ash/accessibility/accessibility_manager.cc
@@ -21,12 +21,12 @@ #include "ash/public/cpp/accessibility_focus_ring_info.h" #include "ash/root_window_controller.h" #include "ash/shell.h" -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/containers/flat_map.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/memory/ptr_util.h" #include "base/memory/singleton.h"
diff --git a/chrome/browser/ash/accessibility/accessibility_manager.h b/chrome/browser/ash/accessibility/accessibility_manager.h index bdd39c24..f95a325 100644 --- a/chrome/browser/ash/accessibility/accessibility_manager.h +++ b/chrome/browser/ash/accessibility/accessibility_manager.h
@@ -11,8 +11,8 @@ #include <string> #include <vector> -#include "base/callback_forward.h" #include "base/callback_list.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "base/scoped_multi_source_observation.h" #include "base/scoped_observation.h"
diff --git a/chrome/browser/ash/accessibility/accessibility_manager_browsertest.cc b/chrome/browser/ash/accessibility/accessibility_manager_browsertest.cc index 1a8898b..0cd917d 100644 --- a/chrome/browser/ash/accessibility/accessibility_manager_browsertest.cc +++ b/chrome/browser/ash/accessibility/accessibility_manager_browsertest.cc
@@ -7,9 +7,9 @@ #include "ash/constants/ash_features.h" #include "ash/constants/ash_pref_names.h" #include "ash/public/cpp/test/accessibility_controller_test_api.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/strings/string_util.h" #include "chrome/browser/ash/accessibility/accessibility_test_utils.h"
diff --git a/chrome/browser/ash/accessibility/dictation_browsertest.cc b/chrome/browser/ash/accessibility/dictation_browsertest.cc index e219331..4e705091 100644 --- a/chrome/browser/ash/accessibility/dictation_browsertest.cc +++ b/chrome/browser/ash/accessibility/dictation_browsertest.cc
@@ -14,10 +14,10 @@ #include "ash/system/status_area_widget.h" #include "ash/system/status_area_widget_test_helper.h" #include "base/base_paths.h" -#include "base/bind.h" #include "base/containers/fixed_flat_set.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/memory/weak_ptr.h" #include "base/metrics/metrics_hashes.h" #include "base/metrics/statistics_recorder.h"
diff --git a/chrome/browser/ash/accessibility/magnification_manager.cc b/chrome/browser/ash/accessibility/magnification_manager.cc index f6865913..8d7fd290 100644 --- a/chrome/browser/ash/accessibility/magnification_manager.cc +++ b/chrome/browser/ash/accessibility/magnification_manager.cc
@@ -11,7 +11,7 @@ #include "ash/accessibility/magnifier/fullscreen_magnifier_controller.h" #include "ash/constants/ash_pref_names.h" #include "ash/shell.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/accessibility/accessibility_manager.h" #include "chrome/browser/ash/profiles/profile_helper.h" #include "chrome/browser/profiles/profile_manager.h"
diff --git a/chrome/browser/ash/accessibility/magnification_manager_browsertest.cc b/chrome/browser/ash/accessibility/magnification_manager_browsertest.cc index bd2c3a5..755ecdd4 100644 --- a/chrome/browser/ash/accessibility/magnification_manager_browsertest.cc +++ b/chrome/browser/ash/accessibility/magnification_manager_browsertest.cc
@@ -8,8 +8,8 @@ #include "ash/constants/ash_pref_names.h" #include "ash/constants/ash_switches.h" #include "ash/shell.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/accessibility/accessibility_manager.h" #include "chrome/browser/ash/accessibility/magnification_manager.h" #include "chrome/browser/ash/login/helper.h"
diff --git a/chrome/browser/ash/accessibility/pumpkin_installer.cc b/chrome/browser/ash/accessibility/pumpkin_installer.cc index 7534f5f5..7c4931d 100644 --- a/chrome/browser/ash/accessibility/pumpkin_installer.cc +++ b/chrome/browser/ash/accessibility/pumpkin_installer.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ash/accessibility/pumpkin_installer.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "ui/accessibility/accessibility_features.h"
diff --git a/chrome/browser/ash/accessibility/pumpkin_installer.h b/chrome/browser/ash/accessibility/pumpkin_installer.h index 33f761e..9d4c0305 100644 --- a/chrome/browser/ash/accessibility/pumpkin_installer.h +++ b/chrome/browser/ash/accessibility/pumpkin_installer.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_ASH_ACCESSIBILITY_PUMPKIN_INSTALLER_H_ #define CHROME_BROWSER_ASH_ACCESSIBILITY_PUMPKIN_INSTALLER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "chromeos/ash/components/dbus/dlcservice/dlcservice_client.h"
diff --git a/chrome/browser/ash/accessibility/select_to_speak_browsertest.cc b/chrome/browser/ash/accessibility/select_to_speak_browsertest.cc index 11c26ad8..d55242d8 100644 --- a/chrome/browser/ash/accessibility/select_to_speak_browsertest.cc +++ b/chrome/browser/ash/accessibility/select_to_speak_browsertest.cc
@@ -17,8 +17,8 @@ #include "ash/shell.h" #include "ash/system/status_area_widget.h" #include "ash/system/unified/unified_system_tray.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/memory/weak_ptr.h" #include "build/branding_buildflags.h" #include "build/build_config.h"
diff --git a/chrome/browser/ash/accessibility/service/accessibility_service_client.cc b/chrome/browser/ash/accessibility/service/accessibility_service_client.cc index 6871ee4..b61c06f 100644 --- a/chrome/browser/ash/accessibility/service/accessibility_service_client.cc +++ b/chrome/browser/ash/accessibility/service/accessibility_service_client.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ash/accessibility/service/accessibility_service_client.h" #include <memory> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "chrome/browser/accessibility/service/accessibility_service_router.h" #include "chrome/browser/accessibility/service/accessibility_service_router_factory.h" #include "chrome/browser/ash/accessibility/service/automation_client_impl.h"
diff --git a/chrome/browser/ash/accessibility/service/accessibility_service_client.h b/chrome/browser/ash/accessibility/service/accessibility_service_client.h index 39f88f6..aabe957 100644 --- a/chrome/browser/ash/accessibility/service/accessibility_service_client.h +++ b/chrome/browser/ash/accessibility/service/accessibility_service_client.h
@@ -7,7 +7,7 @@ #include <vector> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "mojo/public/cpp/bindings/receiver.h" #include "mojo/public/cpp/bindings/remote.h" #include "services/accessibility/public/mojom/accessibility_service.mojom.h"
diff --git a/chrome/browser/ash/accessibility/spoken_feedback_browsertest.cc b/chrome/browser/ash/accessibility/spoken_feedback_browsertest.cc index 506344c..3ec1878 100644 --- a/chrome/browser/ash/accessibility/spoken_feedback_browsertest.cc +++ b/chrome/browser/ash/accessibility/spoken_feedback_browsertest.cc
@@ -28,8 +28,8 @@ #include "ash/system/status_area_widget_test_helper.h" #include "ash/system/unified/unified_system_tray.h" #include "ash/wm/desks/templates/saved_desk_util.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/test/scoped_feature_list.h" #include "base/test/simple_test_tick_clock.h" #include "build/build_config.h"
diff --git a/chrome/browser/ash/account_manager/account_apps_availability.cc b/chrome/browser/ash/account_manager/account_apps_availability.cc index e6cbd1d..7193467 100644 --- a/chrome/browser/ash/account_manager/account_apps_availability.cc +++ b/chrome/browser/ash/account_manager/account_apps_availability.cc
@@ -5,9 +5,9 @@ #include "chrome/browser/ash/account_manager/account_apps_availability.h" #include "ash/constants/ash_features.h" -#include "base/bind.h" #include "base/containers/flat_set.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/metrics/histogram_functions.h" #include "components/account_manager_core/account.h"
diff --git a/chrome/browser/ash/account_manager/account_manager_edu_coexistence_controller.h b/chrome/browser/ash/account_manager/account_manager_edu_coexistence_controller.h index 8fcfea0d8..7aa1ff58 100644 --- a/chrome/browser/ash/account_manager/account_manager_edu_coexistence_controller.h +++ b/chrome/browser/ash/account_manager/account_manager_edu_coexistence_controller.h
@@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "components/account_id/account_id.h" #include "components/account_manager_core/account.h"
diff --git a/chrome/browser/ash/account_manager/account_manager_edu_coexistence_controller_unittest.cc b/chrome/browser/ash/account_manager/account_manager_edu_coexistence_controller_unittest.cc index 067df84..0f31918 100644 --- a/chrome/browser/ash/account_manager/account_manager_edu_coexistence_controller_unittest.cc +++ b/chrome/browser/ash/account_manager/account_manager_edu_coexistence_controller_unittest.cc
@@ -8,8 +8,8 @@ #include <string> #include "ash/constants/ash_pref_names.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/values.h" #include "chrome/browser/ash/child_accounts/edu_coexistence_tos_store_utils.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ash/account_manager/account_manager_policy_controller.cc b/chrome/browser/ash/account_manager/account_manager_policy_controller.cc index 30409f37..318b4f9 100644 --- a/chrome/browser/ash/account_manager/account_manager_policy_controller.cc +++ b/chrome/browser/ash/account_manager/account_manager_policy_controller.cc
@@ -7,7 +7,7 @@ #include <string> #include "ash/constants/ash_pref_names.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/sequence_checker.h" #include "chrome/browser/ash/account_manager/account_manager_edu_coexistence_controller.h" #include "chrome/browser/ash/account_manager/account_manager_util.h"
diff --git a/chrome/browser/ash/account_manager/account_manager_ui_impl.h b/chrome/browser/ash/account_manager/account_manager_ui_impl.h index feb5dad..531e56a 100644 --- a/chrome/browser/ash/account_manager/account_manager_ui_impl.h +++ b/chrome/browser/ash/account_manager/account_manager_ui_impl.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_ASH_ACCOUNT_MANAGER_ACCOUNT_MANAGER_UI_IMPL_H_ #define CHROME_BROWSER_ASH_ACCOUNT_MANAGER_ACCOUNT_MANAGER_UI_IMPL_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "components/account_manager_core/account_addition_options.h" #include "components/account_manager_core/chromeos/account_manager_ui.h"
diff --git a/chrome/browser/ash/account_manager/account_manager_util.h b/chrome/browser/ash/account_manager/account_manager_util.h index 87db88e..011e110b 100644 --- a/chrome/browser/ash/account_manager/account_manager_util.h +++ b/chrome/browser/ash/account_manager/account_manager_util.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_ASH_ACCOUNT_MANAGER_ACCOUNT_MANAGER_UTIL_H_ #define CHROME_BROWSER_ASH_ACCOUNT_MANAGER_ACCOUNT_MANAGER_UTIL_H_ -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" class Profile;
diff --git a/chrome/browser/ash/android_sms/android_sms_app_manager_impl.cc b/chrome/browser/ash/android_sms/android_sms_app_manager_impl.cc index 2e316b0..1d25ed2 100644 --- a/chrome/browser/ash/android_sms/android_sms_app_manager_impl.cc +++ b/chrome/browser/ash/android_sms/android_sms_app_manager_impl.cc
@@ -6,9 +6,9 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.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/launch_utils.h"
diff --git a/chrome/browser/ash/android_sms/android_sms_app_setup_controller.h b/chrome/browser/ash/android_sms/android_sms_app_setup_controller.h index 6ba37ed..a2e9921 100644 --- a/chrome/browser/ash/android_sms/android_sms_app_setup_controller.h +++ b/chrome/browser/ash/android_sms/android_sms_app_setup_controller.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_ASH_ANDROID_SMS_ANDROID_SMS_APP_SETUP_CONTROLLER_H_ #define CHROME_BROWSER_ASH_ANDROID_SMS_ANDROID_SMS_APP_SETUP_CONTROLLER_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "chrome/browser/web_applications/web_app_id.h" #include "third_party/abseil-cpp/absl/types/optional.h" #include "url/gurl.h"
diff --git a/chrome/browser/ash/android_sms/android_sms_app_setup_controller_impl.cc b/chrome/browser/ash/android_sms/android_sms_app_setup_controller_impl.cc index e9825df..acacbc1 100644 --- a/chrome/browser/ash/android_sms/android_sms_app_setup_controller_impl.cc +++ b/chrome/browser/ash/android_sms/android_sms_app_setup_controller_impl.cc
@@ -7,10 +7,10 @@ #include <string> #include <vector> -#include "base/bind.h" -#include "base/callback.h" #include "base/containers/flat_map.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/metrics/histogram_macros.h" #include "base/task/single_thread_task_runner.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ash/android_sms/android_sms_app_setup_controller_impl_unittest.cc b/chrome/browser/ash/android_sms/android_sms_app_setup_controller_impl_unittest.cc index fe15e46..edfc54ac 100644 --- a/chrome/browser/ash/android_sms/android_sms_app_setup_controller_impl_unittest.cc +++ b/chrome/browser/ash/android_sms/android_sms_app_setup_controller_impl_unittest.cc
@@ -10,10 +10,10 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/containers/contains.h" #include "base/containers/flat_map.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/memory/ref_counted.h" #include "base/path_service.h"
diff --git a/chrome/browser/ash/android_sms/android_sms_pairing_state_tracker_impl.cc b/chrome/browser/ash/android_sms/android_sms_pairing_state_tracker_impl.cc index ed8f5645..5bcef20 100644 --- a/chrome/browser/ash/android_sms/android_sms_pairing_state_tracker_impl.cc +++ b/chrome/browser/ash/android_sms/android_sms_pairing_state_tracker_impl.cc
@@ -7,7 +7,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/task/single_thread_task_runner.h" #include "chrome/browser/ash/android_sms/android_sms_urls.h"
diff --git a/chrome/browser/ash/android_sms/fake_android_sms_app_setup_controller.cc b/chrome/browser/ash/android_sms/fake_android_sms_app_setup_controller.cc index bcfff21..7e641ce 100644 --- a/chrome/browser/ash/android_sms/fake_android_sms_app_setup_controller.cc +++ b/chrome/browser/ash/android_sms/fake_android_sms_app_setup_controller.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ash/android_sms/fake_android_sms_app_setup_controller.h" -#include "base/callback.h" #include "base/check_op.h" +#include "base/functional/callback.h" #include "base/path_service.h" namespace ash {
diff --git a/chrome/browser/ash/app_list/app_context_menu.h b/chrome/browser/ash/app_list/app_context_menu.h index f96b9c0..f406d03 100644 --- a/chrome/browser/ash/app_list/app_context_menu.h +++ b/chrome/browser/ash/app_list/app_context_menu.h
@@ -9,7 +9,7 @@ #include <string> #include "ash/public/cpp/app_menu_constants.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "ui/base/models/image_model.h" #include "ui/base/models/simple_menu_model.h"
diff --git a/chrome/browser/ash/app_list/app_context_menu_unittest.cc b/chrome/browser/ash/app_list/app_context_menu_unittest.cc index cf76561..2098dcc 100644 --- a/chrome/browser/ash/app_list/app_context_menu_unittest.cc +++ b/chrome/browser/ash/app_list/app_context_menu_unittest.cc
@@ -11,7 +11,7 @@ #include "ash/components/arc/test/fake_app_instance.h" #include "ash/constants/ash_features.h" #include "ash/public/cpp/app_menu_constants.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/json/json_file_value_serializer.h" #include "base/path_service.h" #include "base/run_loop.h"
diff --git a/chrome/browser/ash/app_list/app_list_client_impl.cc b/chrome/browser/ash/app_list/app_list_client_impl.cc index c1bb801..0faaf74 100644 --- a/chrome/browser/ash/app_list/app_list_client_impl.cc +++ b/chrome/browser/ash/app_list/app_list_client_impl.cc
@@ -14,7 +14,7 @@ #include "ash/public/cpp/app_list/app_list_types.h" #include "ash/public/cpp/new_window_delegate.h" #include "ash/public/cpp/tablet_mode.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h" #include "base/metrics/user_metrics.h"
diff --git a/chrome/browser/ash/app_list/app_list_model_updater.h b/chrome/browser/ash/app_list/app_list_model_updater.h index ff813f50..4341c93 100644 --- a/chrome/browser/ash/app_list/app_list_model_updater.h +++ b/chrome/browser/ash/app_list/app_list_model_updater.h
@@ -10,7 +10,7 @@ #include <vector> #include "ash/public/cpp/app_list/app_list_types.h" -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "chrome/browser/ash/app_list/app_list_model_updater_observer.h" #include "chrome/browser/ash/app_list/app_list_syncable_service.h" #include "chrome/browser/ash/app_list/chrome_app_list_item.h"
diff --git a/chrome/browser/ash/app_list/app_list_sort_browsertest.cc b/chrome/browser/ash/app_list/app_list_sort_browsertest.cc index 6047629c..1d07ec3 100644 --- a/chrome/browser/ash/app_list/app_list_sort_browsertest.cc +++ b/chrome/browser/ash/app_list/app_list_sort_browsertest.cc
@@ -12,9 +12,9 @@ #include "ash/public/cpp/test/app_list_test_api.h" #include "ash/public/cpp/test/shell_test_api.h" #include "ash/shell.h" -#include "base/callback.h" #include "base/feature_list.h" #include "base/files/file_util.h" +#include "base/functional/callback.h" #include "base/run_loop.h" #include "base/strings/safe_sprintf.h" #include "base/test/metrics/histogram_tester.h"
diff --git a/chrome/browser/ash/app_list/app_list_syncable_service.cc b/chrome/browser/ash/app_list/app_list_syncable_service.cc index 6216955..f1efc9f 100644 --- a/chrome/browser/ash/app_list/app_list_syncable_service.cc +++ b/chrome/browser/ash/app_list/app_list_syncable_service.cc
@@ -12,11 +12,11 @@ #include "ash/constants/ash_features.h" #include "ash/constants/ash_switches.h" #include "ash/public/cpp/app_list/app_list_config.h" -#include "base/bind.h" #include "base/check.h" #include "base/command_line.h" #include "base/containers/contains.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/one_shot_event.h" #include "base/task/sequenced_task_runner.h" #include "base/values.h"
diff --git a/chrome/browser/ash/app_list/app_list_syncable_service.h b/chrome/browser/ash/app_list/app_list_syncable_service.h index 05c77a3..cf1a2945 100644 --- a/chrome/browser/ash/app_list/app_list_syncable_service.h +++ b/chrome/browser/ash/app_list/app_list_syncable_service.h
@@ -13,7 +13,7 @@ #include <vector> #include "ash/public/cpp/app_list/app_list_types.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h"
diff --git a/chrome/browser/ash/app_list/app_list_syncable_service_unittest.cc b/chrome/browser/ash/app_list/app_list_syncable_service_unittest.cc index 74c99dce..38ac5c67 100644 --- a/chrome/browser/ash/app_list/app_list_syncable_service_unittest.cc +++ b/chrome/browser/ash/app_list/app_list_syncable_service_unittest.cc
@@ -11,8 +11,8 @@ #include "ash/constants/ash_features.h" #include "ash/public/cpp/app_list/app_list_config.h" #include "ash/public/cpp/app_list/internal_app_id_constants.h" -#include "base/bind.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/strings/string_number_conversions.h" #include "base/test/scoped_command_line.h" #include "base/test/scoped_feature_list.h"
diff --git a/chrome/browser/ash/app_list/app_service/app_service_app_item.cc b/chrome/browser/ash/app_list/app_service/app_service_app_item.cc index 09d1cf4..03f1a93 100644 --- a/chrome/browser/ash/app_list/app_service/app_service_app_item.cc +++ b/chrome/browser/ash/app_list/app_service/app_service_app_item.cc
@@ -11,10 +11,10 @@ #include "ash/public/cpp/shelf_model.h" #include "ash/public/cpp/shelf_types.h" #include "ash/public/cpp/tablet_mode.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/metrics/histogram_functions.h" #include "base/notreached.h"
diff --git a/chrome/browser/ash/app_list/app_service/app_service_context_menu.cc b/chrome/browser/ash/app_list/app_service/app_service_context_menu.cc index 476c63d..8c1aabe 100644 --- a/chrome/browser/ash/app_list/app_service/app_service_context_menu.cc +++ b/chrome/browser/ash/app_list/app_service/app_service_context_menu.cc
@@ -8,9 +8,9 @@ #include "ash/public/cpp/app_list/app_list_types.h" #include "ash/public/cpp/app_menu_constants.h" #include "ash/public/cpp/new_window_delegate.h" -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.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/menu_util.h"
diff --git a/chrome/browser/ash/app_list/arc/arc_app_dialog.h b/chrome/browser/ash/app_list/arc/arc_app_dialog.h index cacc1ed..fad559e 100644 --- a/chrome/browser/ash/app_list/arc/arc_app_dialog.h +++ b/chrome/browser/ash/app_list/arc/arc_app_dialog.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" class Profile;
diff --git a/chrome/browser/ash/app_list/arc/arc_app_icon.cc b/chrome/browser/ash/app_list/arc/arc_app_icon.cc index 5a3264ef..f5afa88 100644 --- a/chrome/browser/ash/app_list/arc/arc_app_icon.cc +++ b/chrome/browser/ash/app_list/arc/arc_app_icon.cc
@@ -9,10 +9,10 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/containers/contains.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/lazy_instance.h" #include "base/metrics/histogram_functions.h" #include "base/no_destructor.h"
diff --git a/chrome/browser/ash/app_list/arc/arc_app_list_prefs.cc b/chrome/browser/ash/app_list/arc/arc_app_list_prefs.cc index 20091da..2ebe75a 100644 --- a/chrome/browser/ash/app_list/arc/arc_app_list_prefs.cc +++ b/chrome/browser/ash/app_list/arc/arc_app_list_prefs.cc
@@ -20,11 +20,11 @@ #include "ash/constants/ash_switches.h" #include "ash/metrics/login_unlock_throughput_recorder.h" #include "ash/shell.h" -#include "base/bind.h" #include "base/check.h" #include "base/containers/contains.h" #include "base/containers/flat_set.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h" #include "base/strings/strcat.h"
diff --git a/chrome/browser/ash/app_list/arc/arc_app_test.cc b/chrome/browser/ash/app_list/arc/arc_app_test.cc index f7bb42a..d73643a0 100644 --- a/chrome/browser/ash/app_list/arc/arc_app_test.cc +++ b/chrome/browser/ash/app_list/arc/arc_app_test.cc
@@ -12,11 +12,11 @@ #include "ash/components/arc/test/connection_holder_util.h" #include "ash/components/arc/test/fake_app_instance.h" #include "ash/components/arc/test/fake_arc_session.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/containers/contains.h" #include "base/containers/cxx20_erase.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/ranges/algorithm.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/ash/app_list/arc/arc_app_unittest.cc b/chrome/browser/ash/app_list/arc/arc_app_unittest.cc index 438aaa2..f77aeda6 100644 --- a/chrome/browser/ash/app_list/arc/arc_app_unittest.cc +++ b/chrome/browser/ash/app_list/arc/arc_app_unittest.cc
@@ -22,10 +22,10 @@ #include "ash/constants/ash_switches.h" #include "ash/public/cpp/app_list/app_list_config.h" #include "ash/public/cpp/shelf_model.h" -#include "base/bind.h" #include "base/containers/contains.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/numerics/safe_conversions.h" #include "base/path_service.h" #include "base/ranges/algorithm.h"
diff --git a/chrome/browser/ash/app_list/arc/arc_data_removal_dialog.h b/chrome/browser/ash/app_list/arc/arc_data_removal_dialog.h index b8dcd0e..17b3518 100644 --- a/chrome/browser/ash/app_list/arc/arc_data_removal_dialog.h +++ b/chrome/browser/ash/app_list/arc/arc_data_removal_dialog.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_ASH_APP_LIST_ARC_ARC_DATA_REMOVAL_DIALOG_H_ #define CHROME_BROWSER_ASH_APP_LIST_ARC_ARC_DATA_REMOVAL_DIALOG_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" class Profile;
diff --git a/chrome/browser/ash/app_list/arc/arc_default_app_list.cc b/chrome/browser/ash/app_list/arc/arc_default_app_list.cc index 173cb97..014b88eb 100644 --- a/chrome/browser/ash/app_list/arc/arc_default_app_list.cc +++ b/chrome/browser/ash/app_list/arc/arc_default_app_list.cc
@@ -11,9 +11,9 @@ #include "ash/components/arc/arc_util.h" #include "base/barrier_closure.h" -#include "base/bind.h" #include "base/files/file_enumerator.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/json/json_file_value_serializer.h" #include "base/path_service.h" #include "base/strings/string_split.h"
diff --git a/chrome/browser/ash/app_list/arc/arc_default_app_list.h b/chrome/browser/ash/app_list/arc/arc_default_app_list.h index 6463a745..6eb93030 100644 --- a/chrome/browser/ash/app_list/arc/arc_default_app_list.h +++ b/chrome/browser/ash/app_list/arc/arc_default_app_list.h
@@ -13,8 +13,8 @@ #include <string> #include <unordered_set> -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ash/arc/session/arc_session_manager_observer.h"
diff --git a/chrome/browser/ash/app_list/arc/arc_package_sync_model_type_controller.h b/chrome/browser/ash/app_list/arc/arc_package_sync_model_type_controller.h index 1f7b3ab..fc68436 100644 --- a/chrome/browser/ash/app_list/arc/arc_package_sync_model_type_controller.h +++ b/chrome/browser/ash/app_list/arc/arc_package_sync_model_type_controller.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ash/app_list/arc/arc_app_list_prefs.h" #include "chrome/browser/ash/arc/session/arc_session_manager_observer.h"
diff --git a/chrome/browser/ash/app_list/arc/arc_pai_starter.cc b/chrome/browser/ash/app_list/arc/arc_pai_starter.cc index b7c399e..ec59ed7 100644 --- a/chrome/browser/ash/app_list/arc/arc_pai_starter.cc +++ b/chrome/browser/ash/app_list/arc/arc_pai_starter.cc
@@ -13,7 +13,7 @@ #include "ash/components/arc/arc_util.h" #include "ash/components/arc/session/arc_bridge_service.h" #include "ash/components/arc/session/arc_service_manager.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/app_list/arc/arc_app_utils.h" #include "chrome/browser/ash/arc/arc_optin_uma.h" #include "chrome/browser/ash/arc/policy/arc_policy_util.h"
diff --git a/chrome/browser/ash/app_list/arc/arc_pai_starter.h b/chrome/browser/ash/app_list/arc/arc_pai_starter.h index 10d0aa5..66569d23 100644 --- a/chrome/browser/ash/app_list/arc/arc_pai_starter.h +++ b/chrome/browser/ash/app_list/arc/arc_pai_starter.h
@@ -8,7 +8,7 @@ #include <vector> #include "ash/components/arc/mojom/app.mojom-forward.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h" #include "base/timer/timer.h"
diff --git a/chrome/browser/ash/app_list/arc/arc_usb_host_permission_browsertest.cc b/chrome/browser/ash/app_list/arc/arc_usb_host_permission_browsertest.cc index fac65f2..e48420d 100644 --- a/chrome/browser/ash/app_list/arc/arc_usb_host_permission_browsertest.cc +++ b/chrome/browser/ash/app_list/arc/arc_usb_host_permission_browsertest.cc
@@ -9,8 +9,8 @@ #include "ash/components/arc/test/arc_util_test_support.h" #include "ash/components/arc/test/connection_holder_util.h" #include "ash/components/arc/test/fake_app_instance.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/ash/app_list/arc/arc_app_list_prefs.h"
diff --git a/chrome/browser/ash/app_list/arc/arc_usb_host_permission_manager.cc b/chrome/browser/ash/app_list/arc/arc_usb_host_permission_manager.cc index cf9f69e5..93c3a4b 100644 --- a/chrome/browser/ash/app_list/arc/arc_usb_host_permission_manager.cc +++ b/chrome/browser/ash/app_list/arc/arc_usb_host_permission_manager.cc
@@ -8,8 +8,8 @@ #include "ash/components/arc/arc_util.h" #include "ash/components/arc/usb/usb_host_bridge.h" -#include "base/bind.h" #include "base/containers/cxx20_erase.h" +#include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/ash/app_list/arc/arc_app_dialog.h" #include "chrome/browser/ash/app_list/arc/arc_usb_host_permission_manager_factory.h"
diff --git a/chrome/browser/ash/app_list/arc/arc_usb_host_permission_manager.h b/chrome/browser/ash/app_list/arc/arc_usb_host_permission_manager.h index 8522656..ead83fd 100644 --- a/chrome/browser/ash/app_list/arc/arc_usb_host_permission_manager.h +++ b/chrome/browser/ash/app_list/arc/arc_usb_host_permission_manager.h
@@ -11,7 +11,7 @@ #include <vector> #include "ash/components/arc/usb/usb_host_ui_delegate.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ash/app_list/arc/arc_app_list_prefs.h" #include "components/keyed_service/core/keyed_service.h"
diff --git a/chrome/browser/ash/app_list/chrome_app_list_model_updater.cc b/chrome/browser/ash/app_list/chrome_app_list_model_updater.cc index 9cd8a1ef..51ba7d4 100644 --- a/chrome/browser/ash/app_list/chrome_app_list_model_updater.cc +++ b/chrome/browser/ash/app_list/chrome_app_list_model_updater.cc
@@ -15,7 +15,7 @@ #include "ash/public/cpp/app_list/app_list_controller.h" #include "ash/public/cpp/app_list/app_list_metrics.h" #include "ash/public/cpp/tablet_mode.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/ash/app_list/app_list_controller_delegate.h" #include "chrome/browser/ash/app_list/app_list_sync_model_sanitizer.h"
diff --git a/chrome/browser/ash/app_list/internal_app/internal_app_metadata.cc b/chrome/browser/ash/app_list/internal_app/internal_app_metadata.cc index d25a231..2936d03 100644 --- a/chrome/browser/ash/app_list/internal_app/internal_app_metadata.cc +++ b/chrome/browser/ash/app_list/internal_app/internal_app_metadata.cc
@@ -11,7 +11,7 @@ #include "ash/public/cpp/keyboard_shortcut_viewer.h" #include "ash/public/cpp/resources/grit/ash_public_unscaled_resources.h" #include "ash/public/cpp/shelf_model.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/no_destructor.h" #include "base/strings/string_util.h"
diff --git a/chrome/browser/ash/app_list/search/app_search_provider.cc b/chrome/browser/ash/app_list/search/app_search_provider.cc index f2a3306..6edbf0d 100644 --- a/chrome/browser/ash/app_list/search/app_search_provider.cc +++ b/chrome/browser/ash/app_list/search/app_search_provider.cc
@@ -8,9 +8,9 @@ #include <utility> #include "ash/public/cpp/app_list/app_list_features.h" -#include "base/bind.h" #include "base/callback_list.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/i18n/rtl.h" #include "base/metrics/histogram_macros.h" #include "base/threading/thread_task_runner_handle.h"
diff --git a/chrome/browser/ash/app_list/search/arc/arc_playstore_search_provider.cc b/chrome/browser/ash/app_list/search/arc/arc_playstore_search_provider.cc index 232b42b..729a17a 100644 --- a/chrome/browser/ash/app_list/search/arc/arc_playstore_search_provider.cc +++ b/chrome/browser/ash/app_list/search/arc/arc_playstore_search_provider.cc
@@ -11,7 +11,7 @@ #include "ash/components/arc/app/arc_playstore_search_request_state.h" #include "ash/components/arc/session/arc_bridge_service.h" #include "ash/components/arc/session/arc_service_manager.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "base/strings/utf_string_conversions.h" #include "base/time/time.h"
diff --git a/chrome/browser/ash/app_list/search/arc/fake_recommend_apps_fetcher_delegate.h b/chrome/browser/ash/app_list/search/arc/fake_recommend_apps_fetcher_delegate.h index 66566ffdc..2075c92 100644 --- a/chrome/browser/ash/app_list/search/arc/fake_recommend_apps_fetcher_delegate.h +++ b/chrome/browser/ash/app_list/search/arc/fake_recommend_apps_fetcher_delegate.h
@@ -7,7 +7,7 @@ #include "chrome/browser/ash/app_list/search/arc/recommend_apps_fetcher_delegate.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/values.h" namespace app_list {
diff --git a/chrome/browser/ash/app_list/search/burn_in_controller.h b/chrome/browser/ash/app_list/search/burn_in_controller.h index 82f5418..20f9842 100644 --- a/chrome/browser/ash/app_list/search/burn_in_controller.h +++ b/chrome/browser/ash/app_list/search/burn_in_controller.h
@@ -6,8 +6,8 @@ #define CHROME_BROWSER_ASH_APP_LIST_SEARCH_BURN_IN_CONTROLLER_H_ #include "ash/public/cpp/app_list/app_list_types.h" -#include "base/callback.h" #include "base/containers/flat_map.h" +#include "base/functional/callback.h" #include "base/time/time.h" #include "base/timer/timer.h" #include "chrome/browser/ash/app_list/search/search_controller.h"
diff --git a/chrome/browser/ash/app_list/search/files/drive_search_provider.cc b/chrome/browser/ash/app_list/search/files/drive_search_provider.cc index c0e26e47..0544a56 100644 --- a/chrome/browser/ash/app_list/search/files/drive_search_provider.cc +++ b/chrome/browser/ash/app_list/search/files/drive_search_provider.cc
@@ -7,8 +7,8 @@ #include <cmath> #include "ash/public/cpp/app_list/app_list_types.h" -#include "base/bind.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "base/strings/utf_string_conversions.h" #include "base/task/task_traits.h"
diff --git a/chrome/browser/ash/app_list/search/files/file_suggest_util.h b/chrome/browser/ash/app_list/search/files/file_suggest_util.h index 7a61ec498..c237e41 100644 --- a/chrome/browser/ash/app_list/search/files/file_suggest_util.h +++ b/chrome/browser/ash/app_list/search/files/file_suggest_util.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_ASH_APP_LIST_SEARCH_FILES_FILE_SUGGEST_UTIL_H_ #define CHROME_BROWSER_ASH_APP_LIST_SEARCH_FILES_FILE_SUGGEST_UTIL_H_ -#include "base/callback_forward.h" #include "base/files/file_path.h" +#include "base/functional/callback_forward.h" #include "third_party/abseil-cpp/absl/types/optional.h" namespace app_list {
diff --git a/chrome/browser/ash/app_list/search/files/item_suggest_cache.cc b/chrome/browser/ash/app_list/search/files/item_suggest_cache.cc index 03435a8..299c7b2 100644 --- a/chrome/browser/ash/app_list/search/files/item_suggest_cache.cc +++ b/chrome/browser/ash/app_list/search/files/item_suggest_cache.cc
@@ -9,8 +9,8 @@ #include "ash/constants/ash_pref_names.h" #include "ash/public/cpp/app_list/app_list_features.h" -#include "base/bind.h" #include "base/callback_list.h" +#include "base/functional/bind.h" #include "base/metrics/field_trial_params.h" #include "base/metrics/histogram_functions.h" #include "base/strings/strcat.h"
diff --git a/chrome/browser/ash/app_list/search/files/zero_state_file_provider.cc b/chrome/browser/ash/app_list/search/files/zero_state_file_provider.cc index 59b1cc8b..0a3b250 100644 --- a/chrome/browser/ash/app_list/search/files/zero_state_file_provider.cc +++ b/chrome/browser/ash/app_list/search/files/zero_state_file_provider.cc
@@ -9,11 +9,11 @@ #include "ash/constants/ash_features.h" #include "ash/constants/ash_pref_names.h" #include "ash/public/cpp/app_list/app_list_features.h" -#include "base/bind.h" #include "base/feature_list.h" #include "base/files/file.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "base/strings/strcat.h" #include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/ash/app_list/search/test/app_list_search_test_helper.h b/chrome/browser/ash/app_list/search/test/app_list_search_test_helper.h index 0f052d4..8a0792c 100644 --- a/chrome/browser/ash/app_list/search/test/app_list_search_test_helper.h +++ b/chrome/browser/ash/app_list/search/test/app_list_search_test_helper.h
@@ -12,8 +12,8 @@ #include "ash/public/cpp/app_list/app_list_features.h" #include "ash/public/cpp/app_list/app_list_metrics.h" #include "ash/public/cpp/app_list/app_list_types.h" -#include "base/callback_helpers.h" #include "base/files/file_util.h" +#include "base/functional/callback_helpers.h" #include "base/notreached.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ash/app_list/search/test/search_results_changed_waiter.cc b/chrome/browser/ash/app_list/search/test/search_results_changed_waiter.cc index 497ee88d..38e8fe9 100644 --- a/chrome/browser/ash/app_list/search/test/search_results_changed_waiter.cc +++ b/chrome/browser/ash/app_list/search/test/search_results_changed_waiter.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ash/app_list/search/test/search_results_changed_waiter.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "chrome/browser/ash/app_list/search/search_controller.h" namespace app_list {
diff --git a/chrome/browser/ash/app_list/test/chrome_app_list_test_support.cc b/chrome/browser/ash/app_list/test/chrome_app_list_test_support.cc index 7d8a2a8..221ed93 100644 --- a/chrome/browser/ash/app_list/test/chrome_app_list_test_support.cc +++ b/chrome/browser/ash/app_list/test/chrome_app_list_test_support.cc
@@ -9,7 +9,7 @@ #include "ash/public/cpp/app_list/app_list_config.h" #include "ash/public/cpp/app_list/app_list_types.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h" #include "chrome/browser/ash/app_list/app_list_client_impl.h"
diff --git a/chrome/browser/ash/app_mode/arc/arc_kiosk_app_manager.cc b/chrome/browser/ash/app_mode/arc/arc_kiosk_app_manager.cc index 8525640..e20eba0 100644 --- a/chrome/browser/ash/app_mode/arc/arc_kiosk_app_manager.cc +++ b/chrome/browser/ash/app_mode/arc/arc_kiosk_app_manager.cc
@@ -10,9 +10,9 @@ #include "ash/components/arc/arc_util.h" #include "base/barrier_closure.h" -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/values.h" #include "chrome/browser/ash/app_list/arc/arc_app_list_prefs.h"
diff --git a/chrome/browser/ash/app_mode/arc/arc_kiosk_app_service.cc b/chrome/browser/ash/app_mode/arc/arc_kiosk_app_service.cc index dfa902a..6476296 100644 --- a/chrome/browser/ash/app_mode/arc/arc_kiosk_app_service.cc +++ b/chrome/browser/ash/app_mode/arc/arc_kiosk_app_service.cc
@@ -7,7 +7,7 @@ #include <memory> #include "ash/public/cpp/app_list/app_list_config.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/time/time.h" #include "chrome/browser/ash/app_list/arc/arc_app_utils.h" #include "chrome/browser/ash/app_mode/arc/arc_kiosk_app_manager.h"
diff --git a/chrome/browser/ash/app_mode/fake_cws.cc b/chrome/browser/ash/app_mode/fake_cws.cc index da988a5..e40f9fa 100644 --- a/chrome/browser/ash/app_mode/fake_cws.cc +++ b/chrome/browser/ash/app_mode/fake_cws.cc
@@ -6,9 +6,9 @@ #include <utility> -#include "base/bind.h" #include "base/command_line.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/path_service.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_tokenizer.h"
diff --git a/chrome/browser/ash/app_mode/fake_cws.h b/chrome/browser/ash/app_mode/fake_cws.h index e613fe7..f55461c 100644 --- a/chrome/browser/ash/app_mode/fake_cws.h +++ b/chrome/browser/ash/app_mode/fake_cws.h
@@ -10,7 +10,7 @@ #include <string> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "extensions/browser/scoped_ignore_content_verifier_for_test.h" #include "net/test/embedded_test_server/embedded_test_server.h" #include "net/test/embedded_test_server/http_request.h"
diff --git a/chrome/browser/ash/app_mode/kiosk_app_data.cc b/chrome/browser/ash/app_mode/kiosk_app_data.cc index 73a3a07..c6d450a 100644 --- a/chrome/browser/ash/app_mode/kiosk_app_data.cc +++ b/chrome/browser/ash/app_mode/kiosk_app_data.cc
@@ -7,8 +7,8 @@ #include <memory> #include <vector> -#include "base/bind.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/json/json_writer.h" #include "base/logging.h" #include "base/memory/ref_counted_memory.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 de6a446..bd3da593 100644 --- a/chrome/browser/ash/app_mode/kiosk_app_data_base.cc +++ b/chrome/browser/ash/app_mode/kiosk_app_data_base.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/ash/app_mode/kiosk_app_icon_loader.cc b/chrome/browser/ash/app_mode/kiosk_app_icon_loader.cc index 7d5c1eb30..e483ea1 100644 --- a/chrome/browser/ash/app_mode/kiosk_app_icon_loader.cc +++ b/chrome/browser/ash/app_mode/kiosk_app_icon_loader.cc
@@ -6,9 +6,9 @@ #include <vector> -#include "base/bind.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_traits.h"
diff --git a/chrome/browser/ash/app_mode/kiosk_app_icon_loader.h b/chrome/browser/ash/app_mode/kiosk_app_icon_loader.h index 600b168f..52b0ac3 100644 --- a/chrome/browser/ash/app_mode/kiosk_app_icon_loader.h +++ b/chrome/browser/ash/app_mode/kiosk_app_icon_loader.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_ASH_APP_MODE_KIOSK_APP_ICON_LOADER_H_ #define CHROME_BROWSER_ASH_APP_MODE_KIOSK_APP_ICON_LOADER_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/ref_counted_memory.h" #include "base/memory/weak_ptr.h" #include "base/task/sequenced_task_runner.h"
diff --git a/chrome/browser/ash/app_mode/kiosk_app_manager.cc b/chrome/browser/ash/app_mode/kiosk_app_manager.cc index 977eb78..0065c562 100644 --- a/chrome/browser/ash/app_mode/kiosk_app_manager.cc +++ b/chrome/browser/ash/app_mode/kiosk_app_manager.cc
@@ -11,10 +11,10 @@ #include "ash/constants/ash_paths.h" #include "ash/constants/ash_switches.h" #include "base/barrier_closure.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/metrics/histogram_functions.h" #include "base/path_service.h"
diff --git a/chrome/browser/ash/app_mode/kiosk_app_manager.h b/chrome/browser/ash/app_mode/kiosk_app_manager.h index a623041..0ad41f0d 100644 --- a/chrome/browser/ash/app_mode/kiosk_app_manager.h +++ b/chrome/browser/ash/app_mode/kiosk_app_manager.h
@@ -10,7 +10,7 @@ #include <string> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/no_destructor.h" #include "base/time/time.h" #include "chrome/browser/ash/app_mode/kiosk_app_manager_base.h"
diff --git a/chrome/browser/ash/app_mode/kiosk_app_manager_base.cc b/chrome/browser/ash/app_mode/kiosk_app_manager_base.cc index c30602b..48c7f58 100644 --- a/chrome/browser/ash/app_mode/kiosk_app_manager_base.cc +++ b/chrome/browser/ash/app_mode/kiosk_app_manager_base.cc
@@ -7,8 +7,8 @@ #include <map> #include <utility> -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/path_service.h" #include "chrome/browser/ash/app_mode/app_session_ash.h" #include "chrome/browser/ash/app_mode/kiosk_app_data_base.h"
diff --git a/chrome/browser/ash/app_mode/kiosk_app_manager_browsertest.cc b/chrome/browser/ash/app_mode/kiosk_app_manager_browsertest.cc index d8cdcc1..52a3575 100644 --- a/chrome/browser/ash/app_mode/kiosk_app_manager_browsertest.cc +++ b/chrome/browser/ash/app_mode/kiosk_app_manager_browsertest.cc
@@ -10,10 +10,10 @@ #include <utility> #include "ash/constants/ash_switches.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/path_service.h" #include "base/run_loop.h" #include "base/test/gtest_tags.h"
diff --git a/chrome/browser/ash/app_mode/kiosk_app_update_service_browsertest.cc b/chrome/browser/ash/app_mode/kiosk_app_update_service_browsertest.cc index f5a1d7d..007e3fd 100644 --- a/chrome/browser/ash/app_mode/kiosk_app_update_service_browsertest.cc +++ b/chrome/browser/ash/app_mode/kiosk_app_update_service_browsertest.cc
@@ -8,13 +8,13 @@ #include <string> #include "ash/constants/ash_paths.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" #include "base/compiler_specific.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/memory/ref_counted.h" #include "base/run_loop.h"
diff --git a/chrome/browser/ash/app_mode/kiosk_cryptohome_remover.cc b/chrome/browser/ash/app_mode/kiosk_cryptohome_remover.cc index ba18508..47d180d 100644 --- a/chrome/browser/ash/app_mode/kiosk_cryptohome_remover.cc +++ b/chrome/browser/ash/app_mode/kiosk_cryptohome_remover.cc
@@ -8,9 +8,9 @@ #include <utility> #include "base/barrier_closure.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "chrome/browser/ash/app_mode/pref_names.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/ash/app_mode/kiosk_external_update_validator.cc b/chrome/browser/ash/app_mode/kiosk_external_update_validator.cc index d90ca35a..babecbe7 100644 --- a/chrome/browser/ash/app_mode/kiosk_external_update_validator.cc +++ b/chrome/browser/ash/app_mode/kiosk_external_update_validator.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ash/app_mode/kiosk_external_update_validator.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/ash/app_mode/kiosk_external_updater.cc b/chrome/browser/ash/app_mode/kiosk_external_updater.cc index 1dea972..0fb78e5 100644 --- a/chrome/browser/ash/app_mode/kiosk_external_updater.cc +++ b/chrome/browser/ash/app_mode/kiosk_external_updater.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ash/app_mode/kiosk_external_updater.h" -#include "base/bind.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/json/json_file_value_serializer.h" #include "base/location.h" #include "base/logging.h"
diff --git a/chrome/browser/ash/app_mode/kiosk_mode_idle_app_name_notification.cc b/chrome/browser/ash/app_mode/kiosk_mode_idle_app_name_notification.cc index 3bb26db..bf30e16 100644 --- a/chrome/browser/ash/app_mode/kiosk_mode_idle_app_name_notification.cc +++ b/chrome/browser/ash/app_mode/kiosk_mode_idle_app_name_notification.cc
@@ -6,9 +6,9 @@ #include <memory> -#include "base/bind.h" #include "base/check.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/notifications/idle_app_name_notification_view.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/common/chrome_switches.h"
diff --git a/chrome/browser/ash/app_mode/kiosk_profile_loader.cc b/chrome/browser/ash/app_mode/kiosk_profile_loader.cc index 3657c00..0d3bbfe 100644 --- a/chrome/browser/ash/app_mode/kiosk_profile_loader.cc +++ b/chrome/browser/ash/app_mode/kiosk_profile_loader.cc
@@ -7,7 +7,7 @@ #include <memory> #include <tuple> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/ash/app_mode/kiosk_profile_loader.h b/chrome/browser/ash/app_mode/kiosk_profile_loader.h index a78fa10..9df916e2 100644 --- a/chrome/browser/ash/app_mode/kiosk_profile_loader.h +++ b/chrome/browser/ash/app_mode/kiosk_profile_loader.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/ash/app_mode/kiosk_app_launch_error.h" #include "chrome/browser/ash/app_mode/kiosk_app_manager_base.h" #include "chrome/browser/ash/login/session/user_session_manager.h"
diff --git a/chrome/browser/ash/app_mode/startup_app_launcher.cc b/chrome/browser/ash/app_mode/startup_app_launcher.cc index 98a71a8..703abb0c 100644 --- a/chrome/browser/ash/app_mode/startup_app_launcher.cc +++ b/chrome/browser/ash/app_mode/startup_app_launcher.cc
@@ -8,9 +8,9 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_forward.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback_forward.h" #include "base/location.h" #include "base/notreached.h" #include "base/syslog_logging.h"
diff --git a/chrome/browser/ash/app_mode/startup_app_launcher.h b/chrome/browser/ash/app_mode/startup_app_launcher.h index 9e1e487..216fc4ef 100644 --- a/chrome/browser/ash/app_mode/startup_app_launcher.h +++ b/chrome/browser/ash/app_mode/startup_app_launcher.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "base/scoped_observation.h" #include "chrome/browser/ash/app_mode/kiosk_app_launcher.h"
diff --git a/chrome/browser/ash/app_mode/startup_app_launcher_unittest.cc b/chrome/browser/ash/app_mode/startup_app_launcher_unittest.cc index 0225bb2..330f018 100644 --- a/chrome/browser/ash/app_mode/startup_app_launcher_unittest.cc +++ b/chrome/browser/ash/app_mode/startup_app_launcher_unittest.cc
@@ -11,9 +11,9 @@ #include <vector> #include "ash/test/ash_test_helper.h" -#include "base/callback.h" #include "base/command_line.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/run_loop.h" #include "base/test/metrics/histogram_tester.h"
diff --git a/chrome/browser/ash/app_mode/web_app/web_kiosk_app_launcher.cc b/chrome/browser/ash/app_mode/web_app/web_kiosk_app_launcher.cc index 8964f1b..7efe008 100644 --- a/chrome/browser/ash/app_mode/web_app/web_kiosk_app_launcher.cc +++ b/chrome/browser/ash/app_mode/web_app/web_kiosk_app_launcher.cc
@@ -7,7 +7,7 @@ #include <memory> #include "ash/public/cpp/window_properties.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/metrics/histogram_functions.h" #include "base/syslog_logging.h"
diff --git a/chrome/browser/ash/app_mode/web_app/web_kiosk_app_launcher.h b/chrome/browser/ash/app_mode/web_app/web_kiosk_app_launcher.h index a63a618..6ff95623 100644 --- a/chrome/browser/ash/app_mode/web_app/web_kiosk_app_launcher.h +++ b/chrome/browser/ash/app_mode/web_app/web_kiosk_app_launcher.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/scoped_observation.h" #include "chrome/browser/ash/app_mode/kiosk_app_launcher.h"
diff --git a/chrome/browser/ash/app_mode/web_app/web_kiosk_app_service_launcher.cc b/chrome/browser/ash/app_mode/web_app/web_kiosk_app_service_launcher.cc index d8a1930..19fb37a 100644 --- a/chrome/browser/ash/app_mode/web_app/web_kiosk_app_service_launcher.cc +++ b/chrome/browser/ash/app_mode/web_app/web_kiosk_app_service_launcher.cc
@@ -5,8 +5,8 @@ #include "chrome/browser/ash/app_mode/web_app/web_kiosk_app_service_launcher.h" #include <memory> -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "base/syslog_logging.h" #include "chrome/browser/apps/app_service/app_service_proxy.h"
diff --git a/chrome/browser/ash/app_mode/web_app/web_kiosk_app_service_launcher_unittest.cc b/chrome/browser/ash/app_mode/web_app/web_kiosk_app_service_launcher_unittest.cc index 4b8d721..6cd28fc 100644 --- a/chrome/browser/ash/app_mode/web_app/web_kiosk_app_service_launcher_unittest.cc +++ b/chrome/browser/ash/app_mode/web_app/web_kiosk_app_service_launcher_unittest.cc
@@ -7,7 +7,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "base/test/bind.h" #include "base/test/gmock_callback_support.h"
diff --git a/chrome/browser/ash/app_mode/web_app/web_kiosk_browser_controller_ash_browsertest.cc b/chrome/browser/ash/app_mode/web_app/web_kiosk_browser_controller_ash_browsertest.cc index 11aa3cd..7b8ed58 100644 --- a/chrome/browser/ash/app_mode/web_app/web_kiosk_browser_controller_ash_browsertest.cc +++ b/chrome/browser/ash/app_mode/web_app/web_kiosk_browser_controller_ash_browsertest.cc
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/callback_forward.h" #include "base/containers/contains.h" +#include "base/functional/callback_forward.h" #include "base/run_loop.h" #include "base/test/bind.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/ash/app_restore/app_launch_handler.cc b/chrome/browser/ash/app_restore/app_launch_handler.cc index 5fb075b..a420c1ce 100644 --- a/chrome/browser/ash/app_restore/app_launch_handler.cc +++ b/chrome/browser/ash/app_restore/app_launch_handler.cc
@@ -8,8 +8,8 @@ #include <vector> #include "apps/launcher.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/task/single_thread_task_runner.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/app_restore/arc_app_queue_restore_handler.cc b/chrome/browser/ash/app_restore/arc_app_queue_restore_handler.cc index af24396..4486cc6 100644 --- a/chrome/browser/ash/app_restore/arc_app_queue_restore_handler.cc +++ b/chrome/browser/ash/app_restore/arc_app_queue_restore_handler.cc
@@ -10,9 +10,9 @@ #include "ash/components/arc/arc_util.h" #include "ash/components/arc/metrics/arc_metrics_constants.h" #include "ash/shell.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/metrics/histogram_functions.h" #include "base/system/sys_info.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/ash/app_restore/arc_ghost_window_view_unittest.cc b/chrome/browser/ash/app_restore/arc_ghost_window_view_unittest.cc index eb437e4..dacbee9 100644 --- a/chrome/browser/ash/app_restore/arc_ghost_window_view_unittest.cc +++ b/chrome/browser/ash/app_restore/arc_ghost_window_view_unittest.cc
@@ -5,7 +5,7 @@ #include "chrome/browser/ash/app_restore/arc_ghost_window_view.h" #include "ash/components/arc/arc_features.h" -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/ash/app_restore/full_restore_app_launch_handler.cc b/chrome/browser/ash/app_restore/full_restore_app_launch_handler.cc index 03866063..ecd6c692 100644 --- a/chrome/browser/ash/app_restore/full_restore_app_launch_handler.cc +++ b/chrome/browser/ash/app_restore/full_restore_app_launch_handler.cc
@@ -10,8 +10,8 @@ #include "ash/constants/ash_switches.h" #include "ash/metrics/login_unlock_throughput_recorder.h" #include "ash/shell.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "base/task/single_thread_task_runner.h" #include "chrome/browser/apps/app_service/app_service_proxy.h"
diff --git a/chrome/browser/ash/app_restore/new_user_restore_pref_handler.cc b/chrome/browser/ash/app_restore/new_user_restore_pref_handler.cc index 1d1eecc..fc2f197 100644 --- a/chrome/browser/ash/app_restore/new_user_restore_pref_handler.cc +++ b/chrome/browser/ash/app_restore/new_user_restore_pref_handler.cc
@@ -5,7 +5,7 @@ #include "chrome/browser/ash/app_restore/new_user_restore_pref_handler.h" #include "ash/constants/ash_features.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/app_restore/full_restore_prefs.h" #include "chrome/browser/prefs/pref_service_syncable_util.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ash/apps/apk_web_app_installer.cc b/chrome/browser/ash/apps/apk_web_app_installer.cc index bb63657..c72306f1e 100644 --- a/chrome/browser/ash/apps/apk_web_app_installer.cc +++ b/chrome/browser/ash/apps/apk_web_app_installer.cc
@@ -7,7 +7,7 @@ #include <limits> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/ash/crosapi/crosapi_ash.h" #include "chrome/browser/ash/crosapi/crosapi_manager.h"
diff --git a/chrome/browser/ash/apps/apk_web_app_installer.h b/chrome/browser/ash/apps/apk_web_app_installer.h index ea771e6e..f257e55 100644 --- a/chrome/browser/ash/apps/apk_web_app_installer.h +++ b/chrome/browser/ash/apps/apk_web_app_installer.h
@@ -9,7 +9,7 @@ #include <vector> #include "ash/components/arc/mojom/app.mojom.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/web_applications/web_app_id.h" #include "chrome/browser/web_applications/web_app_install_info.h"
diff --git a/chrome/browser/ash/apps/apk_web_app_installer_browsertest.cc b/chrome/browser/ash/apps/apk_web_app_installer_browsertest.cc index adff180f..b766503 100644 --- a/chrome/browser/ash/apps/apk_web_app_installer_browsertest.cc +++ b/chrome/browser/ash/apps/apk_web_app_installer_browsertest.cc
@@ -10,8 +10,8 @@ #include "ash/components/arc/test/connection_holder_util.h" #include "ash/components/arc/test/fake_app_instance.h" #include "ash/public/cpp/shelf_model.h" -#include "base/callback.h" #include "base/containers/contains.h" +#include "base/functional/callback.h" #include "base/run_loop.h" #include "base/scoped_observation.h" #include "base/test/bind.h"
diff --git a/chrome/browser/ash/apps/apk_web_app_installer_unittest.cc b/chrome/browser/ash/apps/apk_web_app_installer_unittest.cc index 2eccfb6b..35c4337 100644 --- a/chrome/browser/ash/apps/apk_web_app_installer_unittest.cc +++ b/chrome/browser/ash/apps/apk_web_app_installer_unittest.cc
@@ -6,8 +6,8 @@ #include <utility> #include "ash/components/arc/test/fake_app_instance.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/weak_ptr.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ash/apps/apk_web_app_service.cc b/chrome/browser/ash/apps/apk_web_app_service.cc index 1f2de08..8ea17c8 100644 --- a/chrome/browser/ash/apps/apk_web_app_service.cc +++ b/chrome/browser/ash/apps/apk_web_app_service.cc
@@ -9,8 +9,8 @@ #include "ash/components/arc/mojom/app.mojom.h" #include "ash/components/arc/session/connection_holder.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/task/single_thread_task_runner.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/apps/apk_web_app_service.h b/chrome/browser/ash/apps/apk_web_app_service.h index 8d1d2de..394548f 100644 --- a/chrome/browser/ash/apps/apk_web_app_service.h +++ b/chrome/browser/ash/apps/apk_web_app_service.h
@@ -9,7 +9,7 @@ #include <vector> #include "ash/components/arc/mojom/app.mojom-forward.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/gtest_prod_util.h" #include "base/memory/weak_ptr.h" #include "base/scoped_observation.h"
diff --git a/chrome/browser/ash/apps/apk_web_app_service_lacros_browsertest.cc b/chrome/browser/ash/apps/apk_web_app_service_lacros_browsertest.cc index 54b32c8..40ab817 100644 --- a/chrome/browser/ash/apps/apk_web_app_service_lacros_browsertest.cc +++ b/chrome/browser/ash/apps/apk_web_app_service_lacros_browsertest.cc
@@ -9,8 +9,8 @@ #include "ash/components/arc/test/arc_util_test_support.h" #include "ash/constants/ash_features.h" #include "ash/public/cpp/shelf_model.h" -#include "base/bind.h" #include "base/callback_list.h" +#include "base/functional/bind.h" #include "base/test/scoped_feature_list.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/arc/accessibility/arc_accessibility_helper_bridge.cc b/chrome/browser/ash/arc/accessibility/arc_accessibility_helper_bridge.cc index ba95dc7..630557e 100644 --- a/chrome/browser/ash/arc/accessibility/arc_accessibility_helper_bridge.cc +++ b/chrome/browser/ash/arc/accessibility/arc_accessibility_helper_bridge.cc
@@ -12,8 +12,8 @@ #include "ash/components/arc/session/arc_service_manager.h" #include "ash/public/cpp/external_arc/message_center/arc_notification_surface.h" #include "ash/public/cpp/window_properties.h" -#include "base/bind.h" #include "base/containers/flat_map.h" +#include "base/functional/bind.h" #include "base/memory/singleton.h" #include "base/strings/stringprintf.h" #include "chrome/browser/ash/accessibility/magnification_manager.h"
diff --git a/chrome/browser/ash/arc/accessibility/arc_accessibility_tree_tracker.cc b/chrome/browser/ash/arc/accessibility/arc_accessibility_tree_tracker.cc index 650a3852..1659a8b8 100644 --- a/chrome/browser/ash/arc/accessibility/arc_accessibility_tree_tracker.cc +++ b/chrome/browser/ash/arc/accessibility/arc_accessibility_tree_tracker.cc
@@ -18,8 +18,8 @@ #include "ash/public/cpp/shell_window_ids.h" #include "ash/public/cpp/window_properties.h" #include "ash/shell.h" -#include "base/bind.h" #include "base/containers/cxx20_erase.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "base/scoped_multi_source_observation.h" #include "base/time/time.h"
diff --git a/chrome/browser/ash/arc/adbd/arc_adbd_monitor_bridge.cc b/chrome/browser/ash/arc/adbd/arc_adbd_monitor_bridge.cc index f35d3d65..8f478c3 100644 --- a/chrome/browser/ash/arc/adbd/arc_adbd_monitor_bridge.cc +++ b/chrome/browser/ash/arc/adbd/arc_adbd_monitor_bridge.cc
@@ -12,10 +12,10 @@ #include "ash/components/arc/arc_browser_context_keyed_service_factory_base.h" #include "ash/components/arc/arc_util.h" #include "ash/components/arc/session/arc_bridge_service.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/files/file_util.h" #include "base/format_macros.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/memory/singleton.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/ash/arc/app_shortcuts/arc_app_shortcuts_menu_builder.cc b/chrome/browser/ash/arc/app_shortcuts/arc_app_shortcuts_menu_builder.cc index 657d683b..835576d 100644 --- a/chrome/browser/ash/arc/app_shortcuts/arc_app_shortcuts_menu_builder.cc +++ b/chrome/browser/ash/arc/app_shortcuts/arc_app_shortcuts_menu_builder.cc
@@ -7,7 +7,7 @@ #include <tuple> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/ash/app_list/app_list_client_impl.h"
diff --git a/chrome/browser/ash/arc/app_shortcuts/arc_app_shortcuts_menu_builder.h b/chrome/browser/ash/arc/app_shortcuts/arc_app_shortcuts_menu_builder.h index e09f1c5..1550f70dd 100644 --- a/chrome/browser/ash/arc/app_shortcuts/arc_app_shortcuts_menu_builder.h +++ b/chrome/browser/ash/arc/app_shortcuts/arc_app_shortcuts_menu_builder.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/time/time.h" #include "chrome/browser/apps/app_service/app_shortcut_item.h"
diff --git a/chrome/browser/ash/arc/app_shortcuts/arc_app_shortcuts_request.cc b/chrome/browser/ash/arc/app_shortcuts/arc_app_shortcuts_request.cc index c32e63f..229180cb 100644 --- a/chrome/browser/ash/arc/app_shortcuts/arc_app_shortcuts_request.cc +++ b/chrome/browser/ash/arc/app_shortcuts/arc_app_shortcuts_request.cc
@@ -10,7 +10,7 @@ #include "ash/components/arc/session/arc_bridge_service.h" #include "ash/components/arc/session/arc_service_manager.h" #include "base/barrier_closure.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/apps/app_service/app_icon/app_icon_factory.h"
diff --git a/chrome/browser/ash/arc/app_shortcuts/arc_app_shortcuts_request.h b/chrome/browser/ash/arc/app_shortcuts/arc_app_shortcuts_request.h index b5af258..ab2fc3b0 100644 --- a/chrome/browser/ash/arc/app_shortcuts/arc_app_shortcuts_request.h +++ b/chrome/browser/ash/arc/app_shortcuts/arc_app_shortcuts_request.h
@@ -9,7 +9,7 @@ #include <vector> #include "ash/components/arc/mojom/app.mojom-forward.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/apps/app_service/app_shortcut_item.h"
diff --git a/chrome/browser/ash/arc/arc_demo_mode_delegate_impl.h b/chrome/browser/ash/arc/arc_demo_mode_delegate_impl.h index 2747bbe..5618dc4 100644 --- a/chrome/browser/ash/arc/arc_demo_mode_delegate_impl.h +++ b/chrome/browser/ash/arc/arc_demo_mode_delegate_impl.h
@@ -6,8 +6,8 @@ #define CHROME_BROWSER_ASH_ARC_ARC_DEMO_MODE_DELEGATE_IMPL_H_ #include "ash/components/arc/session/arc_client_adapter.h" -#include "base/callback_forward.h" #include "base/files/file_path.h" +#include "base/functional/callback_forward.h" namespace arc {
diff --git a/chrome/browser/ash/arc/arc_migration_guide_notification.cc b/chrome/browser/ash/arc/arc_migration_guide_notification.cc index 37c1644..885bed6 100644 --- a/chrome/browser/ash/arc/arc_migration_guide_notification.cc +++ b/chrome/browser/ash/arc/arc_migration_guide_notification.cc
@@ -8,7 +8,7 @@ #include "ash/constants/notifier_catalogs.h" #include "ash/public/cpp/notification_utils.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/arc/arc_migration_constants.h" #include "chrome/browser/ash/arc/arc_util.h" #include "chrome/browser/lifetime/application_lifetime.h"
diff --git a/chrome/browser/ash/arc/arc_support_host.cc b/chrome/browser/ash/arc/arc_support_host.cc index 85f62c35..09a8de1 100644 --- a/chrome/browser/ash/arc/arc_support_host.cc +++ b/chrome/browser/ash/arc/arc_support_host.cc
@@ -8,7 +8,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/hash/sha1.h" #include "base/i18n/timezone.h" #include "base/json/json_reader.h"
diff --git a/chrome/browser/ash/arc/arc_support_host.h b/chrome/browser/ash/arc/arc_support_host.h index 66b94e9..a2a390c 100644 --- a/chrome/browser/ash/arc/arc_support_host.h +++ b/chrome/browser/ash/arc/arc_support_host.h
@@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/ash/arc/extensions/arc_support_message_host.h" #include "extensions/browser/api/messaging/native_message_host.h" #include "ui/display/display_observer.h"
diff --git a/chrome/browser/ash/arc/arc_support_host_unittest.cc b/chrome/browser/ash/arc/arc_support_host_unittest.cc index b7a94fa2f..d410c90 100644 --- a/chrome/browser/ash/arc/arc_support_host_unittest.cc +++ b/chrome/browser/ash/arc/arc_support_host_unittest.cc
@@ -6,7 +6,7 @@ #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/arc/extensions/fake_arc_support.h" #include "chrome/browser/ash/login/users/fake_chrome_user_manager.h" #include "chrome/browser/consent_auditor/consent_auditor_factory.h"
diff --git a/chrome/browser/ash/arc/arc_util.cc b/chrome/browser/ash/arc/arc_util.cc index 7b63190..93dc641c 100644 --- a/chrome/browser/ash/arc/arc_util.cc +++ b/chrome/browser/ash/arc/arc_util.cc
@@ -16,9 +16,9 @@ #include "ash/components/arc/arc_util.h" #include "ash/constants/ash_features.h" #include "ash/constants/ash_switches.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/lazy_instance.h" #include "base/logging.h" #include "base/memory/scoped_refptr.h"
diff --git a/chrome/browser/ash/arc/arc_util.h b/chrome/browser/ash/arc/arc_util.h index a92ba14..71a6c1cf 100644 --- a/chrome/browser/ash/arc/arc_util.h +++ b/chrome/browser/ash/arc/arc_util.h
@@ -9,7 +9,7 @@ #include <memory> #include "ash/components/arc/session/arc_management_transition.h" -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "chrome/browser/ash/login/demo_mode/demo_session.h" #include "storage/browser/file_system/file_system_url.h"
diff --git a/chrome/browser/ash/arc/auth/arc_active_directory_enrollment_token_fetcher.cc b/chrome/browser/ash/arc/auth/arc_active_directory_enrollment_token_fetcher.cc index c71f84c5..650e7be4 100644 --- a/chrome/browser/ash/arc/auth/arc_active_directory_enrollment_token_fetcher.cc +++ b/chrome/browser/ash/arc/auth/arc_active_directory_enrollment_token_fetcher.cc
@@ -7,7 +7,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "chrome/browser/ash/arc/arc_optin_uma.h" #include "chrome/browser/ash/policy/core/browser_policy_connector_ash.h"
diff --git a/chrome/browser/ash/arc/auth/arc_active_directory_enrollment_token_fetcher.h b/chrome/browser/ash/arc/auth/arc_active_directory_enrollment_token_fetcher.h index 3a6d2ba..6779fe0 100644 --- a/chrome/browser/ash/arc/auth/arc_active_directory_enrollment_token_fetcher.h +++ b/chrome/browser/ash/arc/auth/arc_active_directory_enrollment_token_fetcher.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ash/arc/arc_support_host.h" #include "chrome/browser/ash/arc/auth/arc_fetcher_base.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 6c910533..df40fe0 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
@@ -6,9 +6,9 @@ #include <string> #include "ash/components/arc/test/arc_util_test_support.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/run_loop.h" #include "base/test/bind.h" #include "chrome/browser/ash/arc/arc_support_host.h"
diff --git a/chrome/browser/ash/arc/auth/arc_auth_code_fetcher.h b/chrome/browser/ash/arc/auth/arc_auth_code_fetcher.h index 34393e7..e139d8fe 100644 --- a/chrome/browser/ash/arc/auth/arc_auth_code_fetcher.h +++ b/chrome/browser/ash/arc/auth/arc_auth_code_fetcher.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/ash/arc/auth/arc_fetcher_base.h" namespace arc {
diff --git a/chrome/browser/ash/arc/auth/arc_auth_context.cc b/chrome/browser/ash/arc/auth/arc_auth_context.cc index 603105f..3fb9f03 100644 --- a/chrome/browser/ash/arc/auth/arc_auth_context.cc +++ b/chrome/browser/ash/arc/auth/arc_auth_context.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "chrome/browser/ash/app_list/arc/arc_app_utils.h" #include "chrome/browser/ash/arc/arc_support_host.h"
diff --git a/chrome/browser/ash/arc/auth/arc_auth_context.h b/chrome/browser/ash/arc/auth/arc_auth_context.h index 52e99ab..a401a40 100644 --- a/chrome/browser/ash/arc/auth/arc_auth_context.h +++ b/chrome/browser/ash/arc/auth/arc_auth_context.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/timer/timer.h" #include "components/signin/public/identity_manager/identity_manager.h" #include "components/signin/public/identity_manager/scope_set.h"
diff --git a/chrome/browser/ash/arc/auth/arc_auth_service.cc b/chrome/browser/ash/arc/auth/arc_auth_service.cc index 48e55d4..971b031 100644 --- a/chrome/browser/ash/arc/auth/arc_auth_service.cc +++ b/chrome/browser/ash/arc/auth/arc_auth_service.cc
@@ -17,9 +17,9 @@ #include "ash/components/arc/session/arc_management_transition.h" #include "ash/components/arc/session/arc_service_manager.h" #include "ash/constants/ash_switches.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/containers/flat_set.h" +#include "base/functional/bind.h" #include "base/memory/singleton.h" #include "base/metrics/histogram_functions.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ash/arc/auth/arc_auth_service.h b/chrome/browser/ash/arc/auth/arc_auth_service.h index 5288972e..b512c8d5 100644 --- a/chrome/browser/ash/arc/auth/arc_auth_service.h +++ b/chrome/browser/ash/arc/auth/arc_auth_service.h
@@ -11,8 +11,8 @@ #include "ash/components/arc/mojom/auth.mojom.h" #include "ash/components/arc/session/connection_observer.h" -#include "base/callback.h" #include "base/containers/flat_set.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ash/account_manager/account_apps_availability.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 df87e62..dba1610 100644 --- a/chrome/browser/ash/arc/auth/arc_auth_service_browsertest.cc +++ b/chrome/browser/ash/arc/auth/arc_auth_service_browsertest.cc
@@ -17,12 +17,12 @@ #include "ash/components/arc/test/fake_arc_session.h" #include "ash/constants/ash_features.h" #include "ash/constants/ash_switches.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/containers/flat_set.h" #include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h" #include "base/test/bind.h"
diff --git a/chrome/browser/ash/arc/auth/arc_background_auth_code_fetcher.cc b/chrome/browser/ash/arc/auth/arc_background_auth_code_fetcher.cc index 3cd659b04..cee06cc 100644 --- a/chrome/browser/ash/arc/auth/arc_background_auth_code_fetcher.cc +++ b/chrome/browser/ash/arc/auth/arc_background_auth_code_fetcher.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/json/json_string_value_serializer.h" #include "base/json/json_writer.h" #include "base/logging.h"
diff --git a/chrome/browser/ash/arc/auth/arc_background_auth_code_fetcher.h b/chrome/browser/ash/arc/auth/arc_background_auth_code_fetcher.h index 9abc07ae..e5049e5 100644 --- a/chrome/browser/ash/arc/auth/arc_background_auth_code_fetcher.h +++ b/chrome/browser/ash/arc/auth/arc_background_auth_code_fetcher.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ash/arc/arc_optin_uma.h" #include "chrome/browser/ash/arc/auth/arc_auth_code_fetcher.h"
diff --git a/chrome/browser/ash/arc/auth/arc_robot_auth_code_fetcher.cc b/chrome/browser/ash/arc/auth/arc_robot_auth_code_fetcher.cc index 63d8f4c..92e40b8 100644 --- a/chrome/browser/ash/arc/auth/arc_robot_auth_code_fetcher.cc +++ b/chrome/browser/ash/arc/auth/arc_robot_auth_code_fetcher.cc
@@ -7,8 +7,8 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "chrome/browser/ash/policy/core/browser_policy_connector_ash.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/browser_process_platform_part.h"
diff --git a/chrome/browser/ash/arc/auth/arc_robot_auth_code_fetcher.h b/chrome/browser/ash/arc/auth/arc_robot_auth_code_fetcher.h index 45839aea..52f7637 100644 --- a/chrome/browser/ash/arc/auth/arc_robot_auth_code_fetcher.h +++ b/chrome/browser/ash/arc/auth/arc_robot_auth_code_fetcher.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ash/arc/auth/arc_auth_code_fetcher.h" #include "components/policy/core/common/cloud/cloud_policy_constants.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 1bd9a45..bfee3498 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
@@ -6,9 +6,9 @@ #include <string> #include "ash/components/arc/test/arc_util_test_support.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/run_loop.h" #include "base/test/bind.h" #include "chrome/browser/ash/arc/auth/arc_auth_service.h"
diff --git a/chrome/browser/ash/arc/bluetooth/arc_bluetooth_bridge.cc b/chrome/browser/ash/arc/bluetooth/arc_bluetooth_bridge.cc index e610471..189bce9 100644 --- a/chrome/browser/ash/arc/bluetooth/arc_bluetooth_bridge.cc +++ b/chrome/browser/ash/arc/bluetooth/arc_bluetooth_bridge.cc
@@ -19,11 +19,11 @@ #include "ash/components/arc/bluetooth/bluetooth_type_converters.h" #include "ash/components/arc/session/arc_bridge_service.h" #include "ash/constants/ash_pref_names.h" -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/containers/contains.h" #include "base/containers/queue.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/json/json_writer.h" #include "base/logging.h" #include "base/memory/singleton.h"
diff --git a/chrome/browser/ash/arc/bluetooth/arc_bluetooth_bridge.h b/chrome/browser/ash/arc/bluetooth/arc_bluetooth_bridge.h index 67297b01..f1fa608b 100644 --- a/chrome/browser/ash/arc/bluetooth/arc_bluetooth_bridge.h +++ b/chrome/browser/ash/arc/bluetooth/arc_bluetooth_bridge.h
@@ -18,10 +18,10 @@ #include "ash/components/arc/mojom/bluetooth.mojom.h" #include "ash/components/arc/mojom/intent_helper.mojom-forward.h" #include "ash/components/arc/session/connection_observer.h" -#include "base/callback_forward.h" #include "base/containers/unique_ptr_adapters.h" #include "base/files/file.h" #include "base/files/file_descriptor_watcher_posix.h" +#include "base/functional/callback_forward.h" #include "base/threading/thread_checker.h" #include "base/timer/timer.h" #include "chrome/browser/ash/arc/bluetooth/arc_bluetooth_task_queue.h"
diff --git a/chrome/browser/ash/arc/bluetooth/arc_bluetooth_bridge_unittest.cc b/chrome/browser/ash/arc/bluetooth/arc_bluetooth_bridge_unittest.cc index cd47798..897a514 100644 --- a/chrome/browser/ash/arc/bluetooth/arc_bluetooth_bridge_unittest.cc +++ b/chrome/browser/ash/arc/bluetooth/arc_bluetooth_bridge_unittest.cc
@@ -14,7 +14,7 @@ #include "ash/components/arc/session/arc_bridge_service.h" #include "ash/components/arc/test/connection_holder_util.h" #include "ash/components/arc/test/fake_bluetooth_instance.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/system/sys_info.h" #include "base/test/scoped_chromeos_version_info.h"
diff --git a/chrome/browser/ash/arc/bluetooth/arc_bluetooth_task_queue.h b/chrome/browser/ash/arc/bluetooth/arc_bluetooth_task_queue.h index 3e103ce..f0b35bf 100644 --- a/chrome/browser/ash/arc/bluetooth/arc_bluetooth_task_queue.h +++ b/chrome/browser/ash/arc/bluetooth/arc_bluetooth_task_queue.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_ASH_ARC_BLUETOOTH_ARC_BLUETOOTH_TASK_QUEUE_H_ #define CHROME_BROWSER_ASH_ARC_BLUETOOTH_ARC_BLUETOOTH_TASK_QUEUE_H_ -#include "base/callback.h" #include "base/containers/queue.h" +#include "base/functional/callback.h" namespace arc {
diff --git a/chrome/browser/ash/arc/bluetooth/arc_bluetooth_task_queue_unittest.cc b/chrome/browser/ash/arc/bluetooth/arc_bluetooth_task_queue_unittest.cc index 5c3d190..84b706a 100644 --- a/chrome/browser/ash/arc/bluetooth/arc_bluetooth_task_queue_unittest.cc +++ b/chrome/browser/ash/arc/bluetooth/arc_bluetooth_task_queue_unittest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ash/arc/bluetooth/arc_bluetooth_task_queue.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/test/bind.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/ash/arc/boot_phase_monitor/arc_boot_phase_monitor_bridge.cc b/chrome/browser/ash/arc/boot_phase_monitor/arc_boot_phase_monitor_bridge.cc index 40d359f..9839418 100644 --- a/chrome/browser/ash/arc/boot_phase_monitor/arc_boot_phase_monitor_bridge.cc +++ b/chrome/browser/ash/arc/boot_phase_monitor/arc_boot_phase_monitor_bridge.cc
@@ -9,7 +9,7 @@ #include "ash/components/arc/arc_prefs.h" #include "ash/components/arc/arc_util.h" #include "ash/components/arc/session/arc_bridge_service.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/singleton.h" #include "base/metrics/histogram_macros.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 553f73d3..b182b2f 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
@@ -10,8 +10,8 @@ #include "ash/components/arc/session/arc_service_manager.h" #include "ash/components/arc/test/arc_util_test_support.h" #include "ash/components/arc/test/fake_arc_session.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/threading/platform_thread.h" #include "base/time/time.h" #include "chrome/browser/ash/arc/arc_util.h"
diff --git a/chrome/browser/ash/arc/enterprise/arc_data_snapshotd_delegate.h b/chrome/browser/ash/arc/enterprise/arc_data_snapshotd_delegate.h index 04ffef96..1d90c71 100644 --- a/chrome/browser/ash/arc/enterprise/arc_data_snapshotd_delegate.h +++ b/chrome/browser/ash/arc/enterprise/arc_data_snapshotd_delegate.h
@@ -9,8 +9,8 @@ #include "ash/components/arc/enterprise/arc_data_snapshotd_manager.h" #include "ash/components/arc/enterprise/arc_snapshot_reboot_notification.h" #include "ash/components/arc/session/arc_stop_reason.h" -#include "base/callback.h" #include "base/command_line.h" +#include "base/functional/callback.h" #include "chrome/browser/ash/arc/session/arc_session_manager_observer.h" class PrefService;
diff --git a/chrome/browser/ash/arc/enterprise/arc_enterprise_reporting_service.cc b/chrome/browser/ash/arc/enterprise/arc_enterprise_reporting_service.cc index 6680632d..2651bdb 100644 --- a/chrome/browser/ash/arc/enterprise/arc_enterprise_reporting_service.cc +++ b/chrome/browser/ash/arc/enterprise/arc_enterprise_reporting_service.cc
@@ -9,7 +9,7 @@ #include "ash/components/arc/arc_browser_context_keyed_service_factory_base.h" #include "ash/components/arc/session/arc_bridge_service.h" #include "ash/components/arc/session/arc_service_manager.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/singleton.h" #include "base/metrics/histogram_functions.h"
diff --git a/chrome/browser/ash/arc/enterprise/arc_enterprise_reporting_service_unittest.cc b/chrome/browser/ash/arc/enterprise/arc_enterprise_reporting_service_unittest.cc index 19f22b9..ee752db 100644 --- a/chrome/browser/ash/arc/enterprise/arc_enterprise_reporting_service_unittest.cc +++ b/chrome/browser/ash/arc/enterprise/arc_enterprise_reporting_service_unittest.cc
@@ -8,8 +8,8 @@ #include "ash/components/arc/session/arc_service_manager.h" #include "ash/components/arc/test/arc_util_test_support.h" #include "ash/components/arc/test/fake_arc_session.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/time/time.h" #include "chrome/browser/ash/arc/session/arc_session_manager.h"
diff --git a/chrome/browser/ash/arc/enterprise/arc_force_installed_apps_tracker.cc b/chrome/browser/ash/arc/enterprise/arc_force_installed_apps_tracker.cc index 1a0775a9..526a9b11 100644 --- a/chrome/browser/ash/arc/enterprise/arc_force_installed_apps_tracker.cc +++ b/chrome/browser/ash/arc/enterprise/arc_force_installed_apps_tracker.cc
@@ -7,8 +7,8 @@ #include <algorithm> #include <vector> -#include "base/bind.h" #include "base/containers/flat_map.h" +#include "base/functional/bind.h" #include "base/json/json_reader.h" #include "base/memory/weak_ptr.h" #include "base/task/sequenced_task_runner.h"
diff --git a/chrome/browser/ash/arc/enterprise/arc_force_installed_apps_tracker.h b/chrome/browser/ash/arc/enterprise/arc_force_installed_apps_tracker.h index e5c775c..550f04b8 100644 --- a/chrome/browser/ash/arc/enterprise/arc_force_installed_apps_tracker.h +++ b/chrome/browser/ash/arc/enterprise/arc_force_installed_apps_tracker.h
@@ -8,7 +8,7 @@ #include <memory> #include "ash/components/arc/enterprise/arc_apps_tracker.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" class ArcAppListPrefs;
diff --git a/chrome/browser/ash/arc/enterprise/arc_force_installed_apps_tracker_unittest.cc b/chrome/browser/ash/arc/enterprise/arc_force_installed_apps_tracker_unittest.cc index 65f2bf9..1117d3b 100644 --- a/chrome/browser/ash/arc/enterprise/arc_force_installed_apps_tracker_unittest.cc +++ b/chrome/browser/ash/arc/enterprise/arc_force_installed_apps_tracker_unittest.cc
@@ -8,7 +8,7 @@ #include "ash/components/arc/session/arc_bridge_service.h" #include "base/barrier_closure.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/test/bind.h" #include "chrome/browser/ash/app_list/arc/arc_app_list_prefs.h"
diff --git a/chrome/browser/ash/arc/enterprise/arc_snapshot_reboot_notification_impl.h b/chrome/browser/ash/arc/enterprise/arc_snapshot_reboot_notification_impl.h index 1faf546d..d09eb08b 100644 --- a/chrome/browser/ash/arc/enterprise/arc_snapshot_reboot_notification_impl.h +++ b/chrome/browser/ash/arc/enterprise/arc_snapshot_reboot_notification_impl.h
@@ -6,7 +6,7 @@ #define CHROME_BROWSER_ASH_ARC_ENTERPRISE_ARC_SNAPSHOT_REBOOT_NOTIFICATION_IMPL_H_ #include "ash/components/arc/enterprise/arc_snapshot_reboot_notification.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/chrome/browser/ash/arc/enterprise/arc_snapshot_reboot_notification_impl_unittest.cc b/chrome/browser/ash/arc/enterprise/arc_snapshot_reboot_notification_impl_unittest.cc index 0f315b5..4d59719 100644 --- a/chrome/browser/ash/arc/enterprise/arc_snapshot_reboot_notification_impl_unittest.cc +++ b/chrome/browser/ash/arc/enterprise/arc_snapshot_reboot_notification_impl_unittest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ash/arc/enterprise/arc_snapshot_reboot_notification_impl.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/run_loop.h" #include "base/test/bind.h" #include "chrome/browser/notifications/notification_display_service_tester.h"
diff --git a/chrome/browser/ash/arc/enterprise/cert_store/arc_cert_installer.cc b/chrome/browser/ash/arc/enterprise/cert_store/arc_cert_installer.cc index df1216b9..3e2a661 100644 --- a/chrome/browser/ash/arc/enterprise/cert_store/arc_cert_installer.cc +++ b/chrome/browser/ash/arc/enterprise/cert_store/arc_cert_installer.cc
@@ -10,8 +10,8 @@ #include <vector> #include "base/base64.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/strings/stringprintf.h" #include "chrome/browser/ash/arc/enterprise/cert_store/arc_cert_installer_utils.h"
diff --git a/chrome/browser/ash/arc/enterprise/cert_store/cert_store_service.cc b/chrome/browser/ash/arc/enterprise/cert_store/cert_store_service.cc index 736883b3..d67fcac 100644 --- a/chrome/browser/ash/arc/enterprise/cert_store/cert_store_service.cc +++ b/chrome/browser/ash/arc/enterprise/cert_store/cert_store_service.cc
@@ -11,8 +11,8 @@ #include <vector> #include "ash/components/arc/arc_browser_context_keyed_service_factory_base.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/memory/singleton.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/ash/arc/enterprise/cert_store/cert_store_service_browsertest.cc b/chrome/browser/ash/arc/enterprise/cert_store/cert_store_service_browsertest.cc index c908708..732ecb34 100644 --- a/chrome/browser/ash/arc/enterprise/cert_store/cert_store_service_browsertest.cc +++ b/chrome/browser/ash/arc/enterprise/cert_store/cert_store_service_browsertest.cc
@@ -15,9 +15,9 @@ #include "ash/constants/ash_features.h" #include "ash/constants/ash_switches.h" #include "base/base64.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/ranges/algorithm.h" #include "base/run_loop.h" #include "chrome/browser/ash/arc/enterprise/cert_store/cert_store_service.h"
diff --git a/chrome/browser/ash/arc/extensions/fake_arc_support.cc b/chrome/browser/ash/arc/extensions/fake_arc_support.cc index d8826fb..60c3650 100644 --- a/chrome/browser/ash/arc/extensions/fake_arc_support.cc +++ b/chrome/browser/ash/arc/extensions/fake_arc_support.cc
@@ -6,8 +6,8 @@ #include <string> -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/notreached.h"
diff --git a/chrome/browser/ash/arc/file_system_watcher/arc_file_system_watcher_service.cc b/chrome/browser/ash/arc/file_system_watcher/arc_file_system_watcher_service.cc index 3cf4a38..efdbf93 100644 --- a/chrome/browser/ash/arc/file_system_watcher/arc_file_system_watcher_service.cc +++ b/chrome/browser/ash/arc/file_system_watcher/arc_file_system_watcher_service.cc
@@ -13,11 +13,11 @@ #include "ash/components/arc/arc_browser_context_keyed_service_factory_base.h" #include "ash/components/arc/mojom/file_system.mojom.h" #include "ash/components/arc/session/arc_bridge_service.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/files/file_enumerator.h" #include "base/files/file_path.h" #include "base/files/file_path_watcher.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/singleton.h" #include "base/metrics/histogram_functions.h" #include "base/sequence_checker.h"
diff --git a/chrome/browser/ash/arc/file_system_watcher/arc_file_system_watcher_service.h b/chrome/browser/ash/arc/file_system_watcher/arc_file_system_watcher_service.h index 43b5347..2d21c7f0 100644 --- a/chrome/browser/ash/arc/file_system_watcher/arc_file_system_watcher_service.h +++ b/chrome/browser/ash/arc/file_system_watcher/arc_file_system_watcher_service.h
@@ -13,7 +13,7 @@ #include "ash/components/arc/mojom/file_system.mojom-forward.h" #include "ash/components/arc/session/connection_observer.h" #include "ash/components/arc/volume_mounter/arc_volume_mounter_bridge.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "components/keyed_service/core/keyed_service.h"
diff --git a/chrome/browser/ash/arc/file_system_watcher/file_system_scanner.h b/chrome/browser/ash/arc/file_system_watcher/file_system_scanner.h index bc92109..6d007513 100644 --- a/chrome/browser/ash/arc/file_system_watcher/file_system_scanner.h +++ b/chrome/browser/ash/arc/file_system_watcher/file_system_scanner.h
@@ -8,8 +8,8 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/gtest_prod_util.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/ash/arc/fileapi/arc_content_file_system_async_file_util.cc b/chrome/browser/ash/arc/fileapi/arc_content_file_system_async_file_util.cc index 4829ae8..d5d8f3d8 100644 --- a/chrome/browser/ash/arc/fileapi/arc_content_file_system_async_file_util.cc +++ b/chrome/browser/ash/arc/fileapi/arc_content_file_system_async_file_util.cc
@@ -5,8 +5,8 @@ #include "chrome/browser/ash/arc/fileapi/arc_content_file_system_async_file_util.h" #include "ash/components/arc/arc_util.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/task/single_thread_task_runner.h" #include "chrome/browser/ash/arc/fileapi/arc_content_file_system_size_util.h" #include "chrome/browser/ash/arc/fileapi/arc_content_file_system_url_util.h"
diff --git a/chrome/browser/ash/arc/fileapi/arc_content_file_system_async_file_util_unittest.cc b/chrome/browser/ash/arc/fileapi/arc_content_file_system_async_file_util_unittest.cc index f400dba..e17f009 100644 --- a/chrome/browser/ash/arc/fileapi/arc_content_file_system_async_file_util_unittest.cc +++ b/chrome/browser/ash/arc/fileapi/arc_content_file_system_async_file_util_unittest.cc
@@ -14,8 +14,8 @@ #include "ash/components/arc/test/connection_holder_util.h" #include "ash/components/arc/test/fake_file_system_instance.h" #include "ash/constants/ash_switches.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/run_loop.h" #include "base/threading/thread_task_runner_handle.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 742273d..5f46c25 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
@@ -9,9 +9,9 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/files/file.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.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_reader_unittest.cc b/chrome/browser/ash/arc/fileapi/arc_content_file_system_file_stream_reader_unittest.cc index e2f15a0..95d264d 100644 --- a/chrome/browser/ash/arc/fileapi/arc_content_file_system_file_stream_reader_unittest.cc +++ b/chrome/browser/ash/arc/fileapi/arc_content_file_system_file_stream_reader_unittest.cc
@@ -14,7 +14,7 @@ #include "ash/components/arc/session/arc_service_manager.h" #include "ash/components/arc/test/connection_holder_util.h" #include "ash/components/arc/test/fake_file_system_instance.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/threading/thread_task_runner_handle.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 f331f95f..df030c8 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
@@ -9,8 +9,8 @@ #include <utility> -#include "base/callback_helpers.h" #include "base/files/file.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/task/thread_pool.h" #include "base/threading/scoped_blocking_call.h"
diff --git a/chrome/browser/ash/arc/fileapi/arc_content_file_system_file_stream_writer_unittest.cc b/chrome/browser/ash/arc/fileapi/arc_content_file_system_file_stream_writer_unittest.cc index e5835c6..9a34469 100644 --- a/chrome/browser/ash/arc/fileapi/arc_content_file_system_file_stream_writer_unittest.cc +++ b/chrome/browser/ash/arc/fileapi/arc_content_file_system_file_stream_writer_unittest.cc
@@ -12,7 +12,7 @@ #include "ash/components/arc/session/arc_service_manager.h" #include "ash/components/arc/test/connection_holder_util.h" #include "ash/components/arc/test/fake_file_system_instance.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "chrome/browser/ash/arc/fileapi/arc_file_system_operation_runner.h" #include "chrome/test/base/testing_profile.h"
diff --git a/chrome/browser/ash/arc/fileapi/arc_content_file_system_size_util.h b/chrome/browser/ash/arc/fileapi/arc_content_file_system_size_util.h index 865384a..e7be6321 100644 --- a/chrome/browser/ash/arc/fileapi/arc_content_file_system_size_util.h +++ b/chrome/browser/ash/arc/fileapi/arc_content_file_system_size_util.h
@@ -7,8 +7,8 @@ class GURL; -#include "base/callback.h" #include "base/files/file.h" +#include "base/functional/callback.h" namespace arc {
diff --git a/chrome/browser/ash/arc/fileapi/arc_documents_provider_async_file_util.cc b/chrome/browser/ash/arc/fileapi/arc_documents_provider_async_file_util.cc index 85676c3..7484d97 100644 --- a/chrome/browser/ash/arc/fileapi/arc_documents_provider_async_file_util.cc +++ b/chrome/browser/ash/arc/fileapi/arc_documents_provider_async_file_util.cc
@@ -8,10 +8,10 @@ #include <vector> #include "ash/components/arc/arc_util.h" -#include "base/bind.h" #include "base/check_op.h" #include "base/files/file.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/notreached.h" #include "chrome/browser/ash/arc/fileapi/arc_content_file_system_size_util.h" #include "chrome/browser/ash/arc/fileapi/arc_documents_provider_file_system_url_util.h"
diff --git a/chrome/browser/ash/arc/fileapi/arc_documents_provider_async_file_util.h b/chrome/browser/ash/arc/fileapi/arc_documents_provider_async_file_util.h index 9dd50d2..60ad06bd 100644 --- a/chrome/browser/ash/arc/fileapi/arc_documents_provider_async_file_util.h +++ b/chrome/browser/ash/arc/fileapi/arc_documents_provider_async_file_util.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "storage/browser/file_system/async_file_util.h" namespace arc {
diff --git a/chrome/browser/ash/arc/fileapi/arc_documents_provider_file_stream_reader.cc b/chrome/browser/ash/arc/fileapi/arc_documents_provider_file_stream_reader.cc index 5cb205d6..f368ebe3 100644 --- a/chrome/browser/ash/arc/fileapi/arc_documents_provider_file_stream_reader.cc +++ b/chrome/browser/ash/arc/fileapi/arc_documents_provider_file_stream_reader.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "chrome/browser/ash/arc/fileapi/arc_content_file_system_file_stream_reader.h" #include "chrome/browser/ash/arc/fileapi/arc_documents_provider_file_system_url_util.h" #include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/ash/arc/fileapi/arc_documents_provider_file_stream_reader.h b/chrome/browser/ash/arc/fileapi/arc_documents_provider_file_stream_reader.h index d2fe4d1..cdf3850 100644 --- a/chrome/browser/ash/arc/fileapi/arc_documents_provider_file_stream_reader.h +++ b/chrome/browser/ash/arc/fileapi/arc_documents_provider_file_stream_reader.h
@@ -8,7 +8,7 @@ #include <memory> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "net/base/completion_once_callback.h"
diff --git a/chrome/browser/ash/arc/fileapi/arc_documents_provider_file_stream_writer.cc b/chrome/browser/ash/arc/fileapi/arc_documents_provider_file_stream_writer.cc index 966fdfa1..5c63cb0 100644 --- a/chrome/browser/ash/arc/fileapi/arc_documents_provider_file_stream_writer.cc +++ b/chrome/browser/ash/arc/fileapi/arc_documents_provider_file_stream_writer.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "chrome/browser/ash/arc/fileapi/arc_content_file_system_file_stream_writer.h" #include "chrome/browser/ash/arc/fileapi/arc_documents_provider_file_system_url_util.h" #include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/ash/arc/fileapi/arc_documents_provider_file_stream_writer.h b/chrome/browser/ash/arc/fileapi/arc_documents_provider_file_stream_writer.h index 36c448a..52f121d9 100644 --- a/chrome/browser/ash/arc/fileapi/arc_documents_provider_file_stream_writer.h +++ b/chrome/browser/ash/arc/fileapi/arc_documents_provider_file_stream_writer.h
@@ -10,7 +10,7 @@ #include <memory> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "net/base/completion_once_callback.h"
diff --git a/chrome/browser/ash/arc/fileapi/arc_documents_provider_file_system_url_util.cc b/chrome/browser/ash/arc/fileapi/arc_documents_provider_file_system_url_util.cc index cd7b5381..0e9be35 100644 --- a/chrome/browser/ash/arc/fileapi/arc_documents_provider_file_system_url_util.cc +++ b/chrome/browser/ash/arc/fileapi/arc_documents_provider_file_system_url_util.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ash/arc/fileapi/arc_documents_provider_file_system_url_util.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/arc/fileapi/arc_documents_provider_root_map.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/ash/arc/fileapi/arc_documents_provider_root.cc b/chrome/browser/ash/arc/fileapi/arc_documents_provider_root.cc index 8a7d080..4dad720b3 100644 --- a/chrome/browser/ash/arc/fileapi/arc_documents_provider_root.cc +++ b/chrome/browser/ash/arc/fileapi/arc_documents_provider_root.cc
@@ -8,10 +8,10 @@ #include <utility> #include "ash/components/arc/arc_features.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/check_op.h" #include "base/files/file.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/strings/stringprintf.h" #include "base/task/thread_pool.h" #include "base/time/time.h"
diff --git a/chrome/browser/ash/arc/fileapi/arc_documents_provider_root.h b/chrome/browser/ash/arc/fileapi/arc_documents_provider_root.h index ece4f74..4d5f684 100644 --- a/chrome/browser/ash/arc/fileapi/arc_documents_provider_root.h +++ b/chrome/browser/ash/arc/fileapi/arc_documents_provider_root.h
@@ -12,8 +12,8 @@ #include <vector> #include "ash/components/arc/mojom/file_system.mojom-forward.h" -#include "base/callback_forward.h" #include "base/files/file_path.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h" #include "chrome/browser/ash/arc/fileapi/arc_file_system_operation_runner.h"
diff --git a/chrome/browser/ash/arc/fileapi/arc_documents_provider_root_map_unittest.cc b/chrome/browser/ash/arc/fileapi/arc_documents_provider_root_map_unittest.cc index 9b250f1..178cc142 100644 --- a/chrome/browser/ash/arc/fileapi/arc_documents_provider_root_map_unittest.cc +++ b/chrome/browser/ash/arc/fileapi/arc_documents_provider_root_map_unittest.cc
@@ -10,7 +10,7 @@ #include "ash/components/arc/session/arc_service_manager.h" #include "ash/components/arc/test/connection_holder_util.h" #include "ash/components/arc/test/fake_file_system_instance.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/ash/arc/fileapi/arc_documents_provider_root.h" #include "chrome/browser/ash/arc/fileapi/arc_file_system_operation_runner.h"
diff --git a/chrome/browser/ash/arc/fileapi/arc_documents_provider_root_unittest.cc b/chrome/browser/ash/arc/fileapi/arc_documents_provider_root_unittest.cc index 31debf6..299b6257 100644 --- a/chrome/browser/ash/arc/fileapi/arc_documents_provider_root_unittest.cc +++ b/chrome/browser/ash/arc/fileapi/arc_documents_provider_root_unittest.cc
@@ -14,8 +14,8 @@ #include "ash/components/arc/session/arc_service_manager.h" #include "ash/components/arc/test/connection_holder_util.h" #include "ash/components/arc/test/fake_file_system_instance.h" -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/test/scoped_feature_list.h" #include "chrome/browser/ash/arc/fileapi/arc_documents_provider_util.h"
diff --git a/chrome/browser/ash/arc/fileapi/arc_documents_provider_watcher_manager.cc b/chrome/browser/ash/arc/fileapi/arc_documents_provider_watcher_manager.cc index 89cfac05..852c4a6 100644 --- a/chrome/browser/ash/arc/fileapi/arc_documents_provider_watcher_manager.cc +++ b/chrome/browser/ash/arc/fileapi/arc_documents_provider_watcher_manager.cc
@@ -4,9 +4,9 @@ #include "chrome/browser/ash/arc/fileapi/arc_documents_provider_watcher_manager.h" -#include "base/bind.h" #include "base/files/file.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/arc/fileapi/arc_documents_provider_root.h" #include "chrome/browser/ash/arc/fileapi/arc_documents_provider_root_map.h" #include "content/public/browser/browser_task_traits.h"
diff --git a/chrome/browser/ash/arc/fileapi/arc_file_system_bridge.cc b/chrome/browser/ash/arc/fileapi/arc_file_system_bridge.cc index 70235c91..3be3bc7 100644 --- a/chrome/browser/ash/arc/fileapi/arc_file_system_bridge.cc +++ b/chrome/browser/ash/arc/fileapi/arc_file_system_bridge.cc
@@ -14,7 +14,7 @@ #include "ash/components/arc/arc_browser_context_keyed_service_factory_base.h" #include "ash/components/arc/session/arc_bridge_service.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/singleton.h" #include "base/posix/eintr_wrapper.h"
diff --git a/chrome/browser/ash/arc/fileapi/arc_file_system_operation_runner.cc b/chrome/browser/ash/arc/fileapi/arc_file_system_operation_runner.cc index d238b32..1887168 100644 --- a/chrome/browser/ash/arc/fileapi/arc_file_system_operation_runner.cc +++ b/chrome/browser/ash/arc/fileapi/arc_file_system_operation_runner.cc
@@ -8,7 +8,7 @@ #include "ash/components/arc/arc_browser_context_keyed_service_factory_base.h" #include "ash/components/arc/session/arc_bridge_service.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/ptr_util.h" #include "base/memory/singleton.h"
diff --git a/chrome/browser/ash/arc/fileapi/arc_file_system_operation_runner.h b/chrome/browser/ash/arc/fileapi/arc_file_system_operation_runner.h index 67fccc9d..719f6e8 100644 --- a/chrome/browser/ash/arc/fileapi/arc_file_system_operation_runner.h +++ b/chrome/browser/ash/arc/fileapi/arc_file_system_operation_runner.h
@@ -14,7 +14,7 @@ #include "ash/components/arc/mojom/file_system.mojom-forward.h" #include "ash/components/arc/session/connection_observer.h" -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" #include "chrome/browser/ash/arc/fileapi/arc_file_system_bridge.h"
diff --git a/chrome/browser/ash/arc/fileapi/arc_file_system_operation_runner_unittest.cc b/chrome/browser/ash/arc/fileapi/arc_file_system_operation_runner_unittest.cc index 4d662da9..123268a 100644 --- a/chrome/browser/ash/arc/fileapi/arc_file_system_operation_runner_unittest.cc +++ b/chrome/browser/ash/arc/fileapi/arc_file_system_operation_runner_unittest.cc
@@ -12,8 +12,8 @@ #include "ash/components/arc/session/arc_service_manager.h" #include "ash/components/arc/test/connection_holder_util.h" #include "ash/components/arc/test/fake_file_system_instance.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "chrome/test/base/testing_profile.h" #include "components/keyed_service/content/browser_context_keyed_service_factory.h"
diff --git a/chrome/browser/ash/arc/fileapi/arc_file_system_operation_runner_util.cc b/chrome/browser/ash/arc/fileapi/arc_file_system_operation_runner_util.cc index 743b7e3..015cee5 100644 --- a/chrome/browser/ash/arc/fileapi/arc_file_system_operation_runner_util.cc +++ b/chrome/browser/ash/arc/fileapi/arc_file_system_operation_runner_util.cc
@@ -9,7 +9,7 @@ #include "ash/components/arc/mojom/file_system.mojom-forward.h" #include "ash/components/arc/session/arc_service_manager.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/bind_post_task.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/ash/arc/fileapi/arc_select_files_handler.cc b/chrome/browser/ash/arc/fileapi/arc_select_files_handler.cc index c013df8..18f33770 100644 --- a/chrome/browser/ash/arc/fileapi/arc_select_files_handler.cc +++ b/chrome/browser/ash/arc/fileapi/arc_select_files_handler.cc
@@ -7,7 +7,7 @@ #include <utility> #include "ash/components/arc/arc_util.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/json/string_escape.h" #include "base/logging.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/ash/arc/fileapi/file_stream_forwarder.cc b/chrome/browser/ash/arc/fileapi/file_stream_forwarder.cc index 7e1f9d7..1ec46212 100644 --- a/chrome/browser/ash/arc/fileapi/file_stream_forwarder.cc +++ b/chrome/browser/ash/arc/fileapi/file_stream_forwarder.cc
@@ -7,9 +7,9 @@ #include <algorithm> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/strings/string_piece.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/ash/arc/fileapi/file_stream_forwarder.h b/chrome/browser/ash/arc/fileapi/file_stream_forwarder.h index 18de1ada..bdac90e 100644 --- a/chrome/browser/ash/arc/fileapi/file_stream_forwarder.h +++ b/chrome/browser/ash/arc/fileapi/file_stream_forwarder.h
@@ -7,8 +7,8 @@ #include <memory> -#include "base/callback.h" #include "base/files/scoped_file.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "net/base/io_buffer.h" #include "storage/browser/file_system/file_stream_reader.h"
diff --git a/chrome/browser/ash/arc/fileapi/file_stream_forwarder_unittest.cc b/chrome/browser/ash/arc/fileapi/file_stream_forwarder_unittest.cc index 0d893f5..7132e0c 100644 --- a/chrome/browser/ash/arc/fileapi/file_stream_forwarder_unittest.cc +++ b/chrome/browser/ash/arc/fileapi/file_stream_forwarder_unittest.cc
@@ -7,9 +7,9 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/rand_util.h" #include "base/run_loop.h" #include "content/public/test/browser_task_environment.h"
diff --git a/chrome/browser/ash/arc/icon_decode_request.h b/chrome/browser/ash/arc/icon_decode_request.h index a3bf46f..5757171d 100644 --- a/chrome/browser/ash/arc/icon_decode_request.h +++ b/chrome/browser/ash/arc/icon_decode_request.h
@@ -7,7 +7,7 @@ #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/image_decoder/image_decoder.h" namespace gfx {
diff --git a/chrome/browser/ash/arc/input_method_manager/arc_input_method_manager_service.cc b/chrome/browser/ash/arc/input_method_manager/arc_input_method_manager_service.cc index fe20185..a512b17 100644 --- a/chrome/browser/ash/arc/input_method_manager/arc_input_method_manager_service.cc +++ b/chrome/browser/ash/arc/input_method_manager/arc_input_method_manager_service.cc
@@ -15,9 +15,9 @@ #include "ash/public/cpp/tablet_mode.h" #include "ash/public/cpp/tablet_mode_observer.h" #include "ash/wm/window_util.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/containers/cxx20_erase.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/singleton.h" #include "base/ranges/algorithm.h"
diff --git a/chrome/browser/ash/arc/input_method_manager/arc_input_method_state.h b/chrome/browser/ash/arc/input_method_manager/arc_input_method_state.h index 761093b..9568e25 100644 --- a/chrome/browser/ash/arc/input_method_manager/arc_input_method_state.h +++ b/chrome/browser/ash/arc/input_method_manager/arc_input_method_state.h
@@ -10,7 +10,7 @@ #include <vector> #include "ash/components/arc/mojom/input_method_manager.mojom-forward.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "ui/base/ime/ash/input_method_descriptor.h" namespace arc {
diff --git a/chrome/browser/ash/arc/input_method_manager/input_connection_impl.cc b/chrome/browser/ash/arc/input_method_manager/input_connection_impl.cc index 3c31bb8..49fc8926 100644 --- a/chrome/browser/ash/arc/input_method_manager/input_connection_impl.cc +++ b/chrome/browser/ash/arc/input_method_manager/input_connection_impl.cc
@@ -6,7 +6,7 @@ #include <tuple> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "base/threading/thread_task_runner_handle.h" #include "third_party/abseil-cpp/absl/utility/utility.h"
diff --git a/chrome/browser/ash/arc/input_overlay/arc_input_overlay_manager.cc b/chrome/browser/ash/arc/input_overlay/arc_input_overlay_manager.cc index 9e2cad23..12cc90b7 100644 --- a/chrome/browser/ash/arc/input_overlay/arc_input_overlay_manager.cc +++ b/chrome/browser/ash/arc/input_overlay/arc_input_overlay_manager.cc
@@ -12,7 +12,7 @@ #include "ash/public/cpp/window_properties.h" #include "ash/shell.h" #include "ash/wm/window_util.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/json/json_reader.h" #include "base/logging.h" #include "base/memory/singleton.h" @@ -443,6 +443,23 @@ UnRegisterWindow(window); } +void ArcInputOverlayManager::OnWindowBoundsChanged( + aura::Window* window, + const gfx::Rect& old_bounds, + const gfx::Rect& new_bounds, + ui::PropertyChangeReason reason) { + if (!window || window != registered_top_level_window_) + return; + if (display_overlay_controller_) + display_overlay_controller_->OnWindowBoundsChanged(); + + auto it = input_overlay_enabled_windows_.find(window); + if (it == input_overlay_enabled_windows_.end()) + return; + + it->second->UpdateForWindowBoundsChanged(); +} + void ArcInputOverlayManager::Shutdown() { UnRegisterWindow(registered_top_level_window_); window_observations_.RemoveAllObservations(); @@ -501,7 +518,7 @@ if (it == input_overlay_enabled_windows_.end()) return; - it->second->UpdatePositionsForRegister(); + it->second->UpdateForDisplayMetricsChanged(); } void ArcInputOverlayManager::ResetForPendingTouchInjector(
diff --git a/chrome/browser/ash/arc/input_overlay/arc_input_overlay_manager.h b/chrome/browser/ash/arc/input_overlay/arc_input_overlay_manager.h index d3e4240e..06ef266 100644 --- a/chrome/browser/ash/arc/input_overlay/arc_input_overlay_manager.h +++ b/chrome/browser/ash/arc/input_overlay/arc_input_overlay_manager.h
@@ -66,6 +66,10 @@ void OnWindowAddedToRootWindow(aura::Window* window) override; void OnWindowRemovingFromRootWindow(aura::Window* window, aura::Window* new_root) override; + void OnWindowBoundsChanged(aura::Window* window, + const gfx::Rect& old_bounds, + const gfx::Rect& new_bounds, + ui::PropertyChangeReason reason) override; // KeyedService: void Shutdown() override;
diff --git a/chrome/browser/ash/arc/input_overlay/arc_input_overlay_manager_unittest.cc b/chrome/browser/ash/arc/input_overlay/arc_input_overlay_manager_unittest.cc index 586ad9c..bf2ddff4 100644 --- a/chrome/browser/ash/arc/input_overlay/arc_input_overlay_manager_unittest.cc +++ b/chrome/browser/ash/arc/input_overlay/arc_input_overlay_manager_unittest.cc
@@ -36,6 +36,15 @@ "org.chromium.arc.testapp.inputoverlay_game"; constexpr const float kTolerance = 0.999f; +class MockDisplayOverlayController : public DisplayOverlayController { + public: + explicit MockDisplayOverlayController(TouchInjector* touch_injector) + : DisplayOverlayController(touch_injector, false) {} + ~MockDisplayOverlayController() override = default; + + void OnWindowBoundsChanged() override {} +}; + // Make sure the tasks run synchronously when creating the window. std::unique_ptr<views::Widget> CreateArcWindowSyncAndWait( base::test::TaskEnvironment* task_environment, @@ -66,8 +75,8 @@ if (!registered_top_level_window_ || !touch_injector) return; DCHECK(!display_overlay_controller_); - display_overlay_controller_ = std::make_unique<DisplayOverlayController>( - touch_injector, /*first_launch=*/false); + display_overlay_controller_ = + std::make_unique<MockDisplayOverlayController>(touch_injector); } }; @@ -123,11 +132,6 @@ void EnableBetaFlag() { arc_test_input_overlay_manager_->beta_ = true; } - void TriggerDisplayOverlayOnWindowBoundsChange() { - arc_test_input_overlay_manager_->display_overlay_controller_ - ->TriggerWidgetBoundsChangedForTesting(); - } - protected: std::unique_ptr<ArcInputOverlayManager> arc_test_input_overlay_manager_; @@ -397,9 +401,6 @@ ash::Shell::GetPrimaryRootWindow()->GetBoundsInScreen()); arc_window->GetNativeWindow()->SetBoundsInScreen(gfx::Rect(10, 10, 150, 150), display); - // No overlay widget attached to |arc_window| in this test, so it needs to - // trigger the |OnWidgetBoundsChanged()| call manually. - TriggerDisplayOverlayOnWindowBoundsChange(); EXPECT_EQ(injector->content_bounds(), gfx::RectF(10, 10 + caption_height, 150, 150 - caption_height)); EXPECT_POINTF_NEAR(
diff --git a/chrome/browser/ash/arc/input_overlay/db/data_controller.cc b/chrome/browser/ash/arc/input_overlay/db/data_controller.cc index 8a820a4e..70baecf 100644 --- a/chrome/browser/ash/arc/input_overlay/db/data_controller.cc +++ b/chrome/browser/ash/arc/input_overlay/db/data_controller.cc
@@ -4,9 +4,9 @@ #include "chrome/browser/ash/arc/input_overlay/db/data_controller.h" -#include "base/bind.h" #include "base/files/file.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/task/task_runner.h" #include "base/task/thread_pool.h" #include "base/threading/scoped_blocking_call.h"
diff --git a/chrome/browser/ash/arc/input_overlay/display_overlay_controller.cc b/chrome/browser/ash/arc/input_overlay/display_overlay_controller.cc index b482d86..a50b477 100644 --- a/chrome/browser/ash/arc/input_overlay/display_overlay_controller.cc +++ b/chrome/browser/ash/arc/input_overlay/display_overlay_controller.cc
@@ -12,7 +12,6 @@ #include "ash/style/dark_light_mode_controller_impl.h" #include "ash/style/pill_button.h" #include "ash/style/style_util.h" -#include "base/bind.h" #include "base/functional/bind.h" #include "chrome/app/vector_icons/vector_icons.h" #include "chrome/browser/ash/arc/input_overlay/ui/edit_finish_view.h" @@ -88,6 +87,17 @@ RemoveOverlayIfAny(); } +void DisplayOverlayController::OnWindowBoundsChanged() { + auto mode = display_mode_; + SetDisplayMode(DisplayMode::kNone); + // Transition to |kView| mode except while on |kEducation| mode since + // displaying this UI needs to be ensured as the user shouldn't be able to + // manually access said view. + if (mode != DisplayMode::kEducation) + mode = DisplayMode::kView; + SetDisplayMode(mode); +} + // For test: gfx::Rect DisplayOverlayController::GetInputMappingViewBoundsForTesting() { return input_mapping_view_ ? input_mapping_view_->bounds() : gfx::Rect(); @@ -107,9 +117,6 @@ params.focusable = true; shell_surface_base->AddOverlay(std::move(params)); - auto* overlay_widget = GetOverlayWidget(); - if (overlay_widget) - overlay_widget_observation_.Observe(overlay_widget); SetDisplayMode(display_mode); } @@ -667,31 +674,6 @@ SetDisplayMode(DisplayMode::kEducation); } -void DisplayOverlayController::OnWidgetBoundsChanged( - views::Widget* widget, - const gfx::Rect& new_bounds) { - touch_injector_->UpdateForOverlayBoundsChanged(gfx::RectF(new_bounds)); - - // Overlay |widget| is null for test. - if (!widget) - return; - - auto mode = display_mode_; - SetDisplayMode(DisplayMode::kNone); - // Transition to |kView| mode except while on |kEducation| mode since - // displaying this UI needs to be ensured as the user shouldn't be able to - // manually access said view. - if (mode != DisplayMode::kEducation) { - mode = DisplayMode::kView; - } - - SetDisplayMode(mode); -} - -void DisplayOverlayController::OnWidgetClosing(views::Widget* widget) { - overlay_widget_observation_.Reset(); -} - bool DisplayOverlayController::HasMenuView() const { return input_menu_view_ != nullptr; } @@ -765,11 +747,4 @@ OnEducationalViewDismissed(); } -void DisplayOverlayController::TriggerWidgetBoundsChangedForTesting() { - auto bounds = CalculateWindowContentBounds(touch_injector_->window()); - OnWidgetBoundsChanged( - /*widget=*/nullptr, - gfx::Rect(bounds.x(), bounds.y(), bounds.width(), bounds.height())); -} - } // namespace arc::input_overlay
diff --git a/chrome/browser/ash/arc/input_overlay/display_overlay_controller.h b/chrome/browser/ash/arc/input_overlay/display_overlay_controller.h index 6912665..14e57fcd 100644 --- a/chrome/browser/ash/arc/input_overlay/display_overlay_controller.h +++ b/chrome/browser/ash/arc/input_overlay/display_overlay_controller.h
@@ -16,8 +16,6 @@ #include "ui/gfx/geometry/point.h" #include "ui/gfx/geometry/rect.h" #include "ui/views/layout/layout_types.h" -#include "ui/views/widget/widget.h" -#include "ui/views/widget/widget_observer.h" namespace views { class Widget; @@ -42,14 +40,15 @@ // menu, and educational dialog. It also handles the visibility of the // |ActionEditMenu| and |MessageView| by listening to the |LocatedEvent|. class DisplayOverlayController : public ui::EventHandler, - public ash::ColorModeObserver, - public views::WidgetObserver { + public ash::ColorModeObserver { public: DisplayOverlayController(TouchInjector* touch_injector, bool first_launch); DisplayOverlayController(const DisplayOverlayController&) = delete; DisplayOverlayController& operator=(const DisplayOverlayController&) = delete; ~DisplayOverlayController() override; + // Virtual for test. + virtual void OnWindowBoundsChanged(); void SetDisplayMode(DisplayMode mode); // Get the bounds of |menu_entry_| in screen coordinates. absl::optional<gfx::Rect> GetOverlayMenuEntryBounds(); @@ -91,11 +90,6 @@ // ash::ColorModeObserver: void OnColorModeChanged(bool dark_mode_enabled) override; - // views::WidgetObserver: - void OnWidgetBoundsChanged(views::Widget* widget, - const gfx::Rect& new_bounds) override; - void OnWidgetClosing(views::Widget* widget) override; - const TouchInjector* touch_injector() const { return touch_injector_; } private: @@ -168,13 +162,9 @@ void DismissEducationalViewForTesting(); InputMenuView* GetInputMenuView() { return input_menu_view_; } MenuEntryView* GetMenuEntryView() { return menu_entry_; } - void TriggerWidgetBoundsChangedForTesting(); const raw_ptr<TouchInjector> touch_injector_; - base::ScopedObservation<views::Widget, views::WidgetObserver> - overlay_widget_observation_{this}; - // References to UI elements owned by the overlay widget. raw_ptr<InputMappingView> input_mapping_view_ = nullptr; raw_ptr<InputMenuView> input_menu_view_ = nullptr;
diff --git a/chrome/browser/ash/arc/input_overlay/display_overlay_controller_unittest.cc b/chrome/browser/ash/arc/input_overlay/display_overlay_controller_unittest.cc index 033a41d..80cfb4a 100644 --- a/chrome/browser/ash/arc/input_overlay/display_overlay_controller_unittest.cc +++ b/chrome/browser/ash/arc/input_overlay/display_overlay_controller_unittest.cc
@@ -65,6 +65,9 @@ display::Display display = display::Screen::GetScreen()->GetPrimaryDisplay(); arc_test_window_->SetBounds(display, new_bounds); + // Trigger the updates for window bounds change. + injector_->UpdateForWindowBoundsChanged(); + controller_->OnWindowBoundsChanged(); auto updated_bounds = GetInputMappingViewBounds(); EXPECT_NE(original_bounds, updated_bounds); EXPECT_EQ(updated_bounds, new_bounds);
diff --git a/chrome/browser/ash/arc/input_overlay/touch_injector.cc b/chrome/browser/ash/arc/input_overlay/touch_injector.cc index 58b7548..652e1f9d 100644 --- a/chrome/browser/ash/arc/input_overlay/touch_injector.cc +++ b/chrome/browser/ash/arc/input_overlay/touch_injector.cc
@@ -10,8 +10,8 @@ #include "ash/app_list/app_list_util.h" #include "ash/public/cpp/window_properties.h" #include "ash/utility/transformer_util.h" -#include "base/bind.h" #include "base/containers/flat_set.h" +#include "base/functional/bind.h" #include "base/task/thread_pool.h" #include "chrome/browser/ash/arc/input_overlay/actions/action_move.h" #include "chrome/browser/ash/arc/input_overlay/actions/action_tap.h" @@ -210,7 +210,7 @@ if (observation_.IsObserving()) return; observation_.Observe(window_->GetHost()->GetEventSource()); - UpdatePositionsForRegister(); + Update(); } void TouchInjector::UnRegisterEventRewriter() { @@ -224,6 +224,11 @@ OnSaveProtoFile(); } +void TouchInjector::Update() { + UpdateForDisplayMetricsChanged(); + UpdateForWindowBoundsChanged(); +} + void TouchInjector::OnInputBindingChange( Action* target_action, std::unique_ptr<InputElement> input_element) { @@ -389,26 +394,28 @@ 1.0 * menu_entry_location_point.y() / content_bounds().height()); } -void TouchInjector::UpdatePositionsForRegister() { +void TouchInjector::UpdateForDisplayMetricsChanged() { if (rotation_transform_) rotation_transform_.reset(); auto display = display::Screen::GetScreen()->GetDisplayNearestWindow(window_); // No need to transform if there is no rotation. - if (display.panel_rotation() != display::Display::ROTATE_0) { - rotation_transform_ = - std::make_unique<gfx::Transform>(ash::CreateRotationTransform( - display::Display::ROTATE_0, display.panel_rotation(), - gfx::SizeF(display.GetSizeInPixel()))); - } - UpdateForOverlayBoundsChanged(CalculateWindowContentBounds(window_)); + if (display.panel_rotation() == display::Display::ROTATE_0) + return; + + rotation_transform_ = + std::make_unique<gfx::Transform>(ash::CreateRotationTransform( + display::Display::ROTATE_0, display.panel_rotation(), + gfx::SizeF(display.GetSizeInPixel()))); + + UpdateForWindowBoundsChanged(); } -void TouchInjector::UpdateForOverlayBoundsChanged( - const gfx::RectF& new_bounds) { - content_bounds_ = new_bounds; - for (auto& action : actions_) +void TouchInjector::UpdateForWindowBoundsChanged() { + content_bounds_ = CalculateWindowContentBounds(window_); + for (auto& action : actions_) { action->UpdateTouchDownPositions(); + } } void TouchInjector::CleanupTouchEvents() {
diff --git a/chrome/browser/ash/arc/input_overlay/touch_injector.h b/chrome/browser/ash/arc/input_overlay/touch_injector.h index 204681d..59d4f9b 100644 --- a/chrome/browser/ash/arc/input_overlay/touch_injector.h +++ b/chrome/browser/ash/arc/input_overlay/touch_injector.h
@@ -8,7 +8,7 @@ #include <memory> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/scoped_observation.h" #include "chrome/browser/ash/arc/input_overlay/actions/action.h" @@ -75,6 +75,9 @@ void RegisterEventRewriter(); // Unregister the EventRewriter. void UnRegisterEventRewriter(); + // Update info for touch injector. For example, update transform information + // if there is screen rotation. + void Update(); // Change bindings. This could be from user editing from display overlay // (|mode| = DisplayMode::kEdit) or from customized protobuf data (|mode| = // DisplayMode::kView). @@ -102,8 +105,8 @@ // Update |content_bounds_| and touch positions for each |actions_| for // different reasons. - void UpdatePositionsForRegister(); - void UpdateForOverlayBoundsChanged(const gfx::RectF& new_bounds); + void UpdateForDisplayMetricsChanged(); + void UpdateForWindowBoundsChanged(); // Add or delete an Action. // Return an action ID (> kMaxDefaultActionID) for adding a new action.
diff --git a/chrome/browser/ash/arc/input_overlay/ui/action_view.cc b/chrome/browser/ash/arc/input_overlay/ui/action_view.cc index d99be63..f0207af 100644 --- a/chrome/browser/ash/arc/input_overlay/ui/action_view.cc +++ b/chrome/browser/ash/arc/input_overlay/ui/action_view.cc
@@ -5,8 +5,8 @@ #include "chrome/browser/ash/arc/input_overlay/ui/action_view.h" #include "ash/app_list/app_list_util.h" -#include "base/bind.h" #include "base/cxx17_backports.h" +#include "base/functional/bind.h" #include "base/strings/string_piece.h" #include "chrome/app/vector_icons/vector_icons.h" #include "chrome/browser/ash/arc/input_overlay/arc_input_overlay_uma.h"
diff --git a/chrome/browser/ash/arc/input_overlay/ui/edit_finish_view.cc b/chrome/browser/ash/arc/input_overlay/ui/edit_finish_view.cc index 03c72e8..42a7547 100644 --- a/chrome/browser/ash/arc/input_overlay/ui/edit_finish_view.cc +++ b/chrome/browser/ash/arc/input_overlay/ui/edit_finish_view.cc
@@ -5,7 +5,7 @@ #include "chrome/browser/ash/arc/input_overlay/ui/edit_finish_view.h" #include "ash/style/style_util.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/arc/input_overlay/display_overlay_controller.h" #include "chrome/grit/generated_resources.h" #include "third_party/skia/include/core/SkColor.h"
diff --git a/chrome/browser/ash/arc/input_overlay/ui/educational_view.cc b/chrome/browser/ash/arc/input_overlay/ui/educational_view.cc index bf898e0..0d45e47 100644 --- a/chrome/browser/ash/arc/input_overlay/ui/educational_view.cc +++ b/chrome/browser/ash/arc/input_overlay/ui/educational_view.cc
@@ -10,7 +10,7 @@ #include "ash/style/ash_color_id.h" #include "ash/style/pill_button.h" #include "ash/style/style_util.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/arc/input_overlay/display_overlay_controller.h" #include "chrome/grit/component_extension_resources.h" #include "chrome/grit/generated_resources.h"
diff --git a/chrome/browser/ash/arc/input_overlay/ui/input_menu_view.cc b/chrome/browser/ash/arc/input_overlay/ui/input_menu_view.cc index 72de8d0..35968af9 100644 --- a/chrome/browser/ash/arc/input_overlay/ui/input_menu_view.cc +++ b/chrome/browser/ash/arc/input_overlay/ui/input_menu_view.cc
@@ -10,7 +10,7 @@ #include "ash/style/ash_color_provider.h" #include "ash/style/pill_button.h" #include "ash/style/style_util.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/system/sys_info.h" #include "chrome/browser/ash/arc/input_overlay/arc_input_overlay_ukm.h" #include "chrome/browser/ash/arc/input_overlay/arc_input_overlay_uma.h"
diff --git a/chrome/browser/ash/arc/instance_throttle/arc_active_window_throttle_observer_unittest.cc b/chrome/browser/ash/arc/instance_throttle/arc_active_window_throttle_observer_unittest.cc index ca499ed8..396f08b4 100644 --- a/chrome/browser/ash/arc/instance_throttle/arc_active_window_throttle_observer_unittest.cc +++ b/chrome/browser/ash/arc/instance_throttle/arc_active_window_throttle_observer_unittest.cc
@@ -5,7 +5,7 @@ #include "chrome/browser/ash/arc/instance_throttle/arc_active_window_throttle_observer.h" #include "ash/constants/app_types.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/test/task_environment.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/aura/client/aura_constants.h"
diff --git a/chrome/browser/ash/arc/instance_throttle/arc_instance_throttle_unittest.cc b/chrome/browser/ash/arc/instance_throttle/arc_instance_throttle_unittest.cc index b289f54..6b2fafd 100644 --- a/chrome/browser/ash/arc/instance_throttle/arc_instance_throttle_unittest.cc +++ b/chrome/browser/ash/arc/instance_throttle/arc_instance_throttle_unittest.cc
@@ -21,8 +21,8 @@ #include "ash/components/arc/test/fake_app_instance.h" #include "ash/components/arc/test/fake_arc_session.h" #include "ash/components/arc/test/fake_power_instance.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "chrome/browser/ash/arc/boot_phase_monitor/arc_boot_phase_monitor_bridge.h"
diff --git a/chrome/browser/ash/arc/instance_throttle/arc_kiosk_mode_throttle_observer_unittest.cc b/chrome/browser/ash/arc/instance_throttle/arc_kiosk_mode_throttle_observer_unittest.cc index 43c926f..86b82ae 100644 --- a/chrome/browser/ash/arc/instance_throttle/arc_kiosk_mode_throttle_observer_unittest.cc +++ b/chrome/browser/ash/arc/instance_throttle/arc_kiosk_mode_throttle_observer_unittest.cc
@@ -3,8 +3,8 @@ // found in the LICENSE file. #include "chrome/browser/ash/arc/instance_throttle/arc_kiosk_mode_throttle_observer.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/login/users/fake_chrome_user_manager.h" #include "chrome/browser/ash/login/users/scoped_test_user_manager.h" #include "components/account_id/account_id.h"
diff --git a/chrome/browser/ash/arc/instance_throttle/arc_power_throttle_observer_unittest.cc b/chrome/browser/ash/arc/instance_throttle/arc_power_throttle_observer_unittest.cc index d4829fc..7e3591e9 100644 --- a/chrome/browser/ash/arc/instance_throttle/arc_power_throttle_observer_unittest.cc +++ b/chrome/browser/ash/arc/instance_throttle/arc_power_throttle_observer_unittest.cc
@@ -9,8 +9,8 @@ #include "ash/components/arc/session/arc_service_manager.h" #include "ash/components/arc/test/arc_util_test_support.h" #include "ash/components/arc/test/fake_arc_session.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/arc/session/arc_session_manager.h" #include "chrome/browser/ash/arc/test/test_arc_session_manager.h" #include "chrome/test/base/testing_profile.h"
diff --git a/chrome/browser/ash/arc/instance_throttle/arc_switch_throttle_observer_unittest.cc b/chrome/browser/ash/arc/instance_throttle/arc_switch_throttle_observer_unittest.cc index 67f59c1d..55e004e5 100644 --- a/chrome/browser/ash/arc/instance_throttle/arc_switch_throttle_observer_unittest.cc +++ b/chrome/browser/ash/arc/instance_throttle/arc_switch_throttle_observer_unittest.cc
@@ -5,8 +5,8 @@ #include "chrome/browser/ash/arc/instance_throttle/arc_switch_throttle_observer.h" #include "ash/constants/ash_switches.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/test/scoped_command_line.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/ash/arc/intent_helper/arc_intent_helper_mojo_ash.cc b/chrome/browser/ash/arc/intent_helper/arc_intent_helper_mojo_ash.cc index c1dc2e95..10db91df 100644 --- a/chrome/browser/ash/arc/intent_helper/arc_intent_helper_mojo_ash.cc +++ b/chrome/browser/ash/arc/intent_helper/arc_intent_helper_mojo_ash.cc
@@ -8,7 +8,7 @@ #include "ash/components/arc/session/arc_bridge_service.h" #include "ash/components/arc/session/arc_service_manager.h" #include "base/barrier_closure.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/apps/app_service/app_icon/app_icon_factory.h" #include "chrome/browser/ash/app_list/arc/arc_app_list_prefs.h" #include "chrome/browser/ash/arc/session/arc_session_manager.h"
diff --git a/chrome/browser/ash/arc/intent_helper/arc_settings_service.cc b/chrome/browser/ash/arc/intent_helper/arc_settings_service.cc index 6438534..6f47f9e0 100644 --- a/chrome/browser/ash/arc/intent_helper/arc_settings_service.cc +++ b/chrome/browser/ash/arc/intent_helper/arc_settings_service.cc
@@ -15,8 +15,8 @@ #include "ash/components/arc/session/arc_bridge_service.h" #include "ash/constants/ash_features.h" #include "ash/constants/ash_pref_names.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/gtest_prod_util.h" #include "base/json/json_writer.h" #include "base/memory/singleton.h"
diff --git a/chrome/browser/ash/arc/intent_helper/arc_settings_service_browsertest.cc b/chrome/browser/ash/arc/intent_helper/arc_settings_service_browsertest.cc index e9cb7b6..ed0317e 100644 --- a/chrome/browser/ash/arc/intent_helper/arc_settings_service_browsertest.cc +++ b/chrome/browser/ash/arc/intent_helper/arc_settings_service_browsertest.cc
@@ -15,9 +15,9 @@ #include "ash/components/arc/test/arc_util_test_support.h" #include "ash/components/arc/test/connection_holder_util.h" #include "ash/components/arc/test/fake_backup_settings_instance.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/json/json_reader.h" #include "base/run_loop.h" #include "base/task/current_thread.h"
diff --git a/chrome/browser/ash/arc/intent_helper/arc_settings_service_unittest.cc b/chrome/browser/ash/arc/intent_helper/arc_settings_service_unittest.cc index 57fca22..0446171 100644 --- a/chrome/browser/ash/arc/intent_helper/arc_settings_service_unittest.cc +++ b/chrome/browser/ash/arc/intent_helper/arc_settings_service_unittest.cc
@@ -16,8 +16,8 @@ #include "ash/components/arc/test/connection_holder_util.h" #include "ash/components/arc/test/fake_arc_session.h" #include "ash/components/arc/test/fake_backup_settings_instance.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/arc/arc_optin_uma.h" #include "chrome/browser/ash/arc/arc_util.h" #include "chrome/browser/ash/arc/session/arc_provisioning_result.h"
diff --git a/chrome/browser/ash/arc/intent_helper/custom_tab_session_impl.cc b/chrome/browser/ash/arc/intent_helper/custom_tab_session_impl.cc index 2a2ed269..15480df 100644 --- a/chrome/browser/ash/arc/intent_helper/custom_tab_session_impl.cc +++ b/chrome/browser/ash/arc/intent_helper/custom_tab_session_impl.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h" #include "components/arc/intent_helper/custom_tab.h"
diff --git a/chrome/browser/ash/arc/keymaster/arc_keymaster_bridge.cc b/chrome/browser/ash/arc/keymaster/arc_keymaster_bridge.cc index e62db83..be43a81 100644 --- a/chrome/browser/ash/arc/keymaster/arc_keymaster_bridge.cc +++ b/chrome/browser/ash/arc/keymaster/arc_keymaster_bridge.cc
@@ -9,7 +9,7 @@ #include "ash/components/arc/arc_browser_context_keyed_service_factory_base.h" #include "ash/components/arc/session/arc_bridge_service.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/singleton.h" #include "base/process/process_handle.h"
diff --git a/chrome/browser/ash/arc/keymaster/arc_keymaster_bridge.h b/chrome/browser/ash/arc/keymaster/arc_keymaster_bridge.h index 7518fe2..faf148c 100644 --- a/chrome/browser/ash/arc/keymaster/arc_keymaster_bridge.h +++ b/chrome/browser/ash/arc/keymaster/arc_keymaster_bridge.h
@@ -7,7 +7,7 @@ #include "ash/components/arc/arc_browser_context_keyed_service_factory_base.h" #include "ash/components/arc/mojom/keymaster.mojom.h" -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ash/arc/keymaster/cert_store_bridge.h" #include "chrome/services/keymaster/public/mojom/cert_store.mojom.h"
diff --git a/chrome/browser/ash/arc/keymaster/cert_store_bridge.cc b/chrome/browser/ash/arc/keymaster/cert_store_bridge.cc index 5baa2aa5..b34e3187 100644 --- a/chrome/browser/ash/arc/keymaster/cert_store_bridge.cc +++ b/chrome/browser/ash/arc/keymaster/cert_store_bridge.cc
@@ -7,8 +7,8 @@ #include <cstdint> #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "mojo/core/embedder/embedder.h" #include "mojo/public/cpp/bindings/pending_remote.h"
diff --git a/chrome/browser/ash/arc/nearby_share/nearby_share_session_impl.cc b/chrome/browser/ash/arc/nearby_share/nearby_share_session_impl.cc index b6c8ff32..899ffc2b 100644 --- a/chrome/browser/ash/arc/nearby_share/nearby_share_session_impl.cc +++ b/chrome/browser/ash/arc/nearby_share/nearby_share_session_impl.cc
@@ -11,11 +11,11 @@ #include "ash/components/arc/arc_features.h" #include "ash/components/arc/arc_util.h" #include "ash/public/cpp/app_types_util.h" -#include "base/bind.h" -#include "base/callback_forward.h" -#include "base/callback_helpers.h" #include "base/feature_list.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_forward.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/numerics/safe_conversions.h" #include "base/system/sys_info.h"
diff --git a/chrome/browser/ash/arc/nearby_share/nearby_share_session_impl.h b/chrome/browser/ash/arc/nearby_share/nearby_share_session_impl.h index bd7c47f..d0aabd9 100644 --- a/chrome/browser/ash/arc/nearby_share/nearby_share_session_impl.h +++ b/chrome/browser/ash/arc/nearby_share/nearby_share_session_impl.h
@@ -6,7 +6,7 @@ #define CHROME_BROWSER_ASH_ARC_NEARBY_SHARE_NEARBY_SHARE_SESSION_IMPL_H_ #include "ash/components/arc/mojom/nearby_share.mojom.h" -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "base/scoped_observation.h" #include "base/timer/timer.h"
diff --git a/chrome/browser/ash/arc/nearby_share/nearby_share_session_impl_unittest.cc b/chrome/browser/ash/arc/nearby_share/nearby_share_session_impl_unittest.cc index 28bbd80..c776f88 100644 --- a/chrome/browser/ash/arc/nearby_share/nearby_share_session_impl_unittest.cc +++ b/chrome/browser/ash/arc/nearby_share/nearby_share_session_impl_unittest.cc
@@ -12,9 +12,9 @@ #include "ash/components/arc/test/arc_util_test_support.h" #include "ash/constants/app_types.h" #include "ash/public/cpp/shelf_model.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/containers/flat_map.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/test/bind.h" #include "base/test/scoped_feature_list.h"
diff --git a/chrome/browser/ash/arc/nearby_share/share_info_file_handler.cc b/chrome/browser/ash/arc/nearby_share/share_info_file_handler.cc index 4a2a9bc4..f4a4305 100644 --- a/chrome/browser/ash/arc/nearby_share/share_info_file_handler.cc +++ b/chrome/browser/ash/arc/nearby_share/share_info_file_handler.cc
@@ -8,9 +8,9 @@ #include <string> #include "ash/components/arc/arc_util.h" -#include "base/bind.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/numerics/checked_math.h"
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 f69d839..d8a32a3 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
@@ -7,8 +7,8 @@ #include <algorithm> #include <utility> -#include "base/bind.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/numerics/safe_conversions.h" #include "base/strings/string_piece.h" #include "base/task/task_traits.h"
diff --git a/chrome/browser/ash/arc/nearby_share/share_info_file_stream_adapter.h b/chrome/browser/ash/arc/nearby_share/share_info_file_stream_adapter.h index 1fccdb3..935fcd9 100644 --- a/chrome/browser/ash/arc/nearby_share/share_info_file_stream_adapter.h +++ b/chrome/browser/ash/arc/nearby_share/share_info_file_stream_adapter.h
@@ -7,8 +7,8 @@ #include <memory> -#include "base/callback.h" #include "base/files/scoped_file.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/ash/arc/nearby_share/share_info_file_stream_adapter_unittest.cc b/chrome/browser/ash/arc/nearby_share/share_info_file_stream_adapter_unittest.cc index e06e61b..38cdfb7 100644 --- a/chrome/browser/ash/arc/nearby_share/share_info_file_stream_adapter_unittest.cc +++ b/chrome/browser/ash/arc/nearby_share/share_info_file_stream_adapter_unittest.cc
@@ -8,9 +8,9 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/memory/scoped_refptr.h" #include "base/rand_util.h" #include "base/run_loop.h"
diff --git a/chrome/browser/ash/arc/nearby_share/ui/error_dialog_view.cc b/chrome/browser/ash/arc/nearby_share/ui/error_dialog_view.cc index 48120fe..302d3d2d 100644 --- a/chrome/browser/ash/arc/nearby_share/ui/error_dialog_view.cc +++ b/chrome/browser/ash/arc/nearby_share/ui/error_dialog_view.cc
@@ -7,7 +7,7 @@ #include <memory> #include "ash/frame/non_client_frame_view_ash.h" -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "components/strings/grit/components_strings.h" #include "ui/base/l10n/l10n_util.h" #include "ui/views/view.h"
diff --git a/chrome/browser/ash/arc/nearby_share/ui/error_dialog_view.h b/chrome/browser/ash/arc/nearby_share/ui/error_dialog_view.h index 62b5045..9e8c2db 100644 --- a/chrome/browser/ash/arc/nearby_share/ui/error_dialog_view.h +++ b/chrome/browser/ash/arc/nearby_share/ui/error_dialog_view.h
@@ -7,7 +7,7 @@ #include "chrome/browser/ash/arc/nearby_share/ui/base_dialog_delegate_view.h" -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" namespace aura { class Window;
diff --git a/chrome/browser/ash/arc/nearby_share/ui/low_disk_space_dialog_view.h b/chrome/browser/ash/arc/nearby_share/ui/low_disk_space_dialog_view.h index 42a106d7..a6c6eff 100644 --- a/chrome/browser/ash/arc/nearby_share/ui/low_disk_space_dialog_view.h +++ b/chrome/browser/ash/arc/nearby_share/ui/low_disk_space_dialog_view.h
@@ -7,7 +7,7 @@ #include "chrome/browser/ash/arc/nearby_share/ui/base_dialog_delegate_view.h" -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" namespace views { class View;
diff --git a/chrome/browser/ash/arc/nearby_share/ui/nearby_share_overlay_view.cc b/chrome/browser/ash/arc/nearby_share/ui/nearby_share_overlay_view.cc index 852d33d..830f9f8b 100644 --- a/chrome/browser/ash/arc/nearby_share/ui/nearby_share_overlay_view.cc +++ b/chrome/browser/ash/arc/nearby_share/ui/nearby_share_overlay_view.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ash/arc/nearby_share/ui/nearby_share_overlay_view.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "components/exo/shell_surface_base.h" #include "components/exo/shell_surface_util.h" #include "ui/base/metadata/metadata_impl_macros.h"
diff --git a/chrome/browser/ash/arc/nearby_share/ui/nearby_share_overlay_view_unittest.cc b/chrome/browser/ash/arc/nearby_share/ui/nearby_share_overlay_view_unittest.cc index 262c2350..902864b 100644 --- a/chrome/browser/ash/arc/nearby_share/ui/nearby_share_overlay_view_unittest.cc +++ b/chrome/browser/ash/arc/nearby_share/ui/nearby_share_overlay_view_unittest.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/test/bind.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/views/accessibility/view_accessibility.h"
diff --git a/chrome/browser/ash/arc/nearby_share/ui/progress_bar_dialog_view.cc b/chrome/browser/ash/arc/nearby_share/ui/progress_bar_dialog_view.cc index a70bcb5..f1b8069 100644 --- a/chrome/browser/ash/arc/nearby_share/ui/progress_bar_dialog_view.cc +++ b/chrome/browser/ash/arc/nearby_share/ui/progress_bar_dialog_view.cc
@@ -8,8 +8,8 @@ #include "ash/components/arc/compat_mode/style/arc_color_provider.h" #include "ash/style/ash_color_id.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "chrome/browser/ash/arc/nearby_share/ui/nearby_share_overlay_view.h" #include "components/strings/grit/components_strings.h" #include "ui/base/l10n/l10n_util.h"
diff --git a/chrome/browser/ash/arc/nearby_share/ui/progress_bar_dialog_view_unittest.cc b/chrome/browser/ash/arc/nearby_share/ui/progress_bar_dialog_view_unittest.cc index 8d932a3b..9a1caaf 100644 --- a/chrome/browser/ash/arc/nearby_share/ui/progress_bar_dialog_view_unittest.cc +++ b/chrome/browser/ash/arc/nearby_share/ui/progress_bar_dialog_view_unittest.cc
@@ -7,7 +7,7 @@ #include <memory> #include "ash/components/arc/compat_mode/test/compat_mode_test_base.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "testing/gtest/include/gtest/gtest.h" namespace arc {
diff --git a/chrome/browser/ash/arc/net/cert_manager_impl_unittest.cc b/chrome/browser/ash/arc/net/cert_manager_impl_unittest.cc index 335f961..add0b32 100644 --- a/chrome/browser/ash/arc/net/cert_manager_impl_unittest.cc +++ b/chrome/browser/ash/arc/net/cert_manager_impl_unittest.cc
@@ -6,7 +6,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/run_loop.h" #include "base/strings/string_number_conversions.h" #include "base/task/bind_post_task.h"
diff --git a/chrome/browser/ash/arc/notification/arc_boot_error_notification.cc b/chrome/browser/ash/arc/notification/arc_boot_error_notification.cc index 1259c054..f0107f44 100644 --- a/chrome/browser/ash/arc/notification/arc_boot_error_notification.cc +++ b/chrome/browser/ash/arc/notification/arc_boot_error_notification.cc
@@ -9,7 +9,7 @@ #include "ash/components/arc/arc_browser_context_keyed_service_factory_base.h" #include "ash/public/cpp/notification_utils.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/scoped_refptr.h" #include "base/strings/utf_string_conversions.h" #include "chrome/app/vector_icons/vector_icons.h"
diff --git a/chrome/browser/ash/arc/notification/arc_management_transition_notification.cc b/chrome/browser/ash/arc/notification/arc_management_transition_notification.cc index 1b160628..5650da04 100644 --- a/chrome/browser/ash/arc/notification/arc_management_transition_notification.cc +++ b/chrome/browser/ash/arc/notification/arc_management_transition_notification.cc
@@ -7,7 +7,7 @@ #include "ash/components/arc/arc_prefs.h" #include "ash/constants/notifier_catalogs.h" #include "ash/public/cpp/notification_utils.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/app/vector_icons/vector_icons.h" #include "chrome/browser/ash/arc/arc_util.h" #include "chrome/browser/ash/arc/session/arc_session_manager.h"
diff --git a/chrome/browser/ash/arc/notification/arc_provision_notification_service_unittest.cc b/chrome/browser/ash/arc/notification/arc_provision_notification_service_unittest.cc index 359ecac..3e9f767 100644 --- a/chrome/browser/ash/arc/notification/arc_provision_notification_service_unittest.cc +++ b/chrome/browser/ash/arc/notification/arc_provision_notification_service_unittest.cc
@@ -13,8 +13,8 @@ #include "ash/components/arc/session/arc_service_manager.h" #include "ash/components/arc/test/arc_util_test_support.h" #include "ash/components/arc/test/fake_arc_session.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/values.h" #include "chrome/browser/ash/arc/arc_optin_uma.h" #include "chrome/browser/ash/arc/arc_util.h"
diff --git a/chrome/browser/ash/arc/oemcrypto/arc_oemcrypto_bridge.cc b/chrome/browser/ash/arc/oemcrypto/arc_oemcrypto_bridge.cc index 12516e4..e859523f 100644 --- a/chrome/browser/ash/arc/oemcrypto/arc_oemcrypto_bridge.cc +++ b/chrome/browser/ash/arc/oemcrypto/arc_oemcrypto_bridge.cc
@@ -9,7 +9,7 @@ #include "ash/components/arc/arc_browser_context_keyed_service_factory_base.h" #include "ash/components/arc/mojom/protected_buffer_manager.mojom.h" #include "ash/components/arc/session/arc_bridge_service.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/singleton.h" #include "chrome/browser/ash/settings/cros_settings.h" #include "chromeos/components/cdm_factory_daemon/cdm_factory_daemon_proxy_ash.h"
diff --git a/chrome/browser/ash/arc/optin/arc_optin_preference_handler.cc b/chrome/browser/ash/arc/optin/arc_optin_preference_handler.cc index dc8ba64a..585b918 100644 --- a/chrome/browser/ash/arc/optin/arc_optin_preference_handler.cc +++ b/chrome/browser/ash/arc/optin/arc_optin_preference_handler.cc
@@ -6,8 +6,8 @@ #include "ash/components/arc/arc_prefs.h" #include "ash/constants/ash_features.h" -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/arc/optin/arc_optin_preference_handler_observer.h" #include "chrome/browser/ash/settings/stats_reporting_controller.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/ash/arc/optin/arc_terms_of_service_default_negotiator.h b/chrome/browser/ash/arc/optin/arc_terms_of_service_default_negotiator.h index 2146d020..1dbeae7 100644 --- a/chrome/browser/ash/arc/optin/arc_terms_of_service_default_negotiator.h +++ b/chrome/browser/ash/arc/optin/arc_terms_of_service_default_negotiator.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/ash/arc/arc_support_host.h" #include "chrome/browser/ash/arc/optin/arc_optin_preference_handler_observer.h" #include "chrome/browser/ash/arc/optin/arc_terms_of_service_negotiator.h"
diff --git a/chrome/browser/ash/arc/optin/arc_terms_of_service_default_negotiator_unittest.cc b/chrome/browser/ash/arc/optin/arc_terms_of_service_default_negotiator_unittest.cc index ea64736..b323a4b 100644 --- a/chrome/browser/ash/arc/optin/arc_terms_of_service_default_negotiator_unittest.cc +++ b/chrome/browser/ash/arc/optin/arc_terms_of_service_default_negotiator_unittest.cc
@@ -9,7 +9,7 @@ #include <vector> #include "ash/components/arc/arc_prefs.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/hash/sha1.h" #include "base/run_loop.h" #include "base/values.h"
diff --git a/chrome/browser/ash/arc/optin/arc_terms_of_service_negotiator.h b/chrome/browser/ash/arc/optin/arc_terms_of_service_negotiator.h index 2ccbc252..1b6f5f4 100644 --- a/chrome/browser/ash/arc/optin/arc_terms_of_service_negotiator.h +++ b/chrome/browser/ash/arc/optin/arc_terms_of_service_negotiator.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_ASH_ARC_OPTIN_ARC_TERMS_OF_SERVICE_NEGOTIATOR_H_ #define CHROME_BROWSER_ASH_ARC_OPTIN_ARC_TERMS_OF_SERVICE_NEGOTIATOR_H_ -#include "base/callback.h" +#include "base/functional/callback.h" namespace arc {
diff --git a/chrome/browser/ash/arc/optin/arc_terms_of_service_oobe_negotiator.cc b/chrome/browser/ash/arc/optin/arc_terms_of_service_oobe_negotiator.cc index ec587f48..921048a 100644 --- a/chrome/browser/ash/arc/optin/arc_terms_of_service_oobe_negotiator.cc +++ b/chrome/browser/ash/arc/optin/arc_terms_of_service_oobe_negotiator.cc
@@ -5,7 +5,7 @@ #include "chrome/browser/ash/arc/optin/arc_terms_of_service_oobe_negotiator.h" #include "ash/constants/ash_features.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/login/ui/login_display_host.h" #include "chrome/browser/ash/login/wizard_controller.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/ash/arc/pip/arc_pip_bridge.cc b/chrome/browser/ash/arc/pip/arc_pip_bridge.cc index 491498d26..7243d93 100644 --- a/chrome/browser/ash/arc/pip/arc_pip_bridge.cc +++ b/chrome/browser/ash/arc/pip/arc_pip_bridge.cc
@@ -10,7 +10,7 @@ #include "ash/components/arc/arc_features.h" #include "ash/components/arc/session/arc_bridge_service.h" #include "base/auto_reset.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/singleton.h" #include "chrome/browser/ash/arc/pip/arc_picture_in_picture_window_controller_impl.h"
diff --git a/chrome/browser/ash/arc/policy/arc_android_management_checker.cc b/chrome/browser/ash/arc/policy/arc_android_management_checker.cc index 6bea714..c6f8ec7 100644 --- a/chrome/browser/ash/arc/policy/arc_android_management_checker.cc +++ b/chrome/browser/ash/arc/policy/arc_android_management_checker.cc
@@ -7,7 +7,7 @@ #include <algorithm> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/single_thread_task_runner.h" #include "chrome/browser/ash/arc/policy/arc_policy_util.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ash/arc/policy/arc_android_management_checker.h b/chrome/browser/ash/arc/policy/arc_android_management_checker.h index b9206245..0b164a94 100644 --- a/chrome/browser/ash/arc/policy/arc_android_management_checker.h +++ b/chrome/browser/ash/arc/policy/arc_android_management_checker.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_ASH_ARC_POLICY_ARC_ANDROID_MANAGEMENT_CHECKER_H_ #define CHROME_BROWSER_ASH_ARC_POLICY_ARC_ANDROID_MANAGEMENT_CHECKER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h" #include "chrome/browser/ash/policy/arc/android_management_client.h"
diff --git a/chrome/browser/ash/arc/policy/arc_policy_bridge.cc b/chrome/browser/ash/arc/policy/arc_policy_bridge.cc index 1bd7b33b..20dc4b5 100644 --- a/chrome/browser/ash/arc/policy/arc_policy_bridge.cc +++ b/chrome/browser/ash/arc/policy/arc_policy_bridge.cc
@@ -12,9 +12,9 @@ #include "ash/components/arc/enterprise/arc_data_snapshotd_manager.h" #include "ash/components/arc/session/arc_bridge_service.h" #include "ash/constants/ash_switches.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/guid.h" #include "base/json/json_reader.h" #include "base/json/json_string_value_serializer.h"
diff --git a/chrome/browser/ash/arc/policy/arc_policy_bridge.h b/chrome/browser/ash/arc/policy/arc_policy_bridge.h index 7dfbb7d3..a6f0607 100644 --- a/chrome/browser/ash/arc/policy/arc_policy_bridge.h +++ b/chrome/browser/ash/arc/policy/arc_policy_bridge.h
@@ -14,7 +14,7 @@ #include "ash/components/arc/mojom/policy.mojom.h" #include "ash/components/arc/session/connection_observer.h" -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" #include "base/time/time.h"
diff --git a/chrome/browser/ash/arc/policy/arc_policy_bridge_unittest.cc b/chrome/browser/ash/arc/policy/arc_policy_bridge_unittest.cc index 54756b12..06deafa 100644 --- a/chrome/browser/ash/arc/policy/arc_policy_bridge_unittest.cc +++ b/chrome/browser/ash/arc/policy/arc_policy_bridge_unittest.cc
@@ -17,8 +17,8 @@ #include "ash/components/arc/test/fake_arc_session.h" #include "ash/components/arc/test/fake_policy_instance.h" #include "ash/constants/ash_switches.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/json/json_reader.h" #include "base/memory/ptr_util.h" #include "base/run_loop.h"
diff --git a/chrome/browser/ash/arc/policy/arc_policy_handler_unittest.cc b/chrome/browser/ash/arc/policy/arc_policy_handler_unittest.cc index 8c8a11c8..5426dd7 100644 --- a/chrome/browser/ash/arc/policy/arc_policy_handler_unittest.cc +++ b/chrome/browser/ash/arc/policy/arc_policy_handler_unittest.cc
@@ -7,7 +7,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/json/json_string_value_serializer.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ash/arc/policy/managed_configuration_variables.cc b/chrome/browser/ash/arc/policy/managed_configuration_variables.cc index 7822230..5c09c4bb 100644 --- a/chrome/browser/ash/arc/policy/managed_configuration_variables.cc +++ b/chrome/browser/ash/arc/policy/managed_configuration_variables.cc
@@ -7,10 +7,10 @@ #include <string> #include <vector> -#include "base/bind.h" -#include "base/callback_forward.h" #include "base/check.h" #include "base/containers/flat_map.h" +#include "base/functional/bind.h" +#include "base/functional/callback_forward.h" #include "base/strings/string_piece_forward.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.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 eb69c6e..4ccfcd7 100644 --- a/chrome/browser/ash/arc/print_spooler/print_session_impl.cc +++ b/chrome/browser/ash/arc/print_spooler/print_session_impl.cc
@@ -9,11 +9,11 @@ #include <utility> #include "ash/components/arc/mojom/print_common.mojom.h" -#include "base/bind.h" #include "base/containers/span.h" #include "base/files/file.h" #include "base/files/file_path.h" #include "base/files/platform_file.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/ptr_util.h" #include "base/numerics/safe_conversions.h"
diff --git a/chrome/browser/ash/arc/process/arc_process_service.cc b/chrome/browser/ash/arc/process/arc_process_service.cc index 6fbf9c3..5a03e86b 100644 --- a/chrome/browser/ash/arc/process/arc_process_service.cc +++ b/chrome/browser/ash/arc/process/arc_process_service.cc
@@ -20,10 +20,10 @@ #include "ash/components/arc/arc_util.h" #include "ash/components/arc/mojom/process.mojom.h" #include "ash/components/arc/session/arc_bridge_service.h" -#include "base/bind.h" #include "base/containers/cxx20_erase.h" #include "base/containers/flat_set.h" #include "base/containers/queue.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/scoped_refptr.h" #include "base/memory/singleton.h"
diff --git a/chrome/browser/ash/arc/process/arc_process_service.h b/chrome/browser/ash/arc/process/arc_process_service.h index 816a51e4..64b4b49 100644 --- a/chrome/browser/ash/arc/process/arc_process_service.h +++ b/chrome/browser/ash/arc/process/arc_process_service.h
@@ -12,7 +12,7 @@ #include "ash/components/arc/mojom/process.mojom-forward.h" #include "ash/components/arc/session/connection_observer.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/process/process_iterator.h"
diff --git a/chrome/browser/ash/arc/screen_capture/arc_screen_capture_bridge.cc b/chrome/browser/ash/arc/screen_capture/arc_screen_capture_bridge.cc index 257a85f..85fd8ff 100644 --- a/chrome/browser/ash/arc/screen_capture/arc_screen_capture_bridge.cc +++ b/chrome/browser/ash/arc/screen_capture/arc_screen_capture_bridge.cc
@@ -10,8 +10,8 @@ #include "ash/components/arc/arc_browser_context_keyed_service_factory_base.h" #include "ash/components/arc/session/arc_bridge_service.h" #include "ash/shell.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/memory/singleton.h" #include "base/strings/utf_string_conversions.h" #include "base/system/sys_info.h"
diff --git a/chrome/browser/ash/arc/screen_capture/arc_screen_capture_session.cc b/chrome/browser/ash/arc/screen_capture/arc_screen_capture_session.cc index ce15c95..8b5dca56 100644 --- a/chrome/browser/ash/arc/screen_capture/arc_screen_capture_session.cc +++ b/chrome/browser/ash/arc/screen_capture/arc_screen_capture_session.cc
@@ -8,7 +8,7 @@ #include "ash/components/arc/mojom/screen_capture.mojom.h" #include "ash/shell.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/ash/notifications/screen_capture_notification_ui_ash.h" #include "chrome/browser/media/webrtc/desktop_capture_access_handler.h"
diff --git a/chrome/browser/ash/arc/session/arc_activation_necessity_checker.h b/chrome/browser/ash/arc/session/arc_activation_necessity_checker.h index 3f6fab8..eb1ee3219 100644 --- a/chrome/browser/ash/arc/session/arc_activation_necessity_checker.h +++ b/chrome/browser/ash/arc/session/arc_activation_necessity_checker.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_ASH_ARC_SESSION_ARC_ACTIVATION_NECESSITY_CHECKER_H_ #define CHROME_BROWSER_ASH_ARC_SESSION_ARC_ACTIVATION_NECESSITY_CHECKER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" class Profile;
diff --git a/chrome/browser/ash/arc/session/arc_initial_optin_notifier.cc b/chrome/browser/ash/arc/session/arc_initial_optin_notifier.cc index ea28e28..3ca443c7 100644 --- a/chrome/browser/ash/arc/session/arc_initial_optin_notifier.cc +++ b/chrome/browser/ash/arc/session/arc_initial_optin_notifier.cc
@@ -9,7 +9,7 @@ #include "ash/components/arc/arc_util.h" #include "ash/metrics/login_unlock_throughput_recorder.h" #include "ash/shell.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "chrome/browser/ash/arc/arc_util.h" #include "chrome/browser/ash/arc/session/arc_session_manager.h"
diff --git a/chrome/browser/ash/arc/session/arc_play_store_enabled_preference_handler.cc b/chrome/browser/ash/arc/session/arc_play_store_enabled_preference_handler.cc index d56341e..6668bbfb 100644 --- a/chrome/browser/ash/arc/session/arc_play_store_enabled_preference_handler.cc +++ b/chrome/browser/ash/arc/session/arc_play_store_enabled_preference_handler.cc
@@ -8,8 +8,8 @@ #include "ash/components/arc/arc_prefs.h" #include "ash/components/arc/arc_util.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "chrome/browser/ash/app_list/arc/arc_app_utils.h" #include "chrome/browser/ash/arc/arc_optin_uma.h"
diff --git a/chrome/browser/ash/arc/session/arc_play_store_enabled_preference_handler_unittest.cc b/chrome/browser/ash/arc/session/arc_play_store_enabled_preference_handler_unittest.cc index beaa034..666da50 100644 --- a/chrome/browser/ash/arc/session/arc_play_store_enabled_preference_handler_unittest.cc +++ b/chrome/browser/ash/arc/session/arc_play_store_enabled_preference_handler_unittest.cc
@@ -11,9 +11,9 @@ #include "ash/components/arc/session/arc_session_runner.h" #include "ash/components/arc/test/arc_util_test_support.h" #include "ash/components/arc/test/fake_arc_session.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/test/scoped_command_line.h" #include "chrome/browser/ash/arc/arc_util.h"
diff --git a/chrome/browser/ash/arc/session/arc_requirement_checker.h b/chrome/browser/ash/arc/session/arc_requirement_checker.h index 362b7637..720d9543 100644 --- a/chrome/browser/ash/arc/session/arc_requirement_checker.h +++ b/chrome/browser/ash/arc/session/arc_requirement_checker.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" #include "base/timer/timer.h"
diff --git a/chrome/browser/ash/arc/session/arc_service_launcher.cc b/chrome/browser/ash/arc/session/arc_service_launcher.cc index ee002f6..9c89982 100644 --- a/chrome/browser/ash/arc/session/arc_service_launcher.cc +++ b/chrome/browser/ash/arc/session/arc_service_launcher.cc
@@ -42,9 +42,9 @@ #include "ash/components/arc/volume_mounter/arc_volume_mounter_bridge.h" #include "ash/components/arc/wake_lock/arc_wake_lock_bridge.h" #include "ash/constants/ash_features.h" -#include "base/bind.h" #include "base/check_op.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "chrome/browser/apps/app_service/publishers/arc_apps_factory.h" #include "chrome/browser/ash/app_list/arc/arc_usb_host_permission_manager.h" #include "chrome/browser/ash/app_restore/app_restore_arc_task_handler.h"
diff --git a/chrome/browser/ash/arc/session/arc_session_manager.cc b/chrome/browser/ash/arc/session/arc_session_manager.cc index 8c376ee6..8cf6520 100644 --- a/chrome/browser/ash/arc/session/arc_session_manager.cc +++ b/chrome/browser/ash/arc/session/arc_session_manager.cc
@@ -21,9 +21,9 @@ #include "ash/components/arc/session/arc_session_runner.h" #include "ash/components/arc/session/serial_number_util.h" #include "ash/constants/ash_switches.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/metrics/histogram_functions.h" #include "base/strings/string_split.h"
diff --git a/chrome/browser/ash/arc/session/arc_session_manager_browsertest.cc b/chrome/browser/ash/arc/session/arc_session_manager_browsertest.cc index e33fdbf6..c85096e 100644 --- a/chrome/browser/ash/arc/session/arc_session_manager_browsertest.cc +++ b/chrome/browser/ash/arc/session/arc_session_manager_browsertest.cc
@@ -13,10 +13,10 @@ #include "ash/components/arc/test/arc_util_test_support.h" #include "ash/components/arc/test/fake_arc_session.h" #include "base/auto_reset.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/memory/scoped_refptr.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/ash/arc/session/arc_session_manager_unittest.cc b/chrome/browser/ash/arc/session/arc_session_manager_unittest.cc index 66d8e6e..6647caa8 100644 --- a/chrome/browser/ash/arc/session/arc_session_manager_unittest.cc +++ b/chrome/browser/ash/arc/session/arc_session_manager_unittest.cc
@@ -18,11 +18,11 @@ #include "ash/components/arc/test/fake_arc_session.h" #include "ash/constants/ash_features.h" #include "ash/constants/ash_switches.h" -#include "base/bind.h" #include "base/check_op.h" #include "base/command_line.h" #include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/notreached.h" #include "base/observer_list.h" #include "base/run_loop.h"
diff --git a/chrome/browser/ash/arc/tracing/arc_app_performance_tracing.h b/chrome/browser/ash/arc/tracing/arc_app_performance_tracing.h index aa572f5..585e332 100644 --- a/chrome/browser/ash/arc/tracing/arc_app_performance_tracing.h +++ b/chrome/browser/ash/arc/tracing/arc_app_performance_tracing.h
@@ -13,7 +13,7 @@ #include <string> #include "ash/components/arc/mojom/metrics.mojom.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/time/time.h" #include "chrome/browser/ash/app_list/arc/arc_app_list_prefs.h" #include "components/exo/surface_observer.h"
diff --git a/chrome/browser/ash/arc/tracing/arc_app_performance_tracing_custom_session.h b/chrome/browser/ash/arc/tracing/arc_app_performance_tracing_custom_session.h index 2a66a47..12718df 100644 --- a/chrome/browser/ash/arc/tracing/arc_app_performance_tracing_custom_session.h +++ b/chrome/browser/ash/arc/tracing/arc_app_performance_tracing_custom_session.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_ASH_ARC_TRACING_ARC_APP_PERFORMANCE_TRACING_CUSTOM_SESSION_H_ #define CHROME_BROWSER_ASH_ARC_TRACING_ARC_APP_PERFORMANCE_TRACING_CUSTOM_SESSION_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/ash/arc/tracing/arc_app_performance_tracing_session.h" namespace arc {
diff --git a/chrome/browser/ash/arc/tracing/arc_app_performance_tracing_session.cc b/chrome/browser/ash/arc/tracing/arc_app_performance_tracing_session.cc index 3d14ed9e..252fb48 100644 --- a/chrome/browser/ash/arc/tracing/arc_app_performance_tracing_session.cc +++ b/chrome/browser/ash/arc/tracing/arc_app_performance_tracing_session.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ash/arc/tracing/arc_app_performance_tracing_session.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/numerics/safe_conversions.h" #include "chrome/browser/ash/arc/tracing/arc_app_performance_tracing.h" #include "components/exo/shell_surface_util.h"
diff --git a/chrome/browser/ash/arc/tracing/arc_cpu_event_unittest.cc b/chrome/browser/ash/arc/tracing/arc_cpu_event_unittest.cc index 421fe87a..5309a73 100644 --- a/chrome/browser/ash/arc/tracing/arc_cpu_event_unittest.cc +++ b/chrome/browser/ash/arc/tracing/arc_cpu_event_unittest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ash/arc/tracing/arc_cpu_event.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "testing/gtest/include/gtest/gtest.h" namespace arc {
diff --git a/chrome/browser/ash/arc/tracing/arc_graphics_jank_detector.h b/chrome/browser/ash/arc/tracing/arc_graphics_jank_detector.h index 3dc2347..70c6a48 100644 --- a/chrome/browser/ash/arc/tracing/arc_graphics_jank_detector.h +++ b/chrome/browser/ash/arc/tracing/arc_graphics_jank_detector.h
@@ -7,7 +7,7 @@ #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/time/time.h" namespace arc {
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 115cdf3..3171849f 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
@@ -4,7 +4,7 @@ #include "chrome/browser/ash/arc/tracing/arc_graphics_jank_detector.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/time/time.h" #include "testing/gtest/include/gtest/gtest.h"
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 93f5b915..c537e9b 100644 --- a/chrome/browser/ash/arc/tracing/arc_system_stat_collector.cc +++ b/chrome/browser/ash/arc/tracing/arc_system_stat_collector.cc
@@ -11,11 +11,11 @@ #include <array> #include <utility> -#include "base/bind.h" #include "base/cpu.h" #include "base/files/file_enumerator.h" #include "base/files/file_util.h" #include "base/files/scoped_file.h" +#include "base/functional/bind.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/logging.h"
diff --git a/chrome/browser/ash/arc/tracing/arc_tracing_bridge.cc b/chrome/browser/ash/arc/tracing/arc_tracing_bridge.cc index 6df852d..33a6a10 100644 --- a/chrome/browser/ash/arc/tracing/arc_tracing_bridge.cc +++ b/chrome/browser/ash/arc/tracing/arc_tracing_bridge.cc
@@ -10,9 +10,9 @@ #include "ash/components/arc/mojom/tracing.mojom.h" #include "ash/components/arc/session/arc_bridge_service.h" #include "ash/components/arc/session/arc_service_manager.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/files/file.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/memory/singleton.h" #include "base/no_destructor.h"
diff --git a/chrome/browser/ash/arc/tracing/arc_tracing_bridge.h b/chrome/browser/ash/arc/tracing/arc_tracing_bridge.h index 082e8fd..9b0545a 100644 --- a/chrome/browser/ash/arc/tracing/arc_tracing_bridge.h +++ b/chrome/browser/ash/arc/tracing/arc_tracing_bridge.h
@@ -12,7 +12,7 @@ #include "ash/components/arc/mojom/tracing.mojom-forward.h" #include "ash/components/arc/session/connection_observer.h" -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "base/synchronization/lock.h" #include "base/thread_annotations.h"
diff --git a/chrome/browser/ash/arc/tracing/arc_tracing_bridge_unittest.cc b/chrome/browser/ash/arc/tracing/arc_tracing_bridge_unittest.cc index bebc7226..a7b729f 100644 --- a/chrome/browser/ash/arc/tracing/arc_tracing_bridge_unittest.cc +++ b/chrome/browser/ash/arc/tracing/arc_tracing_bridge_unittest.cc
@@ -7,7 +7,7 @@ #include "ash/components/arc/session/arc_bridge_service.h" #include "ash/components/arc/test/connection_holder_util.h" #include "ash/components/arc/test/fake_tracing_instance.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/trace_event/trace_event.h" #include "chrome/browser/ash/arc/tracing/arc_tracing_bridge.h" #include "chrome/test/base/testing_browser_process.h"
diff --git a/chrome/browser/ash/arc/tracing/arc_tracing_graphics_model.cc b/chrome/browser/ash/arc/tracing/arc_tracing_graphics_model.cc index f24dfdb..d7b45d5 100644 --- a/chrome/browser/ash/arc/tracing/arc_tracing_graphics_model.cc +++ b/chrome/browser/ash/arc/tracing/arc_tracing_graphics_model.cc
@@ -11,8 +11,8 @@ #include "ash/components/arc/arc_util.h" #include "base/base64.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/logging.h"
diff --git a/chrome/browser/ash/arc/video/gpu_arc_video_service_host.cc b/chrome/browser/ash/arc/video/gpu_arc_video_service_host.cc index 7521fd0..d34a977 100644 --- a/chrome/browser/ash/arc/video/gpu_arc_video_service_host.cc +++ b/chrome/browser/ash/arc/video/gpu_arc_video_service_host.cc
@@ -16,9 +16,9 @@ #include "ash/components/arc/mojom/video_encode_accelerator.mojom.h" #include "ash/components/arc/mojom/video_protected_buffer_allocator.mojom.h" #include "ash/components/arc/session/arc_bridge_service.h" -#include "base/bind.h" #include "base/check_op.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/no_destructor.h" #include "base/rand_util.h"
diff --git a/chrome/browser/ash/arc/wallpaper/arc_wallpaper_service.cc b/chrome/browser/ash/arc/wallpaper/arc_wallpaper_service.cc index 3d88dbf..19593b3d 100644 --- a/chrome/browser/ash/arc/wallpaper/arc_wallpaper_service.cc +++ b/chrome/browser/ash/arc/wallpaper/arc_wallpaper_service.cc
@@ -11,7 +11,7 @@ #include "ash/components/arc/arc_browser_context_keyed_service_factory_base.h" #include "ash/components/arc/session/arc_bridge_service.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/singleton.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/ash/arc/wallpaper/arc_wallpaper_service_unittest.cc b/chrome/browser/ash/arc/wallpaper/arc_wallpaper_service_unittest.cc index 8154f3c..ba56d26 100644 --- a/chrome/browser/ash/arc/wallpaper/arc_wallpaper_service_unittest.cc +++ b/chrome/browser/ash/arc/wallpaper/arc_wallpaper_service_unittest.cc
@@ -14,7 +14,7 @@ #include "ash/components/arc/test/connection_holder_util.h" #include "ash/components/arc/test/fake_wallpaper_instance.h" #include "ash/constants/ash_pref_names.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "chrome/browser/ash/login/users/fake_chrome_user_manager.h" #include "chrome/browser/image_decoder/image_decoder.h"
diff --git a/chrome/browser/ash/attestation/attestation_ca_client.cc b/chrome/browser/ash/attestation/attestation_ca_client.cc index 86306d75..16fbe2f 100644 --- a/chrome/browser/ash/attestation/attestation_ca_client.cc +++ b/chrome/browser/ash/attestation/attestation_ca_client.cc
@@ -6,8 +6,8 @@ #include <string> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/threading/thread_task_runner_handle.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/ash/attestation/attestation_ca_client_unittest.cc b/chrome/browser/ash/attestation/attestation_ca_client_unittest.cc index 71b4034..c07c63ef 100644 --- a/chrome/browser/ash/attestation/attestation_ca_client_unittest.cc +++ b/chrome/browser/ash/attestation/attestation_ca_client_unittest.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ash/attestation/attestation_ca_client.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/test/bind.h" #include "chrome/test/base/testing_browser_process.h" #include "chromeos/dbus/constants/dbus_switches.h"
diff --git a/chrome/browser/ash/attestation/attestation_policy_observer.cc b/chrome/browser/ash/attestation/attestation_policy_observer.cc index e1377c8..509e57b 100644 --- a/chrome/browser/ash/attestation/attestation_policy_observer.cc +++ b/chrome/browser/ash/attestation/attestation_policy_observer.cc
@@ -7,8 +7,8 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "chrome/browser/ash/attestation/machine_certificate_uploader.h" #include "chrome/browser/ash/settings/cros_settings.h" #include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/ash/attestation/attestation_policy_observer.h b/chrome/browser/ash/attestation/attestation_policy_observer.h index 8fff29c..3402e7d 100644 --- a/chrome/browser/ash/attestation/attestation_policy_observer.h +++ b/chrome/browser/ash/attestation/attestation_policy_observer.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_ASH_ATTESTATION_ATTESTATION_POLICY_OBSERVER_H_ #define CHROME_BROWSER_ASH_ATTESTATION_ATTESTATION_POLICY_OBSERVER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/ash/settings/cros_settings.h" #include "chromeos/ash/components/dbus/constants/attestation_constants.h"
diff --git a/chrome/browser/ash/attestation/attestation_policy_observer_unittest.cc b/chrome/browser/ash/attestation/attestation_policy_observer_unittest.cc index 656f5f9..36a649a3 100644 --- a/chrome/browser/ash/attestation/attestation_policy_observer_unittest.cc +++ b/chrome/browser/ash/attestation/attestation_policy_observer_unittest.cc
@@ -6,8 +6,8 @@ #include <string> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/ash/attestation/enrollment_certificate_uploader.h b/chrome/browser/ash/attestation/enrollment_certificate_uploader.h index cc5c796e..7f470fcb 100644 --- a/chrome/browser/ash/attestation/enrollment_certificate_uploader.h +++ b/chrome/browser/ash/attestation/enrollment_certificate_uploader.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_ASH_ATTESTATION_ENROLLMENT_CERTIFICATE_UPLOADER_H_ #define CHROME_BROWSER_ASH_ATTESTATION_ENROLLMENT_CERTIFICATE_UPLOADER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" namespace ash { namespace attestation {
diff --git a/chrome/browser/ash/attestation/enrollment_certificate_uploader_impl.cc b/chrome/browser/ash/attestation/enrollment_certificate_uploader_impl.cc index ccbce87..ddb51b8 100644 --- a/chrome/browser/ash/attestation/enrollment_certificate_uploader_impl.cc +++ b/chrome/browser/ash/attestation/enrollment_certificate_uploader_impl.cc
@@ -7,8 +7,8 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/time/time.h"
diff --git a/chrome/browser/ash/attestation/enrollment_certificate_uploader_impl.h b/chrome/browser/ash/attestation/enrollment_certificate_uploader_impl.h index b124a7a..f1c9eba 100644 --- a/chrome/browser/ash/attestation/enrollment_certificate_uploader_impl.h +++ b/chrome/browser/ash/attestation/enrollment_certificate_uploader_impl.h
@@ -9,7 +9,7 @@ #include <queue> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h" #include "chrome/browser/ash/attestation/enrollment_certificate_uploader.h"
diff --git a/chrome/browser/ash/attestation/enrollment_certificate_uploader_impl_unittest.cc b/chrome/browser/ash/attestation/enrollment_certificate_uploader_impl_unittest.cc index 244443b..c047a9f 100644 --- a/chrome/browser/ash/attestation/enrollment_certificate_uploader_impl_unittest.cc +++ b/chrome/browser/ash/attestation/enrollment_certificate_uploader_impl_unittest.cc
@@ -6,8 +6,8 @@ #include <string> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/ash/attestation/enrollment_id_upload_manager.cc b/chrome/browser/ash/attestation/enrollment_id_upload_manager.cc index 77502a712..c94f17d 100644 --- a/chrome/browser/ash/attestation/enrollment_id_upload_manager.cc +++ b/chrome/browser/ash/attestation/enrollment_id_upload_manager.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h"
diff --git a/chrome/browser/ash/attestation/enrollment_id_upload_manager.h b/chrome/browser/ash/attestation/enrollment_id_upload_manager.h index 6b4fad6..06724a0 100644 --- a/chrome/browser/ash/attestation/enrollment_id_upload_manager.h +++ b/chrome/browser/ash/attestation/enrollment_id_upload_manager.h
@@ -9,7 +9,7 @@ #include <queue> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ash/attestation/enrollment_certificate_uploader.h" #include "chrome/browser/ash/settings/device_settings_service.h"
diff --git a/chrome/browser/ash/attestation/enrollment_id_upload_manager_unittest.cc b/chrome/browser/ash/attestation/enrollment_id_upload_manager_unittest.cc index b8a8648..c406cfa 100644 --- a/chrome/browser/ash/attestation/enrollment_id_upload_manager_unittest.cc +++ b/chrome/browser/ash/attestation/enrollment_id_upload_manager_unittest.cc
@@ -9,8 +9,8 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/run_loop.h" #include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/ash/attestation/machine_certificate_uploader.h b/chrome/browser/ash/attestation/machine_certificate_uploader.h index a8901b4..0febd147 100644 --- a/chrome/browser/ash/attestation/machine_certificate_uploader.h +++ b/chrome/browser/ash/attestation/machine_certificate_uploader.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_ASH_ATTESTATION_MACHINE_CERTIFICATE_UPLOADER_H_ #define CHROME_BROWSER_ASH_ATTESTATION_MACHINE_CERTIFICATE_UPLOADER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" namespace ash { namespace attestation {
diff --git a/chrome/browser/ash/attestation/machine_certificate_uploader_impl.cc b/chrome/browser/ash/attestation/machine_certificate_uploader_impl.cc index a472b538..e018e0e6 100644 --- a/chrome/browser/ash/attestation/machine_certificate_uploader_impl.cc +++ b/chrome/browser/ash/attestation/machine_certificate_uploader_impl.cc
@@ -7,9 +7,9 @@ #include <memory> #include <string> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "chrome/browser/ash/attestation/attestation_ca_client.h" #include "chrome/browser/ash/attestation/attestation_key_payload.pb.h"
diff --git a/chrome/browser/ash/attestation/machine_certificate_uploader_impl.h b/chrome/browser/ash/attestation/machine_certificate_uploader_impl.h index c95d748..4e8c4c37 100644 --- a/chrome/browser/ash/attestation/machine_certificate_uploader_impl.h +++ b/chrome/browser/ash/attestation/machine_certificate_uploader_impl.h
@@ -8,7 +8,7 @@ #include <string> #include <utility> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h" #include "chrome/browser/ash/attestation/machine_certificate_uploader.h"
diff --git a/chrome/browser/ash/attestation/machine_certificate_uploader_impl_unittest.cc b/chrome/browser/ash/attestation/machine_certificate_uploader_impl_unittest.cc index bb8a9186..b95e625 100644 --- a/chrome/browser/ash/attestation/machine_certificate_uploader_impl_unittest.cc +++ b/chrome/browser/ash/attestation/machine_certificate_uploader_impl_unittest.cc
@@ -6,8 +6,8 @@ #include <string> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/ash/attestation/platform_verification_flow.cc b/chrome/browser/ash/attestation/platform_verification_flow.cc index c8b7bcdd..2ca77a45 100644 --- a/chrome/browser/ash/attestation/platform_verification_flow.cc +++ b/chrome/browser/ash/attestation/platform_verification_flow.cc
@@ -8,8 +8,8 @@ #include <utility> #include "ash/constants/ash_switches.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/metrics/histogram_macros.h" #include "base/strings/strcat.h"
diff --git a/chrome/browser/ash/attestation/platform_verification_flow.h b/chrome/browser/ash/attestation/platform_verification_flow.h index 27ed6407..7402ed7 100644 --- a/chrome/browser/ash/attestation/platform_verification_flow.h +++ b/chrome/browser/ash/attestation/platform_verification_flow.h
@@ -9,7 +9,7 @@ #include <set> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "base/time/time.h" #include "base/timer/timer.h"
diff --git a/chrome/browser/ash/attestation/platform_verification_flow_unittest.cc b/chrome/browser/ash/attestation/platform_verification_flow_unittest.cc index ed693fb..fd9edfa 100644 --- a/chrome/browser/ash/attestation/platform_verification_flow_unittest.cc +++ b/chrome/browser/ash/attestation/platform_verification_flow_unittest.cc
@@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "chrome/browser/ash/attestation/platform_verification_flow.h" #include "chrome/browser/ash/login/users/mock_user_manager.h"
diff --git a/chrome/browser/ash/attestation/soft_bind_attestation_flow.h b/chrome/browser/ash/attestation/soft_bind_attestation_flow.h index 90846abb..3e28ff1 100644 --- a/chrome/browser/ash/attestation/soft_bind_attestation_flow.h +++ b/chrome/browser/ash/attestation/soft_bind_attestation_flow.h
@@ -6,7 +6,7 @@ #define CHROME_BROWSER_ASH_ATTESTATION_SOFT_BIND_ATTESTATION_FLOW_H_ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "components/account_id/account_id.h" namespace ash::attestation {
diff --git a/chrome/browser/ash/attestation/soft_bind_attestation_flow_impl.cc b/chrome/browser/ash/attestation/soft_bind_attestation_flow_impl.cc index d232f1c2..657eb29c 100644 --- a/chrome/browser/ash/attestation/soft_bind_attestation_flow_impl.cc +++ b/chrome/browser/ash/attestation/soft_bind_attestation_flow_impl.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ash/attestation/soft_bind_attestation_flow_impl.h" -#include "base/bind.h" #include "base/containers/span.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/timer/timer.h" #include "chrome/browser/ash/attestation/attestation_ca_client.h"
diff --git a/chrome/browser/ash/attestation/soft_bind_attestation_flow_impl.h b/chrome/browser/ash/attestation/soft_bind_attestation_flow_impl.h index 611d2f2d..41f926a5 100644 --- a/chrome/browser/ash/attestation/soft_bind_attestation_flow_impl.h +++ b/chrome/browser/ash/attestation/soft_bind_attestation_flow_impl.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/timer/timer.h" #include "chrome/browser/ash/attestation/certificate_util.h" #include "chrome/browser/ash/attestation/soft_bind_attestation_flow.h"
diff --git a/chrome/browser/ash/attestation/soft_bind_attestation_flow_impl_unittest.cc b/chrome/browser/ash/attestation/soft_bind_attestation_flow_impl_unittest.cc index b91be03..6a96dd7ce 100644 --- a/chrome/browser/ash/attestation/soft_bind_attestation_flow_impl_unittest.cc +++ b/chrome/browser/ash/attestation/soft_bind_attestation_flow_impl_unittest.cc
@@ -10,7 +10,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/single_thread_task_runner.h" #include "chrome/browser/ash/attestation/soft_bind_attestation_flow_impl.h" #include "chrome/browser/ash/settings/scoped_cros_settings_test_helper.h"
diff --git a/chrome/browser/ash/attestation/tpm_challenge_key.cc b/chrome/browser/ash/attestation/tpm_challenge_key.cc index b89c0799..26946ce 100644 --- a/chrome/browser/ash/attestation/tpm_challenge_key.cc +++ b/chrome/browser/ash/attestation/tpm_challenge_key.cc
@@ -8,7 +8,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h" #include "chrome/browser/ash/attestation/tpm_challenge_key_result.h"
diff --git a/chrome/browser/ash/attestation/tpm_challenge_key_subtle.cc b/chrome/browser/ash/attestation/tpm_challenge_key_subtle.cc index d35f8e11..40f7c821 100644 --- a/chrome/browser/ash/attestation/tpm_challenge_key_subtle.cc +++ b/chrome/browser/ash/attestation/tpm_challenge_key_subtle.cc
@@ -9,9 +9,9 @@ #include <vector> #include "base/base64.h" -#include "base/bind.h" #include "base/check_op.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" #include "base/notreached.h" #include "base/values.h" #include "chrome/browser/ash/attestation/attestation_ca_client.h"
diff --git a/chrome/browser/ash/attestation/tpm_challenge_key_subtle.h b/chrome/browser/ash/attestation/tpm_challenge_key_subtle.h index c11b5fe..5a655f8 100644 --- a/chrome/browser/ash/attestation/tpm_challenge_key_subtle.h +++ b/chrome/browser/ash/attestation/tpm_challenge_key_subtle.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h" #include "chrome/browser/ash/attestation/tpm_challenge_key_result.h"
diff --git a/chrome/browser/ash/attestation/tpm_challenge_key_subtle_unittest.cc b/chrome/browser/ash/attestation/tpm_challenge_key_subtle_unittest.cc index 843f1b4..0aea3b5 100644 --- a/chrome/browser/ash/attestation/tpm_challenge_key_subtle_unittest.cc +++ b/chrome/browser/ash/attestation/tpm_challenge_key_subtle_unittest.cc
@@ -8,7 +8,7 @@ #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/test/gmock_callback_support.h" #include "base/time/time.h"
diff --git a/chrome/browser/ash/attestation/tpm_challenge_key_unittest.cc b/chrome/browser/ash/attestation/tpm_challenge_key_unittest.cc index ef2859f..0ca8d3f 100644 --- a/chrome/browser/ash/attestation/tpm_challenge_key_unittest.cc +++ b/chrome/browser/ash/attestation/tpm_challenge_key_unittest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ash/attestation/tpm_challenge_key.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/test/gmock_callback_support.h" #include "chrome/browser/ash/attestation/mock_tpm_challenge_key_subtle.h"
diff --git a/chrome/browser/ash/authpolicy/authpolicy_credentials_manager.cc b/chrome/browser/ash/authpolicy/authpolicy_credentials_manager.cc index 2fcf6a6c..2a33791 100644 --- a/chrome/browser/ash/authpolicy/authpolicy_credentials_manager.cc +++ b/chrome/browser/ash/authpolicy/authpolicy_credentials_manager.cc
@@ -9,7 +9,7 @@ #include "ash/constants/notifier_catalogs.h" #include "ash/public/cpp/notification_utils.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/singleton.h" #include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/ash/authpolicy/authpolicy_helper.cc b/chrome/browser/ash/authpolicy/authpolicy_helper.cc index dbe0e78..52a2027 100644 --- a/chrome/browser/ash/authpolicy/authpolicy_helper.cc +++ b/chrome/browser/ash/authpolicy/authpolicy_helper.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ash/authpolicy/authpolicy_helper.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h"
diff --git a/chrome/browser/ash/authpolicy/authpolicy_helper.h b/chrome/browser/ash/authpolicy/authpolicy_helper.h index 2c78202..da275b7 100644 --- a/chrome/browser/ash/authpolicy/authpolicy_helper.h +++ b/chrome/browser/ash/authpolicy/authpolicy_helper.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "chromeos/ash/components/dbus/authpolicy/authpolicy_client.h"
diff --git a/chrome/browser/ash/authpolicy/authpolicy_helper_unittest.cc b/chrome/browser/ash/authpolicy/authpolicy_helper_unittest.cc index 95a1943f..ffd5c1e 100644 --- a/chrome/browser/ash/authpolicy/authpolicy_helper_unittest.cc +++ b/chrome/browser/ash/authpolicy/authpolicy_helper_unittest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ash/authpolicy/authpolicy_helper.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chromeos/ash/components/dbus/authpolicy/fake_authpolicy_client.h" #include "chromeos/ash/components/dbus/dbus_thread_manager.h" #include "chromeos/ash/components/dbus/userdataauth/fake_install_attributes_client.h"
diff --git a/chrome/browser/ash/authpolicy/kerberos_files_handler.h b/chrome/browser/ash/authpolicy/kerberos_files_handler.h index f419232..bdaf0474 100644 --- a/chrome/browser/ash/authpolicy/kerberos_files_handler.h +++ b/chrome/browser/ash/authpolicy/kerberos_files_handler.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "components/prefs/pref_member.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/chrome/browser/ash/base/file_flusher.cc b/chrome/browser/ash/base/file_flusher.cc index f7f0f88..de0e7a76 100644 --- a/chrome/browser/ash/base/file_flusher.cc +++ b/chrome/browser/ash/base/file_flusher.cc
@@ -7,9 +7,9 @@ #include <algorithm> #include <set> -#include "base/bind.h" #include "base/files/file.h" #include "base/files/file_enumerator.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/ranges/algorithm.h" #include "base/synchronization/atomic_flag.h"
diff --git a/chrome/browser/ash/base/file_flusher.h b/chrome/browser/ash/base/file_flusher.h index c8c9688..43fe2fd9 100644 --- a/chrome/browser/ash/base/file_flusher.h +++ b/chrome/browser/ash/base/file_flusher.h
@@ -7,8 +7,8 @@ #include <vector> -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" namespace ash {
diff --git a/chrome/browser/ash/base/file_flusher_unittest.cc b/chrome/browser/ash/base/file_flusher_unittest.cc index c857a7c..199336d 100644 --- a/chrome/browser/ash/base/file_flusher_unittest.cc +++ b/chrome/browser/ash/base/file_flusher_unittest.cc
@@ -7,10 +7,10 @@ #include <map> #include <memory> -#include "base/bind.h" -#include "base/callback.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h" #include "content/public/test/browser_task_environment.h"
diff --git a/chrome/browser/ash/base/locale_util.cc b/chrome/browser/ash/base/locale_util.cc index 996f85a..183f059e 100644 --- a/chrome/browser/ash/base/locale_util.cc +++ b/chrome/browser/ash/base/locale_util.cc
@@ -7,8 +7,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.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/base/locale_util.h b/chrome/browser/ash/base/locale_util.h index 669b7e13..03e7469 100644 --- a/chrome/browser/ash/base/locale_util.h +++ b/chrome/browser/ash/base/locale_util.h
@@ -10,7 +10,7 @@ #include <memory> #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" class Profile; class PrefService;
diff --git a/chrome/browser/ash/base/locale_util_browsertest.cc b/chrome/browser/ash/base/locale_util_browsertest.cc index fa13316..1a8d7c9 100644 --- a/chrome/browser/ash/base/locale_util_browsertest.cc +++ b/chrome/browser/ash/base/locale_util_browsertest.cc
@@ -6,7 +6,7 @@ #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile_manager.h"
diff --git a/chrome/browser/ash/boot_times_recorder.cc b/chrome/browser/ash/boot_times_recorder.cc index 37c8b7d..3d5f441 100644 --- a/chrome/browser/ash/boot_times_recorder.cc +++ b/chrome/browser/ash/boot_times_recorder.cc
@@ -9,11 +9,11 @@ #include <vector> -#include "base/bind.h" #include "base/check.h" #include "base/command_line.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/lazy_instance.h" #include "base/location.h" #include "base/time/time.h"
diff --git a/chrome/browser/ash/boot_times_recorder.h b/chrome/browser/ash/boot_times_recorder.h index 1c0c152..ddaa47b 100644 --- a/chrome/browser/ash/boot_times_recorder.h +++ b/chrome/browser/ash/boot_times_recorder.h
@@ -8,7 +8,7 @@ #include <string> #include "base/atomic_sequence_num.h" -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/scoped_multi_source_observation.h" #include "chromeos/ash/components/metrics/login_event_recorder.h" #include "content/public/browser/notification_observer.h"
diff --git a/chrome/browser/ash/borealis/borealis_app_launcher.cc b/chrome/browser/ash/borealis/borealis_app_launcher.cc index 6330cbb..a05de00 100644 --- a/chrome/browser/ash/borealis/borealis_app_launcher.cc +++ b/chrome/browser/ash/borealis/borealis_app_launcher.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ash/borealis/borealis_app_launcher.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/ranges/algorithm.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_app_launcher.h b/chrome/browser/ash/borealis/borealis_app_launcher.h index f0400a9e..88dc76d 100644 --- a/chrome/browser/ash/borealis/borealis_app_launcher.h +++ b/chrome/browser/ash/borealis/borealis_app_launcher.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" namespace borealis {
diff --git a/chrome/browser/ash/borealis/borealis_app_launcher_impl.cc b/chrome/browser/ash/borealis/borealis_app_launcher_impl.cc index 39d002b..e4fe2f1 100644 --- a/chrome/browser/ash/borealis/borealis_app_launcher_impl.cc +++ b/chrome/browser/ash/borealis/borealis_app_launcher_impl.cc
@@ -3,7 +3,7 @@ // found in the LICENSE file. #include "chrome/browser/ash/borealis/borealis_app_launcher_impl.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/borealis/borealis_app_launcher.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_app_launcher_impl.h b/chrome/browser/ash/borealis/borealis_app_launcher_impl.h index 8b24d06..a354944 100644 --- a/chrome/browser/ash/borealis/borealis_app_launcher_impl.h +++ b/chrome/browser/ash/borealis/borealis_app_launcher_impl.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "chrome/browser/ash/borealis/borealis_app_launcher.h" class Profile;
diff --git a/chrome/browser/ash/borealis/borealis_app_launcher_unittest.cc b/chrome/browser/ash/borealis/borealis_app_launcher_unittest.cc index 5cd1f6c..9780b0d 100644 --- a/chrome/browser/ash/borealis/borealis_app_launcher_unittest.cc +++ b/chrome/browser/ash/borealis/borealis_app_launcher_unittest.cc
@@ -7,7 +7,7 @@ #include <memory> #include "base/base64.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/test/bind.h" #include "chrome/browser/ash/borealis/borealis_context.h" #include "chrome/browser/ash/borealis/borealis_util.h"
diff --git a/chrome/browser/ash/borealis/borealis_app_uninstaller.h b/chrome/browser/ash/borealis/borealis_app_uninstaller.h index 3e089ec77b..4dffa696 100644 --- a/chrome/browser/ash/borealis/borealis_app_uninstaller.h +++ b/chrome/browser/ash/borealis/borealis_app_uninstaller.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" class Profile;
diff --git a/chrome/browser/ash/borealis/borealis_app_uninstaller_unittest.cc b/chrome/browser/ash/borealis/borealis_app_uninstaller_unittest.cc index d01bd01..1db108df 100644 --- a/chrome/browser/ash/borealis/borealis_app_uninstaller_unittest.cc +++ b/chrome/browser/ash/borealis/borealis_app_uninstaller_unittest.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/test/bind.h" #include "chrome/browser/ash/borealis/borealis_app_launcher.h" #include "chrome/browser/ash/borealis/borealis_installer.h"
diff --git a/chrome/browser/ash/borealis/borealis_context.cc b/chrome/browser/ash/borealis/borealis_context.cc index 04808a3..1a48697b 100644 --- a/chrome/browser/ash/borealis/borealis_context.cc +++ b/chrome/browser/ash/borealis/borealis_context.cc
@@ -9,9 +9,9 @@ #include "ash/constants/notifier_catalogs.h" #include "ash/public/cpp/new_window_delegate.h" #include "ash/public/cpp/notification_utils.h" -#include "base/bind.h" -#include "base/callback_forward.h" #include "base/containers/flat_map.h" +#include "base/functional/bind.h" +#include "base/functional/callback_forward.h" #include "base/memory/ptr_util.h" #include "base/memory/weak_ptr.h" #include "base/scoped_observation.h"
diff --git a/chrome/browser/ash/borealis/borealis_context_manager.h b/chrome/browser/ash/borealis/borealis_context_manager.h index 5de6702..dd3d8701 100644 --- a/chrome/browser/ash/borealis/borealis_context_manager.h +++ b/chrome/browser/ash/borealis/borealis_context_manager.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_ASH_BOREALIS_BOREALIS_CONTEXT_MANAGER_H_ #define CHROME_BROWSER_ASH_BOREALIS_BOREALIS_CONTEXT_MANAGER_H_ -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "chrome/browser/ash/borealis/borealis_metrics.h" #include "chrome/browser/ash/borealis/infra/described.h" #include "chrome/browser/ash/borealis/infra/expected.h"
diff --git a/chrome/browser/ash/borealis/borealis_context_manager_impl.cc b/chrome/browser/ash/borealis/borealis_context_manager_impl.cc index c6c86d59..fee385c51 100644 --- a/chrome/browser/ash/borealis/borealis_context_manager_impl.cc +++ b/chrome/browser/ash/borealis/borealis_context_manager_impl.cc
@@ -7,7 +7,7 @@ #include <memory> #include <ostream> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/ptr_util.h" #include "chrome/browser/ash/borealis/borealis_context.h"
diff --git a/chrome/browser/ash/borealis/borealis_context_manager_unittest.cc b/chrome/browser/ash/borealis/borealis_context_manager_unittest.cc index 7c56e23..521e62d 100644 --- a/chrome/browser/ash/borealis/borealis_context_manager_unittest.cc +++ b/chrome/browser/ash/borealis/borealis_context_manager_unittest.cc
@@ -6,9 +6,9 @@ #include <memory> -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/containers/queue.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "chrome/browser/ash/borealis/borealis_context_manager.h"
diff --git a/chrome/browser/ash/borealis/borealis_credits.cc b/chrome/browser/ash/borealis/borealis_credits.cc index 7bc0b5c..17f43626 100644 --- a/chrome/browser/ash/borealis/borealis_credits.cc +++ b/chrome/browser/ash/borealis/borealis_credits.cc
@@ -4,9 +4,9 @@ #include "chrome/browser/ash/borealis/borealis_credits.h" -#include "base/callback.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/callback.h" #include "base/task/thread_pool.h" #include "chrome/browser/ash/borealis/borealis_features.h" #include "chrome/browser/ash/borealis/borealis_service.h"
diff --git a/chrome/browser/ash/borealis/borealis_credits.h b/chrome/browser/ash/borealis/borealis_credits.h index 6f20b63..787a0cb 100644 --- a/chrome/browser/ash/borealis/borealis_credits.h +++ b/chrome/browser/ash/borealis/borealis_credits.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" class Profile;
diff --git a/chrome/browser/ash/borealis/borealis_disk_manager.h b/chrome/browser/ash/borealis/borealis_disk_manager.h index bda7d66a..8cf113c 100644 --- a/chrome/browser/ash/borealis/borealis_disk_manager.h +++ b/chrome/browser/ash/borealis/borealis_disk_manager.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_ASH_BOREALIS_BOREALIS_DISK_MANAGER_H_ #define CHROME_BROWSER_ASH_BOREALIS_BOREALIS_DISK_MANAGER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/ash/borealis/infra/described.h" #include "chrome/browser/ash/borealis/infra/expected.h"
diff --git a/chrome/browser/ash/borealis/borealis_disk_manager_dispatcher.h b/chrome/browser/ash/borealis/borealis_disk_manager_dispatcher.h index fa238e0..b28b626 100644 --- a/chrome/browser/ash/borealis/borealis_disk_manager_dispatcher.h +++ b/chrome/browser/ash/borealis/borealis_disk_manager_dispatcher.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_ASH_BOREALIS_BOREALIS_DISK_MANAGER_DISPATCHER_H_ #define CHROME_BROWSER_ASH_BOREALIS_BOREALIS_DISK_MANAGER_DISPATCHER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/ash/borealis/borealis_disk_manager.h" namespace borealis {
diff --git a/chrome/browser/ash/borealis/borealis_disk_manager_impl.cc b/chrome/browser/ash/borealis/borealis_disk_manager_impl.cc index 44ea7caf..7f55e0e 100644 --- a/chrome/browser/ash/borealis/borealis_disk_manager_impl.cc +++ b/chrome/browser/ash/borealis/borealis_disk_manager_impl.cc
@@ -7,7 +7,7 @@ #include <string> #include "ash/constants/ash_features.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/ranges/algorithm.h" #include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/ash/borealis/borealis_disk_manager_impl.h b/chrome/browser/ash/borealis/borealis_disk_manager_impl.h index 71099e2b..bb7a2606 100644 --- a/chrome/browser/ash/borealis/borealis_disk_manager_impl.h +++ b/chrome/browser/ash/borealis/borealis_disk_manager_impl.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_ASH_BOREALIS_BOREALIS_DISK_MANAGER_IMPL_H_ #define CHROME_BROWSER_ASH_BOREALIS_BOREALIS_DISK_MANAGER_IMPL_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ash/borealis/borealis_context.h" #include "chrome/browser/ash/borealis/borealis_disk_manager.h"
diff --git a/chrome/browser/ash/borealis/borealis_disk_manager_unittest.cc b/chrome/browser/ash/borealis/borealis_disk_manager_unittest.cc index 990e748..435165f 100644 --- a/chrome/browser/ash/borealis/borealis_disk_manager_unittest.cc +++ b/chrome/browser/ash/borealis/borealis_disk_manager_unittest.cc
@@ -8,8 +8,8 @@ #include <queue> #include "ash/constants/ash_features.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/test/bind.h" #include "chrome/browser/ash/borealis/borealis_context.h" #include "chrome/browser/ash/borealis/borealis_disk_manager_dispatcher.h"
diff --git a/chrome/browser/ash/borealis/borealis_features.cc b/chrome/browser/ash/borealis/borealis_features.cc index 49d5ed38..1c33a47 100644 --- a/chrome/browser/ash/borealis/borealis_features.cc +++ b/chrome/browser/ash/borealis/borealis_features.cc
@@ -8,7 +8,7 @@ #include <string> #include "ash/constants/ash_features.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/memory/weak_ptr.h" #include "base/system/sys_info.h"
diff --git a/chrome/browser/ash/borealis/borealis_features.h b/chrome/browser/ash/borealis/borealis_features.h index f056348..e944362 100644 --- a/chrome/browser/ash/borealis/borealis_features.h +++ b/chrome/browser/ash/borealis/borealis_features.h
@@ -8,7 +8,7 @@ #include <ostream> #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" class Profile;
diff --git a/chrome/browser/ash/borealis/borealis_features_util.h b/chrome/browser/ash/borealis/borealis_features_util.h index 0f99fb2..2d125c9a 100644 --- a/chrome/browser/ash/borealis/borealis_features_util.h +++ b/chrome/browser/ash/borealis/borealis_features_util.h
@@ -7,8 +7,8 @@ #include <memory> #include <string> -#include "base/callback_forward.h" #include "base/containers/flat_set.h" +#include "base/functional/callback_forward.h" namespace borealis {
diff --git a/chrome/browser/ash/borealis/borealis_installer.h b/chrome/browser/ash/borealis/borealis_installer.h index 5e48dd9b..c7298bb 100644 --- a/chrome/browser/ash/borealis/borealis_installer.h +++ b/chrome/browser/ash/borealis/borealis_installer.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/observer_list_types.h" #include "chrome/browser/ash/borealis/borealis_metrics.h" #include "components/keyed_service/core/keyed_service.h"
diff --git a/chrome/browser/ash/borealis/borealis_installer_impl.cc b/chrome/browser/ash/borealis/borealis_installer_impl.cc index 586a543c..f41cfe1 100644 --- a/chrome/browser/ash/borealis/borealis_installer_impl.cc +++ b/chrome/browser/ash/borealis/borealis_installer_impl.cc
@@ -7,7 +7,7 @@ #include <memory> #include <sstream> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/weak_ptr.h" #include "base/scoped_observation.h" #include "base/task/sequenced_task_runner.h"
diff --git a/chrome/browser/ash/borealis/borealis_installer_unittest.cc b/chrome/browser/ash/borealis/borealis_installer_unittest.cc index 7a78718..6b17677 100644 --- a/chrome/browser/ash/borealis/borealis_installer_unittest.cc +++ b/chrome/browser/ash/borealis/borealis_installer_unittest.cc
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/test/metrics/histogram_tester.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_launch_options.h b/chrome/browser/ash/borealis/borealis_launch_options.h index e699956..e80cc78e 100644 --- a/chrome/browser/ash/borealis/borealis_launch_options.h +++ b/chrome/browser/ash/borealis/borealis_launch_options.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_ASH_BOREALIS_BOREALIS_LAUNCH_OPTIONS_H_ #define CHROME_BROWSER_ASH_BOREALIS_BOREALIS_LAUNCH_OPTIONS_H_ -#include "base/callback_forward.h" #include "base/files/file_path.h" +#include "base/functional/callback_forward.h" #include "third_party/abseil-cpp/absl/types/optional.h" class Profile;
diff --git a/chrome/browser/ash/borealis/borealis_launch_watcher.h b/chrome/browser/ash/borealis/borealis_launch_watcher.h index 2da0454..db0fc83b 100644 --- a/chrome/browser/ash/borealis/borealis_launch_watcher.h +++ b/chrome/browser/ash/borealis/borealis_launch_watcher.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_ASH_BOREALIS_BOREALIS_LAUNCH_WATCHER_H_ #define CHROME_BROWSER_ASH_BOREALIS_BOREALIS_LAUNCH_WATCHER_H_ -#include "base/callback.h" #include "base/containers/queue.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "chromeos/ash/components/dbus/cicerone/cicerone_client.h"
diff --git a/chrome/browser/ash/borealis/borealis_security_delegate.cc b/chrome/browser/ash/borealis/borealis_security_delegate.cc index 3a4f06a..abf38e3 100644 --- a/chrome/browser/ash/borealis/borealis_security_delegate.cc +++ b/chrome/browser/ash/borealis/borealis_security_delegate.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ash/borealis/borealis_security_delegate.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "chrome/browser/ash/borealis/borealis_features.h" #include "chrome/browser/ash/borealis/borealis_service.h"
diff --git a/chrome/browser/ash/borealis/borealis_security_delegate.h b/chrome/browser/ash/borealis/borealis_security_delegate.h index ae90f05..7bab11f7 100644 --- a/chrome/browser/ash/borealis/borealis_security_delegate.h +++ b/chrome/browser/ash/borealis/borealis_security_delegate.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_ASH_BOREALIS_BOREALIS_SECURITY_DELEGATE_H_ #define CHROME_BROWSER_ASH_BOREALIS_BOREALIS_SECURITY_DELEGATE_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "chrome/browser/ash/guest_os/guest_os_security_delegate.h" class Profile;
diff --git a/chrome/browser/ash/borealis/borealis_task.cc b/chrome/browser/ash/borealis/borealis_task.cc index b2ff280..951386dc 100644 --- a/chrome/browser/ash/borealis/borealis_task.cc +++ b/chrome/browser/ash/borealis/borealis_task.cc
@@ -8,10 +8,10 @@ #include <string> #include "ash/constants/ash_features.h" -#include "base/callback_helpers.h" #include "base/feature_list.h" #include "base/files/file.h" #include "base/files/scoped_file.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/logging.h" #include "base/process/launch.h"
diff --git a/chrome/browser/ash/borealis/borealis_util.h b/chrome/browser/ash/borealis/borealis_util.h index 66806705..0cb6d3f 100644 --- a/chrome/browser/ash/borealis/borealis_util.h +++ b/chrome/browser/ash/borealis/borealis_util.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/strings/string_piece.h" #include "chromeos/ash/components/dbus/dlcservice/dlcservice_client.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/chrome/browser/ash/borealis/infra/expected.h b/chrome/browser/ash/borealis/infra/expected.h index 04465df8..d4986d8 100644 --- a/chrome/browser/ash/borealis/infra/expected.h +++ b/chrome/browser/ash/borealis/infra/expected.h
@@ -7,7 +7,7 @@ #include <type_traits> -#include "base/callback.h" +#include "base/functional/callback.h" #include "third_party/abseil-cpp/absl/types/variant.h" // TODO(b/172501195): Make these available outside namespace borealis.
diff --git a/chrome/browser/ash/borealis/infra/expected_unittest.cc b/chrome/browser/ash/borealis/infra/expected_unittest.cc index 8401e49..a108083 100644 --- a/chrome/browser/ash/borealis/infra/expected_unittest.cc +++ b/chrome/browser/ash/borealis/infra/expected_unittest.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/borealis/testing/callback_factory.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/ash/borealis/infra/state_manager_unittest.cc b/chrome/browser/ash/borealis/infra/state_manager_unittest.cc index 18bf843..787315a 100644 --- a/chrome/browser/ash/borealis/infra/state_manager_unittest.cc +++ b/chrome/browser/ash/borealis/infra/state_manager_unittest.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/test/task_environment.h" #include "chrome/browser/ash/borealis/infra/expected.h" #include "chrome/browser/ash/borealis/testing/callback_factory.h"
diff --git a/chrome/browser/ash/borealis/infra/transition.h b/chrome/browser/ash/borealis/infra/transition.h index 29afe10..9eacb728 100644 --- a/chrome/browser/ash/borealis/infra/transition.h +++ b/chrome/browser/ash/borealis/infra/transition.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "chrome/browser/ash/borealis/infra/expected.h"
diff --git a/chrome/browser/ash/borealis/infra/transition_unittest.cc b/chrome/browser/ash/borealis/infra/transition_unittest.cc index fb63cc9..ed9cba4 100644 --- a/chrome/browser/ash/borealis/infra/transition_unittest.cc +++ b/chrome/browser/ash/borealis/infra/transition_unittest.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/string_number_conversions.h" #include "base/test/task_environment.h" #include "chrome/browser/ash/borealis/testing/callback_factory.h"
diff --git a/chrome/browser/ash/borealis/testing/callback_factory.h b/chrome/browser/ash/borealis/testing/callback_factory.h index 9483071..41d26cb 100644 --- a/chrome/browser/ash/borealis/testing/callback_factory.h +++ b/chrome/browser/ash/borealis/testing/callback_factory.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_ASH_BOREALIS_TESTING_CALLBACK_FACTORY_H_ #define CHROME_BROWSER_ASH_BOREALIS_TESTING_CALLBACK_FACTORY_H_ -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "testing/gmock/include/gmock/gmock.h"
diff --git a/chrome/browser/ash/bruschetta/bruschetta_installer_impl_unittest.cc b/chrome/browser/ash/bruschetta/bruschetta_installer_impl_unittest.cc index 6201eb6..29a037dc 100644 --- a/chrome/browser/ash/bruschetta/bruschetta_installer_impl_unittest.cc +++ b/chrome/browser/ash/bruschetta/bruschetta_installer_impl_unittest.cc
@@ -4,9 +4,9 @@ #include "chrome/browser/ash/bruschetta/bruschetta_installer_impl.h" -#include "base/callback.h" #include "base/files/file_util.h" #include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/run_loop.h" #include "base/strings/string_number_conversions.h" #include "base/values.h"
diff --git a/chrome/browser/ash/bruschetta/bruschetta_launcher.cc b/chrome/browser/ash/bruschetta/bruschetta_launcher.cc index 5999081..fa4d042 100644 --- a/chrome/browser/ash/bruschetta/bruschetta_launcher.cc +++ b/chrome/browser/ash/bruschetta/bruschetta_launcher.cc
@@ -4,9 +4,9 @@ #include "chrome/browser/ash/bruschetta/bruschetta_launcher.h" -#include "base/callback.h" #include "base/files/file.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/strings/strcat.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/ash/bruschetta/bruschetta_launcher.h b/chrome/browser/ash/bruschetta/bruschetta_launcher.h index d58bf31..1ad5c20c 100644 --- a/chrome/browser/ash/bruschetta/bruschetta_launcher.h +++ b/chrome/browser/ash/bruschetta/bruschetta_launcher.h
@@ -6,9 +6,9 @@ #define CHROME_BROWSER_ASH_BRUSCHETTA_BRUSCHETTA_LAUNCHER_H_ #include <string> -#include "base/callback_forward.h" #include "base/callback_list.h" #include "base/files/file.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ash/bruschetta/bruschetta_util.h" #include "chrome/browser/ash/guest_os/guest_os_session_tracker.h"
diff --git a/chrome/browser/ash/bruschetta/bruschetta_launcher_unittest.cc b/chrome/browser/ash/bruschetta/bruschetta_launcher_unittest.cc index ae3c513..e69040a 100644 --- a/chrome/browser/ash/bruschetta/bruschetta_launcher_unittest.cc +++ b/chrome/browser/ash/bruschetta/bruschetta_launcher_unittest.cc
@@ -6,9 +6,9 @@ #include <memory> -#include "base/callback.h" #include "base/files/file.h" #include "base/files/file_util.h" +#include "base/functional/callback.h" #include "base/run_loop.h" #include "base/test/bind.h" #include "base/test/task_environment.h"
diff --git a/chrome/browser/ash/bruschetta/bruschetta_service_factory.cc b/chrome/browser/ash/bruschetta/bruschetta_service_factory.cc index ab2522b..cd15051 100644 --- a/chrome/browser/ash/bruschetta/bruschetta_service_factory.cc +++ b/chrome/browser/ash/bruschetta/bruschetta_service_factory.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ash/bruschetta/bruschetta_service_factory.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/ptr_util.h" #include "chrome/browser/ash/bruschetta/bruschetta_service.h" #include "chrome/browser/ash/profiles/profile_helper.h"
diff --git a/chrome/browser/ash/bruschetta/bruschetta_terminal_provider_unittest.cc b/chrome/browser/ash/bruschetta/bruschetta_terminal_provider_unittest.cc index 2a760ec2..c8ab41fa 100644 --- a/chrome/browser/ash/bruschetta/bruschetta_terminal_provider_unittest.cc +++ b/chrome/browser/ash/bruschetta/bruschetta_terminal_provider_unittest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ash/bruschetta/bruschetta_terminal_provider.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/test/bind.h" #include "chrome/browser/ash/bruschetta/bruschetta_launcher.h"
diff --git a/chrome/browser/ash/bruschetta/fake_bruschetta_launcher.cc b/chrome/browser/ash/bruschetta/fake_bruschetta_launcher.cc index a8adf65..3e21445 100644 --- a/chrome/browser/ash/bruschetta/fake_bruschetta_launcher.cc +++ b/chrome/browser/ash/bruschetta/fake_bruschetta_launcher.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ash/bruschetta/fake_bruschetta_launcher.h" -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" namespace bruschetta { FakeBruschettaLauncher::FakeBruschettaLauncher()
diff --git a/chrome/browser/ash/bruschetta/fake_bruschetta_launcher.h b/chrome/browser/ash/bruschetta/fake_bruschetta_launcher.h index 0daf94a..35521af 100644 --- a/chrome/browser/ash/bruschetta/fake_bruschetta_launcher.h +++ b/chrome/browser/ash/bruschetta/fake_bruschetta_launcher.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_ASH_BRUSCHETTA_FAKE_BRUSCHETTA_LAUNCHER_H_ #define CHROME_BROWSER_ASH_BRUSCHETTA_FAKE_BRUSCHETTA_LAUNCHER_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "chrome/browser/ash/bruschetta/bruschetta_launcher.h" namespace bruschetta {
diff --git a/chrome/browser/ash/camera_mic/vm_camera_mic_manager.cc b/chrome/browser/ash/camera_mic/vm_camera_mic_manager.cc index 9339a96..3a5b98f 100644 --- a/chrome/browser/ash/camera_mic/vm_camera_mic_manager.cc +++ b/chrome/browser/ash/camera_mic/vm_camera_mic_manager.cc
@@ -14,8 +14,8 @@ #include "ash/public/cpp/notification_utils.h" #include "ash/public/cpp/vm_camera_mic_constants.h" #include "ash/system/privacy/privacy_indicators_controller.h" -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/no_destructor.h" #include "base/notreached.h" #include "base/system/sys_info.h"
diff --git a/chrome/browser/ash/camera_mic/vm_camera_mic_manager_unittest.cc b/chrome/browser/ash/camera_mic/vm_camera_mic_manager_unittest.cc index 05e8d535..e517d42 100644 --- a/chrome/browser/ash/camera_mic/vm_camera_mic_manager_unittest.cc +++ b/chrome/browser/ash/camera_mic/vm_camera_mic_manager_unittest.cc
@@ -17,9 +17,9 @@ #include "ash/system/status_area_widget.h" #include "ash/system/unified/unified_system_tray.h" #include "ash/test/ash_test_helper.h" -#include "base/bind.h" #include "base/containers/contains.h" #include "base/containers/flat_map.h" +#include "base/functional/bind.h" #include "base/test/scoped_feature_list.h" #include "base/time/time.h" #include "chrome/browser/ash/login/users/mock_user_manager.h"
diff --git a/chrome/browser/ash/camera_presence_notifier.cc b/chrome/browser/ash/camera_presence_notifier.cc index 6f73547..667f53c1 100644 --- a/chrome/browser/ash/camera_presence_notifier.cc +++ b/chrome/browser/ash/camera_presence_notifier.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ash/camera_presence_notifier.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/memory/singleton.h" #include "base/time/time.h" #include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/ash/camera_presence_notifier.h b/chrome/browser/ash/camera_presence_notifier.h index db7ed0c..ef5d253 100644 --- a/chrome/browser/ash/camera_presence_notifier.h +++ b/chrome/browser/ash/camera_presence_notifier.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_ASH_CAMERA_PRESENCE_NOTIFIER_H_ #define CHROME_BROWSER_ASH_CAMERA_PRESENCE_NOTIFIER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/sequence_checker.h" #include "base/supports_user_data.h" #include "base/timer/timer.h"
diff --git a/chrome/browser/ash/cert_provisioning/cert_provisioning_client.cc b/chrome/browser/ash/cert_provisioning/cert_provisioning_client.cc index 25c2ec3..d44a1a3 100644 --- a/chrome/browser/ash/cert_provisioning/cert_provisioning_client.cc +++ b/chrome/browser/ash/cert_provisioning/cert_provisioning_client.cc
@@ -9,8 +9,8 @@ #include <string> #include <vector> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "chrome/browser/ash/cert_provisioning/cert_provisioning_common.h" #include "components/policy/core/common/cloud/cloud_policy_client.h" #include "components/policy/core/common/cloud/cloud_policy_constants.h"
diff --git a/chrome/browser/ash/cert_provisioning/cert_provisioning_client.h b/chrome/browser/ash/cert_provisioning/cert_provisioning_client.h index 47dc0cbad..0cbb617 100644 --- a/chrome/browser/ash/cert_provisioning/cert_provisioning_client.h +++ b/chrome/browser/ash/cert_provisioning/cert_provisioning_client.h
@@ -10,7 +10,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ref.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ash/cert_provisioning/cert_provisioning_common.h"
diff --git a/chrome/browser/ash/cert_provisioning/cert_provisioning_common.cc b/chrome/browser/ash/cert_provisioning/cert_provisioning_common.cc index b5772ee..9709643 100644 --- a/chrome/browser/ash/cert_provisioning/cert_provisioning_common.cc +++ b/chrome/browser/ash/cert_provisioning/cert_provisioning_common.cc
@@ -6,7 +6,7 @@ #include <string> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/notreached.h" #include "base/numerics/safe_conversions.h" #include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/ash/cert_provisioning/cert_provisioning_common.h b/chrome/browser/ash/cert_provisioning/cert_provisioning_common.h index 6badb696..a740229 100644 --- a/chrome/browser/ash/cert_provisioning/cert_provisioning_common.h +++ b/chrome/browser/ash/cert_provisioning/cert_provisioning_common.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/callback.h" -#include "base/callback_forward.h" +#include "base/functional/callback.h" +#include "base/functional/callback_forward.h" #include "base/time/time.h" #include "base/values.h" #include "chrome/browser/platform_keys/platform_keys.h"
diff --git a/chrome/browser/ash/cert_provisioning/cert_provisioning_invalidator.h b/chrome/browser/ash/cert_provisioning/cert_provisioning_invalidator.h index 59ebaf1..7d24a4f 100644 --- a/chrome/browser/ash/cert_provisioning/cert_provisioning_invalidator.h +++ b/chrome/browser/ash/cert_provisioning/cert_provisioning_invalidator.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/scoped_observation.h" #include "base/sequence_checker.h" #include "chrome/browser/ash/policy/invalidation/affiliated_invalidation_service_provider.h"
diff --git a/chrome/browser/ash/cert_provisioning/cert_provisioning_invalidator_unittest.cc b/chrome/browser/ash/cert_provisioning/cert_provisioning_invalidator_unittest.cc index a49bf885..8d36543 100644 --- a/chrome/browser/ash/cert_provisioning/cert_provisioning_invalidator_unittest.cc +++ b/chrome/browser/ash/cert_provisioning/cert_provisioning_invalidator_unittest.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/test/task_environment.h" #include "chrome/browser/ash/cert_provisioning/cert_provisioning_common.h" #include "components/invalidation/impl/fake_invalidation_service.h"
diff --git a/chrome/browser/ash/cert_provisioning/cert_provisioning_platform_keys_helpers.cc b/chrome/browser/ash/cert_provisioning/cert_provisioning_platform_keys_helpers.cc index fd56a1df..4d63fcc 100644 --- a/chrome/browser/ash/cert_provisioning/cert_provisioning_platform_keys_helpers.cc +++ b/chrome/browser/ash/cert_provisioning/cert_provisioning_platform_keys_helpers.cc
@@ -6,10 +6,10 @@ #include <memory> -#include "base/bind.h" #include "base/check.h" #include "base/containers/contains.h" #include "base/containers/flat_set.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/cert_provisioning/cert_provisioning_common.h" #include "chrome/browser/ash/platform_keys/platform_keys_service.h" #include "chrome/browser/platform_keys/platform_keys.h"
diff --git a/chrome/browser/ash/cert_provisioning/cert_provisioning_platform_keys_helpers.h b/chrome/browser/ash/cert_provisioning/cert_provisioning_platform_keys_helpers.h index 6dee9607..1702847f 100644 --- a/chrome/browser/ash/cert_provisioning/cert_provisioning_platform_keys_helpers.h +++ b/chrome/browser/ash/cert_provisioning/cert_provisioning_platform_keys_helpers.h
@@ -5,9 +5,9 @@ #ifndef CHROME_BROWSER_ASH_CERT_PROVISIONING_CERT_PROVISIONING_PLATFORM_KEYS_HELPERS_H_ #define CHROME_BROWSER_ASH_CERT_PROVISIONING_CERT_PROVISIONING_PLATFORM_KEYS_HELPERS_H_ -#include "base/callback.h" #include "base/containers/flat_map.h" #include "base/containers/flat_set.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ash/cert_provisioning/cert_provisioning_common.h" #include "net/cert/x509_certificate.h"
diff --git a/chrome/browser/ash/cert_provisioning/cert_provisioning_platform_keys_helpers_unittest.cc b/chrome/browser/ash/cert_provisioning/cert_provisioning_platform_keys_helpers_unittest.cc index 8982dc36..e138929 100644 --- a/chrome/browser/ash/cert_provisioning/cert_provisioning_platform_keys_helpers_unittest.cc +++ b/chrome/browser/ash/cert_provisioning/cert_provisioning_platform_keys_helpers_unittest.cc
@@ -7,8 +7,8 @@ #include <memory> #include <vector> -#include "base/bind.h" #include "base/containers/flat_map.h" +#include "base/functional/bind.h" #include "base/memory/weak_ptr.h" #include "base/run_loop.h" #include "base/test/gmock_callback_support.h"
diff --git a/chrome/browser/ash/cert_provisioning/cert_provisioning_scheduler.cc b/chrome/browser/ash/cert_provisioning/cert_provisioning_scheduler.cc index f71d63a..8aa156bf 100644 --- a/chrome/browser/ash/cert_provisioning/cert_provisioning_scheduler.cc +++ b/chrome/browser/ash/cert_provisioning/cert_provisioning_scheduler.cc
@@ -9,10 +9,10 @@ #include <memory> #include <unordered_set> -#include "base/bind.h" #include "base/containers/contains.h" #include "base/containers/flat_map.h" #include "base/containers/flat_set.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/observer_list.h"
diff --git a/chrome/browser/ash/cert_provisioning/cert_provisioning_scheduler_unittest.cc b/chrome/browser/ash/cert_provisioning/cert_provisioning_scheduler_unittest.cc index fdc352a..d233013d 100644 --- a/chrome/browser/ash/cert_provisioning/cert_provisioning_scheduler_unittest.cc +++ b/chrome/browser/ash/cert_provisioning/cert_provisioning_scheduler_unittest.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ash/cert_provisioning/cert_provisioning_scheduler.h" -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/json/json_reader.h" #include "base/test/values_test_util.h" #include "base/time/time.h"
diff --git a/chrome/browser/ash/cert_provisioning/cert_provisioning_worker.h b/chrome/browser/ash/cert_provisioning/cert_provisioning_worker.h index f3067434..e4cba372 100644 --- a/chrome/browser/ash/cert_provisioning/cert_provisioning_worker.h +++ b/chrome/browser/ash/cert_provisioning/cert_provisioning_worker.h
@@ -11,7 +11,7 @@ #include <string> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/time/time.h" #include "chrome/browser/ash/cert_provisioning/cert_provisioning_client.h" #include "chrome/browser/ash/cert_provisioning/cert_provisioning_common.h"
diff --git a/chrome/browser/ash/cert_provisioning/cert_provisioning_worker_static.cc b/chrome/browser/ash/cert_provisioning/cert_provisioning_worker_static.cc index 979a214d..a59276f 100644 --- a/chrome/browser/ash/cert_provisioning/cert_provisioning_worker_static.cc +++ b/chrome/browser/ash/cert_provisioning/cert_provisioning_worker_static.cc
@@ -9,8 +9,8 @@ #include <vector> #include "base/base64.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/no_destructor.h" #include "base/strings/strcat.h" #include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/ash/cert_provisioning/cert_provisioning_worker_static.h b/chrome/browser/ash/cert_provisioning/cert_provisioning_worker_static.h index d77833ed..7d98841 100644 --- a/chrome/browser/ash/cert_provisioning/cert_provisioning_worker_static.h +++ b/chrome/browser/ash/cert_provisioning/cert_provisioning_worker_static.h
@@ -11,7 +11,7 @@ #include <string> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h" #include "base/time/time.h"
diff --git a/chrome/browser/ash/cert_provisioning/cert_provisioning_worker_static_unittest.cc b/chrome/browser/ash/cert_provisioning/cert_provisioning_worker_static_unittest.cc index a8bfdd8..1e6104d 100644 --- a/chrome/browser/ash/cert_provisioning/cert_provisioning_worker_static_unittest.cc +++ b/chrome/browser/ash/cert_provisioning/cert_provisioning_worker_static_unittest.cc
@@ -11,7 +11,7 @@ #include <vector> #include "base/base64.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/json/json_string_value_serializer.h" #include "base/json/json_writer.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/ash/cert_provisioning/mock_cert_provisioning_worker.h b/chrome/browser/ash/cert_provisioning/mock_cert_provisioning_worker.h index bfaf5ab..74af196 100644 --- a/chrome/browser/ash/cert_provisioning/mock_cert_provisioning_worker.h +++ b/chrome/browser/ash/cert_provisioning/mock_cert_provisioning_worker.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_ASH_CERT_PROVISIONING_MOCK_CERT_PROVISIONING_WORKER_H_ #define CHROME_BROWSER_ASH_CERT_PROVISIONING_MOCK_CERT_PROVISIONING_WORKER_H_ -#include "base/callback_forward.h" #include "base/containers/queue.h" +#include "base/functional/callback_forward.h" #include "chrome/browser/ash/cert_provisioning/cert_provisioning_worker.h" #include "chrome/browser/ash/cert_provisioning/mock_cert_provisioning_invalidator.h" #include "testing/gmock/include/gmock/gmock.h"
diff --git a/chrome/browser/ash/child_accounts/child_policy_observer.h b/chrome/browser/ash/child_accounts/child_policy_observer.h index 5733f4c..4e867bad 100644 --- a/chrome/browser/ash/child_accounts/child_policy_observer.h +++ b/chrome/browser/ash/child_accounts/child_policy_observer.h
@@ -8,7 +8,7 @@ #include <memory> #include <utility> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/time/time.h" #include "components/policy/core/common/cloud/cloud_policy_service.h"
diff --git a/chrome/browser/ash/child_accounts/child_status_reporting_service.cc b/chrome/browser/ash/child_accounts/child_status_reporting_service.cc index cd6f183..63423c4 100644 --- a/chrome/browser/ash/child_accounts/child_status_reporting_service.cc +++ b/chrome/browser/ash/child_accounts/child_status_reporting_service.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ash/child_accounts/child_status_reporting_service.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/task/single_thread_task_runner.h" #include "chrome/browser/ash/child_accounts/event_based_status_reporting_service_factory.h"
diff --git a/chrome/browser/ash/child_accounts/child_user_service.cc b/chrome/browser/ash/child_accounts/child_user_service.cc index c860dbd..044c1e6 100644 --- a/chrome/browser/ash/child_accounts/child_user_service.cc +++ b/chrome/browser/ash/child_accounts/child_user_service.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ash/child_accounts/child_user_service.h" -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "base/notreached.h" #include "base/time/time.h"
diff --git a/chrome/browser/ash/child_accounts/event_based_status_reporting_service_unittest.cc b/chrome/browser/ash/child_accounts/event_based_status_reporting_service_unittest.cc index 1fd839d9..6625b15 100644 --- a/chrome/browser/ash/child_accounts/event_based_status_reporting_service_unittest.cc +++ b/chrome/browser/ash/child_accounts/event_based_status_reporting_service_unittest.cc
@@ -7,7 +7,7 @@ #include <memory> #include "ash/components/arc/mojom/app.mojom.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/time/time.h" #include "chrome/browser/ash/app_list/arc/arc_app_test.h"
diff --git a/chrome/browser/ash/child_accounts/parent_access_code/config_source.cc b/chrome/browser/ash/child_accounts/parent_access_code/config_source.cc index 0368ffa7..f545507 100644 --- a/chrome/browser/ash/child_accounts/parent_access_code/config_source.cc +++ b/chrome/browser/ash/child_accounts/parent_access_code/config_source.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/values.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/ash/child_accounts/parent_access_code/parent_access_service_browsertest.cc b/chrome/browser/ash/child_accounts/parent_access_code/parent_access_service_browsertest.cc index f8565df..2051958 100644 --- a/chrome/browser/ash/child_accounts/parent_access_code/parent_access_service_browsertest.cc +++ b/chrome/browser/ash/child_accounts/parent_access_code/parent_access_service_browsertest.cc
@@ -8,7 +8,7 @@ #include <utility> #include "ash/public/cpp/child_accounts/parent_access_controller.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/json/json_writer.h" #include "chrome/browser/ash/child_accounts/parent_access_code/config_source.h" #include "chrome/browser/ash/child_accounts/parent_access_code/parent_access_service.h"
diff --git a/chrome/browser/ash/child_accounts/screen_time_controller.cc b/chrome/browser/ash/child_accounts/screen_time_controller.cc index 8f07f40b..520e786 100644 --- a/chrome/browser/ash/child_accounts/screen_time_controller.cc +++ b/chrome/browser/ash/child_accounts/screen_time_controller.cc
@@ -10,8 +10,8 @@ #include "ash/public/cpp/child_accounts/parent_access_controller.h" #include "ash/public/cpp/login_screen.h" -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/time/clock.h" #include "base/time/default_clock.h" #include "base/timer/timer.h"
diff --git a/chrome/browser/ash/child_accounts/time_limit_consistency_test/run_all_unittests.cc b/chrome/browser/ash/child_accounts/time_limit_consistency_test/run_all_unittests.cc index f98d48ec..5a52dc7e 100644 --- a/chrome/browser/ash/child_accounts/time_limit_consistency_test/run_all_unittests.cc +++ b/chrome/browser/ash/child_accounts/time_limit_consistency_test/run_all_unittests.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 "base/bind.h" +#include "base/functional/bind.h" #include "base/test/launcher/unit_test_launcher.h" #include "base/test/test_suite.h" #include "build/build_config.h"
diff --git a/chrome/browser/ash/child_accounts/time_limit_notifier.cc b/chrome/browser/ash/child_accounts/time_limit_notifier.cc index d37ffb00..6194764 100644 --- a/chrome/browser/ash/child_accounts/time_limit_notifier.cc +++ b/chrome/browser/ash/child_accounts/time_limit_notifier.cc
@@ -9,7 +9,7 @@ #include "ash/constants/notifier_catalogs.h" #include "ash/public/cpp/notification_utils.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/i18n/time_formatting.h" #include "base/memory/ref_counted.h" #include "chrome/browser/notifications/notification_display_service.h"
diff --git a/chrome/browser/ash/child_accounts/time_limits/app_service_wrapper.cc b/chrome/browser/ash/child_accounts/time_limits/app_service_wrapper.cc index 64bc651..83554ea 100644 --- a/chrome/browser/ash/child_accounts/time_limits/app_service_wrapper.cc +++ b/chrome/browser/ash/child_accounts/time_limits/app_service_wrapper.cc
@@ -8,8 +8,8 @@ #include <set> #include <string> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.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/child_accounts/time_limits/app_service_wrapper.h b/chrome/browser/ash/child_accounts/time_limits/app_service_wrapper.h index 3297f4be..5f80751 100644 --- a/chrome/browser/ash/child_accounts/time_limits/app_service_wrapper.h +++ b/chrome/browser/ash/child_accounts/time_limits/app_service_wrapper.h
@@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/observer_list.h" #include "base/observer_list_types.h" #include "base/time/time.h"
diff --git a/chrome/browser/ash/child_accounts/time_limits/app_time_controller.cc b/chrome/browser/ash/child_accounts/time_limits/app_time_controller.cc index 7c67cfb3..40757aa 100644 --- a/chrome/browser/ash/child_accounts/time_limits/app_time_controller.cc +++ b/chrome/browser/ash/child_accounts/time_limits/app_time_controller.cc
@@ -8,8 +8,8 @@ #include "ash/constants/notifier_catalogs.h" #include "ash/public/cpp/notification_utils.h" -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/metrics/histogram_functions.h" #include "base/strings/strcat.h"
diff --git a/chrome/browser/ash/child_accounts/time_limits/app_time_controller.h b/chrome/browser/ash/child_accounts/time_limits/app_time_controller.h index be0772a..4623a95 100644 --- a/chrome/browser/ash/child_accounts/time_limits/app_time_controller.h +++ b/chrome/browser/ash/child_accounts/time_limits/app_time_controller.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "base/time/default_tick_clock.h" #include "base/time/time.h"
diff --git a/chrome/browser/ash/child_accounts/time_limits/app_time_controller_unittest.cc b/chrome/browser/ash/child_accounts/time_limits/app_time_controller_unittest.cc index 01abe53d..ae6fd6d 100644 --- a/chrome/browser/ash/child_accounts/time_limits/app_time_controller_unittest.cc +++ b/chrome/browser/ash/child_accounts/time_limits/app_time_controller_unittest.cc
@@ -6,8 +6,8 @@ #include "ash/components/arc/mojom/app.mojom.h" #include "ash/components/arc/test/fake_app_instance.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/strings/strcat.h" #include "base/strings/utf_string_conversions.h" #include "base/test/metrics/histogram_tester.h"
diff --git a/chrome/browser/ash/child_accounts/website_approval_notifier.cc b/chrome/browser/ash/child_accounts/website_approval_notifier.cc index 8d4259e1..0565085f 100644 --- a/chrome/browser/ash/child_accounts/website_approval_notifier.cc +++ b/chrome/browser/ash/child_accounts/website_approval_notifier.cc
@@ -10,7 +10,7 @@ #include "ash/constants/notifier_catalogs.h" #include "ash/public/cpp/new_window_delegate.h" #include "ash/public/cpp/notification_utils.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/user_metrics.h" #include "base/strings/strcat.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ash/chrome_browser_main_parts_ash.cc b/chrome/browser/ash/chrome_browser_main_parts_ash.cc index 0615827..de73539 100644 --- a/chrome/browser/ash/chrome_browser_main_parts_ash.cc +++ b/chrome/browser/ash/chrome_browser_main_parts_ash.cc
@@ -24,11 +24,11 @@ #include "ash/system/pcie_peripheral/pcie_peripheral_notification_controller.h" #include "ash/system/usb_peripheral/usb_peripheral_notification_controller.h" #include "ash/webui/camera_app_ui/document_scanner_installer.h" -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/lazy_instance.h" #include "base/linux_util.h" #include "base/logging.h"
diff --git a/chrome/browser/ash/chrome_browser_main_parts_ash.h b/chrome/browser/ash/chrome_browser_main_parts_ash.h index 71dd5e8..fbe743e 100644 --- a/chrome/browser/ash/chrome_browser_main_parts_ash.h +++ b/chrome/browser/ash/chrome_browser_main_parts_ash.h
@@ -7,8 +7,8 @@ #include <memory> -#include "base/callback_helpers.h" #include "base/feature_list.h" +#include "base/functional/callback_helpers.h" #include "base/memory/weak_ptr.h" #include "base/task/cancelable_task_tracker.h" #include "chrome/browser/ash/external_metrics.h"
diff --git a/chrome/browser/ash/chromebox_for_meetings/browser/cfm_browser_service.cc b/chrome/browser/ash/chromebox_for_meetings/browser/cfm_browser_service.cc index 5f7060f..57db319 100644 --- a/chrome/browser/ash/chromebox_for_meetings/browser/cfm_browser_service.cc +++ b/chrome/browser/ash/chromebox_for_meetings/browser/cfm_browser_service.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ash/chromebox_for_meetings/browser/cfm_browser_service.h" -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/chromebox_for_meetings/browser/cfm_memory_details.h" #include "chrome/browser/memory_details.h" #include "chromeos/ash/components/dbus/chromebox_for_meetings/cfm_hotline_client.h"
diff --git a/chrome/browser/ash/chromebox_for_meetings/browser/cfm_browser_service_unittest.cc b/chrome/browser/ash/chromebox_for_meetings/browser/cfm_browser_service_unittest.cc index 07ac0dd..cd29902 100644 --- a/chrome/browser/ash/chromebox_for_meetings/browser/cfm_browser_service_unittest.cc +++ b/chrome/browser/ash/chromebox_for_meetings/browser/cfm_browser_service_unittest.cc
@@ -8,7 +8,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/field_trial.h" #include "base/metrics/field_trial_params.h" #include "base/run_loop.h"
diff --git a/chrome/browser/ash/chromebox_for_meetings/browser/cfm_memory_details.cc b/chrome/browser/ash/chromebox_for_meetings/browser/cfm_memory_details.cc index d25a659..c962ee8 100644 --- a/chrome/browser/ash/chromebox_for_meetings/browser/cfm_memory_details.cc +++ b/chrome/browser/ash/chromebox_for_meetings/browser/cfm_memory_details.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ash/chromebox_for_meetings/browser/cfm_memory_details.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "base/task/thread_pool.h" #include "content/public/browser/browser_task_traits.h"
diff --git a/chrome/browser/ash/chromebox_for_meetings/device_info/device_info_service.cc b/chrome/browser/ash/chromebox_for_meetings/device_info/device_info_service.cc index feea6d0..e96fd810 100644 --- a/chrome/browser/ash/chromebox_for_meetings/device_info/device_info_service.cc +++ b/chrome/browser/ash/chromebox_for_meetings/device_info/device_info_service.cc
@@ -6,8 +6,8 @@ #include <cstdint> -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/strings/string_number_conversions.h" #include "base/system/sys_info.h" #include "base/task/sequenced_task_runner.h"
diff --git a/chrome/browser/ash/chromebox_for_meetings/device_info/device_info_service_unittest.cc b/chrome/browser/ash/chromebox_for_meetings/device_info/device_info_service_unittest.cc index 556f819..03b5610 100644 --- a/chrome/browser/ash/chromebox_for_meetings/device_info/device_info_service_unittest.cc +++ b/chrome/browser/ash/chromebox_for_meetings/device_info/device_info_service_unittest.cc
@@ -8,7 +8,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/ash/chromebox_for_meetings/diagnostics/diagnostics_service.cc b/chrome/browser/ash/chromebox_for_meetings/diagnostics/diagnostics_service.cc index c20c726..695cd4f 100644 --- a/chrome/browser/ash/chromebox_for_meetings/diagnostics/diagnostics_service.cc +++ b/chrome/browser/ash/chromebox_for_meetings/diagnostics/diagnostics_service.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "chromeos/ash/components/dbus/chromebox_for_meetings/cfm_hotline_client.h" #include "chromeos/ash/services/cros_healthd/public/cpp/service_connection.h" #include "mojo/public/cpp/bindings/receiver_set.h"
diff --git a/chrome/browser/ash/chromebox_for_meetings/diagnostics/diagnostics_service_unittest.cc b/chrome/browser/ash/chromebox_for_meetings/diagnostics/diagnostics_service_unittest.cc index 7df5881..5788682 100644 --- a/chrome/browser/ash/chromebox_for_meetings/diagnostics/diagnostics_service_unittest.cc +++ b/chrome/browser/ash/chromebox_for_meetings/diagnostics/diagnostics_service_unittest.cc
@@ -8,7 +8,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/strings/string_number_conversions.h" #include "base/test/bind.h"
diff --git a/chrome/browser/ash/chromebox_for_meetings/logger/cfm_logger_service.cc b/chrome/browser/ash/chromebox_for_meetings/logger/cfm_logger_service.cc index 2978bcd..b7fcef7 100644 --- a/chrome/browser/ash/chromebox_for_meetings/logger/cfm_logger_service.cc +++ b/chrome/browser/ash/chromebox_for_meetings/logger/cfm_logger_service.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ash/chromebox_for_meetings/logger/cfm_logger_service.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/chromebox_for_meetings/logger/reporting_pipeline.h" #include "chromeos/ash/components/chromebox_for_meetings/features.h" #include "chromeos/ash/components/dbus/chromebox_for_meetings/cfm_hotline_client.h"
diff --git a/chrome/browser/ash/chromebox_for_meetings/logger/cfm_logger_service_unittest.cc b/chrome/browser/ash/chromebox_for_meetings/logger/cfm_logger_service_unittest.cc index 5efd062..64d6987d 100644 --- a/chrome/browser/ash/chromebox_for_meetings/logger/cfm_logger_service_unittest.cc +++ b/chrome/browser/ash/chromebox_for_meetings/logger/cfm_logger_service_unittest.cc
@@ -8,7 +8,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/test/bind.h" #include "base/test/mock_callback.h"
diff --git a/chrome/browser/ash/chromebox_for_meetings/logger/reporting_pipeline.cc b/chrome/browser/ash/chromebox_for_meetings/logger/reporting_pipeline.cc index e49fa05b..e4b753e 100644 --- a/chrome/browser/ash/chromebox_for_meetings/logger/reporting_pipeline.cc +++ b/chrome/browser/ash/chromebox_for_meetings/logger/reporting_pipeline.cc
@@ -7,7 +7,7 @@ #include <cstdint> #include <memory> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/task/bind_post_task.h" #include "base/task/sequenced_task_runner.h" #include "components/reporting/client/report_queue.h"
diff --git a/chrome/browser/ash/chromebox_for_meetings/service_adaptor_unittest.cc b/chrome/browser/ash/chromebox_for_meetings/service_adaptor_unittest.cc index 5feb4a0..1d681b2 100644 --- a/chrome/browser/ash/chromebox_for_meetings/service_adaptor_unittest.cc +++ b/chrome/browser/ash/chromebox_for_meetings/service_adaptor_unittest.cc
@@ -7,7 +7,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/test/bind.h" #include "base/test/mock_callback.h"
diff --git a/chrome/browser/ash/chromebox_for_meetings/xu_camera/xu_camera_service_unittest.cc b/chrome/browser/ash/chromebox_for_meetings/xu_camera/xu_camera_service_unittest.cc index b9d1615..257e5b3 100644 --- a/chrome/browser/ash/chromebox_for_meetings/xu_camera/xu_camera_service_unittest.cc +++ b/chrome/browser/ash/chromebox_for_meetings/xu_camera/xu_camera_service_unittest.cc
@@ -9,7 +9,7 @@ #include <linux/videodev2.h> #include <cstdint> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/test/bind.h" #include "base/test/mock_callback.h"
diff --git a/chrome/browser/ash/concierge_helper_service.cc b/chrome/browser/ash/concierge_helper_service.cc index 2cf4a1e4..cfecd64 100644 --- a/chrome/browser/ash/concierge_helper_service.cc +++ b/chrome/browser/ash/concierge_helper_service.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ash/concierge_helper_service.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/no_destructor.h" #include "chromeos/ash/components/dbus/concierge/concierge_client.h"
diff --git a/chrome/browser/ash/crosapi/arc_ash.cc b/chrome/browser/ash/crosapi/arc_ash.cc index f263da0..18ea04f2 100644 --- a/chrome/browser/ash/crosapi/arc_ash.cc +++ b/chrome/browser/ash/crosapi/arc_ash.cc
@@ -10,7 +10,7 @@ #include "ash/components/arc/session/arc_bridge_service.h" #include "ash/components/arc/session/arc_service_manager.h" #include "base/barrier_closure.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/apps/app_service/app_icon/app_icon_factory.h" #include "chrome/browser/ash/app_list/arc/arc_app_list_prefs.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ash/crosapi/browser_data_back_migrator.cc b/chrome/browser/ash/crosapi/browser_data_back_migrator.cc index 218775f..fa43bb7 100644 --- a/chrome/browser/ash/crosapi/browser_data_back_migrator.cc +++ b/chrome/browser/ash/crosapi/browser_data_back_migrator.cc
@@ -10,11 +10,11 @@ #include "ash/constants/ash_features.h" #include "ash/constants/ash_switches.h" -#include "base/callback.h" #include "base/command_line.h" #include "base/files/file_enumerator.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/callback.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/logging.h"
diff --git a/chrome/browser/ash/crosapi/browser_data_back_migrator.h b/chrome/browser/ash/crosapi/browser_data_back_migrator.h index 39b6649..94b7c7f0 100644 --- a/chrome/browser/ash/crosapi/browser_data_back_migrator.h +++ b/chrome/browser/ash/crosapi/browser_data_back_migrator.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_ASH_CROSAPI_BROWSER_DATA_BACK_MIGRATOR_H_ #define CHROME_BROWSER_ASH_CROSAPI_BROWSER_DATA_BACK_MIGRATOR_H_ -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ash/crosapi/browser_data_migrator_util.h"
diff --git a/chrome/browser/ash/crosapi/browser_data_migrator.cc b/chrome/browser/ash/crosapi/browser_data_migrator.cc index 11618783..78f990a5 100644 --- a/chrome/browser/ash/crosapi/browser_data_migrator.cc +++ b/chrome/browser/ash/crosapi/browser_data_migrator.cc
@@ -9,9 +9,9 @@ #include "ash/constants/ash_features.h" #include "ash/constants/ash_switches.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/feature_list.h" +#include "base/functional/callback_helpers.h" #include "base/memory/scoped_refptr.h" #include "base/path_service.h" #include "base/task/task_traits.h"
diff --git a/chrome/browser/ash/crosapi/browser_data_migrator.h b/chrome/browser/ash/crosapi/browser_data_migrator.h index 2a796bf..aa6514af 100644 --- a/chrome/browser/ash/crosapi/browser_data_migrator.h +++ b/chrome/browser/ash/crosapi/browser_data_migrator.h
@@ -7,9 +7,9 @@ #include <memory> -#include "base/callback.h" #include "base/feature_list.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/gtest_prod_util.h" #include "base/memory/scoped_refptr.h" #include "base/sequence_checker.h"
diff --git a/chrome/browser/ash/crosapi/browser_loader.cc b/chrome/browser/ash/crosapi/browser_loader.cc index a98b8694..1e00e00 100644 --- a/chrome/browser/ash/crosapi/browser_loader.cc +++ b/chrome/browser/ash/crosapi/browser_loader.cc
@@ -7,12 +7,12 @@ #include <utility> #include "ash/constants/ash_switches.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/feature_list.h" #include "base/files/file_enumerator.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/metrics/histogram_functions.h" #include "base/path_service.h"
diff --git a/chrome/browser/ash/crosapi/browser_loader.h b/chrome/browser/ash/crosapi/browser_loader.h index c117cc2..5c424cb 100644 --- a/chrome/browser/ash/crosapi/browser_loader.h +++ b/chrome/browser/ash/crosapi/browser_loader.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_ASH_CROSAPI_BROWSER_LOADER_H_ #define CHROME_BROWSER_ASH_CROSAPI_BROWSER_LOADER_H_ -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/gtest_prod_util.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/ash/crosapi/browser_manager.cc b/chrome/browser/ash/crosapi/browser_manager.cc index 916b9a8..7be2aa5 100644 --- a/chrome/browser/ash/crosapi/browser_manager.cc +++ b/chrome/browser/ash/crosapi/browser_manager.cc
@@ -17,9 +17,6 @@ #include "ash/public/cpp/notification_utils.h" #include "ash/strings/grit/ash_strings.h" #include "base/base_switches.h" -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/check_is_test.h" #include "base/command_line.h" #include "base/environment.h" @@ -28,6 +25,9 @@ #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/platform_file.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/json/json_file_value_serializer.h" #include "base/logging.h" #include "base/memory/ptr_util.h"
diff --git a/chrome/browser/ash/crosapi/browser_manager.h b/chrome/browser/ash/crosapi/browser_manager.h index 3cd2038..b309979b 100644 --- a/chrome/browser/ash/crosapi/browser_manager.h +++ b/chrome/browser/ash/crosapi/browser_manager.h
@@ -9,9 +9,9 @@ #include <set> #include <vector> -#include "base/callback.h" #include "base/feature_list.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/gtest_prod_util.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/ash/crosapi/browser_service_host_ash.cc b/chrome/browser/ash/crosapi/browser_service_host_ash.cc index 9ced212a..528e9665 100644 --- a/chrome/browser/ash/crosapi/browser_service_host_ash.cc +++ b/chrome/browser/ash/crosapi/browser_service_host_ash.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/crosapi/browser_service_host_observer.h" #include "chromeos/crosapi/mojom/crosapi.mojom.h"
diff --git a/chrome/browser/ash/crosapi/cert_database_ash.cc b/chrome/browser/ash/crosapi/cert_database_ash.cc index 0d50c042..9441f9d 100644 --- a/chrome/browser/ash/crosapi/cert_database_ash.cc +++ b/chrome/browser/ash/crosapi/cert_database_ash.cc
@@ -6,7 +6,7 @@ #include <algorithm> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/ranges/algorithm.h" #include "base/system/sys_info.h" #include "chrome/browser/ash/profiles/profile_helper.h"
diff --git a/chrome/browser/ash/crosapi/crosapi_manager.cc b/chrome/browser/ash/crosapi/crosapi_manager.cc index 9077dd7f..560bbf1 100644 --- a/chrome/browser/ash/crosapi/crosapi_manager.cc +++ b/chrome/browser/ash/crosapi/crosapi_manager.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/process/process_handle.h" #include "chrome/browser/ash/crosapi/crosapi_ash.h" #include "chromeos/crosapi/mojom/crosapi.mojom.h"
diff --git a/chrome/browser/ash/crosapi/crosapi_manager.h b/chrome/browser/ash/crosapi/crosapi_manager.h index 6387ff5..c71659d 100644 --- a/chrome/browser/ash/crosapi/crosapi_manager.h +++ b/chrome/browser/ash/crosapi/crosapi_manager.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/ash/crosapi/crosapi_dependency_registry.h" #include "chrome/browser/ash/crosapi/crosapi_id.h"
diff --git a/chrome/browser/ash/crosapi/device_oauth2_token_service_ash.cc b/chrome/browser/ash/crosapi/device_oauth2_token_service_ash.cc index 035398d..13307e7 100644 --- a/chrome/browser/ash/crosapi/device_oauth2_token_service_ash.cc +++ b/chrome/browser/ash/crosapi/device_oauth2_token_service_ash.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ash/crosapi/device_oauth2_token_service_ash.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/ash/profiles/profile_helper.h" #include "chrome/browser/device_identity/device_oauth2_token_service.h" #include "chrome/browser/device_identity/device_oauth2_token_service_factory.h"
diff --git a/chrome/browser/ash/crosapi/echo_private_ash.cc b/chrome/browser/ash/crosapi/echo_private_ash.cc index 9dbd79d8..c4ce6cc1 100644 --- a/chrome/browser/ash/crosapi/echo_private_ash.cc +++ b/chrome/browser/ash/crosapi/echo_private_ash.cc
@@ -4,9 +4,9 @@ #include "chrome/browser/ash/crosapi/echo_private_ash.h" -#include "base/bind.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.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/crosapi/echo_private_ash.h b/chrome/browser/ash/crosapi/echo_private_ash.h index 2d280547..6b09bae 100644 --- a/chrome/browser/ash/crosapi/echo_private_ash.h +++ b/chrome/browser/ash/crosapi/echo_private_ash.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ash/notifications/echo_dialog_listener.h" #include "chromeos/crosapi/mojom/echo_private.mojom.h"
diff --git a/chrome/browser/ash/crosapi/file_manager_ash.cc b/chrome/browser/ash/crosapi/file_manager_ash.cc index 9ac26b0..bcb9503 100644 --- a/chrome/browser/ash/crosapi/file_manager_ash.cc +++ b/chrome/browser/ash/crosapi/file_manager_ash.cc
@@ -6,9 +6,9 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/notreached.h" #include "chrome/browser/ash/file_manager/open_util.h" #include "chrome/browser/platform_util.h"
diff --git a/chrome/browser/ash/crosapi/files_app_launcher.h b/chrome/browser/ash/crosapi/files_app_launcher.h index 8f2bc88..7613689 100644 --- a/chrome/browser/ash/crosapi/files_app_launcher.h +++ b/chrome/browser/ash/crosapi/files_app_launcher.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_ASH_CROSAPI_FILES_APP_LAUNCHER_H_ #define CHROME_BROWSER_ASH_CROSAPI_FILES_APP_LAUNCHER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/apps/app_service/app_service_proxy_forward.h" #include "components/services/app_service/public/cpp/app_registry_cache.h"
diff --git a/chrome/browser/ash/crosapi/identity_manager_ash.cc b/chrome/browser/ash/crosapi/identity_manager_ash.cc index 552e2834..ece3fc4 100644 --- a/chrome/browser/ash/crosapi/identity_manager_ash.cc +++ b/chrome/browser/ash/crosapi/identity_manager_ash.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ash/crosapi/identity_manager_ash.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/ash/profiles/profile_helper.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/signin/identity_manager_factory.h"
diff --git a/chrome/browser/ash/crosapi/image_writer_ash.cc b/chrome/browser/ash/crosapi/image_writer_ash.cc index 1d6ad22..0f5a6104 100644 --- a/chrome/browser/ash/crosapi/image_writer_ash.cc +++ b/chrome/browser/ash/crosapi/image_writer_ash.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ash/crosapi/image_writer_ash.h" -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/unguessable_token.h" #include "chrome/browser/extensions/api/image_writer_private/operation_manager.h" #include "chrome/browser/extensions/api/image_writer_private/removable_storage_provider.h"
diff --git a/chrome/browser/ash/crosapi/image_writer_ash.h b/chrome/browser/ash/crosapi/image_writer_ash.h index 83bcd25..b50b8e6a 100644 --- a/chrome/browser/ash/crosapi/image_writer_ash.h +++ b/chrome/browser/ash/crosapi/image_writer_ash.h
@@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "base/unguessable_token.h"
diff --git a/chrome/browser/ash/crosapi/keystore_service_ash_unittest.cc b/chrome/browser/ash/crosapi/keystore_service_ash_unittest.cc index 1a710cf..ff3292e 100644 --- a/chrome/browser/ash/crosapi/keystore_service_ash_unittest.cc +++ b/chrome/browser/ash/crosapi/keystore_service_ash_unittest.cc
@@ -7,7 +7,7 @@ #include <initializer_list> #include "base/base64.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/no_destructor.h" #include "base/notreached.h"
diff --git a/chrome/browser/ash/crosapi/lacros_availability_policy_observer.cc b/chrome/browser/ash/crosapi/lacros_availability_policy_observer.cc index 5b891b9..6f2d2b4d 100644 --- a/chrome/browser/ash/crosapi/lacros_availability_policy_observer.cc +++ b/chrome/browser/ash/crosapi/lacros_availability_policy_observer.cc
@@ -4,9 +4,9 @@ #include "chrome/browser/ash/crosapi/lacros_availability_policy_observer.h" -#include "base/bind.h" #include "base/check.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/profiles/profile_helper.h" #include "chrome/browser/ash/settings/about_flags.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/ash/crosapi/lacros_data_backward_migration_mode_policy_observer.cc b/chrome/browser/ash/crosapi/lacros_data_backward_migration_mode_policy_observer.cc index 9fdc7e89..ac9c063a 100644 --- a/chrome/browser/ash/crosapi/lacros_data_backward_migration_mode_policy_observer.cc +++ b/chrome/browser/ash/crosapi/lacros_data_backward_migration_mode_policy_observer.cc
@@ -4,9 +4,9 @@ #include "chrome/browser/ash/crosapi/lacros_data_backward_migration_mode_policy_observer.h" -#include "base/bind.h" #include "base/check.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/profiles/profile_helper.h" #include "chrome/browser/ash/settings/about_flags.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/ash/crosapi/local_printer_ash.cc b/chrome/browser/ash/crosapi/local_printer_ash.cc index 85c10efa..4ad2970 100644 --- a/chrome/browser/ash/crosapi/local_printer_ash.cc +++ b/chrome/browser/ash/crosapi/local_printer_ash.cc
@@ -10,10 +10,10 @@ #include <vector> #include "ash/constants/ash_features.h" -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/check.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/ash/crosapi/local_printer_ash_unittest.cc b/chrome/browser/ash/crosapi/local_printer_ash_unittest.cc index 0ba8103..0495eaa 100644 --- a/chrome/browser/ash/crosapi/local_printer_ash_unittest.cc +++ b/chrome/browser/ash/crosapi/local_printer_ash_unittest.cc
@@ -12,7 +12,7 @@ #include <vector> #include "ash/constants/ash_features.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "base/run_loop.h"
diff --git a/chrome/browser/ash/crosapi/message_center_ash.cc b/chrome/browser/ash/crosapi/message_center_ash.cc index 43771bcc..8544bc70 100644 --- a/chrome/browser/ash/crosapi/message_center_ash.cc +++ b/chrome/browser/ash/crosapi/message_center_ash.cc
@@ -8,9 +8,9 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/check.h" #include "base/cxx17_backports.h" +#include "base/functional/bind.h" #include "base/memory/scoped_refptr.h" #include "chromeos/crosapi/mojom/message_center.mojom.h" #include "chromeos/crosapi/mojom/notification.mojom-shared.h"
diff --git a/chrome/browser/ash/crosapi/metrics_ash.cc b/chrome/browser/ash/crosapi/metrics_ash.cc index e234975..b303db98 100644 --- a/chrome/browser/ash/crosapi/metrics_ash.cc +++ b/chrome/browser/ash/crosapi/metrics_ash.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "chromeos/ash/components/system/statistics_provider.h" namespace crosapi {
diff --git a/chrome/browser/ash/crosapi/metrics_reporting_ash.cc b/chrome/browser/ash/crosapi/metrics_reporting_ash.cc index b310646f..b1c8d770 100644 --- a/chrome/browser/ash/crosapi/metrics_reporting_ash.cc +++ b/chrome/browser/ash/crosapi/metrics_reporting_ash.cc
@@ -6,9 +6,9 @@ #include <utility> -#include "base/bind.h" #include "base/callback_list.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/ash/settings/stats_reporting_controller.h" #include "chrome/browser/profiles/profile_manager.h"
diff --git a/chrome/browser/ash/crosapi/migration_progress_tracker.h b/chrome/browser/ash/crosapi/migration_progress_tracker.h index 8bc73f8..c2119d0 100644 --- a/chrome/browser/ash/crosapi/migration_progress_tracker.h +++ b/chrome/browser/ash/crosapi/migration_progress_tracker.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_ASH_CROSAPI_MIGRATION_PROGRESS_TRACKER_H_ #define CHROME_BROWSER_ASH_CROSAPI_MIGRATION_PROGRESS_TRACKER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" namespace ash { using ProgressCallback = base::RepeatingCallback<void(int)>;
diff --git a/chrome/browser/ash/crosapi/move_migrator.cc b/chrome/browser/ash/crosapi/move_migrator.cc index 1f587bc..8627b81 100644 --- a/chrome/browser/ash/crosapi/move_migrator.cc +++ b/chrome/browser/ash/crosapi/move_migrator.cc
@@ -9,11 +9,11 @@ #include <memory> #include <string> -#include "base/callback.h" #include "base/containers/contains.h" #include "base/files/file_enumerator.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "base/metrics/histogram_functions.h"
diff --git a/chrome/browser/ash/crosapi/move_migrator.h b/chrome/browser/ash/crosapi/move_migrator.h index 543cc6a..fbffbec 100644 --- a/chrome/browser/ash/crosapi/move_migrator.h +++ b/chrome/browser/ash/crosapi/move_migrator.h
@@ -8,8 +8,8 @@ #include <memory> #include <string> -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/gtest_prod_util.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/ash/crosapi/network_settings_service_ash_browsertest.cc b/chrome/browser/ash/crosapi/network_settings_service_ash_browsertest.cc index 1ca3033d..2948b7ac6 100644 --- a/chrome/browser/ash/crosapi/network_settings_service_ash_browsertest.cc +++ b/chrome/browser/ash/crosapi/network_settings_service_ash_browsertest.cc
@@ -5,7 +5,7 @@ #include "chrome/browser/ash/crosapi/network_settings_service_ash.h" #include "ash/constants/ash_pref_names.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/test/repeating_test_future.h" #include "chrome/browser/ash/crosapi/network_settings_translation.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/ash/crosapi/parent_access_ash.h b/chrome/browser/ash/crosapi/parent_access_ash.h index 66e9546..1c80a49 100644 --- a/chrome/browser/ash/crosapi/parent_access_ash.h +++ b/chrome/browser/ash/crosapi/parent_access_ash.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "chrome/browser/ui/webui/ash/parent_access/parent_access_dialog.h" #include "chrome/browser/ui/webui/ash/parent_access/parent_access_ui.mojom.h" #include "chromeos/crosapi/mojom/parent_access.mojom.h"
diff --git a/chrome/browser/ash/crosapi/power_ash.cc b/chrome/browser/ash/crosapi/power_ash.cc index 3d64ac4..d652409 100644 --- a/chrome/browser/ash/crosapi/power_ash.cc +++ b/chrome/browser/ash/crosapi/power_ash.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.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/crosapi/prefs_ash.cc b/chrome/browser/ash/crosapi/prefs_ash.cc index 33d1168..e3c57ea 100644 --- a/chrome/browser/ash/crosapi/prefs_ash.cc +++ b/chrome/browser/ash/crosapi/prefs_ash.cc
@@ -8,8 +8,8 @@ #include <utility> #include "ash/constants/ash_pref_names.h" -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/no_destructor.h" #include "chrome/browser/ash/profiles/profile_helper.h" #include "chrome/browser/lifetime/termination_notification.h"
diff --git a/chrome/browser/ash/crosapi/prefs_ash_unittest.cc b/chrome/browser/ash/crosapi/prefs_ash_unittest.cc index 8047252..1851c02 100644 --- a/chrome/browser/ash/crosapi/prefs_ash_unittest.cc +++ b/chrome/browser/ash/crosapi/prefs_ash_unittest.cc
@@ -7,7 +7,7 @@ #include <memory> #include "ash/constants/ash_pref_names.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/test/bind.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/printing_metrics_ash.cc b/chrome/browser/ash/crosapi/printing_metrics_ash.cc index 0c472160..fe8d9e9c5 100644 --- a/chrome/browser/ash/crosapi/printing_metrics_ash.cc +++ b/chrome/browser/ash/crosapi/printing_metrics_ash.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ash/crosapi/printing_metrics_ash.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/notreached.h" #include "chrome/browser/ash/crosapi/print_job_info_idl_conversions.h" #include "chrome/browser/ash/printing/history/print_job_history_service.h"
diff --git a/chrome/browser/ash/crosapi/screen_manager_ash.cc b/chrome/browser/ash/crosapi/screen_manager_ash.cc index 9f0fe889..efdc6d4 100644 --- a/chrome/browser/ash/crosapi/screen_manager_ash.cc +++ b/chrome/browser/ash/crosapi/screen_manager_ash.cc
@@ -11,9 +11,9 @@ #include "ash/public/cpp/shell_window_ids.h" #include "ash/shell.h" #include "ash/wm/desks/desks_util.h" -#include "base/bind.h" #include "base/containers/adapters.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/ash/crosapi/browser_util.h" #include "chrome/browser/ash/crosapi/video_capture_device_ash.h"
diff --git a/chrome/browser/ash/crosapi/search_provider_ash.cc b/chrome/browser/ash/crosapi/search_provider_ash.cc index 7dc1ac3a..4184971 100644 --- a/chrome/browser/ash/crosapi/search_provider_ash.cc +++ b/chrome/browser/ash/crosapi/search_provider_ash.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" namespace crosapi {
diff --git a/chrome/browser/ash/crosapi/search_provider_ash.h b/chrome/browser/ash/crosapi/search_provider_ash.h index 86ac3fc..ff202be 100644 --- a/chrome/browser/ash/crosapi/search_provider_ash.h +++ b/chrome/browser/ash/crosapi/search_provider_ash.h
@@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "chromeos/crosapi/mojom/launcher_search.mojom.h" #include "mojo/public/cpp/bindings/associated_receiver_set.h"
diff --git a/chrome/browser/ash/crosapi/test/ash_crosapi_tests_main.cc b/chrome/browser/ash/crosapi/test/ash_crosapi_tests_main.cc index 0943ba35..05bb8a9 100644 --- a/chrome/browser/ash/crosapi/test/ash_crosapi_tests_main.cc +++ b/chrome/browser/ash/crosapi/test/ash_crosapi_tests_main.cc
@@ -4,8 +4,8 @@ #include <memory> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/task/single_thread_task_executor.h" #include "base/test/launcher/unit_test_launcher.h" #include "base/test/test_suite.h"
diff --git a/chrome/browser/ash/crosapi/test/file_manager_ash_crosapitest.cc b/chrome/browser/ash/crosapi/test/file_manager_ash_crosapitest.cc index 99adcf6..48738ac7 100644 --- a/chrome/browser/ash/crosapi/test/file_manager_ash_crosapitest.cc +++ b/chrome/browser/ash/crosapi/test/file_manager_ash_crosapitest.cc
@@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/test/bind.h" #include "base/test/test_future.h" #include "base/threading/thread_restrictions.h"
diff --git a/chrome/browser/ash/crosapi/test_controller_ash.cc b/chrome/browser/ash/crosapi/test_controller_ash.cc index f7c8f4bf..10e4284 100644 --- a/chrome/browser/ash/crosapi/test_controller_ash.cc +++ b/chrome/browser/ash/crosapi/test_controller_ash.cc
@@ -19,8 +19,8 @@ #include "ash/wm/overview/overview_controller.h" #include "ash/wm/overview/overview_observer.h" #include "ash/wm/tablet_mode/tablet_mode_controller.h" -#include "base/callback_helpers.h" #include "base/containers/flat_set.h" +#include "base/functional/callback_helpers.h" #include "base/scoped_observation.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ash/crosapi/test_mojo_connection_manager.cc b/chrome/browser/ash/crosapi/test_mojo_connection_manager.cc index aa70facb..0e0d10c 100644 --- a/chrome/browser/ash/crosapi/test_mojo_connection_manager.cc +++ b/chrome/browser/ash/crosapi/test_mojo_connection_manager.cc
@@ -6,8 +6,8 @@ #include <fcntl.h> -#include "base/bind.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/path_service.h" #include "base/task/task_traits.h"
diff --git a/chrome/browser/ash/crosapi/test_mojo_connection_manager_unittest.cc b/chrome/browser/ash/crosapi/test_mojo_connection_manager_unittest.cc index 509ebc1..5e78abfd 100644 --- a/chrome/browser/ash/crosapi/test_mojo_connection_manager_unittest.cc +++ b/chrome/browser/ash/crosapi/test_mojo_connection_manager_unittest.cc
@@ -9,13 +9,13 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/files/file_path.h" #include "base/files/file_path_watcher.h" #include "base/files/scoped_file.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/notreached.h" #include "base/process/launch.h" #include "base/run_loop.h"
diff --git a/chrome/browser/ash/crosapi/video_capture_device_ash.h b/chrome/browser/ash/crosapi/video_capture_device_ash.h index 6d5343e..369097e 100644 --- a/chrome/browser/ash/crosapi/video_capture_device_ash.h +++ b/chrome/browser/ash/crosapi/video_capture_device_ash.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_ASH_CROSAPI_VIDEO_CAPTURE_DEVICE_ASH_H_ #define CHROME_BROWSER_ASH_CROSAPI_VIDEO_CAPTURE_DEVICE_ASH_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "chromeos/crosapi/mojom/video_capture.mojom.h" #include "mojo/public/cpp/bindings/pending_receiver.h" #include "mojo/public/cpp/bindings/pending_remote.h"
diff --git a/chrome/browser/ash/crosapi/video_capture_device_factory_ash.cc b/chrome/browser/ash/crosapi/video_capture_device_factory_ash.cc index 2677f0f..82d6bfe 100644 --- a/chrome/browser/ash/crosapi/video_capture_device_factory_ash.cc +++ b/chrome/browser/ash/crosapi/video_capture_device_factory_ash.cc
@@ -8,7 +8,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/notreached.h" #include "chrome/browser/ash/crosapi/video_capture_device_ash.h" #include "content/public/browser/video_capture_service.h"
diff --git a/chrome/browser/ash/crosapi/vpn_extension_observer_ash.cc b/chrome/browser/ash/crosapi/vpn_extension_observer_ash.cc index 9494d63..bb171fb 100644 --- a/chrome/browser/ash/crosapi/vpn_extension_observer_ash.cc +++ b/chrome/browser/ash/crosapi/vpn_extension_observer_ash.cc
@@ -3,7 +3,7 @@ // found in the LICENSE file. #include "chrome/browser/ash/crosapi/vpn_extension_observer_ash.h" -#include "base/bind.h" +#include "base/functional/bind.h" namespace crosapi {
diff --git a/chrome/browser/ash/crosapi/vpn_service_ash.cc b/chrome/browser/ash/crosapi/vpn_service_ash.cc index 50ce70a..25010737 100644 --- a/chrome/browser/ash/crosapi/vpn_service_ash.cc +++ b/chrome/browser/ash/crosapi/vpn_service_ash.cc
@@ -7,8 +7,8 @@ #include <utility> #include "ash/public/cpp/network_config_service.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/guid.h" #include "base/memory/raw_ptr.h" #include "base/values.h"
diff --git a/chrome/browser/ash/crosapi/vpn_service_ash.h b/chrome/browser/ash/crosapi/vpn_service_ash.h index 85134e62..e7b3ec96 100644 --- a/chrome/browser/ash/crosapi/vpn_service_ash.h +++ b/chrome/browser/ash/crosapi/vpn_service_ash.h
@@ -10,8 +10,8 @@ #include <string> #include <vector> -#include "base/callback_helpers.h" #include "base/containers/flat_set.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/scoped_observation.h"
diff --git a/chrome/browser/ash/crosapi/wallpaper_ash.cc b/chrome/browser/ash/crosapi/wallpaper_ash.cc index 87b9db5b..f377c546 100644 --- a/chrome/browser/ash/crosapi/wallpaper_ash.cc +++ b/chrome/browser/ash/crosapi/wallpaper_ash.cc
@@ -7,8 +7,8 @@ #include <string> #include <vector> -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "chrome/browser/ash/profiles/profile_helper.h" #include "chrome/browser/profiles/profile_manager.h"
diff --git a/chrome/browser/ash/crosapi/web_page_info_ash.h b/chrome/browser/ash/crosapi/web_page_info_ash.h index c2765832..754f69e 100644 --- a/chrome/browser/ash/crosapi/web_page_info_ash.h +++ b/chrome/browser/ash/crosapi/web_page_info_ash.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_ASH_CROSAPI_WEB_PAGE_INFO_ASH_H_ #define CHROME_BROWSER_ASH_CROSAPI_WEB_PAGE_INFO_ASH_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" #include "base/observer_list_types.h"
diff --git a/chrome/browser/ash/crostini/ansible/ansible_management_service.h b/chrome/browser/ash/crostini/ansible/ansible_management_service.h index dc579a51..1e47049 100644 --- a/chrome/browser/ash/crostini/ansible/ansible_management_service.h +++ b/chrome/browser/ash/crostini/ansible/ansible_management_service.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/ash/crostini/crostini_manager.h" #include "chrome/browser/ash/guest_os/guest_id.h" #include "components/keyed_service/core/keyed_service.h"
diff --git a/chrome/browser/ash/crostini/crostini_browsertest.cc b/chrome/browser/ash/crostini/crostini_browsertest.cc index 0d7b598..46a3d65c7 100644 --- a/chrome/browser/ash/crostini/crostini_browsertest.cc +++ b/chrome/browser/ash/crostini/crostini_browsertest.cc
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/run_loop.h" #include "chrome/browser/ash/crostini/crostini_browser_test_util.h" #include "chrome/browser/ash/crostini/crostini_util.h"
diff --git a/chrome/browser/ash/crostini/crostini_disk.cc b/chrome/browser/ash/crostini/crostini_disk.cc index fe43eee..f8fde11d 100644 --- a/chrome/browser/ash/crostini/crostini_disk.cc +++ b/chrome/browser/ash/crostini/crostini_disk.cc
@@ -7,7 +7,7 @@ #include <cmath> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "base/ranges/algorithm.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ash/crostini/crostini_export_import.cc b/chrome/browser/ash/crostini/crostini_export_import.cc index 1fbc23e9..6c083e9 100644 --- a/chrome/browser/ash/crostini/crostini_export_import.cc +++ b/chrome/browser/ash/crostini/crostini_export_import.cc
@@ -6,9 +6,9 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h" #include "base/no_destructor.h"
diff --git a/chrome/browser/ash/crostini/crostini_features.h b/chrome/browser/ash/crostini/crostini_features.h index 4410887..4ce3d95 100644 --- a/chrome/browser/ash/crostini/crostini_features.h +++ b/chrome/browser/ash/crostini/crostini_features.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" class Profile;
diff --git a/chrome/browser/ash/crostini/crostini_features_unittest.cc b/chrome/browser/ash/crostini/crostini_features_unittest.cc index 1f2704a..b1677ff4 100644 --- a/chrome/browser/ash/crostini/crostini_features_unittest.cc +++ b/chrome/browser/ash/crostini/crostini_features_unittest.cc
@@ -5,7 +5,7 @@ #include "chrome/browser/ash/crostini/crostini_features.h" #include "ash/constants/ash_features.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "chrome/browser/ash/crostini/crostini_pref_names.h"
diff --git a/chrome/browser/ash/crostini/crostini_file_selector.h b/chrome/browser/ash/crostini/crostini_file_selector.h index 892c537..59a56a52 100644 --- a/chrome/browser/ash/crostini/crostini_file_selector.h +++ b/chrome/browser/ash/crostini/crostini_file_selector.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_ASH_CROSTINI_CROSTINI_FILE_SELECTOR_H_ #define CHROME_BROWSER_ASH_CROSTINI_CROSTINI_FILE_SELECTOR_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "content/public/browser/web_ui.h" #include "ui/gfx/native_widget_types.h"
diff --git a/chrome/browser/ash/crostini/crostini_force_close_watcher.cc b/chrome/browser/ash/crostini/crostini_force_close_watcher.cc index 54116a7..785910f 100644 --- a/chrome/browser/ash/crostini/crostini_force_close_watcher.cc +++ b/chrome/browser/ash/crostini/crostini_force_close_watcher.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/weak_ptr.h" #include "base/task/sequenced_task_runner.h" #include "base/time/time.h"
diff --git a/chrome/browser/ash/crostini/crostini_installer.cc b/chrome/browser/ash/crostini/crostini_installer.cc index 242d74388..344c1b4 100644 --- a/chrome/browser/ash/crostini/crostini_installer.cc +++ b/chrome/browser/ash/crostini/crostini_installer.cc
@@ -6,8 +6,8 @@ #include <string> -#include "base/bind.h" #include "base/cxx17_backports.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h" #include "base/no_destructor.h"
diff --git a/chrome/browser/ash/crostini/crostini_installer.h b/chrome/browser/ash/crostini/crostini_installer.h index 7a26504d..adfdcbd 100644 --- a/chrome/browser/ash/crostini/crostini_installer.h +++ b/chrome/browser/ash/crostini/crostini_installer.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_ASH_CROSTINI_CROSTINI_INSTALLER_H_ #define CHROME_BROWSER_ASH_CROSTINI_CROSTINI_INSTALLER_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/scoped_observation.h" #include "base/time/time.h" #include "base/timer/timer.h"
diff --git a/chrome/browser/ash/crostini/crostini_installer_ui_delegate.h b/chrome/browser/ash/crostini/crostini_installer_ui_delegate.h index ef783f1..62da4c7 100644 --- a/chrome/browser/ash/crostini/crostini_installer_ui_delegate.h +++ b/chrome/browser/ash/crostini/crostini_installer_ui_delegate.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_ASH_CROSTINI_CROSTINI_INSTALLER_UI_DELEGATE_H_ #define CHROME_BROWSER_ASH_CROSTINI_CROSTINI_INSTALLER_UI_DELEGATE_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "chrome/browser/ash/crostini/crostini_manager.h" #include "chrome/browser/ash/crostini/crostini_types.mojom-forward.h"
diff --git a/chrome/browser/ash/crostini/crostini_installer_unittest.cc b/chrome/browser/ash/crostini/crostini_installer_unittest.cc index df895a2..ea49fc5 100644 --- a/chrome/browser/ash/crostini/crostini_installer_unittest.cc +++ b/chrome/browser/ash/crostini/crostini_installer_unittest.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ash/crostini/crostini_installer.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/task_environment.h"
diff --git a/chrome/browser/ash/crostini/crostini_low_disk_notification.cc b/chrome/browser/ash/crostini/crostini_low_disk_notification.cc index 41a6247a..c4d5a7aa 100644 --- a/chrome/browser/ash/crostini/crostini_low_disk_notification.cc +++ b/chrome/browser/ash/crostini/crostini_low_disk_notification.cc
@@ -8,7 +8,7 @@ #include "ash/constants/notifier_catalogs.h" #include "ash/public/cpp/notification_utils.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/app/vector_icons/vector_icons.h" #include "chrome/browser/ash/crostini/crostini_util.h" #include "chrome/browser/ash/settings/cros_settings.h"
diff --git a/chrome/browser/ash/crostini/crostini_low_disk_notification_unittest.cc b/chrome/browser/ash/crostini/crostini_low_disk_notification_unittest.cc index e96bca5c..af8e88a 100644 --- a/chrome/browser/ash/crostini/crostini_low_disk_notification_unittest.cc +++ b/chrome/browser/ash/crostini/crostini_low_disk_notification_unittest.cc
@@ -8,7 +8,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/time/time.h" #include "chrome/browser/ash/crostini/crostini_util.h" #include "chrome/browser/notifications/notification_display_service_tester.h"
diff --git a/chrome/browser/ash/crostini/crostini_manager.cc b/chrome/browser/ash/crostini/crostini_manager.cc index a7b86ee..b9cc474 100644 --- a/chrome/browser/ash/crostini/crostini_manager.cc +++ b/chrome/browser/ash/crostini/crostini_manager.cc
@@ -10,12 +10,12 @@ #include "ash/constants/ash_features.h" #include "base/barrier_closure.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check_op.h" #include "base/command_line.h" #include "base/feature_list.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/histogram_functions.h" #include "base/notreached.h" #include "base/ranges/algorithm.h"
diff --git a/chrome/browser/ash/crostini/crostini_manager_unittest.cc b/chrome/browser/ash/crostini/crostini_manager_unittest.cc index 0a923ac..bf1dde2 100644 --- a/chrome/browser/ash/crostini/crostini_manager_unittest.cc +++ b/chrome/browser/ash/crostini/crostini_manager_unittest.cc
@@ -8,8 +8,8 @@ #include "ash/constants/ash_features.h" #include "base/barrier_closure.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h"
diff --git a/chrome/browser/ash/crostini/crostini_mount_provider.cc b/chrome/browser/ash/crostini/crostini_mount_provider.cc index 84c5beca..4097e53e 100644 --- a/chrome/browser/ash/crostini/crostini_mount_provider.cc +++ b/chrome/browser/ash/crostini/crostini_mount_provider.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/crostini/crostini_util.h" #include "chrome/browser/ash/guest_os/guest_os_session_tracker.h" #include "chrome/browser/ash/guest_os/public/types.h"
diff --git a/chrome/browser/ash/crostini/crostini_package_service.cc b/chrome/browser/ash/crostini/crostini_package_service.cc index b65f1248..08f4f38 100644 --- a/chrome/browser/ash/crostini/crostini_package_service.cc +++ b/chrome/browser/ash/crostini/crostini_package_service.cc
@@ -4,9 +4,9 @@ #include "chrome/browser/ash/crostini/crostini_package_service.h" -#include "base/bind.h" #include "base/containers/contains.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/no_destructor.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ash/crostini/crostini_package_service.h b/chrome/browser/ash/crostini/crostini_package_service.h index 40bff00..018e060 100644 --- a/chrome/browser/ash/crostini/crostini_package_service.h +++ b/chrome/browser/ash/crostini/crostini_package_service.h
@@ -13,7 +13,7 @@ #include <utility> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ash/crostini/crostini_manager.h" #include "chrome/browser/ash/crostini/crostini_package_notification.h"
diff --git a/chrome/browser/ash/crostini/crostini_package_service_unittest.cc b/chrome/browser/ash/crostini/crostini_package_service_unittest.cc index 4985fa1..1879514 100644 --- a/chrome/browser/ash/crostini/crostini_package_service_unittest.cc +++ b/chrome/browser/ash/crostini/crostini_package_service_unittest.cc
@@ -7,8 +7,8 @@ #include <memory> #include <string> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/strings/string_util.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_port_forwarder.cc b/chrome/browser/ash/crostini/crostini_port_forwarder.cc index e498aec4b..6f8dcee 100644 --- a/chrome/browser/ash/crostini/crostini_port_forwarder.cc +++ b/chrome/browser/ash/crostini/crostini_port_forwarder.cc
@@ -6,8 +6,8 @@ #include <fcntl.h> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/no_destructor.h" #include "base/ranges/algorithm.h" #include "chrome/browser/ash/crostini/crostini_manager.h"
diff --git a/chrome/browser/ash/crostini/crostini_remover.cc b/chrome/browser/ash/crostini/crostini_remover.cc index 47e51f9..3db1c1b 100644 --- a/chrome/browser/ash/crostini/crostini_remover.cc +++ b/chrome/browser/ash/crostini/crostini_remover.cc
@@ -7,7 +7,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/crostini/crostini_pref_names.h" #include "chrome/browser/ash/guest_os/guest_os_mime_types_service.h" #include "chrome/browser/ash/guest_os/guest_os_mime_types_service_factory.h"
diff --git a/chrome/browser/ash/crostini/crostini_security_delegate.h b/chrome/browser/ash/crostini/crostini_security_delegate.h index e4facf93..eb3fb18b 100644 --- a/chrome/browser/ash/crostini/crostini_security_delegate.h +++ b/chrome/browser/ash/crostini/crostini_security_delegate.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_ASH_CROSTINI_CROSTINI_SECURITY_DELEGATE_H_ #define CHROME_BROWSER_ASH_CROSTINI_CROSTINI_SECURITY_DELEGATE_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "chrome/browser/ash/guest_os/guest_os_security_delegate.h" class Profile;
diff --git a/chrome/browser/ash/crostini/crostini_shared_devices.cc b/chrome/browser/ash/crostini/crostini_shared_devices.cc index fd20da8..f90d8f2 100644 --- a/chrome/browser/ash/crostini/crostini_shared_devices.cc +++ b/chrome/browser/ash/crostini/crostini_shared_devices.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ash/crostini/crostini_shared_devices.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/no_destructor.h" #include "chrome/browser/ash/crostini/crostini_util.h" #include "chrome/browser/ash/guest_os/guest_os_pref_names.h"
diff --git a/chrome/browser/ash/crostini/crostini_simple_types.h b/chrome/browser/ash/crostini/crostini_simple_types.h index 42670c7..51bd953 100644 --- a/chrome/browser/ash/crostini/crostini_simple_types.h +++ b/chrome/browser/ash/crostini/crostini_simple_types.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "chromeos/ash/components/dbus/cicerone/cicerone_service.pb.h" #include "chromeos/ash/components/dbus/concierge/concierge_service.pb.h"
diff --git a/chrome/browser/ash/crostini/crostini_sshfs.cc b/chrome/browser/ash/crostini/crostini_sshfs.cc index 29c0884..6b7ed44 100644 --- a/chrome/browser/ash/crostini/crostini_sshfs.cc +++ b/chrome/browser/ash/crostini/crostini_sshfs.cc
@@ -8,7 +8,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/metrics/histogram_functions.h" #include "base/scoped_observation.h"
diff --git a/chrome/browser/ash/crostini/crostini_sshfs_unittest.cc b/chrome/browser/ash/crostini/crostini_sshfs_unittest.cc index 460684e..9aaa20c 100644 --- a/chrome/browser/ash/crostini/crostini_sshfs_unittest.cc +++ b/chrome/browser/ash/crostini/crostini_sshfs_unittest.cc
@@ -7,9 +7,9 @@ #include <memory> #include "base/base64.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/task_environment.h"
diff --git a/chrome/browser/ash/crostini/crostini_upgrade_available_notification.cc b/chrome/browser/ash/crostini/crostini_upgrade_available_notification.cc index d63d3f4..8f5331b 100644 --- a/chrome/browser/ash/crostini/crostini_upgrade_available_notification.cc +++ b/chrome/browser/ash/crostini/crostini_upgrade_available_notification.cc
@@ -6,8 +6,8 @@ #include "ash/constants/notifier_catalogs.h" #include "ash/public/cpp/notification_utils.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/histogram_functions.h" #include "chrome/browser/ash/crostini/crostini_manager.h" #include "chrome/browser/notifications/notification_display_service.h"
diff --git a/chrome/browser/ash/crostini/crostini_upgrade_available_notification.h b/chrome/browser/ash/crostini/crostini_upgrade_available_notification.h index d66afa9..9fefd72a 100644 --- a/chrome/browser/ash/crostini/crostini_upgrade_available_notification.h +++ b/chrome/browser/ash/crostini/crostini_upgrade_available_notification.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "ui/message_center/public/cpp/notification.h"
diff --git a/chrome/browser/ash/crostini/crostini_upgrader.h b/chrome/browser/ash/crostini/crostini_upgrader.h index 5fcbce8..3dae588 100644 --- a/chrome/browser/ash/crostini/crostini_upgrader.h +++ b/chrome/browser/ash/crostini/crostini_upgrader.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_ASH_CROSTINI_CROSTINI_UPGRADER_H_ #define CHROME_BROWSER_ASH_CROSTINI_CROSTINI_UPGRADER_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/scoped_observation.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 43e656e..24d728f 100644 --- a/chrome/browser/ash/crostini/crostini_util.cc +++ b/chrome/browser/ash/crostini/crostini_util.cc
@@ -8,11 +8,11 @@ #include "ash/constants/app_types.h" #include "ash/constants/ash_features.h" -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/feature_list.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/histogram_functions.h" #include "base/no_destructor.h" #include "base/strings/strcat.h"
diff --git a/chrome/browser/ash/crostini/crostini_util.h b/chrome/browser/ash/crostini/crostini_util.h index b5ec631..7b6cb48c 100644 --- a/chrome/browser/ash/crostini/crostini_util.h +++ b/chrome/browser/ash/crostini/crostini_util.h
@@ -9,9 +9,9 @@ #include <utility> #include <vector> -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/values.h" #include "chrome/browser/ash/crostini/crostini_simple_types.h" #include "chrome/browser/ash/guest_os/guest_id.h"
diff --git a/chrome/browser/ash/crostini/crostini_util_unittest.cc b/chrome/browser/ash/crostini/crostini_util_unittest.cc index 72cd750..ec835fbf 100644 --- a/chrome/browser/ash/crostini/crostini_util_unittest.cc +++ b/chrome/browser/ash/crostini/crostini_util_unittest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ash/crostini/crostini_util.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "chrome/browser/ash/crostini/crostini_manager.h" #include "chrome/browser/ash/crostini/crostini_pref_names.h"
diff --git a/chrome/browser/ash/crostini/termina_installer.cc b/chrome/browser/ash/crostini/termina_installer.cc index 935b2e5..0371c484 100644 --- a/chrome/browser/ash/crostini/termina_installer.cc +++ b/chrome/browser/ash/crostini/termina_installer.cc
@@ -8,10 +8,10 @@ #include <memory> #include "base/barrier_closure.h" -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.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/crostini/termina_installer.h b/chrome/browser/ash/crostini/termina_installer.h index 5f0e9451..f4388a8 100644 --- a/chrome/browser/ash/crostini/termina_installer.h +++ b/chrome/browser/ash/crostini/termina_installer.h
@@ -7,8 +7,8 @@ #include <vector> -#include "base/callback_forward.h" #include "base/files/file_path.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "chromeos/ash/components/dbus/dlcservice/dlcservice_client.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/chrome/browser/ash/crostini/termina_installer_unittest.cc b/chrome/browser/ash/crostini/termina_installer_unittest.cc index 5c9a42c..ef49221 100644 --- a/chrome/browser/ash/crostini/termina_installer_unittest.cc +++ b/chrome/browser/ash/crostini/termina_installer_unittest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ash/crostini/termina_installer.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/test/scoped_feature_list.h" #include "base/test/task_environment.h"
diff --git a/chrome/browser/ash/cryptauth/client_app_metadata_provider_service.cc b/chrome/browser/ash/cryptauth/client_app_metadata_provider_service.cc index fa01d873..d63b7e1 100644 --- a/chrome/browser/ash/cryptauth/client_app_metadata_provider_service.cc +++ b/chrome/browser/ash/cryptauth/client_app_metadata_provider_service.cc
@@ -8,8 +8,8 @@ #include "ash/constants/ash_features.h" #include "ash/constants/ash_pref_names.h" -#include "base/callback.h" #include "base/feature_list.h" +#include "base/functional/callback.h" #include "base/linux_util.h" #include "base/logging.h" #include "base/metrics/histogram_functions.h"
diff --git a/chrome/browser/ash/customization/customization_document.cc b/chrome/browser/ash/customization/customization_document.cc index d51d315f..7a7b321 100644 --- a/chrome/browser/ash/customization/customization_document.cc +++ b/chrome/browser/ash/customization/customization_document.cc
@@ -8,10 +8,10 @@ #include <utility> #include "ash/constants/ash_paths.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/i18n/rtl.h" #include "base/json/json_reader.h" #include "base/logging.h"
diff --git a/chrome/browser/ash/customization/customization_document.h b/chrome/browser/ash/customization/customization_document.h index 8ceab974..18feb85 100644 --- a/chrome/browser/ash/customization/customization_document.h +++ b/chrome/browser/ash/customization/customization_document.h
@@ -11,7 +11,7 @@ #include <string> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/gtest_prod_util.h" #include "base/memory/singleton.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/ash/customization/customization_document_browsertest.cc b/chrome/browser/ash/customization/customization_document_browsertest.cc index 74e6c2c8..559452f 100644 --- a/chrome/browser/ash/customization/customization_document_browsertest.cc +++ b/chrome/browser/ash/customization/customization_document_browsertest.cc
@@ -6,8 +6,8 @@ #include <stddef.h> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" #include "base/threading/thread_restrictions.h"
diff --git a/chrome/browser/ash/customization/customization_document_unittest.cc b/chrome/browser/ash/customization/customization_document_unittest.cc index 3050da7..71b0517 100644 --- a/chrome/browser/ash/customization/customization_document_unittest.cc +++ b/chrome/browser/ash/customization/customization_document_unittest.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h" #include "chrome/browser/ash/app_list/app_list_syncable_service.h"
diff --git a/chrome/browser/ash/customization/customization_wallpaper_downloader.h b/chrome/browser/ash/customization/customization_wallpaper_downloader.h index ca456d21..4c7ed15 100644 --- a/chrome/browser/ash/customization/customization_wallpaper_downloader.h +++ b/chrome/browser/ash/customization/customization_wallpaper_downloader.h
@@ -7,8 +7,8 @@ #include <stddef.h> -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h" #include "base/timer/timer.h"
diff --git a/chrome/browser/ash/customization/customization_wallpaper_downloader_browsertest.cc b/chrome/browser/ash/customization/customization_wallpaper_downloader_browsertest.cc index 4bedfc43..864a05e4 100644 --- a/chrome/browser/ash/customization/customization_wallpaper_downloader_browsertest.cc +++ b/chrome/browser/ash/customization/customization_wallpaper_downloader_browsertest.cc
@@ -8,8 +8,8 @@ #include "ash/constants/ash_switches.h" #include "ash/public/cpp/wallpaper/wallpaper_controller_observer.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/ranges/algorithm.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/ash/customization/customization_wallpaper_util.cc b/chrome/browser/ash/customization/customization_wallpaper_util.cc index 05836a1b..5fc992d 100644 --- a/chrome/browser/ash/customization/customization_wallpaper_util.cc +++ b/chrome/browser/ash/customization/customization_wallpaper_util.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ash/customization/customization_wallpaper_util.h" -#include "base/bind.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/ash/dbus/chrome_features_service_provider.cc b/chrome/browser/ash/dbus/chrome_features_service_provider.cc index f3db9d6..8dfbb98 100644 --- a/chrome/browser/ash/dbus/chrome_features_service_provider.cc +++ b/chrome/browser/ash/dbus/chrome_features_service_provider.cc
@@ -12,8 +12,8 @@ #include "ash/components/arc/arc_features.h" #include "ash/constants/ash_features.h" #include "ash/constants/ash_pref_names.h" -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/metrics/field_trial.h" #include "base/ranges/algorithm.h" #include "chrome/browser/ash/crostini/crostini_features.h"
diff --git a/chrome/browser/ash/dbus/component_updater_service_provider.cc b/chrome/browser/ash/dbus/component_updater_service_provider.cc index 1a29f37..b29c45b 100644 --- a/chrome/browser/ash/dbus/component_updater_service_provider.cc +++ b/chrome/browser/ash/dbus/component_updater_service_provider.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "chrome/browser/component_updater/cros_component_installer_chromeos.h" #include "content/public/browser/browser_task_traits.h"
diff --git a/chrome/browser/ash/dbus/cryptohome_key_delegate_service_provider.cc b/chrome/browser/ash/dbus/cryptohome_key_delegate_service_provider.cc index 0309deb..997dcd9d 100644 --- a/chrome/browser/ash/dbus/cryptohome_key_delegate_service_provider.cc +++ b/chrome/browser/ash/dbus/cryptohome_key_delegate_service_provider.cc
@@ -9,9 +9,9 @@ #include <string> #include <vector> -#include "base/bind.h" #include "base/containers/contains.h" #include "base/containers/span.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "chrome/browser/ash/profiles/profile_helper.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/ash/dbus/dlp_files_policy_service_provider.cc b/chrome/browser/ash/dbus/dlp_files_policy_service_provider.cc index 48340ce..4f676a06 100644 --- a/chrome/browser/ash/dbus/dlp_files_policy_service_provider.cc +++ b/chrome/browser/ash/dbus/dlp_files_policy_service_provider.cc
@@ -7,8 +7,8 @@ #include <memory> #include <vector> -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "chrome/browser/ash/policy/dlp/dlp_files_controller.h" #include "chrome/browser/chromeos/policy/dlp/dlp_rules_manager.h"
diff --git a/chrome/browser/ash/dbus/drive_file_stream_service_provider.cc b/chrome/browser/ash/dbus/drive_file_stream_service_provider.cc index 67b16c9c5..9a38e5f 100644 --- a/chrome/browser/ash/dbus/drive_file_stream_service_provider.cc +++ b/chrome/browser/ash/dbus/drive_file_stream_service_provider.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "chromeos/components/mojo_bootstrap/pending_connection_manager.h" #include "dbus/message.h"
diff --git a/chrome/browser/ash/dbus/encrypted_reporting_service_provider.cc b/chrome/browser/ash/dbus/encrypted_reporting_service_provider.cc index 3d056f6..fa368c1d 100644 --- a/chrome/browser/ash/dbus/encrypted_reporting_service_provider.cc +++ b/chrome/browser/ash/dbus/encrypted_reporting_service_provider.cc
@@ -8,7 +8,7 @@ #include <memory> #include <utility> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted_delete_on_sequence.h" #include "base/memory/weak_ptr.h" #include "base/strings/strcat.h"
diff --git a/chrome/browser/ash/dbus/encrypted_reporting_service_provider.h b/chrome/browser/ash/dbus/encrypted_reporting_service_provider.h index b7c565f..ea4e12cd 100644 --- a/chrome/browser/ash/dbus/encrypted_reporting_service_provider.h +++ b/chrome/browser/ash/dbus/encrypted_reporting_service_provider.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/task/sequenced_task_runner.h"
diff --git a/chrome/browser/ash/dbus/kiosk_info_service_provider.cc b/chrome/browser/ash/dbus/kiosk_info_service_provider.cc index b4b96ead..fe46f37 100644 --- a/chrome/browser/ash/dbus/kiosk_info_service_provider.cc +++ b/chrome/browser/ash/dbus/kiosk_info_service_provider.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "chrome/browser/ash/app_mode/kiosk_app_manager.h" #include "dbus/message.h"
diff --git a/chrome/browser/ash/dbus/libvda_service_provider.cc b/chrome/browser/ash/dbus/libvda_service_provider.cc index 8d57fde7..39087b52 100644 --- a/chrome/browser/ash/dbus/libvda_service_provider.cc +++ b/chrome/browser/ash/dbus/libvda_service_provider.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/arc/video/gpu_arc_video_service_host.h" #include "dbus/bus.h" #include "dbus/message.h"
diff --git a/chrome/browser/ash/dbus/lock_to_single_user_service_provider.cc b/chrome/browser/ash/dbus/lock_to_single_user_service_provider.cc index 2da92a9..7e241f0 100644 --- a/chrome/browser/ash/dbus/lock_to_single_user_service_provider.cc +++ b/chrome/browser/ash/dbus/lock_to_single_user_service_provider.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ash/dbus/lock_to_single_user_service_provider.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "dbus/bus.h" #include "dbus/message.h" #include "third_party/cros_system_api/dbus/service_constants.h"
diff --git a/chrome/browser/ash/dbus/machine_learning_decision_service_provider.cc b/chrome/browser/ash/dbus/machine_learning_decision_service_provider.cc index 228ea58..d048ddc 100644 --- a/chrome/browser/ash/dbus/machine_learning_decision_service_provider.cc +++ b/chrome/browser/ash/dbus/machine_learning_decision_service_provider.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ash/dbus/machine_learning_decision_service_provider.h" -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/power/ml/user_activity_controller.h" #include "chrome/common/chrome_features.h" #include "dbus/bus.h"
diff --git a/chrome/browser/ash/dbus/mojo_connection_service_provider.cc b/chrome/browser/ash/dbus/mojo_connection_service_provider.cc index c9b65cb..fa06db82 100644 --- a/chrome/browser/ash/dbus/mojo_connection_service_provider.cc +++ b/chrome/browser/ash/dbus/mojo_connection_service_provider.cc
@@ -7,8 +7,8 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/files/scoped_file.h" +#include "base/functional/bind.h" #include "base/threading/thread_task_runner_handle.h" #include "chrome/browser/ash/net/rollback_network_config/rollback_network_config_service.h" #include "chromeos/ash/services/rollback_network_config/public/mojom/rollback_network_config.mojom.h"
diff --git a/chrome/browser/ash/dbus/profiler_status_service_provider.cc b/chrome/browser/ash/dbus/profiler_status_service_provider.cc index 5bf69a0..990373ea 100644 --- a/chrome/browser/ash/dbus/profiler_status_service_provider.cc +++ b/chrome/browser/ash/dbus/profiler_status_service_provider.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "components/metrics/call_stack_profile_metrics_provider.h" #include "dbus/message.h"
diff --git a/chrome/browser/ash/dbus/proxy_resolution_service_provider.cc b/chrome/browser/ash/dbus/proxy_resolution_service_provider.cc index 721f324..f7e8b71 100644 --- a/chrome/browser/ash/dbus/proxy_resolution_service_provider.cc +++ b/chrome/browser/ash/dbus/proxy_resolution_service_provider.cc
@@ -7,8 +7,8 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/strings/stringprintf.h" #include "base/task/single_thread_task_runner.h" #include "chrome/browser/ash/net/system_proxy_manager.h"
diff --git a/chrome/browser/ash/dbus/proxy_resolution_service_provider_browsertest.cc b/chrome/browser/ash/dbus/proxy_resolution_service_provider_browsertest.cc index 94983df..ee96a4a5 100644 --- a/chrome/browser/ash/dbus/proxy_resolution_service_provider_browsertest.cc +++ b/chrome/browser/ash/dbus/proxy_resolution_service_provider_browsertest.cc
@@ -3,8 +3,8 @@ // found in the LICENSE file. #include "base/base64.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "chrome/browser/ash/dbus/proxy_resolution_service_provider.h" #include "chrome/browser/ash/net/system_proxy_manager.h" #include "chrome/common/chrome_switches.h"
diff --git a/chrome/browser/ash/dbus/screen_lock_service_provider.cc b/chrome/browser/ash/dbus/screen_lock_service_provider.cc index 6e50a60..66eb0eb 100644 --- a/chrome/browser/ash/dbus/screen_lock_service_provider.cc +++ b/chrome/browser/ash/dbus/screen_lock_service_provider.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ash/dbus/screen_lock_service_provider.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/login/lock/screen_locker.h" #include "dbus/bus.h" #include "dbus/message.h"
diff --git a/chrome/browser/ash/dbus/smb_fs_service_provider.cc b/chrome/browser/ash/dbus/smb_fs_service_provider.cc index 1b9961be..86cf173 100644 --- a/chrome/browser/ash/dbus/smb_fs_service_provider.cc +++ b/chrome/browser/ash/dbus/smb_fs_service_provider.cc
@@ -7,8 +7,8 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/files/scoped_file.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "chromeos/components/mojo_bootstrap/pending_connection_manager.h" #include "dbus/message.h"
diff --git a/chrome/browser/ash/dbus/virtual_file_request_service_provider.cc b/chrome/browser/ash/dbus/virtual_file_request_service_provider.cc index 243ca9d..f0fda03 100644 --- a/chrome/browser/ash/dbus/virtual_file_request_service_provider.cc +++ b/chrome/browser/ash/dbus/virtual_file_request_service_provider.cc
@@ -10,8 +10,8 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/files/scoped_file.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/arc/fileapi/arc_file_system_bridge.h" #include "chrome/browser/ash/arc/session/arc_session_manager.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ash/dbus/vm/plugin_vm_service_provider.cc b/chrome/browser/ash/dbus/vm/plugin_vm_service_provider.cc index ab28fe1..0e74f61 100644 --- a/chrome/browser/ash/dbus/vm/plugin_vm_service_provider.cc +++ b/chrome/browser/ash/dbus/vm/plugin_vm_service_provider.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/plugin_vm/plugin_vm_pref_names.h" #include "chrome/browser/ash/plugin_vm/plugin_vm_util.h" #include "chrome/browser/ash/policy/core/browser_policy_connector_ash.h"
diff --git a/chrome/browser/ash/dbus/vm/vm_applications_service_provider.cc b/chrome/browser/ash/dbus/vm/vm_applications_service_provider.cc index 08e447d..9fb59f3d 100644 --- a/chrome/browser/ash/dbus/vm/vm_applications_service_provider.cc +++ b/chrome/browser/ash/dbus/vm/vm_applications_service_provider.cc
@@ -7,7 +7,7 @@ #include <string> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/strings/string_split.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ash/dbus/vm/vm_disk_management_service_provider.cc b/chrome/browser/ash/dbus/vm/vm_disk_management_service_provider.cc index b3d0b87..c78f129 100644 --- a/chrome/browser/ash/dbus/vm/vm_disk_management_service_provider.cc +++ b/chrome/browser/ash/dbus/vm/vm_disk_management_service_provider.cc
@@ -6,7 +6,7 @@ #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "chrome/browser/ash/borealis/borealis_disk_manager_dispatcher.h" #include "chrome/browser/ash/borealis/borealis_metrics.h"
diff --git a/chrome/browser/ash/dbus/vm/vm_launch_service_provider.cc b/chrome/browser/ash/dbus/vm/vm_launch_service_provider.cc index 6cd02c43..1ea4962 100644 --- a/chrome/browser/ash/dbus/vm/vm_launch_service_provider.cc +++ b/chrome/browser/ash/dbus/vm/vm_launch_service_provider.cc
@@ -8,7 +8,7 @@ #include <memory> #include <sstream> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "chrome/browser/ash/borealis/borealis_app_launcher.h" #include "chrome/browser/ash/borealis/borealis_features.h"
diff --git a/chrome/browser/ash/dbus/vm/vm_sk_forwarding_service_provider.cc b/chrome/browser/ash/dbus/vm/vm_sk_forwarding_service_provider.cc index cd5c71e..b282501d 100644 --- a/chrome/browser/ash/dbus/vm/vm_sk_forwarding_service_provider.cc +++ b/chrome/browser/ash/dbus/vm/vm_sk_forwarding_service_provider.cc
@@ -6,7 +6,7 @@ #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "chrome/browser/ash/crostini/crostini_features.h" #include "chrome/browser/ash/crostini/crostini_util.h"
diff --git a/chrome/browser/ash/device_name/device_name_applier_impl.cc b/chrome/browser/ash/device_name/device_name_applier_impl.cc index 786b4ac1..7ab163d 100644 --- a/chrome/browser/ash/device_name/device_name_applier_impl.cc +++ b/chrome/browser/ash/device_name/device_name_applier_impl.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ash/device_name/device_name_applier_impl.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/ash/device_sync/device_sync_client_factory.cc b/chrome/browser/ash/device_sync/device_sync_client_factory.cc index 9662e3d5..e2d84ba 100644 --- a/chrome/browser/ash/device_sync/device_sync_client_factory.cc +++ b/chrome/browser/ash/device_sync/device_sync_client_factory.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ash/device_sync/device_sync_client_factory.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/timer/timer.h" #include "chrome/browser/ash/attestation/soft_bind_attestation_flow_impl.h" #include "chrome/browser/ash/cryptauth/client_app_metadata_provider_service.h"
diff --git a/chrome/browser/ash/display/quirks_browsertest.cc b/chrome/browser/ash/display/quirks_browsertest.cc index b8fb5b7..f2bf76c9 100644 --- a/chrome/browser/ash/display/quirks_browsertest.cc +++ b/chrome/browser/ash/display/quirks_browsertest.cc
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/bind.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/run_loop.h" #include "base/test/bind.h"
diff --git a/chrome/browser/ash/drive/drive_integration_service.cc b/chrome/browser/ash/drive/drive_integration_service.cc index dd0408f..cebffc5 100644 --- a/chrome/browser/ash/drive/drive_integration_service.cc +++ b/chrome/browser/ash/drive/drive_integration_service.cc
@@ -11,12 +11,12 @@ #include <vector> #include "ash/constants/ash_features.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/adapters.h" #include "base/files/file_enumerator.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/hash/md5.h" #include "base/logging.h" #include "base/metrics/histogram_macros.h"
diff --git a/chrome/browser/ash/drive/drive_integration_service.h b/chrome/browser/ash/drive/drive_integration_service.h index 793d950b..12925d0 100644 --- a/chrome/browser/ash/drive/drive_integration_service.h +++ b/chrome/browser/ash/drive/drive_integration_service.h
@@ -10,8 +10,8 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/feature_list.h" +#include "base/functional/callback.h" #include "base/gtest_prod_util.h" #include "base/memory/singleton.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/ash/drive/drive_integration_service_browsertest.cc b/chrome/browser/ash/drive/drive_integration_service_browsertest.cc index 093fa6e8..ee71d4c 100644 --- a/chrome/browser/ash/drive/drive_integration_service_browsertest.cc +++ b/chrome/browser/ash/drive/drive_integration_service_browsertest.cc
@@ -5,10 +5,10 @@ #include "ash/constants/ash_features.h" #include "ash/constants/ash_switches.h" #include "base/base_switches.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/test/bind.h" #include "base/test/gmock_callback_support.h" #include "base/test/mock_callback.h"
diff --git a/chrome/browser/ash/drive/drivefs_native_message_host.cc b/chrome/browser/ash/drive/drivefs_native_message_host.cc index 9fbaeac..b41caa7b 100644 --- a/chrome/browser/ash/drive/drivefs_native_message_host.cc +++ b/chrome/browser/ash/drive/drivefs_native_message_host.cc
@@ -5,8 +5,8 @@ #include "chrome/browser/ash/drive/drivefs_native_message_host.h" #include "ash/constants/ash_features.h" -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/task/single_thread_task_runner.h" #include "chrome/browser/ash/drive/drive_integration_service.h"
diff --git a/chrome/browser/ash/drive/drivefs_test_support.cc b/chrome/browser/ash/drive/drivefs_test_support.cc index 2a29c63..733a2896 100644 --- a/chrome/browser/ash/drive/drivefs_test_support.cc +++ b/chrome/browser/ash/drive/drivefs_test_support.cc
@@ -7,8 +7,8 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/hash/md5.h" #include "base/json/json_writer.h" #include "base/path_service.h"
diff --git a/chrome/browser/ash/drive/drivefs_test_support.h b/chrome/browser/ash/drive/drivefs_test_support.h index 03d2828..66bfbd31 100644 --- a/chrome/browser/ash/drive/drivefs_test_support.h +++ b/chrome/browser/ash/drive/drivefs_test_support.h
@@ -7,8 +7,8 @@ #include <memory> -#include "base/callback_forward.h" #include "base/files/file_path.h" +#include "base/functional/callback_forward.h" #include "chromeos/ash/components/drivefs/drivefs_host.h" #include "chromeos/ash/components/drivefs/fake_drivefs.h"
diff --git a/chrome/browser/ash/drive/file_system_util.cc b/chrome/browser/ash/drive/file_system_util.cc index bb04206..9482399 100644 --- a/chrome/browser/ash/drive/file_system_util.cc +++ b/chrome/browser/ash/drive/file_system_util.cc
@@ -12,10 +12,10 @@ #include "ash/constants/ash_constants.h" #include "ash/constants/ash_switches.h" -#include "base/callback_helpers.h" #include "base/check_op.h" #include "base/command_line.h" #include "base/files/file_path.h" +#include "base/functional/callback_helpers.h" #include "base/strings/escape.h" #include "chrome/browser/ash/drive/drive_integration_service.h" #include "chrome/browser/ash/profiles/profile_helper.h"
diff --git a/chrome/browser/ash/drive/fileapi/drivefs_async_file_util.cc b/chrome/browser/ash/drive/fileapi/drivefs_async_file_util.cc index 5e7551bc..c7f1643 100644 --- a/chrome/browser/ash/drive/fileapi/drivefs_async_file_util.cc +++ b/chrome/browser/ash/drive/fileapi/drivefs_async_file_util.cc
@@ -6,9 +6,9 @@ #include <utility> -#include "base/bind.h" #include "base/files/file_enumerator.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/task/sequenced_task_runner.h" #include "chrome/browser/ash/drive/drive_integration_service.h" #include "chrome/browser/ash/drive/file_system_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 683f82d219..f0cccf5 100644 --- a/chrome/browser/ash/eche_app/eche_app_manager_factory.cc +++ b/chrome/browser/ash/eche_app/eche_app_manager_factory.cc
@@ -12,8 +12,8 @@ #include "ash/webui/eche_app_ui/eche_tray_stream_status_observer.h" #include "ash/webui/eche_app_ui/eche_uid_provider.h" #include "ash/webui/eche_app_ui/system_info.h" -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "base/strings/utf_string_conversions.h" #include "base/system/sys_info.h"
diff --git a/chrome/browser/ash/enhanced_network_tts/enhanced_network_tts_impl.cc b/chrome/browser/ash/enhanced_network_tts/enhanced_network_tts_impl.cc index cfe3d58..216f66c 100644 --- a/chrome/browser/ash/enhanced_network_tts/enhanced_network_tts_impl.cc +++ b/chrome/browser/ash/enhanced_network_tts/enhanced_network_tts_impl.cc
@@ -8,7 +8,7 @@ #include <utility> #include "base/base64.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/no_destructor.h" #include "base/strings/string_util.h"
diff --git a/chrome/browser/ash/enhanced_network_tts/enhanced_network_tts_impl_unittest.cc b/chrome/browser/ash/enhanced_network_tts/enhanced_network_tts_impl_unittest.cc index a4f10e9..8c848ea 100644 --- a/chrome/browser/ash/enhanced_network_tts/enhanced_network_tts_impl_unittest.cc +++ b/chrome/browser/ash/enhanced_network_tts/enhanced_network_tts_impl_unittest.cc
@@ -7,7 +7,7 @@ #include <map> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/test/task_environment.h" #include "chrome/browser/ash/enhanced_network_tts/enhanced_network_tts_constants.h" #include "chrome/browser/ash/enhanced_network_tts/enhanced_network_tts_test_utils.h"
diff --git a/chrome/browser/ash/eol_notification.cc b/chrome/browser/ash/eol_notification.cc index f5ea6fc..dcccde0 100644 --- a/chrome/browser/ash/eol_notification.cc +++ b/chrome/browser/ash/eol_notification.cc
@@ -6,7 +6,7 @@ #include "ash/constants/notifier_catalogs.h" #include "ash/public/cpp/system_notification_builder.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/i18n/time_formatting.h" #include "base/time/default_clock.h" #include "chrome/app/vector_icons/vector_icons.h"
diff --git a/chrome/browser/ash/exo/chrome_data_exchange_delegate.h b/chrome/browser/ash/exo/chrome_data_exchange_delegate.h index 87a28f18..95721051 100644 --- a/chrome/browser/ash/exo/chrome_data_exchange_delegate.h +++ b/chrome/browser/ash/exo/chrome_data_exchange_delegate.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_ASH_EXO_CHROME_DATA_EXCHANGE_DELEGATE_H_ #define CHROME_BROWSER_ASH_EXO_CHROME_DATA_EXCHANGE_DELEGATE_H_ -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "components/exo/data_exchange_delegate.h" namespace ash {
diff --git a/chrome/browser/ash/extensions/autotest_private/autotest_private_api.cc b/chrome/browser/ash/extensions/autotest_private/autotest_private_api.cc index 3dab4523..fb573cee 100644 --- a/chrome/browser/ash/extensions/autotest_private/autotest_private_api.cc +++ b/chrome/browser/ash/extensions/autotest_private/autotest_private_api.cc
@@ -48,10 +48,10 @@ #include "ash/wm/overview/overview_controller.h" #include "ash/wm/wm_event.h" #include "base/base64.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/compiler_specific.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/i18n/base_i18n_switches.h" #include "base/json/json_reader.h" #include "base/json/values_util.h"
diff --git a/chrome/browser/ash/extensions/default_app_order.cc b/chrome/browser/ash/extensions/default_app_order.cc index 2b2ddad..0fa1de1 100644 --- a/chrome/browser/ash/extensions/default_app_order.cc +++ b/chrome/browser/ash/extensions/default_app_order.cc
@@ -9,10 +9,10 @@ #include "ash/constants/ash_paths.h" #include "ash/public/cpp/app_list/internal_app_id_constants.h" #include "ash/webui/projector_app/public/cpp/projector_app_constants.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/json/json_file_value_serializer.h" #include "base/path_service.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/ash/extensions/external_cache.h b/chrome/browser/ash/extensions/external_cache.h index 0e1399c4..153c19d4 100644 --- a/chrome/browser/ash/extensions/external_cache.h +++ b/chrome/browser/ash/extensions/external_cache.h
@@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/values.h" #include "net/base/backoff_entry.h" #include "url/gurl.h"
diff --git a/chrome/browser/ash/extensions/external_cache_impl.cc b/chrome/browser/ash/extensions/external_cache_impl.cc index d488472..18b44db 100644 --- a/chrome/browser/ash/extensions/external_cache_impl.cc +++ b/chrome/browser/ash/extensions/external_cache_impl.cc
@@ -7,10 +7,10 @@ #include <stddef.h> #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/logging.h" #include "base/rand_util.h"
diff --git a/chrome/browser/ash/extensions/external_cache_impl.h b/chrome/browser/ash/extensions/external_cache_impl.h index 1216fa88..75c3b21 100644 --- a/chrome/browser/ash/extensions/external_cache_impl.h +++ b/chrome/browser/ash/extensions/external_cache_impl.h
@@ -10,9 +10,9 @@ #include <string> #include <vector> -#include "base/callback_forward.h" #include "base/callback_list.h" #include "base/files/file_path.h" +#include "base/functional/callback_forward.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/task/sequenced_task_runner.h"
diff --git a/chrome/browser/ash/extensions/external_cache_impl_unittest.cc b/chrome/browser/ash/extensions/external_cache_impl_unittest.cc index 84da518..af623300 100644 --- a/chrome/browser/ash/extensions/external_cache_impl_unittest.cc +++ b/chrome/browser/ash/extensions/external_cache_impl_unittest.cc
@@ -9,10 +9,10 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/task/thread_pool.h" #include "base/values.h"
diff --git a/chrome/browser/ash/extensions/file_manager/device_event_router.cc b/chrome/browser/ash/extensions/file_manager/device_event_router.cc index db7af97..42c1e09b4 100644 --- a/chrome/browser/ash/extensions/file_manager/device_event_router.cc +++ b/chrome/browser/ash/extensions/file_manager/device_event_router.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ash/extensions/file_manager/device_event_router.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/single_thread_task_runner.h" #include "chrome/browser/ash/file_manager/volume_manager.h" #include "chromeos/ash/components/disks/disk.h"
diff --git a/chrome/browser/ash/extensions/file_manager/event_router.cc b/chrome/browser/ash/extensions/file_manager/event_router.cc index dfc0f3d..bdedc56 100644 --- a/chrome/browser/ash/extensions/file_manager/event_router.cc +++ b/chrome/browser/ash/extensions/file_manager/event_router.cc
@@ -16,12 +16,12 @@ #include "ash/constants/ash_pref_names.h" #include "ash/public/cpp/tablet_mode.h" #include "ash/webui/file_manager/file_manager_ui.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/containers/adapters.h" #include "base/containers/contains.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/metrics/histogram.h" #include "base/metrics/histogram_macros.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/ash/extensions/file_manager/file_manager_private_apitest.cc b/chrome/browser/ash/extensions/file_manager/file_manager_private_apitest.cc index ca322c42..d2dabb2 100644 --- a/chrome/browser/ash/extensions/file_manager/file_manager_private_apitest.cc +++ b/chrome/browser/ash/extensions/file_manager/file_manager_private_apitest.cc
@@ -9,9 +9,9 @@ #include "ash/constants/ash_features.h" #include "base/base64.h" -#include "base/bind.h" #include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/path_service.h" #include "base/run_loop.h" #include "base/strings/strcat.h"
diff --git a/chrome/browser/ash/extensions/file_manager/file_stream_md5_digester.cc b/chrome/browser/ash/extensions/file_manager/file_stream_md5_digester.cc index 60be2da..0419cb7 100644 --- a/chrome/browser/ash/extensions/file_manager/file_stream_md5_digester.cc +++ b/chrome/browser/ash/extensions/file_manager/file_stream_md5_digester.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "net/base/net_errors.h" #include "storage/browser/file_system/file_stream_reader.h"
diff --git a/chrome/browser/ash/extensions/file_manager/file_stream_md5_digester.h b/chrome/browser/ash/extensions/file_manager/file_stream_md5_digester.h index 8c94983..7f273897 100644 --- a/chrome/browser/ash/extensions/file_manager/file_stream_md5_digester.h +++ b/chrome/browser/ash/extensions/file_manager/file_stream_md5_digester.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/hash/md5.h" #include "base/memory/ref_counted.h" #include "net/base/io_buffer.h"
diff --git a/chrome/browser/ash/extensions/file_manager/private_api_dialog.cc b/chrome/browser/ash/extensions/file_manager/private_api_dialog.cc index f4db289..3589205 100644 --- a/chrome/browser/ash/extensions/file_manager/private_api_dialog.cc +++ b/chrome/browser/ash/extensions/file_manager/private_api_dialog.cc
@@ -9,8 +9,8 @@ #include "ash/components/arc/mojom/intent_helper.mojom.h" #include "ash/components/arc/session/arc_bridge_service.h" #include "ash/components/arc/session/arc_service_manager.h" -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "chrome/browser/ash/arc/fileapi/arc_select_files_util.h" #include "chrome/browser/ash/drive/drive_integration_service.h"
diff --git a/chrome/browser/ash/extensions/file_manager/private_api_drive.cc b/chrome/browser/ash/extensions/file_manager/private_api_drive.cc index cb88147..6866d16 100644 --- a/chrome/browser/ash/extensions/file_manager/private_api_drive.cc +++ b/chrome/browser/ash/extensions/file_manager/private_api_drive.cc
@@ -11,9 +11,9 @@ #include "ash/constants/ash_features.h" #include "base/base64.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/i18n/string_search.h" #include "base/memory/ptr_util.h" #include "base/metrics/histogram_functions.h"
diff --git a/chrome/browser/ash/extensions/file_manager/private_api_file_system.cc b/chrome/browser/ash/extensions/file_manager/private_api_file_system.cc index e1cd0b8..1d00bb5 100644 --- a/chrome/browser/ash/extensions/file_manager/private_api_file_system.cc +++ b/chrome/browser/ash/extensions/file_manager/private_api_file_system.cc
@@ -18,10 +18,10 @@ #include "ash/constants/ash_features.h" #include "ash/constants/ash_pref_names.h" #include "base/barrier_callback.h" -#include "base/bind.h" #include "base/files/file.h" #include "base/files/file_enumerator.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/notreached.h" #include "base/numerics/safe_conversions.h"
diff --git a/chrome/browser/ash/extensions/file_manager/private_api_file_system.h b/chrome/browser/ash/extensions/file_manager/private_api_file_system.h index 7c65b13..b658d6b 100644 --- a/chrome/browser/ash/extensions/file_manager/private_api_file_system.h +++ b/chrome/browser/ash/extensions/file_manager/private_api_file_system.h
@@ -15,7 +15,7 @@ #include <string> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "base/types/expected.h" #include "chrome/browser/ash/extensions/file_manager/logged_extension_function.h"
diff --git a/chrome/browser/ash/extensions/file_manager/private_api_guest_os.cc b/chrome/browser/ash/extensions/file_manager/private_api_guest_os.cc index 497483e..13679c0e 100644 --- a/chrome/browser/ash/extensions/file_manager/private_api_guest_os.cc +++ b/chrome/browser/ash/extensions/file_manager/private_api_guest_os.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ash/extensions/file_manager/private_api_guest_os.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/stringprintf.h" #include "base/values.h" #include "chrome/browser/ash/extensions/file_manager/private_api_util.h"
diff --git a/chrome/browser/ash/extensions/file_manager/private_api_media_parser.cc b/chrome/browser/ash/extensions/file_manager/private_api_media_parser.cc index 615b6a41..94d5e455 100644 --- a/chrome/browser/ash/extensions/file_manager/private_api_media_parser.cc +++ b/chrome/browser/ash/extensions/file_manager/private_api_media_parser.cc
@@ -5,7 +5,7 @@ #include "chrome/browser/ash/extensions/file_manager/private_api_media_parser.h" #include "base/base64.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/numerics/safe_conversions.h" #include "base/strings/strcat.h" #include "base/strings/string_piece.h"
diff --git a/chrome/browser/ash/extensions/file_manager/private_api_misc.cc b/chrome/browser/ash/extensions/file_manager/private_api_misc.cc index 504bead..a53a6454 100644 --- a/chrome/browser/ash/extensions/file_manager/private_api_misc.cc +++ b/chrome/browser/ash/extensions/file_manager/private_api_misc.cc
@@ -18,10 +18,10 @@ #include "ash/public/cpp/style/dark_light_mode_controller.h" #include "ash/public/cpp/style/scoped_light_mode_as_default.h" #include "ash/public/cpp/tablet_mode.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/files/file.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_refptr.h" #include "base/no_destructor.h"
diff --git a/chrome/browser/ash/extensions/file_manager/private_api_mount.cc b/chrome/browser/ash/extensions/file_manager/private_api_mount.cc index 24be937e2..0b18b1f 100644 --- a/chrome/browser/ash/extensions/file_manager/private_api_mount.cc +++ b/chrome/browser/ash/extensions/file_manager/private_api_mount.cc
@@ -7,11 +7,11 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/feature_list.h" #include "base/files/file_util.h" #include "base/format_macros.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/memory/weak_ptr.h" #include "base/strings/strcat.h"
diff --git a/chrome/browser/ash/extensions/file_manager/private_api_sharesheet.cc b/chrome/browser/ash/extensions/file_manager/private_api_sharesheet.cc index 4a8146f..fa93558 100644 --- a/chrome/browser/ash/extensions/file_manager/private_api_sharesheet.cc +++ b/chrome/browser/ash/extensions/file_manager/private_api_sharesheet.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ash/extensions/file_manager/private_api_sharesheet.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "chrome/browser/ash/drive/file_system_util.h" #include "chrome/browser/ash/extensions/file_manager/private_api_util.h" #include "chrome/browser/ash/file_manager/fileapi_util.h"
diff --git a/chrome/browser/ash/extensions/file_manager/private_api_tasks.cc b/chrome/browser/ash/extensions/file_manager/private_api_tasks.cc index d2fcae8..106275f5 100644 --- a/chrome/browser/ash/extensions/file_manager/private_api_tasks.cc +++ b/chrome/browser/ash/extensions/file_manager/private_api_tasks.cc
@@ -12,8 +12,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/drive/file_system_util.h" #include "chrome/browser/ash/file_manager/app_service_file_tasks.h" #include "chrome/browser/ash/file_manager/file_tasks.h"
diff --git a/chrome/browser/ash/extensions/file_manager/private_api_util.cc b/chrome/browser/ash/extensions/file_manager/private_api_util.cc index 8150e7909..cd5ab36 100644 --- a/chrome/browser/ash/extensions/file_manager/private_api_util.cc +++ b/chrome/browser/ash/extensions/file_manager/private_api_util.cc
@@ -10,8 +10,8 @@ #include <utility> #include "ash/constants/ash_features.h" -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/notreached.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/ash/extensions/file_manager/private_api_util.h b/chrome/browser/ash/extensions/file_manager/private_api_util.h index 4fd98b8..a386e49f 100644 --- a/chrome/browser/ash/extensions/file_manager/private_api_util.h +++ b/chrome/browser/ash/extensions/file_manager/private_api_util.h
@@ -10,8 +10,8 @@ #include <memory> #include <vector> -#include "base/callback.h" -#include "base/callback_forward.h" +#include "base/functional/callback.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "base/strings/strcat.h" #include "chrome/browser/ash/file_system_provider/icon_set.h"
diff --git a/chrome/browser/ash/extensions/file_manager/system_notification_manager.cc b/chrome/browser/ash/extensions/file_manager/system_notification_manager.cc index 56dc022..cf1fac83 100644 --- a/chrome/browser/ash/extensions/file_manager/system_notification_manager.cc +++ b/chrome/browser/ash/extensions/file_manager/system_notification_manager.cc
@@ -7,7 +7,7 @@ #include "ash/components/arc/arc_prefs.h" #include "ash/resources/vector_icons/vector_icons.h" #include "ash/webui/file_manager/file_manager_ui.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted.h" #include "base/metrics/histogram_macros.h" #include "base/numerics/safe_conversions.h"
diff --git a/chrome/browser/ash/extensions/input_method_api.cc b/chrome/browser/ash/extensions/input_method_api.cc index 5f36e93..017eff4 100644 --- a/chrome/browser/ash/extensions/input_method_api.cc +++ b/chrome/browser/ash/extensions/input_method_api.cc
@@ -10,8 +10,8 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/lazy_instance.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ash/extensions/install_limiter.cc b/chrome/browser/ash/extensions/install_limiter.cc index 850d26b8..30252cb 100644 --- a/chrome/browser/ash/extensions/install_limiter.cc +++ b/chrome/browser/ash/extensions/install_limiter.cc
@@ -6,8 +6,8 @@ #include <string> -#include "base/bind.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/task/thread_pool.h" #include "chrome/browser/ash/extensions/install_limiter_factory.h" #include "extensions/browser/extensions_browser_client.h"
diff --git a/chrome/browser/ash/extensions/login_screen_ui/ui_handler.h b/chrome/browser/ash/extensions/login_screen_ui/ui_handler.h index 3a6ce8f..e066e822 100644 --- a/chrome/browser/ash/extensions/login_screen_ui/ui_handler.h +++ b/chrome/browser/ash/extensions/login_screen_ui/ui_handler.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/scoped_observation.h" // TODO(https://crbug.com/1164001): use forward declaration.
diff --git a/chrome/browser/ash/extensions/signin_screen_extensions_external_loader.cc b/chrome/browser/ash/extensions/signin_screen_extensions_external_loader.cc index a621eedf..2ecd67f 100644 --- a/chrome/browser/ash/extensions/signin_screen_extensions_external_loader.cc +++ b/chrome/browser/ash/extensions/signin_screen_extensions_external_loader.cc
@@ -8,8 +8,8 @@ #include <utility> #include "ash/constants/ash_paths.h" -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/scoped_refptr.h" #include "base/path_service.h"
diff --git a/chrome/browser/ash/extensions/speech/speech_recognition_private_manager.h b/chrome/browser/ash/extensions/speech/speech_recognition_private_manager.h index 3e10bc66..0c9a516 100644 --- a/chrome/browser/ash/extensions/speech/speech_recognition_private_manager.h +++ b/chrome/browser/ash/extensions/speech/speech_recognition_private_manager.h
@@ -9,7 +9,7 @@ #include <memory> #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "chrome/browser/ash/extensions/speech/speech_recognition_private_delegate.h" #include "chrome/browser/speech/speech_recognition_constants.h" #include "components/keyed_service/core/keyed_service.h"
diff --git a/chrome/browser/ash/extensions/speech/speech_recognition_private_recognizer.h b/chrome/browser/ash/extensions/speech/speech_recognition_private_recognizer.h index 1cc4002..6065236b 100644 --- a/chrome/browser/ash/extensions/speech/speech_recognition_private_recognizer.h +++ b/chrome/browser/ash/extensions/speech/speech_recognition_private_recognizer.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/speech/speech_recognition_constants.h" #include "chrome/browser/speech/speech_recognizer_delegate.h"
diff --git a/chrome/browser/ash/extensions/test_external_cache.cc b/chrome/browser/ash/extensions/test_external_cache.cc index cfbc3833..a6fc2d3 100644 --- a/chrome/browser/ash/extensions/test_external_cache.cc +++ b/chrome/browser/ash/extensions/test_external_cache.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/values.h" #include "chrome/browser/ash/extensions/external_cache_delegate.h" #include "chrome/browser/extensions/external_provider_impl.h"
diff --git a/chrome/browser/ash/extensions/users_private/users_private_api.cc b/chrome/browser/ash/extensions/users_private/users_private_api.cc index 89499205..7928fe1 100644 --- a/chrome/browser/ash/extensions/users_private/users_private_api.cc +++ b/chrome/browser/ash/extensions/users_private/users_private_api.cc
@@ -9,8 +9,8 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/ash/extensions/users_private/users_private_delegate.h"
diff --git a/chrome/browser/ash/extensions/users_private/users_private_apitest.cc b/chrome/browser/ash/extensions/users_private/users_private_apitest.cc index b03804d..da83f235 100644 --- a/chrome/browser/ash/extensions/users_private/users_private_apitest.cc +++ b/chrome/browser/ash/extensions/users_private/users_private_apitest.cc
@@ -5,8 +5,8 @@ #include <memory> #include <vector> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/ranges/algorithm.h" #include "base/values.h"
diff --git a/chrome/browser/ash/external_metrics.cc b/chrome/browser/ash/external_metrics.cc index f357bacf..af560ca 100644 --- a/chrome/browser/ash/external_metrics.cc +++ b/chrome/browser/ash/external_metrics.cc
@@ -12,8 +12,8 @@ #include <vector> #include "ash/constants/ash_switches.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/metrics/histogram.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/statistics_recorder.h"
diff --git a/chrome/browser/ash/file_manager/app_service_file_tasks.cc b/chrome/browser/ash/file_manager/app_service_file_tasks.cc index bddadabe..977c745 100644 --- a/chrome/browser/ash/file_manager/app_service_file_tasks.cc +++ b/chrome/browser/ash/file_manager/app_service_file_tasks.cc
@@ -11,10 +11,10 @@ #include "ash/constants/ash_features.h" #include "ash/webui/file_manager/url_constants.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/feature_list.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/ranges/algorithm.h" #include "base/strings/string_util.h"
diff --git a/chrome/browser/ash/file_manager/arc_file_tasks.cc b/chrome/browser/ash/file_manager/arc_file_tasks.cc index 391de8c..0a56cd9 100644 --- a/chrome/browser/ash/file_manager/arc_file_tasks.cc +++ b/chrome/browser/ash/file_manager/arc_file_tasks.cc
@@ -15,9 +15,9 @@ #include "ash/components/arc/mojom/intent_helper.mojom.h" #include "ash/components/arc/session/arc_bridge_service.h" #include "ash/components/arc/session/arc_service_manager.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/metrics/histogram_macros.h" #include "base/strings/string_util.h"
diff --git a/chrome/browser/ash/file_manager/copy_or_move_io_task.cc b/chrome/browser/ash/file_manager/copy_or_move_io_task.cc index cb96f344..6e93961 100644 --- a/chrome/browser/ash/file_manager/copy_or_move_io_task.cc +++ b/chrome/browser/ash/file_manager/copy_or_move_io_task.cc
@@ -9,9 +9,9 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/check_op.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "chrome/browser/ash/file_manager/copy_or_move_io_task_impl.h" #include "chrome/browser/ash/file_manager/copy_or_move_io_task_scanning_impl.h" #include "chrome/browser/ash/file_manager/io_task.h"
diff --git a/chrome/browser/ash/file_manager/copy_or_move_io_task_impl.cc b/chrome/browser/ash/file_manager/copy_or_move_io_task_impl.cc index ff7087e..5f6fa2f0 100644 --- a/chrome/browser/ash/file_manager/copy_or_move_io_task_impl.cc +++ b/chrome/browser/ash/file_manager/copy_or_move_io_task_impl.cc
@@ -5,16 +5,17 @@ #include "chrome/browser/ash/file_manager/copy_or_move_io_task_impl.h" #include <cmath> +#include <cstdint> #include <memory> #include <string> #include <vector> -#include "base/bind.h" -#include "base/callback.h" #include "base/check_op.h" #include "base/files/file.h" #include "base/files/file_error_or.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/metrics/histogram_macros.h" #include "base/system/sys_info.h" #include "base/task/bind_post_task.h" @@ -131,6 +132,9 @@ } // namespace +ItemProgress::ItemProgress() = default; +ItemProgress::~ItemProgress() = default; + CopyOrMoveIOTaskImpl::CopyOrMoveIOTaskImpl( OperationType type, ProgressStatus& progress, @@ -142,7 +146,8 @@ : progress_(progress), profile_(profile), file_system_context_(file_system_context), - source_sizes_(progress_.sources.size()) { + source_sizes_(progress_.sources.size()), + item_progresses(progress_.sources.size()) { DCHECK(type == OperationType::kCopy || type == OperationType::kMove); if (!destination_file_names.empty()) { DCHECK_EQ(progress_.sources.size(), destination_file_names.size()); @@ -365,8 +370,6 @@ } progress_.outputs.emplace_back(destination_result.value(), absl::nullopt); - last_progress_size_ = 0; - const storage::FileSystemURL& source_url = progress_.sources[idx].url; const storage::FileSystemURL& destination_url = destination_result.value(); @@ -415,20 +418,37 @@ // current thread. auto progress_callback = google_apis::CreateRelayCallback( base::BindRepeating(&CopyOrMoveIOTaskImpl::OnCopyOrMoveProgress, - weak_ptr_factory_.GetWeakPtr())); + weak_ptr_factory_.GetWeakPtr(), idx)); return std::make_unique<FileManagerCopyOrMoveHookDelegate>(progress_callback); } void CopyOrMoveIOTaskImpl::OnCopyOrMoveProgress( + size_t idx, FileManagerCopyOrMoveHookDelegate::ProgressType type, const storage::FileSystemURL& source_url, const storage::FileSystemURL& destination_url, int64_t size) { + std::string destination_path = destination_url.path().AsUTF8Unsafe(); + auto& [individual_progress, aggregate_progress] = item_progresses[idx]; // |size| is only valid for kProgress. - if (type != FileManagerCopyOrMoveHookDelegate::ProgressType::kProgress) + if (type != FileManagerCopyOrMoveHookDelegate::ProgressType::kProgress) { + if (type == FileManagerCopyOrMoveHookDelegate::ProgressType::kBegin) { + individual_progress[destination_path] = 0; + } else if (type == + FileManagerCopyOrMoveHookDelegate::ProgressType::kEndCopy || + type == + FileManagerCopyOrMoveHookDelegate::ProgressType::kEndMove) { + individual_progress.erase(destination_path); + } return; + } - progress_.bytes_transferred += size - last_progress_size_; + int64_t& last_size = individual_progress.at(destination_path); + int64_t delta = size - last_size; + last_size = size; + + aggregate_progress += delta; + progress_.bytes_transferred += delta; speedometer_.Update(progress_.bytes_transferred); const double remaining_seconds = speedometer_.GetRemainingSeconds(); @@ -438,7 +458,6 @@ progress_.remaining_seconds = remaining_seconds; } - last_progress_size_ = size; progress_callback_.Run(progress_); } @@ -449,7 +468,16 @@ operation_id_.reset(); progress_.sources[idx].error = error; progress_.outputs[idx].error = error; - progress_.bytes_transferred += source_sizes_[idx] - last_progress_size_; + + auto& [individual_progress, aggregate_progress] = item_progresses[idx]; + individual_progress.clear(); + + // Some copy and move operations (depending on the source and destination + // filesystems) don't support progress reporting yet, so we rely on setting + // bytes_transferred only when each item completes. By also deducting + // `aggregate_progress` from bytes_transferred, we ensure that both operations + // that report progress and those that don't are supported. + progress_.bytes_transferred += source_sizes_[idx] - aggregate_progress; if (idx < progress_.sources.size() - 1) { progress_callback_.Run(progress_);
diff --git a/chrome/browser/ash/file_manager/copy_or_move_io_task_impl.h b/chrome/browser/ash/file_manager/copy_or_move_io_task_impl.h index c9d0610..52b0ac8 100644 --- a/chrome/browser/ash/file_manager/copy_or_move_io_task_impl.h +++ b/chrome/browser/ash/file_manager/copy_or_move_io_task_impl.h
@@ -5,10 +5,12 @@ #ifndef CHROME_BROWSER_ASH_FILE_MANAGER_COPY_OR_MOVE_IO_TASK_IMPL_H_ #define CHROME_BROWSER_ASH_FILE_MANAGER_COPY_OR_MOVE_IO_TASK_IMPL_H_ +#include <cstdint> #include <memory> #include <string> #include <vector> +#include "base/containers/flat_map.h" #include "base/files/file.h" #include "base/files/file_error_or.h" #include "base/memory/weak_ptr.h" @@ -23,6 +25,19 @@ namespace file_manager::io_task { +// Moving or copying a folder with multiple nested files and folders is treated +// as a single operation (moving or copying the top level folder). However, +// progress is reported at an individual level (that is, for each nested file). +// This struct lets this io_task keep track of both the aggregate progress of +// top folders and that of their individual items. +struct ItemProgress { + ItemProgress(); + ~ItemProgress(); + + base::flat_map<std::string, int64_t> individual_progress; + int64_t aggregate_progress = 0; +}; + // This class represents a copy or move operation. It checks whether there is // enough space for the copy or move to occur, and also sends the copy or move // requests to the storage backend. @@ -73,6 +88,7 @@ // `FileManagerCopyOrMoveHookDelegate` to one understandable by // `progress_callback_`. void OnCopyOrMoveProgress( + size_t idx, FileManagerCopyOrMoveHookDelegate::ProgressType type, const storage::FileSystemURL& source_url, const storage::FileSystemURL& destination_url, @@ -133,9 +149,9 @@ // std::vector::size here MUST be the same as progress_.sources size. std::vector<base::FilePath> destination_file_names_; - // Stores the size reported by the last progress update so we can compute the + // Stores the sizes reported by the last progress update so we can compute the // delta on the next progress update. - int64_t last_progress_size_; + std::vector<ItemProgress> item_progresses; // Stores the id of the copy or move operation if one is in progress. Used so // the transfer can be cancelled.
diff --git a/chrome/browser/ash/file_manager/copy_or_move_io_task_scanning_impl.cc b/chrome/browser/ash/file_manager/copy_or_move_io_task_scanning_impl.cc index 06b871a4..7c7a553 100644 --- a/chrome/browser/ash/file_manager/copy_or_move_io_task_scanning_impl.cc +++ b/chrome/browser/ash/file_manager/copy_or_move_io_task_scanning_impl.cc
@@ -9,11 +9,11 @@ #include <string> #include <vector> -#include "base/bind.h" -#include "base/callback.h" #include "base/check_op.h" #include "base/files/file.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/ranges/algorithm.h" #include "chrome/browser/ash/file_manager/file_manager_copy_or_move_hook_delegate.h" #include "chrome/browser/ash/file_manager/file_manager_copy_or_move_hook_file_check_delegate.h" @@ -248,7 +248,7 @@ // callbacks are executed on the current (i.e., UI) thread. auto progress_callback = google_apis::CreateRelayCallback( base::BindRepeating(&CopyOrMoveIOTaskScanningImpl::OnCopyOrMoveProgress, - weak_ptr_factory_.GetWeakPtr())); + weak_ptr_factory_.GetWeakPtr(), idx)); if (report_only_scans_) { // For report-only scans, no blocking should be performed, so we use the
diff --git a/chrome/browser/ash/file_manager/copy_or_move_io_task_scanning_impl.h b/chrome/browser/ash/file_manager/copy_or_move_io_task_scanning_impl.h index 1bb5b6b..ce022f6e 100644 --- a/chrome/browser/ash/file_manager/copy_or_move_io_task_scanning_impl.h +++ b/chrome/browser/ash/file_manager/copy_or_move_io_task_scanning_impl.h
@@ -9,8 +9,8 @@ #include <string> #include <vector> -#include "base/callback_forward.h" #include "base/files/file.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ash/file_manager/copy_or_move_io_task_impl.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ash/file_manager/copy_or_move_io_task_unittest.cc b/chrome/browser/ash/file_manager/copy_or_move_io_task_unittest.cc index 1935e63..11e9b11 100644 --- a/chrome/browser/ash/file_manager/copy_or_move_io_task_unittest.cc +++ b/chrome/browser/ash/file_manager/copy_or_move_io_task_unittest.cc
@@ -7,13 +7,13 @@ #include <algorithm> #include <memory> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/files/file.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/rand_util.h" #include "base/run_loop.h" #include "base/test/gmock_callback_support.h"
diff --git a/chrome/browser/ash/file_manager/delete_io_task.cc b/chrome/browser/ash/file_manager/delete_io_task.cc index bb178ecf..60fab43 100644 --- a/chrome/browser/ash/file_manager/delete_io_task.cc +++ b/chrome/browser/ash/file_manager/delete_io_task.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/callback.h" #include "base/files/file.h" +#include "base/functional/callback.h" #include "base/task/sequenced_task_runner.h" #include "chrome/browser/ash/file_manager/io_task_util.h" #include "content/public/browser/browser_task_traits.h"
diff --git a/chrome/browser/ash/file_manager/delete_io_task.h b/chrome/browser/ash/file_manager/delete_io_task.h index 321da2c..31c4f4cd 100644 --- a/chrome/browser/ash/file_manager/delete_io_task.h +++ b/chrome/browser/ash/file_manager/delete_io_task.h
@@ -7,9 +7,9 @@ #include <vector> -#include "base/callback.h" #include "base/files/file.h" #include "base/files/file_error_or.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ash/file_manager/io_task.h" #include "storage/browser/file_system/file_system_context.h"
diff --git a/chrome/browser/ash/file_manager/documents_provider_root_manager.cc b/chrome/browser/ash/file_manager/documents_provider_root_manager.cc index 88edefac..b0ea3ef 100644 --- a/chrome/browser/ash/file_manager/documents_provider_root_manager.cc +++ b/chrome/browser/ash/file_manager/documents_provider_root_manager.cc
@@ -14,7 +14,7 @@ #include "ash/components/arc/arc_features.h" #include "ash/components/arc/mojom/bitmap.mojom.h" #include "base/base64.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/string_util.h" #include "chrome/browser/ash/arc/fileapi/arc_file_system_operation_runner.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ash/file_manager/empty_trash_io_task.cc b/chrome/browser/ash/file_manager/empty_trash_io_task.cc index ca82a74..d973075 100644 --- a/chrome/browser/ash/file_manager/empty_trash_io_task.cc +++ b/chrome/browser/ash/file_manager/empty_trash_io_task.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/task/bind_post_task.h" #include "base/task/sequenced_task_runner.h" #include "chrome/browser/ash/file_manager/io_task_util.h"
diff --git a/chrome/browser/ash/file_manager/external_filesystem_apitest.cc b/chrome/browser/ash/file_manager/external_filesystem_apitest.cc index 35a3cf8..9f16989 100644 --- a/chrome/browser/ash/file_manager/external_filesystem_apitest.cc +++ b/chrome/browser/ash/file_manager/external_filesystem_apitest.cc
@@ -5,10 +5,10 @@ #include <memory> #include "ash/constants/ash_switches.h" -#include "base/bind.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/path_service.h" #include "base/strings/strcat.h" #include "base/strings/string_util.h"
diff --git a/chrome/browser/ash/file_manager/fake_disk_mount_manager.cc b/chrome/browser/ash/file_manager/fake_disk_mount_manager.cc index c40f2113..08d3f35 100644 --- a/chrome/browser/ash/file_manager/fake_disk_mount_manager.cc +++ b/chrome/browser/ash/file_manager/fake_disk_mount_manager.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "chromeos/ash/components/disks/disk.h" namespace file_manager {
diff --git a/chrome/browser/ash/file_manager/fake_disk_mount_manager.h b/chrome/browser/ash/file_manager/fake_disk_mount_manager.h index a7cf641..c9462abed 100644 --- a/chrome/browser/ash/file_manager/fake_disk_mount_manager.h +++ b/chrome/browser/ash/file_manager/fake_disk_mount_manager.h
@@ -10,8 +10,8 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/containers/queue.h" +#include "base/functional/callback.h" #include "base/observer_list.h" #include "chromeos/ash/components/dbus/cros_disks/cros_disks_client.h" #include "chromeos/ash/components/disks/disk_mount_manager.h"
diff --git a/chrome/browser/ash/file_manager/file_browser_handlers.cc b/chrome/browser/ash/file_manager/file_browser_handlers.cc index 336086f..13ac8b2 100644 --- a/chrome/browser/ash/file_manager/file_browser_handlers.cc +++ b/chrome/browser/ash/file_manager/file_browser_handlers.cc
@@ -10,10 +10,10 @@ #include <set> #include <utility> -#include "base/bind.h" #include "base/command_line.h" #include "base/containers/contains.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/i18n/case_conversion.h" #include "base/strings/escape.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ash/file_manager/file_browser_handlers.h b/chrome/browser/ash/file_manager/file_browser_handlers.h index 6c6c4654..5fe44e4c 100644 --- a/chrome/browser/ash/file_manager/file_browser_handlers.h +++ b/chrome/browser/ash/file_manager/file_browser_handlers.h
@@ -11,7 +11,7 @@ #include <string> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "chrome/browser/ash/file_manager/file_tasks.h" class Profile;
diff --git a/chrome/browser/ash/file_manager/file_manager_browsertest_base.cc b/chrome/browser/ash/file_manager/file_manager_browsertest_base.cc index ee534ee..a71ad12 100644 --- a/chrome/browser/ash/file_manager/file_manager_browsertest_base.cc +++ b/chrome/browser/ash/file_manager/file_manager_browsertest_base.cc
@@ -23,12 +23,12 @@ #include "ash/public/cpp/test/shell_test_api.h" #include "ash/style/dark_light_mode_controller_impl.h" #include "ash/webui/file_manager/url_constants.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/circular_deque.h" #include "base/containers/contains.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/json/json_reader.h" #include "base/json/json_value_converter.h" #include "base/json/json_writer.h"
diff --git a/chrome/browser/ash/file_manager/file_manager_copy_or_move_hook_file_check_delegate.cc b/chrome/browser/ash/file_manager/file_manager_copy_or_move_hook_file_check_delegate.cc index ef2c739..d549f16 100644 --- a/chrome/browser/ash/file_manager/file_manager_copy_or_move_hook_file_check_delegate.cc +++ b/chrome/browser/ash/file_manager/file_manager_copy_or_move_hook_file_check_delegate.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ash/file_manager/file_manager_copy_or_move_hook_file_check_delegate.h" -#include "base/callback.h" #include "base/files/file.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "google_apis/common/task_util.h" #include "storage/browser/file_system/file_system_context.h"
diff --git a/chrome/browser/ash/file_manager/file_manager_copy_or_move_hook_file_check_delegate.h b/chrome/browser/ash/file_manager/file_manager_copy_or_move_hook_file_check_delegate.h index 2141278b..b0b7c08 100644 --- a/chrome/browser/ash/file_manager/file_manager_copy_or_move_hook_file_check_delegate.h +++ b/chrome/browser/ash/file_manager/file_manager_copy_or_move_hook_file_check_delegate.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_ASH_FILE_MANAGER_FILE_MANAGER_COPY_OR_MOVE_HOOK_FILE_CHECK_DELEGATE_H_ #define CHROME_BROWSER_ASH_FILE_MANAGER_FILE_MANAGER_COPY_OR_MOVE_HOOK_FILE_CHECK_DELEGATE_H_ -#include "base/callback_forward.h" #include "base/files/file.h" +#include "base/functional/callback_forward.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ash/file_manager/file_manager_copy_or_move_hook_delegate.h"
diff --git a/chrome/browser/ash/file_manager/file_tasks.cc b/chrome/browser/ash/file_manager/file_tasks.cc index 2a4807b..a89828d 100644 --- a/chrome/browser/ash/file_manager/file_tasks.cc +++ b/chrome/browser/ash/file_manager/file_tasks.cc
@@ -14,7 +14,6 @@ #include "apps/launcher.h" #include "ash/constants/ash_features.h" #include "ash/webui/file_manager/url_constants.h" -#include "base/bind.h" #include "base/containers/contains.h" #include "base/feature_list.h" #include "base/functional/bind.h"
diff --git a/chrome/browser/ash/file_manager/file_tasks.h b/chrome/browser/ash/file_manager/file_tasks.h index dd6823e..0e62348 100644 --- a/chrome/browser/ash/file_manager/file_tasks.h +++ b/chrome/browser/ash/file_manager/file_tasks.h
@@ -98,7 +98,7 @@ #include <string> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "chrome/browser/ui/webui/ash/office_fallback/office_fallback_dialog.h" #include "chrome/common/extensions/api/file_manager_private.h" #include "components/prefs/pref_registry_simple.h"
diff --git a/chrome/browser/ash/file_manager/file_tasks_browsertest.cc b/chrome/browser/ash/file_manager/file_tasks_browsertest.cc index e00300f..334ca8c 100644 --- a/chrome/browser/ash/file_manager/file_tasks_browsertest.cc +++ b/chrome/browser/ash/file_manager/file_tasks_browsertest.cc
@@ -7,11 +7,11 @@ #include "ash/constants/ash_features.h" #include "ash/webui/file_manager/url_constants.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/files/file.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/path_service.h" #include "base/ranges/algorithm.h" #include "base/strings/strcat.h"
diff --git a/chrome/browser/ash/file_manager/file_tasks_notifier.cc b/chrome/browser/ash/file_manager/file_tasks_notifier.cc index 26c843b..3d5a6b3 100644 --- a/chrome/browser/ash/file_manager/file_tasks_notifier.cc +++ b/chrome/browser/ash/file_manager/file_tasks_notifier.cc
@@ -8,8 +8,8 @@ #include <utility> #include "base/barrier_closure.h" -#include "base/callback.h" #include "base/files/file_util.h" +#include "base/functional/callback.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "chrome/browser/ash/drive/drive_integration_service.h"
diff --git a/chrome/browser/ash/file_manager/file_tasks_notifier.h b/chrome/browser/ash/file_manager/file_tasks_notifier.h index 325c95ed..afc1ffa 100644 --- a/chrome/browser/ash/file_manager/file_tasks_notifier.h +++ b/chrome/browser/ash/file_manager/file_tasks_notifier.h
@@ -7,7 +7,7 @@ #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/observer_list.h" #include "chrome/browser/ash/file_manager/file_tasks_observer.h" #include "chromeos/ash/components/drivefs/mojom/drivefs.mojom-forward.h"
diff --git a/chrome/browser/ash/file_manager/file_tasks_unittest.cc b/chrome/browser/ash/file_manager/file_tasks_unittest.cc index 03c1ec9..30a95be 100644 --- a/chrome/browser/ash/file_manager/file_tasks_unittest.cc +++ b/chrome/browser/ash/file_manager/file_tasks_unittest.cc
@@ -10,9 +10,9 @@ #include <utility> #include "ash/constants/ash_features.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/ranges/algorithm.h" #include "base/run_loop.h" #include "base/strings/escape.h"
diff --git a/chrome/browser/ash/file_manager/file_watcher.cc b/chrome/browser/ash/file_manager/file_watcher.cc index f66184d..6ed1100 100644 --- a/chrome/browser/ash/file_manager/file_watcher.cc +++ b/chrome/browser/ash/file_manager/file_watcher.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/task/thread_pool.h" #include "chrome/browser/ash/crostini/crostini_util.h"
diff --git a/chrome/browser/ash/file_manager/file_watcher.h b/chrome/browser/ash/file_manager/file_watcher.h index ef94948..f1b1428f 100644 --- a/chrome/browser/ash/file_manager/file_watcher.h +++ b/chrome/browser/ash/file_manager/file_watcher.h
@@ -9,9 +9,9 @@ #include <string> #include <vector> -#include "base/callback_forward.h" #include "base/files/file_path.h" #include "base/files/file_path_watcher.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "base/task/sequenced_task_runner.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ash/file_manager/fileapi_util.cc b/chrome/browser/ash/file_manager/fileapi_util.cc index ada80d2..9a536d9 100644 --- a/chrome/browser/ash/file_manager/fileapi_util.cc +++ b/chrome/browser/ash/file_manager/fileapi_util.cc
@@ -9,10 +9,10 @@ #include "ash/constants/ash_features.h" #include "ash/webui/file_manager/url_constants.h" -#include "base/bind.h" #include "base/files/file.h" #include "base/files/file_error_or.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/strings/escape.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ash/file_manager/fileapi_util.h b/chrome/browser/ash/file_manager/fileapi_util.h index e8a29aa5..e871365 100644 --- a/chrome/browser/ash/file_manager/fileapi_util.h +++ b/chrome/browser/ash/file_manager/fileapi_util.h
@@ -11,10 +11,10 @@ #include <string> #include <vector> -#include "base/callback_forward.h" #include "base/files/file.h" #include "base/files/file_error_or.h" #include "base/files/file_path.h" +#include "base/functional/callback_forward.h" #include "base/values.h" #include "storage/browser/file_system/file_system_operation_runner.h" #include "storage/browser/file_system/isolated_context.h"
diff --git a/chrome/browser/ash/file_manager/fileapi_util_unittest.cc b/chrome/browser/ash/file_manager/fileapi_util_unittest.cc index 91d8e7c..863d562 100644 --- a/chrome/browser/ash/file_manager/fileapi_util_unittest.cc +++ b/chrome/browser/ash/file_manager/fileapi_util_unittest.cc
@@ -7,8 +7,8 @@ #include <memory> #include <string> -#include "base/bind.h" #include "base/files/file_error_or.h" +#include "base/functional/bind.h" #include "base/strings/strcat.h" #include "base/strings/utf_string_conversions.h" #include "base/test/bind.h"
diff --git a/chrome/browser/ash/file_manager/filesystem_api_util.cc b/chrome/browser/ash/file_manager/filesystem_api_util.cc index dea3901b..a98324c8 100644 --- a/chrome/browser/ash/file_manager/filesystem_api_util.cc +++ b/chrome/browser/ash/file_manager/filesystem_api_util.cc
@@ -8,10 +8,10 @@ #include <utility> #include "ash/components/arc/session/arc_service_manager.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/files/file.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/strings/string_util.h" #include "base/task/sequenced_task_runner.h" #include "chrome/browser/ash/arc/arc_util.h"
diff --git a/chrome/browser/ash/file_manager/filesystem_api_util.h b/chrome/browser/ash/file_manager/filesystem_api_util.h index cdfbaf637..e27e25d 100644 --- a/chrome/browser/ash/file_manager/filesystem_api_util.h +++ b/chrome/browser/ash/file_manager/filesystem_api_util.h
@@ -12,7 +12,7 @@ #include <string> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "storage/common/file_system/file_system_types.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/chrome/browser/ash/file_manager/fusebox_daemon.cc b/chrome/browser/ash/file_manager/fusebox_daemon.cc index 934c5e6..917b212 100644 --- a/chrome/browser/ash/file_manager/fusebox_daemon.cc +++ b/chrome/browser/ash/file_manager/fusebox_daemon.cc
@@ -4,9 +4,9 @@ #include "chrome/browser/ash/file_manager/fusebox_daemon.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "chrome/browser/ash/fusebox/fusebox_server.h"
diff --git a/chrome/browser/ash/file_manager/guest_os_file_tasks.cc b/chrome/browser/ash/file_manager/guest_os_file_tasks.cc index 5e0ad4d9..3980917 100644 --- a/chrome/browser/ash/file_manager/guest_os_file_tasks.cc +++ b/chrome/browser/ash/file_manager/guest_os_file_tasks.cc
@@ -11,8 +11,8 @@ #include <vector> #include "base/base64.h" -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/ranges/algorithm.h" #include "base/strings/strcat.h" #include "base/strings/string_util.h"
diff --git a/chrome/browser/ash/file_manager/io_task.cc b/chrome/browser/ash/file_manager/io_task.cc index ad7f7ed..a749f72 100644 --- a/chrome/browser/ash/file_manager/io_task.cc +++ b/chrome/browser/ash/file_manager/io_task.cc
@@ -6,8 +6,8 @@ #include <vector> -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/task/sequenced_task_runner.h" #include "chrome/browser/ash/file_manager/path_util.h" #include "storage/browser/file_system/file_system_url.h"
diff --git a/chrome/browser/ash/file_manager/io_task.h b/chrome/browser/ash/file_manager/io_task.h index 5a6816e2..5e1104c 100644 --- a/chrome/browser/ash/file_manager/io_task.h +++ b/chrome/browser/ash/file_manager/io_task.h
@@ -7,8 +7,8 @@ #include <vector> -#include "base/callback.h" #include "base/files/file.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "storage/browser/file_system/file_system_url.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/chrome/browser/ash/file_manager/io_task_controller.h b/chrome/browser/ash/file_manager/io_task_controller.h index e0ab515..cbd010f 100644 --- a/chrome/browser/ash/file_manager/io_task_controller.h +++ b/chrome/browser/ash/file_manager/io_task_controller.h
@@ -8,7 +8,7 @@ #include <map> #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" #include "base/sequence_checker.h"
diff --git a/chrome/browser/ash/file_manager/open_util.cc b/chrome/browser/ash/file_manager/open_util.cc index 74305174..1eecfb0 100644 --- a/chrome/browser/ash/file_manager/open_util.cc +++ b/chrome/browser/ash/file_manager/open_util.cc
@@ -9,9 +9,9 @@ #include <string> #include <vector> -#include "base/bind.h" #include "base/check_op.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/metrics/user_metrics.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/ash/drive/file_system_util.h"
diff --git a/chrome/browser/ash/file_manager/open_util.h b/chrome/browser/ash/file_manager/open_util.h index 5af914c..5d0fd5a 100644 --- a/chrome/browser/ash/file_manager/open_util.h +++ b/chrome/browser/ash/file_manager/open_util.h
@@ -8,7 +8,7 @@ #ifndef CHROME_BROWSER_ASH_FILE_MANAGER_OPEN_UTIL_H_ #define CHROME_BROWSER_ASH_FILE_MANAGER_OPEN_UTIL_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "chrome/browser/platform_util.h" class Profile;
diff --git a/chrome/browser/ash/file_manager/open_with_browser.cc b/chrome/browser/ash/file_manager/open_with_browser.cc index afabf90..0fd22ab 100644 --- a/chrome/browser/ash/file_manager/open_with_browser.cc +++ b/chrome/browser/ash/file_manager/open_with_browser.cc
@@ -7,8 +7,8 @@ #include <stddef.h> #include "ash/public/cpp/new_window_delegate.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/metrics/histogram_macros.h" #include "base/path_service.h"
diff --git a/chrome/browser/ash/file_manager/path_util.cc b/chrome/browser/ash/file_manager/path_util.cc index 5abffd5..85c6cfa 100644 --- a/chrome/browser/ash/file_manager/path_util.cc +++ b/chrome/browser/ash/file_manager/path_util.cc
@@ -12,8 +12,8 @@ #include "ash/constants/ash_switches.h" #include "base/barrier_closure.h" #include "base/base64.h" -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/no_destructor.h" #include "base/strings/escape.h" #include "base/strings/strcat.h"
diff --git a/chrome/browser/ash/file_manager/path_util.h b/chrome/browser/ash/file_manager/path_util.h index 0241c9f..0d3774cd 100644 --- a/chrome/browser/ash/file_manager/path_util.h +++ b/chrome/browser/ash/file_manager/path_util.h
@@ -8,8 +8,8 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "chrome/browser/ash/guest_os/guest_id.h" #include "storage/browser/file_system/file_system_url.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/chrome/browser/ash/file_manager/path_util_unittest.cc b/chrome/browser/ash/file_manager/path_util_unittest.cc index d77a2936..0e3baa6c 100644 --- a/chrome/browser/ash/file_manager/path_util_unittest.cc +++ b/chrome/browser/ash/file_manager/path_util_unittest.cc
@@ -13,9 +13,9 @@ #include "ash/components/arc/session/arc_service_manager.h" #include "ash/components/arc/test/connection_holder_util.h" #include "ash/components/arc/test/fake_file_system_instance.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/system/sys_info.h" #include "base/test/bind.h"
diff --git a/chrome/browser/ash/file_manager/restore_io_task.cc b/chrome/browser/ash/file_manager/restore_io_task.cc index 923bd3eb..019efdbd 100644 --- a/chrome/browser/ash/file_manager/restore_io_task.cc +++ b/chrome/browser/ash/file_manager/restore_io_task.cc
@@ -4,9 +4,9 @@ #include "chrome/browser/ash/file_manager/restore_io_task.h" -#include "base/callback.h" #include "base/files/file.h" #include "base/files/file_util.h" +#include "base/functional/callback.h" #include "base/task/bind_post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_traits.h"
diff --git a/chrome/browser/ash/file_manager/restore_to_destination_io_task.cc b/chrome/browser/ash/file_manager/restore_to_destination_io_task.cc index 9faf8255..6c720f9 100644 --- a/chrome/browser/ash/file_manager/restore_to_destination_io_task.cc +++ b/chrome/browser/ash/file_manager/restore_to_destination_io_task.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/task/sequenced_task_runner.h" #include "chrome/browser/ash/file_manager/io_task_util.h"
diff --git a/chrome/browser/ash/file_manager/snapshot_manager.cc b/chrome/browser/ash/file_manager/snapshot_manager.cc index d39ca1d..87b67e2 100644 --- a/chrome/browser/ash/file_manager/snapshot_manager.cc +++ b/chrome/browser/ash/file_manager/snapshot_manager.cc
@@ -6,9 +6,9 @@ #include <utility> -#include "base/bind.h" #include "base/containers/circular_deque.h" #include "base/files/file.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted.h" #include "base/system/sys_info.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/ash/file_manager/snapshot_manager.h b/chrome/browser/ash/file_manager/snapshot_manager.h index 2d675106b..e29e572 100644 --- a/chrome/browser/ash/file_manager/snapshot_manager.h +++ b/chrome/browser/ash/file_manager/snapshot_manager.h
@@ -7,7 +7,7 @@ #include <stdint.h> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/ash/file_manager/trash_io_task.cc b/chrome/browser/ash/file_manager/trash_io_task.cc index e39efa6..1cd4422 100644 --- a/chrome/browser/ash/file_manager/trash_io_task.cc +++ b/chrome/browser/ash/file_manager/trash_io_task.cc
@@ -7,9 +7,9 @@ #include <sys/xattr.h> #include "ash/metrics/histogram_macros.h" -#include "base/callback.h" #include "base/containers/adapters.h" #include "base/files/file_util.h" +#include "base/functional/callback.h" #include "base/ranges/algorithm.h" #include "base/strings/strcat.h" #include "base/system/sys_info.h"
diff --git a/chrome/browser/ash/file_manager/volume_manager.cc b/chrome/browser/ash/file_manager/volume_manager.cc index 7564fb91..4f51023e 100644 --- a/chrome/browser/ash/file_manager/volume_manager.cc +++ b/chrome/browser/ash/file_manager/volume_manager.cc
@@ -15,12 +15,12 @@ #include "ash/components/arc/arc_util.h" #include "ash/constants/ash_features.h" #include "base/base64url.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/contains.h" #include "base/feature_list.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/memory/weak_ptr.h" #include "base/metrics/histogram_functions.h"
diff --git a/chrome/browser/ash/file_manager/volume_manager.h b/chrome/browser/ash/file_manager/volume_manager.h index 03e186be..63e46ca 100644 --- a/chrome/browser/ash/file_manager/volume_manager.h +++ b/chrome/browser/ash/file_manager/volume_manager.h
@@ -11,9 +11,9 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/files/file.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" #include "chrome/browser/ash/arc/session/arc_session_manager_observer.h"
diff --git a/chrome/browser/ash/file_manager/volume_manager_factory.cc b/chrome/browser/ash/file_manager/volume_manager_factory.cc index 8f9bb19..343dd506 100644 --- a/chrome/browser/ash/file_manager/volume_manager_factory.cc +++ b/chrome/browser/ash/file_manager/volume_manager_factory.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ash/file_manager/volume_manager_factory.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/singleton.h" #include "chrome/browser/ash/drive/drive_integration_service.h" #include "chrome/browser/ash/file_manager/volume_manager.h"
diff --git a/chrome/browser/ash/file_manager/volume_manager_unittest.cc b/chrome/browser/ash/file_manager/volume_manager_unittest.cc index 2d0382ea..812a36c 100644 --- a/chrome/browser/ash/file_manager/volume_manager_unittest.cc +++ b/chrome/browser/ash/file_manager/volume_manager_unittest.cc
@@ -16,9 +16,9 @@ #include "ash/components/arc/session/arc_service_manager.h" #include "ash/components/arc/test/connection_holder_util.h" #include "ash/components/arc/test/fake_file_system_instance.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/weak_ptr.h" #include "base/notreached.h" #include "base/ranges/algorithm.h"
diff --git a/chrome/browser/ash/file_manager/zip_io_task.cc b/chrome/browser/ash/file_manager/zip_io_task.cc index d0201a24..5d4085952 100644 --- a/chrome/browser/ash/file_manager/zip_io_task.cc +++ b/chrome/browser/ash/file_manager/zip_io_task.cc
@@ -8,12 +8,12 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/check_op.h" #include "base/files/file.h" #include "base/files/file_error_or.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/memory/scoped_refptr.h" #include "base/metrics/histogram_functions.h"
diff --git a/chrome/browser/ash/file_system_provider/abort_callback.h b/chrome/browser/ash/file_system_provider/abort_callback.h index 7eb3d0b..8d4c5cb6 100644 --- a/chrome/browser/ash/file_system_provider/abort_callback.h +++ b/chrome/browser/ash/file_system_provider/abort_callback.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_ASH_FILE_SYSTEM_PROVIDER_ABORT_CALLBACK_H_ #define CHROME_BROWSER_ASH_FILE_SYSTEM_PROVIDER_ABORT_CALLBACK_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "storage/browser/file_system/async_file_util.h" namespace ash {
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 350c9a28..eed085c 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
@@ -9,7 +9,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/single_thread_task_runner.h" #include "base/time/time.h" #include "components/services/filesystem/public/mojom/types.mojom.h"
diff --git a/chrome/browser/ash/file_system_provider/fake_provided_file_system.h b/chrome/browser/ash/file_system_provider/fake_provided_file_system.h index 5cb5570..2ba6781 100644 --- a/chrome/browser/ash/file_system_provider/fake_provided_file_system.h +++ b/chrome/browser/ash/file_system_provider/fake_provided_file_system.h
@@ -12,8 +12,8 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/files/file.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" #include "base/task/cancelable_task_tracker.h"
diff --git a/chrome/browser/ash/file_system_provider/fileapi/buffering_file_stream_reader.cc b/chrome/browser/ash/file_system_provider/fileapi/buffering_file_stream_reader.cc index 708859b76..974148f 100644 --- a/chrome/browser/ash/file_system_provider/fileapi/buffering_file_stream_reader.cc +++ b/chrome/browser/ash/file_system_provider/fileapi/buffering_file_stream_reader.cc
@@ -7,7 +7,7 @@ #include <algorithm> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h" #include "storage/browser/file_system/file_system_backend.h"
diff --git a/chrome/browser/ash/file_system_provider/fileapi/buffering_file_stream_reader_unittest.cc b/chrome/browser/ash/file_system_provider/fileapi/buffering_file_stream_reader_unittest.cc index 23dccbc7..6d97253b 100644 --- a/chrome/browser/ash/file_system_provider/fileapi/buffering_file_stream_reader_unittest.cc +++ b/chrome/browser/ash/file_system_provider/fileapi/buffering_file_stream_reader_unittest.cc
@@ -11,7 +11,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/ash/file_system_provider/fileapi/buffering_file_stream_writer.cc b/chrome/browser/ash/file_system_provider/fileapi/buffering_file_stream_writer.cc index b7eb2ce..adff1ed 100644 --- a/chrome/browser/ash/file_system_provider/fileapi/buffering_file_stream_writer.cc +++ b/chrome/browser/ash/file_system_provider/fileapi/buffering_file_stream_writer.cc
@@ -7,7 +7,7 @@ #include <algorithm> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h"
diff --git a/chrome/browser/ash/file_system_provider/fileapi/buffering_file_stream_writer_unittest.cc b/chrome/browser/ash/file_system_provider/fileapi/buffering_file_stream_writer_unittest.cc index ff90b286..fc8c68e 100644 --- a/chrome/browser/ash/file_system_provider/fileapi/buffering_file_stream_writer_unittest.cc +++ b/chrome/browser/ash/file_system_provider/fileapi/buffering_file_stream_writer_unittest.cc
@@ -9,7 +9,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/memory/ref_counted.h" #include "base/run_loop.h"
diff --git a/chrome/browser/ash/file_system_provider/fileapi/file_stream_reader.cc b/chrome/browser/ash/file_system_provider/fileapi/file_stream_reader.cc index 35718fc2..d8d3429 100644 --- a/chrome/browser/ash/file_system_provider/fileapi/file_stream_reader.cc +++ b/chrome/browser/ash/file_system_provider/fileapi/file_stream_reader.cc
@@ -7,8 +7,8 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/files/file.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/memory/ref_counted.h" #include "base/trace_event/trace_event.h"
diff --git a/chrome/browser/ash/file_system_provider/fileapi/file_stream_reader_unittest.cc b/chrome/browser/ash/file_system_provider/fileapi/file_stream_reader_unittest.cc index c8ad8d2..fe30ebb 100644 --- a/chrome/browser/ash/file_system_provider/fileapi/file_stream_reader_unittest.cc +++ b/chrome/browser/ash/file_system_provider/fileapi/file_stream_reader_unittest.cc
@@ -11,10 +11,10 @@ #include <string> #include <vector> -#include "base/bind.h" #include "base/files/file.h" #include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/memory/weak_ptr.h" #include "base/numerics/safe_math.h" #include "base/run_loop.h"
diff --git a/chrome/browser/ash/file_system_provider/fileapi/file_stream_writer.cc b/chrome/browser/ash/file_system_provider/fileapi/file_stream_writer.cc index 161ae42..c854f349 100644 --- a/chrome/browser/ash/file_system_provider/fileapi/file_stream_writer.cc +++ b/chrome/browser/ash/file_system_provider/fileapi/file_stream_writer.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted.h" #include "base/task/single_thread_task_runner.h" #include "base/trace_event/trace_event.h"
diff --git a/chrome/browser/ash/file_system_provider/fileapi/file_stream_writer_unittest.cc b/chrome/browser/ash/file_system_provider/fileapi/file_stream_writer_unittest.cc index a8ca5235..e1fb5b9 100644 --- a/chrome/browser/ash/file_system_provider/fileapi/file_stream_writer_unittest.cc +++ b/chrome/browser/ash/file_system_provider/fileapi/file_stream_writer_unittest.cc
@@ -11,10 +11,10 @@ #include <string> #include <vector> -#include "base/bind.h" #include "base/files/file.h" #include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/memory/weak_ptr.h" #include "base/run_loop.h" #include "chrome/browser/ash/file_system_provider/fake_extension_provider.h"
diff --git a/chrome/browser/ash/file_system_provider/fileapi/provider_async_file_util.cc b/chrome/browser/ash/file_system_provider/fileapi/provider_async_file_util.cc index 2c8e8dd..c760539 100644 --- a/chrome/browser/ash/file_system_provider/fileapi/provider_async_file_util.cc +++ b/chrome/browser/ash/file_system_provider/fileapi/provider_async_file_util.cc
@@ -7,12 +7,12 @@ #include <algorithm> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/check_op.h" #include "base/containers/contains.h" #include "base/files/file.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/ptr_util.h" #include "base/notreached.h" #include "chrome/browser/ash/file_system_provider/mount_path_util.h"
diff --git a/chrome/browser/ash/file_system_provider/fileapi/provider_async_file_util.h b/chrome/browser/ash/file_system_provider/fileapi/provider_async_file_util.h index 9b1c533..d6d2ca9 100644 --- a/chrome/browser/ash/file_system_provider/fileapi/provider_async_file_util.h +++ b/chrome/browser/ash/file_system_provider/fileapi/provider_async_file_util.h
@@ -9,7 +9,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "storage/browser/file_system/async_file_util.h" namespace ash {
diff --git a/chrome/browser/ash/file_system_provider/fileapi/provider_async_file_util_unittest.cc b/chrome/browser/ash/file_system_provider/fileapi/provider_async_file_util_unittest.cc index c4542458..bae2acb 100644 --- a/chrome/browser/ash/file_system_provider/fileapi/provider_async_file_util_unittest.cc +++ b/chrome/browser/ash/file_system_provider/fileapi/provider_async_file_util_unittest.cc
@@ -11,10 +11,10 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/files/file.h" #include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/memory/weak_ptr.h" #include "base/run_loop.h" #include "chrome/browser/ash/file_system_provider/fake_extension_provider.h"
diff --git a/chrome/browser/ash/file_system_provider/fileapi/watcher_manager.cc b/chrome/browser/ash/file_system_provider/fileapi/watcher_manager.cc index a443ca43..afee1aa 100644 --- a/chrome/browser/ash/file_system_provider/fileapi/watcher_manager.cc +++ b/chrome/browser/ash/file_system_provider/fileapi/watcher_manager.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ash/file_system_provider/fileapi/watcher_manager.h" -#include "base/bind.h" #include "base/files/file.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/file_system_provider/mount_path_util.h" #include "chrome/browser/ash/file_system_provider/provided_file_system_info.h" #include "chrome/browser/ash/file_system_provider/provided_file_system_interface.h"
diff --git a/chrome/browser/ash/file_system_provider/notification_manager.h b/chrome/browser/ash/file_system_provider/notification_manager.h index 2892c168..dd6fcf1 100644 --- a/chrome/browser/ash/file_system_provider/notification_manager.h +++ b/chrome/browser/ash/file_system_provider/notification_manager.h
@@ -9,7 +9,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ash/file_system_provider/notification_manager_interface.h" #include "chrome/browser/ash/file_system_provider/provided_file_system_info.h"
diff --git a/chrome/browser/ash/file_system_provider/notification_manager_interface.h b/chrome/browser/ash/file_system_provider/notification_manager_interface.h index bba542b..4a391de 100644 --- a/chrome/browser/ash/file_system_provider/notification_manager_interface.h +++ b/chrome/browser/ash/file_system_provider/notification_manager_interface.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_ASH_FILE_SYSTEM_PROVIDER_NOTIFICATION_MANAGER_INTERFACE_H_ #define CHROME_BROWSER_ASH_FILE_SYSTEM_PROVIDER_NOTIFICATION_MANAGER_INTERFACE_H_ -#include "base/callback.h" +#include "base/functional/callback.h" namespace ash { namespace file_system_provider {
diff --git a/chrome/browser/ash/file_system_provider/operation_request_manager.h b/chrome/browser/ash/file_system_provider/operation_request_manager.h index 24bb505..5943f82d 100644 --- a/chrome/browser/ash/file_system_provider/operation_request_manager.h +++ b/chrome/browser/ash/file_system_provider/operation_request_manager.h
@@ -10,8 +10,8 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/files/file.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h"
diff --git a/chrome/browser/ash/file_system_provider/operation_request_manager_unittest.cc b/chrome/browser/ash/file_system_provider/operation_request_manager_unittest.cc index 134ea3e..a29ffa2 100644 --- a/chrome/browser/ash/file_system_provider/operation_request_manager_unittest.cc +++ b/chrome/browser/ash/file_system_provider/operation_request_manager_unittest.cc
@@ -12,10 +12,10 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" #include "base/files/file.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/ptr_util.h" #include "base/memory/weak_ptr.h" #include "base/run_loop.h"
diff --git a/chrome/browser/ash/file_system_provider/operations/abort_unittest.cc b/chrome/browser/ash/file_system_provider/operations/abort_unittest.cc index b1bd290..3267699 100644 --- a/chrome/browser/ash/file_system_provider/operations/abort_unittest.cc +++ b/chrome/browser/ash/file_system_provider/operations/abort_unittest.cc
@@ -8,9 +8,9 @@ #include <string> #include <vector> -#include "base/bind.h" #include "base/files/file.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/file_system_provider/icon_set.h" #include "chrome/browser/ash/file_system_provider/operations/test_util.h" #include "chrome/browser/ash/file_system_provider/provided_file_system_interface.h"
diff --git a/chrome/browser/ash/file_system_provider/operations/add_watcher_unittest.cc b/chrome/browser/ash/file_system_provider/operations/add_watcher_unittest.cc index cbd9881e..3ad0b7f4 100644 --- a/chrome/browser/ash/file_system_provider/operations/add_watcher_unittest.cc +++ b/chrome/browser/ash/file_system_provider/operations/add_watcher_unittest.cc
@@ -8,9 +8,9 @@ #include <string> #include <vector> -#include "base/bind.h" #include "base/files/file.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/file_system_provider/icon_set.h" #include "chrome/browser/ash/file_system_provider/operations/test_util.h" #include "chrome/browser/ash/file_system_provider/provided_file_system_interface.h"
diff --git a/chrome/browser/ash/file_system_provider/operations/close_file_unittest.cc b/chrome/browser/ash/file_system_provider/operations/close_file_unittest.cc index 6dd4873d..7f6e99a 100644 --- a/chrome/browser/ash/file_system_provider/operations/close_file_unittest.cc +++ b/chrome/browser/ash/file_system_provider/operations/close_file_unittest.cc
@@ -8,9 +8,9 @@ #include <string> #include <vector> -#include "base/bind.h" #include "base/files/file.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/file_system_provider/icon_set.h" #include "chrome/browser/ash/file_system_provider/operations/test_util.h" #include "chrome/browser/ash/file_system_provider/provided_file_system_interface.h"
diff --git a/chrome/browser/ash/file_system_provider/operations/configure_unittest.cc b/chrome/browser/ash/file_system_provider/operations/configure_unittest.cc index af831bee1..d6e94ad 100644 --- a/chrome/browser/ash/file_system_provider/operations/configure_unittest.cc +++ b/chrome/browser/ash/file_system_provider/operations/configure_unittest.cc
@@ -8,9 +8,9 @@ #include <string> #include <vector> -#include "base/bind.h" #include "base/files/file.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/file_system_provider/icon_set.h" #include "chrome/browser/ash/file_system_provider/operations/test_util.h" #include "chrome/browser/ash/file_system_provider/provided_file_system_interface.h"
diff --git a/chrome/browser/ash/file_system_provider/operations/copy_entry_unittest.cc b/chrome/browser/ash/file_system_provider/operations/copy_entry_unittest.cc index ceae3315..f56919a 100644 --- a/chrome/browser/ash/file_system_provider/operations/copy_entry_unittest.cc +++ b/chrome/browser/ash/file_system_provider/operations/copy_entry_unittest.cc
@@ -8,9 +8,9 @@ #include <string> #include <vector> -#include "base/bind.h" #include "base/files/file.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/file_system_provider/icon_set.h" #include "chrome/browser/ash/file_system_provider/operations/test_util.h" #include "chrome/browser/ash/file_system_provider/provided_file_system_interface.h"
diff --git a/chrome/browser/ash/file_system_provider/operations/create_directory_unittest.cc b/chrome/browser/ash/file_system_provider/operations/create_directory_unittest.cc index 50a997f..f28ae3f 100644 --- a/chrome/browser/ash/file_system_provider/operations/create_directory_unittest.cc +++ b/chrome/browser/ash/file_system_provider/operations/create_directory_unittest.cc
@@ -10,9 +10,9 @@ #include <string> #include <vector> -#include "base/bind.h" #include "base/files/file.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/file_system_provider/icon_set.h" #include "chrome/browser/ash/file_system_provider/operations/test_util.h" #include "chrome/browser/ash/file_system_provider/provided_file_system_interface.h"
diff --git a/chrome/browser/ash/file_system_provider/operations/create_file_unittest.cc b/chrome/browser/ash/file_system_provider/operations/create_file_unittest.cc index 6dbdc284..9013c3b8 100644 --- a/chrome/browser/ash/file_system_provider/operations/create_file_unittest.cc +++ b/chrome/browser/ash/file_system_provider/operations/create_file_unittest.cc
@@ -8,9 +8,9 @@ #include <string> #include <vector> -#include "base/bind.h" #include "base/files/file.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/file_system_provider/icon_set.h" #include "chrome/browser/ash/file_system_provider/operations/test_util.h" #include "chrome/browser/ash/file_system_provider/provided_file_system_interface.h"
diff --git a/chrome/browser/ash/file_system_provider/operations/delete_entry_unittest.cc b/chrome/browser/ash/file_system_provider/operations/delete_entry_unittest.cc index cc13900..e056c460 100644 --- a/chrome/browser/ash/file_system_provider/operations/delete_entry_unittest.cc +++ b/chrome/browser/ash/file_system_provider/operations/delete_entry_unittest.cc
@@ -8,9 +8,9 @@ #include <string> #include <vector> -#include "base/bind.h" #include "base/files/file.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/file_system_provider/icon_set.h" #include "chrome/browser/ash/file_system_provider/operations/test_util.h" #include "chrome/browser/ash/file_system_provider/provided_file_system_interface.h"
diff --git a/chrome/browser/ash/file_system_provider/operations/execute_action_unittest.cc b/chrome/browser/ash/file_system_provider/operations/execute_action_unittest.cc index 684f38f..77223fa 100644 --- a/chrome/browser/ash/file_system_provider/operations/execute_action_unittest.cc +++ b/chrome/browser/ash/file_system_provider/operations/execute_action_unittest.cc
@@ -8,9 +8,9 @@ #include <string> #include <vector> -#include "base/bind.h" #include "base/files/file.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/file_system_provider/icon_set.h" #include "chrome/browser/ash/file_system_provider/operations/test_util.h" #include "chrome/browser/ash/file_system_provider/provided_file_system_interface.h"
diff --git a/chrome/browser/ash/file_system_provider/operations/get_actions_unittest.cc b/chrome/browser/ash/file_system_provider/operations/get_actions_unittest.cc index 0efd52d..5386389 100644 --- a/chrome/browser/ash/file_system_provider/operations/get_actions_unittest.cc +++ b/chrome/browser/ash/file_system_provider/operations/get_actions_unittest.cc
@@ -9,9 +9,9 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/files/file.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/json/json_reader.h" #include "base/values.h" #include "chrome/browser/ash/file_system_provider/icon_set.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 7ca3854..5b6d8d6 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
@@ -9,9 +9,9 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/files/file.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/json/json_reader.h" #include "base/time/time.h" #include "base/values.h"
diff --git a/chrome/browser/ash/file_system_provider/operations/move_entry_unittest.cc b/chrome/browser/ash/file_system_provider/operations/move_entry_unittest.cc index 29cb9fc..8af7ab8 100644 --- a/chrome/browser/ash/file_system_provider/operations/move_entry_unittest.cc +++ b/chrome/browser/ash/file_system_provider/operations/move_entry_unittest.cc
@@ -8,9 +8,9 @@ #include <string> #include <vector> -#include "base/bind.h" #include "base/files/file.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/file_system_provider/icon_set.h" #include "chrome/browser/ash/file_system_provider/operations/test_util.h" #include "chrome/browser/ash/file_system_provider/provided_file_system_interface.h"
diff --git a/chrome/browser/ash/file_system_provider/operations/open_file_unittest.cc b/chrome/browser/ash/file_system_provider/operations/open_file_unittest.cc index 7607c03..a595b66 100644 --- a/chrome/browser/ash/file_system_provider/operations/open_file_unittest.cc +++ b/chrome/browser/ash/file_system_provider/operations/open_file_unittest.cc
@@ -8,9 +8,9 @@ #include <string> #include <vector> -#include "base/bind.h" #include "base/files/file.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/file_system_provider/icon_set.h" #include "chrome/browser/ash/file_system_provider/operations/test_util.h" #include "chrome/browser/ash/file_system_provider/provided_file_system_interface.h"
diff --git a/chrome/browser/ash/file_system_provider/operations/operation.cc b/chrome/browser/ash/file_system_provider/operations/operation.cc index dea28a5..97baaf3 100644 --- a/chrome/browser/ash/file_system_provider/operations/operation.cc +++ b/chrome/browser/ash/file_system_provider/operations/operation.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/file_system_provider/provided_file_system_info.h" #include "chrome/browser/ash/file_system_provider/request_dispatcher.h" #include "extensions/browser/event_router.h"
diff --git a/chrome/browser/ash/file_system_provider/operations/read_directory_unittest.cc b/chrome/browser/ash/file_system_provider/operations/read_directory_unittest.cc index 1a8b515..c7cd6cfe4 100644 --- a/chrome/browser/ash/file_system_provider/operations/read_directory_unittest.cc +++ b/chrome/browser/ash/file_system_provider/operations/read_directory_unittest.cc
@@ -9,9 +9,9 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/files/file.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/json/json_reader.h" #include "base/values.h" #include "chrome/browser/ash/file_system_provider/icon_set.h"
diff --git a/chrome/browser/ash/file_system_provider/operations/read_file_unittest.cc b/chrome/browser/ash/file_system_provider/operations/read_file_unittest.cc index 228a72e..9fe0b09 100644 --- a/chrome/browser/ash/file_system_provider/operations/read_file_unittest.cc +++ b/chrome/browser/ash/file_system_provider/operations/read_file_unittest.cc
@@ -9,10 +9,10 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/containers/span.h" #include "base/files/file.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted.h" #include "base/values.h" #include "chrome/browser/ash/file_system_provider/icon_set.h"
diff --git a/chrome/browser/ash/file_system_provider/operations/remove_watcher_unittest.cc b/chrome/browser/ash/file_system_provider/operations/remove_watcher_unittest.cc index 5bba538..eb77ef8 100644 --- a/chrome/browser/ash/file_system_provider/operations/remove_watcher_unittest.cc +++ b/chrome/browser/ash/file_system_provider/operations/remove_watcher_unittest.cc
@@ -8,9 +8,9 @@ #include <string> #include <vector> -#include "base/bind.h" #include "base/files/file.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/file_system_provider/icon_set.h" #include "chrome/browser/ash/file_system_provider/operations/test_util.h" #include "chrome/browser/ash/file_system_provider/provided_file_system_interface.h"
diff --git a/chrome/browser/ash/file_system_provider/operations/truncate_unittest.cc b/chrome/browser/ash/file_system_provider/operations/truncate_unittest.cc index e40c1d70..579b9c6 100644 --- a/chrome/browser/ash/file_system_provider/operations/truncate_unittest.cc +++ b/chrome/browser/ash/file_system_provider/operations/truncate_unittest.cc
@@ -10,9 +10,9 @@ #include <string> #include <vector> -#include "base/bind.h" #include "base/files/file.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/file_system_provider/icon_set.h" #include "chrome/browser/ash/file_system_provider/operations/test_util.h" #include "chrome/browser/ash/file_system_provider/provided_file_system_interface.h"
diff --git a/chrome/browser/ash/file_system_provider/operations/unmount_unittest.cc b/chrome/browser/ash/file_system_provider/operations/unmount_unittest.cc index 649eff7..327deec 100644 --- a/chrome/browser/ash/file_system_provider/operations/unmount_unittest.cc +++ b/chrome/browser/ash/file_system_provider/operations/unmount_unittest.cc
@@ -8,9 +8,9 @@ #include <string> #include <vector> -#include "base/bind.h" #include "base/files/file.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/file_system_provider/icon_set.h" #include "chrome/browser/ash/file_system_provider/operations/test_util.h" #include "chrome/browser/ash/file_system_provider/provided_file_system_interface.h"
diff --git a/chrome/browser/ash/file_system_provider/operations/write_file_unittest.cc b/chrome/browser/ash/file_system_provider/operations/write_file_unittest.cc index 75890efa..bdb33c0b 100644 --- a/chrome/browser/ash/file_system_provider/operations/write_file_unittest.cc +++ b/chrome/browser/ash/file_system_provider/operations/write_file_unittest.cc
@@ -8,9 +8,9 @@ #include <string> #include <vector> -#include "base/bind.h" #include "base/files/file.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted.h" #include "base/values.h" #include "chrome/browser/ash/file_system_provider/icon_set.h"
diff --git a/chrome/browser/ash/file_system_provider/provided_file_system.cc b/chrome/browser/ash/file_system_provider/provided_file_system.cc index 73c7bf2..d99f6fe 100644 --- a/chrome/browser/ash/file_system_provider/provided_file_system.cc +++ b/chrome/browser/ash/file_system_provider/provided_file_system.cc
@@ -9,9 +9,9 @@ #include <vector> #include "ash/constants/ash_features.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/files/file.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/trace_event/trace_event.h" #include "chrome/browser/ash/file_system_provider/notification_manager.h"
diff --git a/chrome/browser/ash/file_system_provider/provided_file_system_interface.h b/chrome/browser/ash/file_system_provider/provided_file_system_interface.h index 4ccbd2a1..261dff40 100644 --- a/chrome/browser/ash/file_system_provider/provided_file_system_interface.h +++ b/chrome/browser/ash/file_system_provider/provided_file_system_interface.h
@@ -12,9 +12,9 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/files/file.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ash/file_system_provider/abort_callback.h" #include "chrome/browser/ash/file_system_provider/provided_file_system_observer.h"
diff --git a/chrome/browser/ash/file_system_provider/provided_file_system_observer.h b/chrome/browser/ash/file_system_provider/provided_file_system_observer.h index e0196fe..5c393d3 100644 --- a/chrome/browser/ash/file_system_provider/provided_file_system_observer.h +++ b/chrome/browser/ash/file_system_provider/provided_file_system_observer.h
@@ -7,8 +7,8 @@ #include <vector> -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "chrome/browser/ash/file_system_provider/watcher.h" #include "storage/browser/file_system/watcher_manager.h"
diff --git a/chrome/browser/ash/file_system_provider/provided_file_system_unittest.cc b/chrome/browser/ash/file_system_provider/provided_file_system_unittest.cc index 4f5b20a..b59be68 100644 --- a/chrome/browser/ash/file_system_provider/provided_file_system_unittest.cc +++ b/chrome/browser/ash/file_system_provider/provided_file_system_unittest.cc
@@ -9,8 +9,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/files/file.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/memory/ref_counted.h" #include "base/run_loop.h"
diff --git a/chrome/browser/ash/file_system_provider/queue.cc b/chrome/browser/ash/file_system_provider/queue.cc index ed2140d..028ee51 100644 --- a/chrome/browser/ash/file_system_provider/queue.cc +++ b/chrome/browser/ash/file_system_provider/queue.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ash/file_system_provider/queue.h" -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/notreached.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/ash/file_system_provider/queue.h b/chrome/browser/ash/file_system_provider/queue.h index b8f38ba..eea1670 100644 --- a/chrome/browser/ash/file_system_provider/queue.h +++ b/chrome/browser/ash/file_system_provider/queue.h
@@ -9,8 +9,8 @@ #include <map> -#include "base/callback.h" #include "base/containers/circular_deque.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ash/file_system_provider/abort_callback.h" #include "storage/browser/file_system/async_file_util.h"
diff --git a/chrome/browser/ash/file_system_provider/queue_unittest.cc b/chrome/browser/ash/file_system_provider/queue_unittest.cc index 0f38b35f..b2cc017e 100644 --- a/chrome/browser/ash/file_system_provider/queue_unittest.cc +++ b/chrome/browser/ash/file_system_provider/queue_unittest.cc
@@ -8,8 +8,8 @@ #include <vector> -#include "base/bind.h" #include "base/files/file.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "content/public/test/browser_task_environment.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/ash/file_system_provider/request_dispatcher_impl.cc b/chrome/browser/ash/file_system_provider/request_dispatcher_impl.cc index 2efd9be..6557da9 100644 --- a/chrome/browser/ash/file_system_provider/request_dispatcher_impl.cc +++ b/chrome/browser/ash/file_system_provider/request_dispatcher_impl.cc
@@ -5,7 +5,7 @@ #include "chrome/browser/ash/file_system_provider/request_dispatcher_impl.h" #include "ash/constants/ash_features.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/crosapi/crosapi_ash.h" #include "chrome/browser/ash/crosapi/crosapi_manager.h" #include "chrome/browser/ash/crosapi/file_system_provider_service_ash.h"
diff --git a/chrome/browser/ash/file_system_provider/scoped_file_opener.cc b/chrome/browser/ash/file_system_provider/scoped_file_opener.cc index ad47456e2..c993b8d 100644 --- a/chrome/browser/ash/file_system_provider/scoped_file_opener.cc +++ b/chrome/browser/ash/file_system_provider/scoped_file_opener.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ash/file_system_provider/scoped_file_opener.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ash/file_system_provider/abort_callback.h"
diff --git a/chrome/browser/ash/file_system_provider/scoped_file_opener_unittest.cc b/chrome/browser/ash/file_system_provider/scoped_file_opener_unittest.cc index 38a259c..a033f12 100644 --- a/chrome/browser/ash/file_system_provider/scoped_file_opener_unittest.cc +++ b/chrome/browser/ash/file_system_provider/scoped_file_opener_unittest.cc
@@ -7,8 +7,8 @@ #include <memory> #include <vector> -#include "base/bind.h" #include "base/files/file.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/strings/string_number_conversions.h" #include "base/threading/thread_task_runner_handle.h"
diff --git a/chrome/browser/ash/file_system_provider/service.cc b/chrome/browser/ash/file_system_provider/service.cc index afa74b8..44f070a 100644 --- a/chrome/browser/ash/file_system_provider/service.cc +++ b/chrome/browser/ash/file_system_provider/service.cc
@@ -8,9 +8,9 @@ #include <utility> -#include "base/bind.h" #include "base/files/file.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/values.h" #include "chrome/browser/ash/file_system_provider/mount_path_util.h" #include "chrome/browser/ash/file_system_provider/observer.h"
diff --git a/chrome/browser/ash/file_system_provider/throttled_file_system.cc b/chrome/browser/ash/file_system_provider/throttled_file_system.cc index c8798015..f1007ea 100644 --- a/chrome/browser/ash/file_system_provider/throttled_file_system.cc +++ b/chrome/browser/ash/file_system_provider/throttled_file_system.cc
@@ -10,8 +10,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/files/file.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/file_system_provider/queue.h" namespace ash {
diff --git a/chrome/browser/ash/file_system_provider/throttled_file_system_unittest.cc b/chrome/browser/ash/file_system_provider/throttled_file_system_unittest.cc index 3a0d4feb..883dcc693 100644 --- a/chrome/browser/ash/file_system_provider/throttled_file_system_unittest.cc +++ b/chrome/browser/ash/file_system_provider/throttled_file_system_unittest.cc
@@ -9,8 +9,8 @@ #include <memory> #include <vector> -#include "base/bind.h" #include "base/files/file.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "chrome/browser/ash/file_system_provider/abort_callback.h" #include "chrome/browser/ash/file_system_provider/fake_provided_file_system.h"
diff --git a/chrome/browser/ash/file_system_provider/watcher.h b/chrome/browser/ash/file_system_provider/watcher.h index 13bb794..b6c4a704 100644 --- a/chrome/browser/ash/file_system_provider/watcher.h +++ b/chrome/browser/ash/file_system_provider/watcher.h
@@ -9,8 +9,8 @@ #include <set> #include <string> -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "storage/browser/file_system/watcher_manager.h" #include "url/gurl.h"
diff --git a/chrome/browser/ash/fileapi/external_file_resolver.cc b/chrome/browser/ash/fileapi/external_file_resolver.cc index 3b08093e..5d552324 100644 --- a/chrome/browser/ash/fileapi/external_file_resolver.cc +++ b/chrome/browser/ash/fileapi/external_file_resolver.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/file_manager/fileapi_util.h" #include "chrome/browser/ash/fileapi/external_file_url_util.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/ash/fileapi/external_file_resolver.h b/chrome/browser/ash/fileapi/external_file_resolver.h index 33a54419..a37fe7f 100644 --- a/chrome/browser/ash/fileapi/external_file_resolver.h +++ b/chrome/browser/ash/fileapi/external_file_resolver.h
@@ -8,8 +8,8 @@ #include <memory> #include <string> -#include "base/callback.h" #include "base/files/file.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ash/file_manager/fileapi_util.h" #include "net/base/net_errors.h"
diff --git a/chrome/browser/ash/fileapi/external_file_url_loader_factory.cc b/chrome/browser/ash/fileapi/external_file_url_loader_factory.cc index 5b9ab46f..9de0586 100644 --- a/chrome/browser/ash/fileapi/external_file_url_loader_factory.cc +++ b/chrome/browser/ash/fileapi/external_file_url_loader_factory.cc
@@ -6,8 +6,8 @@ #include <algorithm> -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/task/sequenced_task_runner.h" #include "chrome/browser/ash/file_manager/fileapi_util.h" #include "chrome/browser/ash/fileapi/external_file_resolver.h"
diff --git a/chrome/browser/ash/fileapi/external_file_url_loader_factory_unittest.cc b/chrome/browser/ash/fileapi/external_file_url_loader_factory_unittest.cc index 9c48f49..2bba6f39 100644 --- a/chrome/browser/ash/fileapi/external_file_url_loader_factory_unittest.cc +++ b/chrome/browser/ash/fileapi/external_file_url_loader_factory_unittest.cc
@@ -8,7 +8,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/file_system_provider/fake_extension_provider.h" #include "chrome/browser/ash/file_system_provider/service.h" #include "chrome/browser/ash/login/users/fake_chrome_user_manager.h"
diff --git a/chrome/browser/ash/fileapi/file_system_backend_delegate.h b/chrome/browser/ash/fileapi/file_system_backend_delegate.h index c420818..49e3a68f 100644 --- a/chrome/browser/ash/fileapi/file_system_backend_delegate.h +++ b/chrome/browser/ash/fileapi/file_system_backend_delegate.h
@@ -9,7 +9,7 @@ #include <memory> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "storage/browser/file_system/file_system_backend.h" #include "storage/common/file_system/file_system_types.h"
diff --git a/chrome/browser/ash/fileapi/recent_arc_media_source.cc b/chrome/browser/ash/fileapi/recent_arc_media_source.cc index 832cab01..1fa833a 100644 --- a/chrome/browser/ash/fileapi/recent_arc_media_source.cc +++ b/chrome/browser/ash/fileapi/recent_arc_media_source.cc
@@ -11,8 +11,8 @@ #include <utility> #include "ash/components/arc/mojom/file_system.mojom.h" -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "base/strings/string_util.h" #include "chrome/browser/ash/arc/arc_util.h"
diff --git a/chrome/browser/ash/fileapi/recent_arc_media_source_unittest.cc b/chrome/browser/ash/fileapi/recent_arc_media_source_unittest.cc index deedc7e..be26183 100644 --- a/chrome/browser/ash/fileapi/recent_arc_media_source_unittest.cc +++ b/chrome/browser/ash/fileapi/recent_arc_media_source_unittest.cc
@@ -9,7 +9,7 @@ #include "ash/components/arc/session/arc_service_manager.h" #include "ash/components/arc/test/connection_holder_util.h" #include "ash/components/arc/test/fake_file_system_instance.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/test/metrics/histogram_tester.h" #include "base/time/time.h"
diff --git a/chrome/browser/ash/fileapi/recent_disk_source.cc b/chrome/browser/ash/fileapi/recent_disk_source.cc index 657f77e..e532602 100644 --- a/chrome/browser/ash/fileapi/recent_disk_source.cc +++ b/chrome/browser/ash/fileapi/recent_disk_source.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "base/strings/string_util.h" #include "base/time/time.h"
diff --git a/chrome/browser/ash/fileapi/recent_disk_source_unittest.cc b/chrome/browser/ash/fileapi/recent_disk_source_unittest.cc index ad0133f1..b586254 100644 --- a/chrome/browser/ash/fileapi/recent_disk_source_unittest.cc +++ b/chrome/browser/ash/fileapi/recent_disk_source_unittest.cc
@@ -8,10 +8,10 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/files/file.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/test/metrics/histogram_tester.h" #include "base/time/time.h"
diff --git a/chrome/browser/ash/fileapi/recent_drive_source.cc b/chrome/browser/ash/fileapi/recent_drive_source.cc index 4b3fdf5..d3b2237 100644 --- a/chrome/browser/ash/fileapi/recent_drive_source.cc +++ b/chrome/browser/ash/fileapi/recent_drive_source.cc
@@ -8,8 +8,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "chrome/browser/ash/drive/drive_integration_service.h" #include "chrome/browser/ash/drive/file_system_util.h"
diff --git a/chrome/browser/ash/fileapi/recent_model.cc b/chrome/browser/ash/fileapi/recent_model.cc index 85493d6..ad8e78f 100644 --- a/chrome/browser/ash/fileapi/recent_model.cc +++ b/chrome/browser/ash/fileapi/recent_model.cc
@@ -9,8 +9,8 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/metrics/histogram_macros.h" #include "base/time/time.h"
diff --git a/chrome/browser/ash/fileapi/recent_model.h b/chrome/browser/ash/fileapi/recent_model.h index 6c9bcb6d..2faa318b 100644 --- a/chrome/browser/ash/fileapi/recent_model.h +++ b/chrome/browser/ash/fileapi/recent_model.h
@@ -9,7 +9,7 @@ #include <queue> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/gtest_prod_util.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h"
diff --git a/chrome/browser/ash/fileapi/recent_model_unittest.cc b/chrome/browser/ash/fileapi/recent_model_unittest.cc index f350a49..d67f99c 100644 --- a/chrome/browser/ash/fileapi/recent_model_unittest.cc +++ b/chrome/browser/ash/fileapi/recent_model_unittest.cc
@@ -6,8 +6,8 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/test/metrics/histogram_tester.h" #include "chrome/browser/ash/fileapi/recent_file.h"
diff --git a/chrome/browser/ash/fileapi/recent_source.h b/chrome/browser/ash/fileapi/recent_source.h index d22d8ef..2064874 100644 --- a/chrome/browser/ash/fileapi/recent_source.h +++ b/chrome/browser/ash/fileapi/recent_source.h
@@ -8,7 +8,7 @@ #include <memory> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/ref_counted.h" #include "base/time/time.h" #include "storage/browser/file_system/file_system_context.h"
diff --git a/chrome/browser/ash/fusebox/fusebox_read_writer.h b/chrome/browser/ash/fusebox/fusebox_read_writer.h index c199e76..7d05412 100644 --- a/chrome/browser/ash/fusebox/fusebox_read_writer.h +++ b/chrome/browser/ash/fusebox/fusebox_read_writer.h
@@ -7,8 +7,8 @@ #include <utility> -#include "base/callback_forward.h" #include "base/files/scoped_file.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ash/fusebox/fusebox.pb.h" #include "net/base/io_buffer.h"
diff --git a/chrome/browser/ash/fusebox/fusebox_server.cc b/chrome/browser/ash/fusebox/fusebox_server.cc index 174a8a4e..63c697cb 100644 --- a/chrome/browser/ash/fusebox/fusebox_server.cc +++ b/chrome/browser/ash/fusebox/fusebox_server.cc
@@ -7,8 +7,8 @@ #include <sys/stat.h> #include <utility> -#include "base/callback.h" #include "base/files/file_util.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/strings/strcat.h" #include "base/strings/string_util.h"
diff --git a/chrome/browser/ash/fusebox/fusebox_server.h b/chrome/browser/ash/fusebox/fusebox_server.h index 3f87afb..820f419 100644 --- a/chrome/browser/ash/fusebox/fusebox_server.h +++ b/chrome/browser/ash/fusebox/fusebox_server.h
@@ -7,10 +7,10 @@ #include <string> -#include "base/callback_forward.h" #include "base/containers/circular_deque.h" #include "base/files/file.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "base/threading/sequence_bound.h" #include "base/values.h"
diff --git a/chrome/browser/ash/guest_os/guest_os_external_protocol_handler.cc b/chrome/browser/ash/guest_os/guest_os_external_protocol_handler.cc index 7f46411e..1d5946e 100644 --- a/chrome/browser/ash/guest_os/guest_os_external_protocol_handler.cc +++ b/chrome/browser/ash/guest_os/guest_os_external_protocol_handler.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ash/guest_os/guest_os_external_protocol_handler.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/time/time.h" #include "chrome/browser/ash/borealis/borealis_app_launcher.h" #include "chrome/browser/ash/borealis/borealis_service.h"
diff --git a/chrome/browser/ash/guest_os/guest_os_file_watcher_unittest.cc b/chrome/browser/ash/guest_os/guest_os_file_watcher_unittest.cc index afecf0a1..b8fde37 100644 --- a/chrome/browser/ash/guest_os/guest_os_file_watcher_unittest.cc +++ b/chrome/browser/ash/guest_os/guest_os_file_watcher_unittest.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/callback_forward.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_forward.h" +#include "base/functional/callback_helpers.h" #include "base/test/bind.h" #include "base/test/task_environment.h" #include "chrome/browser/ash/guest_os/dbus_test_helper.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 7fcfdfc..b697f9b 100644 --- a/chrome/browser/ash/guest_os/guest_os_registry_service.cc +++ b/chrome/browser/ash/guest_os/guest_os_registry_service.cc
@@ -8,9 +8,9 @@ #include "ash/constants/ash_features.h" #include "ash/public/cpp/app_list/app_list_config.h" -#include "base/bind.h" #include "base/feature_list.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h"
diff --git a/chrome/browser/ash/guest_os/guest_os_registry_service.h b/chrome/browser/ash/guest_os/guest_os_registry_service.h index b8c80cd..7a9e9f28 100644 --- a/chrome/browser/ash/guest_os/guest_os_registry_service.h +++ b/chrome/browser/ash/guest_os/guest_os_registry_service.h
@@ -10,8 +10,8 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" #include "base/values.h"
diff --git a/chrome/browser/ash/guest_os/guest_os_security_delegate.cc b/chrome/browser/ash/guest_os/guest_os_security_delegate.cc index 8b449d09..d712ef6 100644 --- a/chrome/browser/ash/guest_os/guest_os_security_delegate.cc +++ b/chrome/browser/ash/guest_os/guest_os_security_delegate.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ash/guest_os/guest_os_security_delegate.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/weak_ptr.h" #include "components/exo/server/wayland_server_controller.h"
diff --git a/chrome/browser/ash/guest_os/guest_os_security_delegate.h b/chrome/browser/ash/guest_os/guest_os_security_delegate.h index 2c1e371..6daad24 100644 --- a/chrome/browser/ash/guest_os/guest_os_security_delegate.h +++ b/chrome/browser/ash/guest_os/guest_os_security_delegate.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "components/exo/security_delegate.h"
diff --git a/chrome/browser/ash/guest_os/guest_os_session_tracker.cc b/chrome/browser/ash/guest_os/guest_os_session_tracker.cc index 61eef1e9..d3af2e0 100644 --- a/chrome/browser/ash/guest_os/guest_os_session_tracker.cc +++ b/chrome/browser/ash/guest_os/guest_os_session_tracker.cc
@@ -6,9 +6,9 @@ #include <memory> -#include "base/bind.h" #include "base/callback_list.h" #include "base/containers/flat_tree.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "chrome/browser/ash/guest_os/guest_id.h" #include "chrome/browser/ash/guest_os/guest_os_session_tracker_factory.h"
diff --git a/chrome/browser/ash/guest_os/guest_os_session_tracker.h b/chrome/browser/ash/guest_os/guest_os_session_tracker.h index 81d2d684..945f69a 100644 --- a/chrome/browser/ash/guest_os/guest_os_session_tracker.h +++ b/chrome/browser/ash/guest_os/guest_os_session_tracker.h
@@ -5,9 +5,9 @@ #ifndef CHROME_BROWSER_ASH_GUEST_OS_GUEST_OS_SESSION_TRACKER_H_ #define CHROME_BROWSER_ASH_GUEST_OS_GUEST_OS_SESSION_TRACKER_H_ -#include "base/callback_forward.h" #include "base/callback_list.h" #include "base/files/file_path.h" +#include "base/functional/callback_forward.h" #include "chrome/browser/ash/guest_os/guest_id.h" #include "chromeos/ash/components/dbus/cicerone/cicerone_client.h" #include "chromeos/ash/components/dbus/cicerone/cicerone_service.pb.h"
diff --git a/chrome/browser/ash/guest_os/guest_os_share_path_unittest.cc b/chrome/browser/ash/guest_os/guest_os_share_path_unittest.cc index 46282eb..833cbe7 100644 --- a/chrome/browser/ash/guest_os/guest_os_share_path_unittest.cc +++ b/chrome/browser/ash/guest_os/guest_os_share_path_unittest.cc
@@ -7,9 +7,9 @@ #include "ash/components/arc/arc_util.h" #include "ash/components/arc/session/arc_session_runner.h" #include "ash/components/arc/test/fake_arc_session.h" -#include "base/bind.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/test/scoped_feature_list.h" #include "chrome/browser/ash/arc/session/arc_session_manager.h"
diff --git a/chrome/browser/ash/guest_os/guest_os_terminal.cc b/chrome/browser/ash/guest_os/guest_os_terminal.cc index 7a5a192..50a1134 100644 --- a/chrome/browser/ash/guest_os/guest_os_terminal.cc +++ b/chrome/browser/ash/guest_os/guest_os_terminal.cc
@@ -5,7 +5,7 @@ #include "chrome/browser/ash/guest_os/guest_os_terminal.h" #include "ash/public/cpp/app_menu_constants.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/metrics/histogram_functions.h"
diff --git a/chrome/browser/ash/guest_os/infra/cached_callback.h b/chrome/browser/ash/guest_os/infra/cached_callback.h index 1c42040c..c30cdf60 100644 --- a/chrome/browser/ash/guest_os/infra/cached_callback.h +++ b/chrome/browser/ash/guest_os/infra/cached_callback.h
@@ -8,7 +8,7 @@ #include <memory> #include <type_traits> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ash/borealis/infra/expected.h"
diff --git a/chrome/browser/ash/guest_os/infra/cached_callback_unittest.cc b/chrome/browser/ash/guest_os/infra/cached_callback_unittest.cc index 40d0e0ed..fe9e362 100644 --- a/chrome/browser/ash/guest_os/infra/cached_callback_unittest.cc +++ b/chrome/browser/ash/guest_os/infra/cached_callback_unittest.cc
@@ -7,8 +7,8 @@ #include <atomic> #include <memory> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/task/thread_pool.h" #include "base/test/bind.h" #include "base/test/task_environment.h"
diff --git a/chrome/browser/ash/guest_os/public/guest_os_mount_provider.cc b/chrome/browser/ash/guest_os/public/guest_os_mount_provider.cc index 2bfe36a6..96a6036 100644 --- a/chrome/browser/ash/guest_os/public/guest_os_mount_provider.cc +++ b/chrome/browser/ash/guest_os/public/guest_os_mount_provider.cc
@@ -6,10 +6,10 @@ #include <memory> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_forward.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_forward.h" +#include "base/functional/callback_helpers.h" #include "base/memory/weak_ptr.h" #include "base/strings/stringprintf.h" #include "chrome/browser/ash/borealis/infra/expected.h"
diff --git a/chrome/browser/ash/guest_os/public/guest_os_mount_provider.h b/chrome/browser/ash/guest_os/public/guest_os_mount_provider.h index 7d50e74..2a182f4 100644 --- a/chrome/browser/ash/guest_os/public/guest_os_mount_provider.h +++ b/chrome/browser/ash/guest_os/public/guest_os_mount_provider.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/callback_forward.h" #include "base/files/file_path.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ash/guest_os/guest_id.h" #include "chrome/browser/ash/guest_os/guest_os_file_watcher.h"
diff --git a/chrome/browser/ash/guest_os/public/guest_os_mount_provider_unittest.cc b/chrome/browser/ash/guest_os/public/guest_os_mount_provider_unittest.cc index 85ac986..15c84c64 100644 --- a/chrome/browser/ash/guest_os/public/guest_os_mount_provider_unittest.cc +++ b/chrome/browser/ash/guest_os/public/guest_os_mount_provider_unittest.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/memory/weak_ptr.h" #include "base/strings/stringprintf.h" #include "base/test/bind.h"
diff --git a/chrome/browser/ash/guest_os/public/guest_os_wayland_server.cc b/chrome/browser/ash/guest_os/public/guest_os_wayland_server.cc index 2b3c7a9..1bf987b 100644 --- a/chrome/browser/ash/guest_os/public/guest_os_wayland_server.cc +++ b/chrome/browser/ash/guest_os/public/guest_os_wayland_server.cc
@@ -7,8 +7,8 @@ #include <algorithm> #include <memory> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "chrome/browser/ash/borealis/borealis_security_delegate.h" #include "chrome/browser/ash/crostini/crostini_security_delegate.h" #include "chrome/browser/ash/guest_os/guest_os_security_delegate.h"
diff --git a/chrome/browser/ash/guest_os/public/guest_os_wayland_server.h b/chrome/browser/ash/guest_os/public/guest_os_wayland_server.h index 6d7a52b..c184e71 100644 --- a/chrome/browser/ash/guest_os/public/guest_os_wayland_server.h +++ b/chrome/browser/ash/guest_os/public/guest_os_wayland_server.h
@@ -7,9 +7,9 @@ #include <memory> -#include "base/callback_forward.h" #include "base/containers/flat_map.h" #include "base/files/file_path.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ash/borealis/infra/expected.h" #include "chromeos/ash/components/dbus/vm_launch/launch.pb.h"
diff --git a/chrome/browser/ash/guest_os/vm_sk_forwarding_native_message_host.cc b/chrome/browser/ash/guest_os/vm_sk_forwarding_native_message_host.cc index 9b7bdef6..998db76 100644 --- a/chrome/browser/ash/guest_os/vm_sk_forwarding_native_message_host.cc +++ b/chrome/browser/ash/guest_os/vm_sk_forwarding_native_message_host.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/logging.h"
diff --git a/chrome/browser/ash/guest_os/vm_sk_forwarding_native_message_host_unittest.cc b/chrome/browser/ash/guest_os/vm_sk_forwarding_native_message_host_unittest.cc index 210352b..20bab1b1 100644 --- a/chrome/browser/ash/guest_os/vm_sk_forwarding_native_message_host_unittest.cc +++ b/chrome/browser/ash/guest_os/vm_sk_forwarding_native_message_host_unittest.cc
@@ -4,10 +4,10 @@ #include "chrome/browser/ash/guest_os/vm_sk_forwarding_native_message_host.h" -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/check.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/test/bind.h" #include "base/test/task_environment.h"
diff --git a/chrome/browser/ash/hats/hats_dialog.cc b/chrome/browser/ash/hats/hats_dialog.cc index ad843f5f..fdb7432e 100644 --- a/chrome/browser/ash/hats/hats_dialog.cc +++ b/chrome/browser/ash/hats/hats_dialog.cc
@@ -5,8 +5,8 @@ #include "chrome/browser/ash/hats/hats_dialog.h" #include "ash/constants/ash_features.h" -#include "base/bind.h" #include "base/containers/flat_map.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/metrics/histogram_functions.h" #include "base/strings/escape.h"
diff --git a/chrome/browser/ash/hats/hats_notification_controller.cc b/chrome/browser/ash/hats/hats_notification_controller.cc index 7be92dd9..4c5384e 100644 --- a/chrome/browser/ash/hats/hats_notification_controller.cc +++ b/chrome/browser/ash/hats/hats_notification_controller.cc
@@ -8,9 +8,9 @@ #include "ash/constants/ash_switches.h" #include "ash/constants/notifier_catalogs.h" #include "ash/public/cpp/notification_utils.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/metrics/histogram_functions.h" #include "base/strings/escape.h"
diff --git a/chrome/browser/ash/idle_detector.h b/chrome/browser/ash/idle_detector.h index 69fb07d..78af449 100644 --- a/chrome/browser/ash/idle_detector.h +++ b/chrome/browser/ash/idle_detector.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_ASH_IDLE_DETECTOR_H_ #define CHROME_BROWSER_ASH_IDLE_DETECTOR_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/time/tick_clock.h" #include "base/time/time.h" #include "base/timer/timer.h"
diff --git a/chrome/browser/ash/input_method/assistive_suggester_client_filter.cc b/chrome/browser/ash/input_method/assistive_suggester_client_filter.cc index d03e96502..9a03208 100644 --- a/chrome/browser/ash/input_method/assistive_suggester_client_filter.cc +++ b/chrome/browser/ash/input_method/assistive_suggester_client_filter.cc
@@ -7,7 +7,7 @@ #include <vector> #include "ash/public/cpp/window_properties.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/hash/hash.h" #include "chrome/browser/ash/input_method/assistive_suggester_client_filter.h" #include "chrome/browser/ui/browser_finder.h"
diff --git a/chrome/browser/ash/input_method/assistive_suggester_client_filter.h b/chrome/browser/ash/input_method/assistive_suggester_client_filter.h index 39ffbfe4..485303c1 100644 --- a/chrome/browser/ash/input_method/assistive_suggester_client_filter.h +++ b/chrome/browser/ash/input_method/assistive_suggester_client_filter.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_ASH_INPUT_METHOD_ASSISTIVE_SUGGESTER_CLIENT_FILTER_H_ #define CHROME_BROWSER_ASH_INPUT_METHOD_ASSISTIVE_SUGGESTER_CLIENT_FILTER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ash/input_method/assistive_suggester_switch.h" #include "chrome/browser/ash/input_method/get_current_window_properties.h"
diff --git a/chrome/browser/ash/input_method/assistive_suggester_client_filter_unittest.cc b/chrome/browser/ash/input_method/assistive_suggester_client_filter_unittest.cc index f28911da..d910b31 100644 --- a/chrome/browser/ash/input_method/assistive_suggester_client_filter_unittest.cc +++ b/chrome/browser/ash/input_method/assistive_suggester_client_filter_unittest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ash/input_method/assistive_suggester_client_filter.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/test/bind.h" #include "chrome/browser/ash/input_method/assistive_suggester_switch.h" #include "chrome/browser/ash/input_method/get_current_window_properties.h"
diff --git a/chrome/browser/ash/input_method/assistive_suggester_switch.h b/chrome/browser/ash/input_method/assistive_suggester_switch.h index 6dcc209..7a5793b 100644 --- a/chrome/browser/ash/input_method/assistive_suggester_switch.h +++ b/chrome/browser/ash/input_method/assistive_suggester_switch.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_ASH_INPUT_METHOD_ASSISTIVE_SUGGESTER_SWITCH_H_ #define CHROME_BROWSER_ASH_INPUT_METHOD_ASSISTIVE_SUGGESTER_SWITCH_H_ -#include "base/callback.h" +#include "base/functional/callback.h" namespace ash { namespace input_method {
diff --git a/chrome/browser/ash/input_method/autocorrect_manager.cc b/chrome/browser/ash/input_method/autocorrect_manager.cc index 69773d01..bd69e031 100644 --- a/chrome/browser/ash/input_method/autocorrect_manager.cc +++ b/chrome/browser/ash/input_method/autocorrect_manager.cc
@@ -5,8 +5,8 @@ #include "chrome/browser/ash/input_method/autocorrect_manager.h" #include "ash/constants/ash_features.h" -#include "base/callback_helpers.h" #include "base/feature_list.h" +#include "base/functional/callback_helpers.h" #include "base/i18n/case_conversion.h" #include "base/metrics/histogram_functions.h" #include "base/numerics/safe_conversions.h"
diff --git a/chrome/browser/ash/input_method/autocorrect_manager_unittest.cc b/chrome/browser/ash/input_method/autocorrect_manager_unittest.cc index ef8e3d1..448b9b0 100644 --- a/chrome/browser/ash/input_method/autocorrect_manager_unittest.cc +++ b/chrome/browser/ash/input_method/autocorrect_manager_unittest.cc
@@ -5,7 +5,7 @@ #include "chrome/browser/ash/input_method/autocorrect_manager.h" #include "ash/constants/ash_features.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h" #include "chrome/browser/ash/input_method/autocorrect_enums.h"
diff --git a/chrome/browser/ash/input_method/component_extension_ime_manager_delegate_impl.h b/chrome/browser/ash/input_method/component_extension_ime_manager_delegate_impl.h index c923f2b8..f6936f1 100644 --- a/chrome/browser/ash/input_method/component_extension_ime_manager_delegate_impl.h +++ b/chrome/browser/ash/input_method/component_extension_ime_manager_delegate_impl.h
@@ -8,7 +8,7 @@ #include <set> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/sequenced_task_runner.h" #include "base/threading/thread_checker.h" #include "base/values.h"
diff --git a/chrome/browser/ash/input_method/get_current_window_properties.cc b/chrome/browser/ash/input_method/get_current_window_properties.cc index 4f695fcc..d8411f9e 100644 --- a/chrome/browser/ash/input_method/get_current_window_properties.cc +++ b/chrome/browser/ash/input_method/get_current_window_properties.cc
@@ -7,7 +7,7 @@ #include "chrome/browser/ash/input_method/get_current_window_properties.h" #include "ash/public/cpp/window_properties.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/ash/crosapi/browser_manager.h" #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/browser_window.h"
diff --git a/chrome/browser/ash/input_method/get_current_window_properties.h b/chrome/browser/ash/input_method/get_current_window_properties.h index 19cd4eb8..19c0cf0 100644 --- a/chrome/browser/ash/input_method/get_current_window_properties.h +++ b/chrome/browser/ash/input_method/get_current_window_properties.h
@@ -7,7 +7,7 @@ #ifndef CHROME_BROWSER_ASH_INPUT_METHOD_GET_CURRENT_WINDOW_PROPERTIES_H_ #define CHROME_BROWSER_ASH_INPUT_METHOD_GET_CURRENT_WINDOW_PROPERTIES_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "third_party/abseil-cpp/absl/types/optional.h" #include "url/gurl.h"
diff --git a/chrome/browser/ash/input_method/grammar_service_client.h b/chrome/browser/ash/input_method/grammar_service_client.h index 38d39fa..0b7c3366 100644 --- a/chrome/browser/ash/input_method/grammar_service_client.h +++ b/chrome/browser/ash/input_method/grammar_service_client.h
@@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/profiles/profile.h" #include "chromeos/services/machine_learning/public/mojom/grammar_checker.mojom.h" #include "chromeos/services/machine_learning/public/mojom/machine_learning_service.mojom-shared.h"
diff --git a/chrome/browser/ash/input_method/grammar_service_client_unittest.cc b/chrome/browser/ash/input_method/grammar_service_client_unittest.cc index d73bccb..048072b1e 100644 --- a/chrome/browser/ash/input_method/grammar_service_client_unittest.cc +++ b/chrome/browser/ash/input_method/grammar_service_client_unittest.cc
@@ -6,7 +6,7 @@ #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" #include "chrome/test/base/testing_profile.h"
diff --git a/chrome/browser/ash/input_method/input_method_engine_browsertests.cc b/chrome/browser/ash/input_method/input_method_engine_browsertests.cc index db263b3..f8ae8506 100644 --- a/chrome/browser/ash/input_method/input_method_engine_browsertests.cc +++ b/chrome/browser/ash/input_method/input_method_engine_browsertests.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ash/input_method/input_method_engine_unittest.cc b/chrome/browser/ash/input_method/input_method_engine_unittest.cc index fe302a68..e9c60ebc 100644 --- a/chrome/browser/ash/input_method/input_method_engine_unittest.cc +++ b/chrome/browser/ash/input_method/input_method_engine_unittest.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/histogram_macros.h" #include "base/metrics/histogram_samples.h" #include "base/metrics/statistics_recorder.h"
diff --git a/chrome/browser/ash/input_method/input_method_manager_impl.cc b/chrome/browser/ash/input_method/input_method_manager_impl.cc index 28ca1d91..e696829 100644 --- a/chrome/browser/ash/input_method/input_method_manager_impl.cc +++ b/chrome/browser/ash/input_method/input_method_manager_impl.cc
@@ -12,9 +12,9 @@ #include <utility> #include "ash/constants/ash_features.h" -#include "base/bind.h" #include "base/containers/contains.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/hash/hash.h" #include "base/i18n/string_compare.h" #include "base/location.h"
diff --git a/chrome/browser/ash/input_method/input_method_manager_impl_unittest.cc b/chrome/browser/ash/input_method/input_method_manager_impl_unittest.cc index 2ea4b7e..530fc4bb 100644 --- a/chrome/browser/ash/input_method/input_method_manager_impl_unittest.cc +++ b/chrome/browser/ash/input_method/input_method_manager_impl_unittest.cc
@@ -11,9 +11,9 @@ #include <utility> #include "ash/public/cpp/ime_controller.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/i18n/string_compare.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ash/input_method/input_method_syncer.cc b/chrome/browser/ash/input_method/input_method_syncer.cc index c872703..1e223ff 100644 --- a/chrome/browser/ash/input_method/input_method_syncer.cc +++ b/chrome/browser/ash/input_method/input_method_syncer.cc
@@ -9,7 +9,7 @@ #include <vector> #include "ash/constants/ash_features.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/string_piece.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h"
diff --git a/chrome/browser/ash/input_method/native_input_method_engine_unittest.cc b/chrome/browser/ash/input_method/native_input_method_engine_unittest.cc index f713764..39e950f 100644 --- a/chrome/browser/ash/input_method/native_input_method_engine_unittest.cc +++ b/chrome/browser/ash/input_method/native_input_method_engine_unittest.cc
@@ -6,8 +6,8 @@ #include "ash/constants/ash_features.h" #include "ash/constants/ash_pref_names.h" -#include "base/callback_helpers.h" #include "base/feature_list.h" +#include "base/functional/callback_helpers.h" #include "chrome/browser/ash/input_method/stub_input_method_engine_observer.h" #include "chrome/browser/ui/ash/keyboard/chrome_keyboard_controller_client_test_helper.h" #include "chrome/common/pref_names.h"
diff --git a/chrome/browser/ash/input_method/suggestions_collector.cc b/chrome/browser/ash/input_method/suggestions_collector.cc index 2977fdf..a579160a 100644 --- a/chrome/browser/ash/input_method/suggestions_collector.cc +++ b/chrome/browser/ash/input_method/suggestions_collector.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ash/input_method/suggestions_collector.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "chromeos/ash/services/ime/public/cpp/assistive_suggestions.h" #include "chromeos/ash/services/ime/public/mojom/input_engine.mojom.h"
diff --git a/chrome/browser/ash/input_method/suggestions_collector.h b/chrome/browser/ash/input_method/suggestions_collector.h index c5b542a..64b9ac05 100644 --- a/chrome/browser/ash/input_method/suggestions_collector.h +++ b/chrome/browser/ash/input_method/suggestions_collector.h
@@ -8,7 +8,7 @@ #include <memory> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/ash/input_method/suggestions_source.h" #include "chromeos/ash/services/ime/public/cpp/assistive_suggestions.h" #include "chromeos/ash/services/ime/public/mojom/input_method_host.mojom.h"
diff --git a/chrome/browser/ash/input_method/suggestions_collector_unittest.cc b/chrome/browser/ash/input_method/suggestions_collector_unittest.cc index fb0a50aa..28d0a8d 100644 --- a/chrome/browser/ash/input_method/suggestions_collector_unittest.cc +++ b/chrome/browser/ash/input_method/suggestions_collector_unittest.cc
@@ -6,8 +6,8 @@ #include <vector> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/test/bind.h" #include "chrome/browser/ash/input_method/suggestions_source.h" #include "chromeos/ash/services/ime/public/cpp/assistive_suggestions.h"
diff --git a/chrome/browser/ash/input_method/suggestions_service_client.cc b/chrome/browser/ash/input_method/suggestions_service_client.cc index 2c12e7f..73fffd9 100644 --- a/chrome/browser/ash/input_method/suggestions_service_client.cc +++ b/chrome/browser/ash/input_method/suggestions_service_client.cc
@@ -5,7 +5,7 @@ #include "chrome/browser/ash/input_method/suggestions_service_client.h" #include "ash/constants/ash_features.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/field_trial_params.h" #include "base/metrics/histogram_functions.h" #include "chrome/browser/ash/input_method/suggestion_enums.h"
diff --git a/chrome/browser/ash/input_method/suggestions_service_client.h b/chrome/browser/ash/input_method/suggestions_service_client.h index 63885b1c..bb91815c 100644 --- a/chrome/browser/ash/input_method/suggestions_service_client.h +++ b/chrome/browser/ash/input_method/suggestions_service_client.h
@@ -7,7 +7,7 @@ #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h" #include "chrome/browser/ash/input_method/suggestions_source.h"
diff --git a/chrome/browser/ash/input_method/suggestions_source.h b/chrome/browser/ash/input_method/suggestions_source.h index 6ed8bc6..871e8ee2 100644 --- a/chrome/browser/ash/input_method/suggestions_source.h +++ b/chrome/browser/ash/input_method/suggestions_source.h
@@ -7,7 +7,7 @@ #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "chromeos/ash/services/ime/public/cpp/assistive_suggestions.h" namespace ash {
diff --git a/chrome/browser/ash/input_method/text_field_contextual_info_fetcher.h b/chrome/browser/ash/input_method/text_field_contextual_info_fetcher.h index bbd10b2d..364285af 100644 --- a/chrome/browser/ash/input_method/text_field_contextual_info_fetcher.h +++ b/chrome/browser/ash/input_method/text_field_contextual_info_fetcher.h
@@ -8,7 +8,7 @@ #include <string> #include "ash/constants/app_types.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/ash/crosapi/browser_manager.h" #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/browser_window.h"
diff --git a/chrome/browser/ash/input_method/ui/suggestion_window_view.cc b/chrome/browser/ash/input_method/ui/suggestion_window_view.cc index 343b3f64..b3b6ae2 100644 --- a/chrome/browser/ash/input_method/ui/suggestion_window_view.cc +++ b/chrome/browser/ash/input_method/ui/suggestion_window_view.cc
@@ -7,7 +7,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/i18n/number_formatting.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/ash/input_method/assistive_window_properties.h"
diff --git a/chrome/browser/ash/kerberos/kerberos_credentials_manager.cc b/chrome/browser/ash/kerberos/kerberos_credentials_manager.cc index 4d2684b..2351110 100644 --- a/chrome/browser/ash/kerberos/kerberos_credentials_manager.cc +++ b/chrome/browser/ash/kerberos/kerberos_credentials_manager.cc
@@ -6,8 +6,8 @@ #include <vector> -#include "base/bind.h" #include "base/containers/flat_map.h" +#include "base/functional/bind.h" #include "base/ranges/algorithm.h" #include "base/strings/escape.h" #include "base/strings/string_split.h"
diff --git a/chrome/browser/ash/kerberos/kerberos_credentials_manager.h b/chrome/browser/ash/kerberos/kerberos_credentials_manager.h index 171327d..4755614e 100644 --- a/chrome/browser/ash/kerberos/kerberos_credentials_manager.h +++ b/chrome/browser/ash/kerberos/kerberos_credentials_manager.h
@@ -8,8 +8,8 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/callback_list.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" #include "base/observer_list_types.h"
diff --git a/chrome/browser/ash/kerberos/kerberos_credentials_manager_unittest.cc b/chrome/browser/ash/kerberos/kerberos_credentials_manager_unittest.cc index 3ce2c33..360c265 100644 --- a/chrome/browser/ash/kerberos/kerberos_credentials_manager_unittest.cc +++ b/chrome/browser/ash/kerberos/kerberos_credentials_manager_unittest.cc
@@ -9,8 +9,8 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/containers/contains.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/run_loop.h" #include "base/test/bind.h"
diff --git a/chrome/browser/ash/kerberos/kerberos_ticket_expiry_notification.cc b/chrome/browser/ash/kerberos/kerberos_ticket_expiry_notification.cc index dc7a66b..01cebc91 100644 --- a/chrome/browser/ash/kerberos/kerberos_ticket_expiry_notification.cc +++ b/chrome/browser/ash/kerberos/kerberos_ticket_expiry_notification.cc
@@ -8,7 +8,7 @@ #include "ash/constants/notifier_catalogs.h" #include "ash/public/cpp/notification_utils.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/notifications/notification_display_service.h"
diff --git a/chrome/browser/ash/locale_change_guard.cc b/chrome/browser/ash/locale_change_guard.cc index dec66d9..0877bf4 100644 --- a/chrome/browser/ash/locale_change_guard.cc +++ b/chrome/browser/ash/locale_change_guard.cc
@@ -6,8 +6,8 @@ #include <algorithm> -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/metrics/user_metrics.h" #include "base/strings/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h"
diff --git a/chrome/browser/ash/lock_screen_apps/app_manager.h b/chrome/browser/ash/lock_screen_apps/app_manager.h index 2463231..944b7488 100644 --- a/chrome/browser/ash/lock_screen_apps/app_manager.h +++ b/chrome/browser/ash/lock_screen_apps/app_manager.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" class Profile;
diff --git a/chrome/browser/ash/lock_screen_apps/app_manager_impl.cc b/chrome/browser/ash/lock_screen_apps/app_manager_impl.cc index 4f38f6a..e5a1323 100644 --- a/chrome/browser/ash/lock_screen_apps/app_manager_impl.cc +++ b/chrome/browser/ash/lock_screen_apps/app_manager_impl.cc
@@ -12,13 +12,13 @@ #include <utility> #include "apps/launcher.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/check.h" #include "base/check_op.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/metrics/histogram_base.h" #include "base/metrics/histogram_macros.h"
diff --git a/chrome/browser/ash/lock_screen_apps/app_manager_impl.h b/chrome/browser/ash/lock_screen_apps/app_manager_impl.h index a389659..afe9ed0 100644 --- a/chrome/browser/ash/lock_screen_apps/app_manager_impl.h +++ b/chrome/browser/ash/lock_screen_apps/app_manager_impl.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "base/scoped_observation.h"
diff --git a/chrome/browser/ash/lock_screen_apps/app_manager_impl_unittest.cc b/chrome/browser/ash/lock_screen_apps/app_manager_impl_unittest.cc index 64d4339..d6a4e88 100644 --- a/chrome/browser/ash/lock_screen_apps/app_manager_impl_unittest.cc +++ b/chrome/browser/ash/lock_screen_apps/app_manager_impl_unittest.cc
@@ -14,13 +14,13 @@ #include "ash/components/arc/session/arc_service_manager.h" #include "ash/components/arc/session/arc_session.h" #include "ash/components/arc/session/arc_session_runner.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check.h" #include "base/command_line.h" #include "base/files/file.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/json/json_file_value_serializer.h" #include "base/location.h" #include "base/memory/raw_ptr.h"
diff --git a/chrome/browser/ash/lock_screen_apps/fake_lock_screen_profile_creator.cc b/chrome/browser/ash/lock_screen_apps/fake_lock_screen_profile_creator.cc index 6f785fb..9319bb6 100644 --- a/chrome/browser/ash/lock_screen_apps/fake_lock_screen_profile_creator.cc +++ b/chrome/browser/ash/lock_screen_apps/fake_lock_screen_profile_creator.cc
@@ -4,9 +4,9 @@ #include "chrome/browser/ash/lock_screen_apps/fake_lock_screen_profile_creator.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/location.h" #include "chrome/browser/extensions/test_extension_system.h" #include "chrome/test/base/testing_profile_manager.h"
diff --git a/chrome/browser/ash/lock_screen_apps/first_app_run_toast_manager.cc b/chrome/browser/ash/lock_screen_apps/first_app_run_toast_manager.cc index c867af93..dcb65788 100644 --- a/chrome/browser/ash/lock_screen_apps/first_app_run_toast_manager.cc +++ b/chrome/browser/ash/lock_screen_apps/first_app_run_toast_manager.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ash/lock_screen_apps/first_app_run_toast_manager.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "base/task/single_thread_task_runner.h" #include "base/values.h"
diff --git a/chrome/browser/ash/lock_screen_apps/focus_cycler_delegate.h b/chrome/browser/ash/lock_screen_apps/focus_cycler_delegate.h index 21dcde6..24577c2 100644 --- a/chrome/browser/ash/lock_screen_apps/focus_cycler_delegate.h +++ b/chrome/browser/ash/lock_screen_apps/focus_cycler_delegate.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_ASH_LOCK_SCREEN_APPS_FOCUS_CYCLER_DELEGATE_H_ #define CHROME_BROWSER_ASH_LOCK_SCREEN_APPS_FOCUS_CYCLER_DELEGATE_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" namespace lock_screen_apps {
diff --git a/chrome/browser/ash/lock_screen_apps/lock_screen_apps.cc b/chrome/browser/ash/lock_screen_apps/lock_screen_apps.cc index c8c1cf0..db9ecbe 100644 --- a/chrome/browser/ash/lock_screen_apps/lock_screen_apps.cc +++ b/chrome/browser/ash/lock_screen_apps/lock_screen_apps.cc
@@ -7,11 +7,11 @@ #include <memory> #include <ostream> -#include "base/bind.h" #include "base/check.h" #include "base/check_op.h" #include "base/containers/contains.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/no_destructor.h" #include "base/values.h"
diff --git a/chrome/browser/ash/lock_screen_apps/lock_screen_profile_creator.cc b/chrome/browser/ash/lock_screen_apps/lock_screen_profile_creator.cc index 6ada65d..36e88e70 100644 --- a/chrome/browser/ash/lock_screen_apps/lock_screen_profile_creator.cc +++ b/chrome/browser/ash/lock_screen_apps/lock_screen_profile_creator.cc
@@ -7,9 +7,9 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/check_op.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" namespace lock_screen_apps {
diff --git a/chrome/browser/ash/lock_screen_apps/lock_screen_profile_creator.h b/chrome/browser/ash/lock_screen_apps/lock_screen_profile_creator.h index e4d84f94..c5cf7db 100644 --- a/chrome/browser/ash/lock_screen_apps/lock_screen_profile_creator.h +++ b/chrome/browser/ash/lock_screen_apps/lock_screen_profile_creator.h
@@ -7,7 +7,7 @@ #include <list> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" class Profile;
diff --git a/chrome/browser/ash/lock_screen_apps/lock_screen_profile_creator_impl.cc b/chrome/browser/ash/lock_screen_apps/lock_screen_profile_creator_impl.cc index ef20ba2c..9b4ebe95 100644 --- a/chrome/browser/ash/lock_screen_apps/lock_screen_profile_creator_impl.cc +++ b/chrome/browser/ash/lock_screen_apps/lock_screen_profile_creator_impl.cc
@@ -8,7 +8,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "base/one_shot_event.h" #include "base/time/tick_clock.h"
diff --git a/chrome/browser/ash/lock_screen_apps/note_taking_browsertest.cc b/chrome/browser/ash/lock_screen_apps/note_taking_browsertest.cc index 8815571..5345224 100644 --- a/chrome/browser/ash/lock_screen_apps/note_taking_browsertest.cc +++ b/chrome/browser/ash/lock_screen_apps/note_taking_browsertest.cc
@@ -10,9 +10,9 @@ #include "apps/launcher.h" #include "ash/constants/ash_switches.h" #include "ash/public/mojom/tray_action.mojom-shared.h" -#include "base/callback_forward.h" #include "base/command_line.h" #include "base/files/file_path.h" +#include "base/functional/callback_forward.h" #include "base/memory/scoped_refptr.h" #include "base/run_loop.h" #include "base/scoped_observation.h"
diff --git a/chrome/browser/ash/lock_screen_apps/state_controller.cc b/chrome/browser/ash/lock_screen_apps/state_controller.cc index 42ca360c..1ba7212 100644 --- a/chrome/browser/ash/lock_screen_apps/state_controller.cc +++ b/chrome/browser/ash/lock_screen_apps/state_controller.cc
@@ -14,11 +14,11 @@ #include "ash/public/cpp/stylus_utils.h" #include "ash/public/mojom/tray_action.mojom.h" #include "base/base64.h" -#include "base/bind.h" #include "base/check.h" #include "base/check_op.h" #include "base/feature_list.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/metrics/histogram_base.h" #include "base/metrics/histogram_macros.h"
diff --git a/chrome/browser/ash/lock_screen_apps/state_controller.h b/chrome/browser/ash/lock_screen_apps/state_controller.h index 18980db4..9213c38 100644 --- a/chrome/browser/ash/lock_screen_apps/state_controller.h +++ b/chrome/browser/ash/lock_screen_apps/state_controller.h
@@ -12,7 +12,7 @@ #include "ash/public/mojom/tray_action.mojom-forward.h" #include "ash/public/mojom/tray_action.mojom-shared.h" #include "ash/public/mojom/tray_action.mojom.h" -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" #include "base/scoped_observation.h"
diff --git a/chrome/browser/ash/lock_screen_apps/state_controller_unittest.cc b/chrome/browser/ash/lock_screen_apps/state_controller_unittest.cc index 456e832..e15f99f 100644 --- a/chrome/browser/ash/lock_screen_apps/state_controller_unittest.cc +++ b/chrome/browser/ash/lock_screen_apps/state_controller_unittest.cc
@@ -15,9 +15,9 @@ #include "ash/public/mojom/tray_action.mojom.h" #include "ash/session/test_session_controller_client.h" #include "base/base64.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/run_loop.h" #include "base/test/scoped_command_line.h"
diff --git a/chrome/browser/ash/lock_screen_apps/toast_dialog_view.h b/chrome/browser/ash/lock_screen_apps/toast_dialog_view.h index cb3a018a..f6311b42 100644 --- a/chrome/browser/ash/lock_screen_apps/toast_dialog_view.h +++ b/chrome/browser/ash/lock_screen_apps/toast_dialog_view.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "ui/base/metadata/metadata_header_macros.h" #include "ui/views/bubble/bubble_dialog_delegate_view.h"
diff --git a/chrome/browser/ash/logging.cc b/chrome/browser/ash/logging.cc index f2fc69e..9f2f424 100644 --- a/chrome/browser/ash/logging.cc +++ b/chrome/browser/ash/logging.cc
@@ -6,11 +6,11 @@ #include <cstdio> -#include "base/bind.h" #include "base/command_line.h" #include "base/files/file_path.h" #include "base/files/platform_file.h" #include "base/files/scoped_file.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/posix/eintr_wrapper.h" #include "base/system/sys_info.h"
diff --git a/chrome/browser/ash/login/active_directory_migration_utils.cc b/chrome/browser/ash/login/active_directory_migration_utils.cc index daf6fac9..bc135cd 100644 --- a/chrome/browser/ash/login/active_directory_migration_utils.cc +++ b/chrome/browser/ash/login/active_directory_migration_utils.cc
@@ -5,9 +5,9 @@ #include "chrome/browser/ash/login/active_directory_migration_utils.h" #include "ash/constants/ash_paths.h" -#include "base/callback.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/logging.h" #include "base/path_service.h"
diff --git a/chrome/browser/ash/login/active_directory_migration_utils.h b/chrome/browser/ash/login/active_directory_migration_utils.h index 5569f7e..d9c7ad7 100644 --- a/chrome/browser/ash/login/active_directory_migration_utils.h +++ b/chrome/browser/ash/login/active_directory_migration_utils.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_ASH_LOGIN_ACTIVE_DIRECTORY_MIGRATION_UTILS_H_ #define CHROME_BROWSER_ASH_LOGIN_ACTIVE_DIRECTORY_MIGRATION_UTILS_H_ -#include "base/callback.h" +#include "base/functional/callback.h" namespace ash {
diff --git a/chrome/browser/ash/login/app_mode/force_install_observer.h b/chrome/browser/ash/login/app_mode/force_install_observer.h index ec698dce..19a5b10 100644 --- a/chrome/browser/ash/login/app_mode/force_install_observer.h +++ b/chrome/browser/ash/login/app_mode/force_install_observer.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_ASH_LOGIN_APP_MODE_FORCE_INSTALL_OBSERVER_H_ #define CHROME_BROWSER_ASH_LOGIN_APP_MODE_FORCE_INSTALL_OBSERVER_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/scoped_observation.h" #include "base/time/time.h" #include "base/timer/timer.h"
diff --git a/chrome/browser/ash/login/app_mode/kiosk_launch_controller.cc b/chrome/browser/ash/login/app_mode/kiosk_launch_controller.cc index a023c89..f2328bf 100644 --- a/chrome/browser/ash/login/app_mode/kiosk_launch_controller.cc +++ b/chrome/browser/ash/login/app_mode/kiosk_launch_controller.cc
@@ -7,10 +7,10 @@ #include <memory> #include "ash/public/cpp/login_accelerators.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/check_is_test.h" #include "base/feature_list.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h" #include "base/syslog_logging.h"
diff --git a/chrome/browser/ash/login/app_mode/test/kiosk_base_test.cc b/chrome/browser/ash/login/app_mode/test/kiosk_base_test.cc index 245d14fe3..448bb7a 100644 --- a/chrome/browser/ash/login/app_mode/test/kiosk_base_test.cc +++ b/chrome/browser/ash/login/app_mode/test/kiosk_base_test.cc
@@ -10,8 +10,8 @@ #include "apps/test/app_window_waiter.h" #include "ash/constants/ash_switches.h" #include "ash/public/cpp/login_screen_test_api.h" -#include "base/callback_forward.h" #include "base/command_line.h" +#include "base/functional/callback_forward.h" #include "base/json/json_reader.h" #include "base/logging.h" #include "base/run_loop.h"
diff --git a/chrome/browser/ash/login/app_mode/test/kiosk_consumer_browsertest.cc b/chrome/browser/ash/login/app_mode/test/kiosk_consumer_browsertest.cc index 4d6b7d3..6185935 100644 --- a/chrome/browser/ash/login/app_mode/test/kiosk_consumer_browsertest.cc +++ b/chrome/browser/ash/login/app_mode/test/kiosk_consumer_browsertest.cc
@@ -5,8 +5,8 @@ #include <utility> #include "ash/constants/ash_switches.h" -#include "base/callback_forward.h" #include "base/command_line.h" +#include "base/functional/callback_forward.h" #include "base/logging.h" #include "base/run_loop.h" #include "chrome/browser/ash/app_mode/kiosk_app_manager.h"
diff --git a/chrome/browser/ash/login/app_mode/test/kiosk_update_browsertest.cc b/chrome/browser/ash/login/app_mode/test/kiosk_update_browsertest.cc index c0c7b4a..988770ac 100644 --- a/chrome/browser/ash/login/app_mode/test/kiosk_update_browsertest.cc +++ b/chrome/browser/ash/login/app_mode/test/kiosk_update_browsertest.cc
@@ -5,8 +5,8 @@ #include <string> #include <vector> -#include "base/callback_helpers.h" #include "base/files/file_path.h" +#include "base/functional/callback_helpers.h" #include "base/path_service.h" #include "base/run_loop.h" #include "base/test/gtest_tags.h"
diff --git a/chrome/browser/ash/login/arc_terms_of_service_browsertest.cc b/chrome/browser/ash/login/arc_terms_of_service_browsertest.cc index a16768c..32abf1c2 100644 --- a/chrome/browser/ash/login/arc_terms_of_service_browsertest.cc +++ b/chrome/browser/ash/login/arc_terms_of_service_browsertest.cc
@@ -9,8 +9,8 @@ #include "ash/constants/ash_features.h" #include "ash/constants/ash_switches.h" #include "ash/public/cpp/login_screen_test_api.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/callback_helpers.h" #include "base/hash/sha1.h" #include "base/memory/ptr_util.h" #include "base/strings/strcat.h"
diff --git a/chrome/browser/ash/login/auth/chrome_login_performer.cc b/chrome/browser/ash/login/auth/chrome_login_performer.cc index 5557bdfb..83a10ccc 100644 --- a/chrome/browser/ash/login/auth/chrome_login_performer.cc +++ b/chrome/browser/ash/login/auth/chrome_login_performer.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/login/easy_unlock/easy_unlock_user_login_flow.h" #include "chrome/browser/ash/login/helper.h" #include "chrome/browser/ash/login/session/user_session_manager.h"
diff --git a/chrome/browser/ash/login/challenge_response_auth_keys_loader.cc b/chrome/browser/ash/login/challenge_response_auth_keys_loader.cc index f7abeb7..ec394fb 100644 --- a/chrome/browser/ash/login/challenge_response_auth_keys_loader.cc +++ b/chrome/browser/ash/login/challenge_response_auth_keys_loader.cc
@@ -9,9 +9,9 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" #include "base/containers/flat_set.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/scoped_multi_source_observation.h" #include "base/scoped_observation.h" #include "base/time/time.h"
diff --git a/chrome/browser/ash/login/challenge_response_auth_keys_loader_browsertest.cc b/chrome/browser/ash/login/challenge_response_auth_keys_loader_browsertest.cc index ae83d67..13e2842f 100644 --- a/chrome/browser/ash/login/challenge_response_auth_keys_loader_browsertest.cc +++ b/chrome/browser/ash/login/challenge_response_auth_keys_loader_browsertest.cc
@@ -6,7 +6,7 @@ #include <vector> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/scoped_observation.h" #include "base/test/bind.h"
diff --git a/chrome/browser/ash/login/chrome_restart_request.cc b/chrome/browser/ash/login/chrome_restart_request.cc index 71eda273..219e231 100644 --- a/chrome/browser/ash/login/chrome_restart_request.cc +++ b/chrome/browser/ash/login/chrome_restart_request.cc
@@ -13,9 +13,9 @@ #include "ash/constants/ash_switches.h" #include "ash/public/cpp/app_list/app_list_switches.h" #include "base/base_switches.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/memory/weak_ptr.h" #include "base/process/launch.h" #include "base/strings/string_split.h"
diff --git a/chrome/browser/ash/login/demo_mode/demo_components.cc b/chrome/browser/ash/login/demo_mode/demo_components.cc index db1fdff7be..f36248b 100644 --- a/chrome/browser/ash/login/demo_mode/demo_components.cc +++ b/chrome/browser/ash/login/demo_mode/demo_components.cc
@@ -6,10 +6,10 @@ #include "ash/constants/ash_features.h" #include "ash/constants/ash_paths.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/check_op.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/path_service.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/browser_process_platform_part.h"
diff --git a/chrome/browser/ash/login/demo_mode/demo_components.h b/chrome/browser/ash/login/demo_mode/demo_components.h index cf49edf..b3de825 100644 --- a/chrome/browser/ash/login/demo_mode/demo_components.h +++ b/chrome/browser/ash/login/demo_mode/demo_components.h
@@ -7,8 +7,8 @@ #include <list> -#include "base/callback_forward.h" #include "base/files/file_path.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ash/login/demo_mode/demo_session.h" #include "chrome/browser/component_updater/cros_component_installer_chromeos.h"
diff --git a/chrome/browser/ash/login/demo_mode/demo_components_unittest.cc b/chrome/browser/ash/login/demo_mode/demo_components_unittest.cc index f222d0a..c64f22d 100644 --- a/chrome/browser/ash/login/demo_mode/demo_components_unittest.cc +++ b/chrome/browser/ash/login/demo_mode/demo_components_unittest.cc
@@ -7,9 +7,9 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "chrome/browser/ash/login/demo_mode/demo_components.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/browser_process_platform_part.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 cfbc824b..89b14cb 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
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/json/json_reader.h" #include "base/location.h" #include "base/logging.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 da8644c..173adda1 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
@@ -7,10 +7,10 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/check_op.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/ptr_util.h" #include "base/metrics/histogram_macros.h"
diff --git a/chrome/browser/ash/login/demo_mode/demo_mode_resources_remover.h b/chrome/browser/ash/login/demo_mode/demo_mode_resources_remover.h index 85eecf4..cd7b358 100644 --- a/chrome/browser/ash/login/demo_mode/demo_mode_resources_remover.h +++ b/chrome/browser/ash/login/demo_mode/demo_mode_resources_remover.h
@@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "base/scoped_observation.h" #include "chromeos/ash/components/dbus/userdataauth/userdataauth_client.h"
diff --git a/chrome/browser/ash/login/demo_mode/demo_mode_resources_remover_unittest.cc b/chrome/browser/ash/login/demo_mode/demo_mode_resources_remover_unittest.cc index 02a81d44..6ddb27b 100644 --- a/chrome/browser/ash/login/demo_mode/demo_mode_resources_remover_unittest.cc +++ b/chrome/browser/ash/login/demo_mode/demo_mode_resources_remover_unittest.cc
@@ -8,8 +8,8 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/test/simple_test_tick_clock.h" #include "base/values.h" #include "chrome/browser/ash/login/demo_mode/demo_mode_test_helper.h"
diff --git a/chrome/browser/ash/login/demo_mode/demo_session.cc b/chrome/browser/ash/login/demo_mode/demo_session.cc index 36ac5e27..88c16e991 100644 --- a/chrome/browser/ash/login/demo_mode/demo_session.cc +++ b/chrome/browser/ash/login/demo_mode/demo_session.cc
@@ -12,13 +12,13 @@ #include "ash/shell.h" #include "ash/system/keyboard_brightness/keyboard_backlight_color_controller.h" #include "ash/webui/personalization_app/mojom/personalization_app.mojom.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" #include "base/containers/contains.h" #include "base/containers/flat_set.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/i18n/string_compare.h" #include "base/logging.h" #include "base/metrics/histogram_macros.h"
diff --git a/chrome/browser/ash/login/demo_mode/demo_session.h b/chrome/browser/ash/login/demo_mode/demo_session.h index d2988a8..c6012be 100644 --- a/chrome/browser/ash/login/demo_mode/demo_session.h +++ b/chrome/browser/ash/login/demo_mode/demo_session.h
@@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "base/scoped_multi_source_observation.h"
diff --git a/chrome/browser/ash/login/demo_mode/demo_session_unittest.cc b/chrome/browser/ash/login/demo_mode/demo_session_unittest.cc index 4b7c46182..8c9fe8f 100644 --- a/chrome/browser/ash/login/demo_mode/demo_session_unittest.cc +++ b/chrome/browser/ash/login/demo_mode/demo_session_unittest.cc
@@ -10,8 +10,8 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "base/task/thread_pool/thread_pool_instance.h" #include "base/timer/mock_timer.h"
diff --git a/chrome/browser/ash/login/demo_mode/demo_setup_browsertest.cc b/chrome/browser/ash/login/demo_mode/demo_setup_browsertest.cc index 5c574ea..8d7ed11 100644 --- a/chrome/browser/ash/login/demo_mode/demo_setup_browsertest.cc +++ b/chrome/browser/ash/login/demo_mode/demo_setup_browsertest.cc
@@ -10,10 +10,10 @@ #include "ash/constants/ash_features.h" #include "ash/constants/ash_switches.h" #include "ash/public/cpp/login_accelerators.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/containers/flat_map.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/strings/strcat.h" #include "base/strings/string_number_conversions.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 912be0c..3fc6bd06 100644 --- a/chrome/browser/ash/login/demo_mode/demo_setup_controller.cc +++ b/chrome/browser/ash/login/demo_mode/demo_setup_controller.cc
@@ -11,11 +11,11 @@ #include "ash/constants/ash_features.h" #include "ash/constants/ash_switches.h" #include "base/barrier_closure.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" #include "base/containers/contains.h" #include "base/containers/flat_map.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/metrics/histogram_functions.h" #include "base/strings/stringprintf.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 9b3b64d..44f3cbe 100644 --- a/chrome/browser/ash/login/demo_mode/demo_setup_controller.h +++ b/chrome/browser/ash/login/demo_mode/demo_setup_controller.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/callback_forward.h" #include "base/files/file_path.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h" #include "chrome/browser/ash/login/demo_mode/demo_session.h"
diff --git a/chrome/browser/ash/login/demo_mode/demo_setup_controller_unittest.cc b/chrome/browser/ash/login/demo_mode/demo_setup_controller_unittest.cc index 6c8d074..d2659fd 100644 --- a/chrome/browser/ash/login/demo_mode/demo_setup_controller_unittest.cc +++ b/chrome/browser/ash/login/demo_mode/demo_setup_controller_unittest.cc
@@ -7,10 +7,10 @@ #include <memory> #include "ash/constants/ash_switches.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/test/scoped_command_line.h" #include "base/test/scoped_feature_list.h"
diff --git a/chrome/browser/ash/login/easy_unlock/easy_unlock_auth_attempt.cc b/chrome/browser/ash/login/easy_unlock/easy_unlock_auth_attempt.cc index 88895f80..381a688 100644 --- a/chrome/browser/ash/login/easy_unlock/easy_unlock_auth_attempt.cc +++ b/chrome/browser/ash/login/easy_unlock/easy_unlock_auth_attempt.cc
@@ -4,9 +4,9 @@ #include "chrome/browser/ash/login/easy_unlock/easy_unlock_auth_attempt.h" -#include "base/bind.h" #include "base/check_op.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "build/build_config.h" #include "chrome/browser/ash/login/easy_unlock/easy_unlock_key_manager.h" #include "chromeos/ash/components/proximity_auth/screenlock_bridge.h"
diff --git a/chrome/browser/ash/login/easy_unlock/easy_unlock_auth_attempt.h b/chrome/browser/ash/login/easy_unlock/easy_unlock_auth_attempt.h index 41bfb39a..e9b6e77 100644 --- a/chrome/browser/ash/login/easy_unlock/easy_unlock_auth_attempt.h +++ b/chrome/browser/ash/login/easy_unlock/easy_unlock_auth_attempt.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "components/account_id/account_id.h" namespace ash {
diff --git a/chrome/browser/ash/login/easy_unlock/easy_unlock_challenge_wrapper.cc b/chrome/browser/ash/login/easy_unlock/easy_unlock_challenge_wrapper.cc index 1b1a699..97c5f1c 100644 --- a/chrome/browser/ash/login/easy_unlock/easy_unlock_challenge_wrapper.cc +++ b/chrome/browser/ash/login/easy_unlock/easy_unlock_challenge_wrapper.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ash/login/easy_unlock/easy_unlock_challenge_wrapper.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/login/easy_unlock/easy_unlock_tpm_key_manager.h" #include "chromeos/ash/components/multidevice/logging/logging.h" #include "third_party/securemessage/proto/securemessage.pb.h"
diff --git a/chrome/browser/ash/login/easy_unlock/easy_unlock_challenge_wrapper.h b/chrome/browser/ash/login/easy_unlock/easy_unlock_challenge_wrapper.h index 6614aad..372cfe9 100644 --- a/chrome/browser/ash/login/easy_unlock/easy_unlock_challenge_wrapper.h +++ b/chrome/browser/ash/login/easy_unlock/easy_unlock_challenge_wrapper.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "components/account_id/account_id.h"
diff --git a/chrome/browser/ash/login/easy_unlock/easy_unlock_challenge_wrapper_unittest.cc b/chrome/browser/ash/login/easy_unlock/easy_unlock_challenge_wrapper_unittest.cc index 49a4324aa..e4a3f37 100644 --- a/chrome/browser/ash/login/easy_unlock/easy_unlock_challenge_wrapper_unittest.cc +++ b/chrome/browser/ash/login/easy_unlock/easy_unlock_challenge_wrapper_unittest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ash/login/easy_unlock/easy_unlock_challenge_wrapper.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/test/task_environment.h" #include "base/test/test_future.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/ash/login/easy_unlock/easy_unlock_create_keys_operation.cc b/chrome/browser/ash/login/easy_unlock/easy_unlock_create_keys_operation.cc index a9ed5db..2dbcc497 100644 --- a/chrome/browser/ash/login/easy_unlock/easy_unlock_create_keys_operation.cc +++ b/chrome/browser/ash/login/easy_unlock/easy_unlock_create_keys_operation.cc
@@ -7,7 +7,7 @@ #include <memory> #include "base/base64url.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "chrome/browser/ash/login/easy_unlock/easy_unlock_types.h" #include "chromeos/ash/components/cryptohome/common_types.h"
diff --git a/chrome/browser/ash/login/easy_unlock/easy_unlock_create_keys_operation.h b/chrome/browser/ash/login/easy_unlock/easy_unlock_create_keys_operation.h index 9722dca..cf89877 100644 --- a/chrome/browser/ash/login/easy_unlock/easy_unlock_create_keys_operation.h +++ b/chrome/browser/ash/login/easy_unlock/easy_unlock_create_keys_operation.h
@@ -10,7 +10,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ash/login/easy_unlock/easy_unlock_types.h" #include "chromeos/ash/components/login/auth/public/user_context.h"
diff --git a/chrome/browser/ash/login/easy_unlock/easy_unlock_get_keys_operation.h b/chrome/browser/ash/login/easy_unlock/easy_unlock_get_keys_operation.h index 8edcae5c..2bbfe9b 100644 --- a/chrome/browser/ash/login/easy_unlock/easy_unlock_get_keys_operation.h +++ b/chrome/browser/ash/login/easy_unlock/easy_unlock_get_keys_operation.h
@@ -7,7 +7,7 @@ #include <stddef.h> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ash/login/easy_unlock/easy_unlock_types.h" #include "chromeos/ash/components/dbus/cryptohome/rpc.pb.h"
diff --git a/chrome/browser/ash/login/easy_unlock/easy_unlock_key_manager.cc b/chrome/browser/ash/login/easy_unlock/easy_unlock_key_manager.cc index f297418..c9a6de61e 100644 --- a/chrome/browser/ash/login/easy_unlock/easy_unlock_key_manager.cc +++ b/chrome/browser/ash/login/easy_unlock/easy_unlock_key_manager.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/strings/stringprintf.h" #include "chrome/browser/ash/login/easy_unlock/easy_unlock_key_names.h"
diff --git a/chrome/browser/ash/login/easy_unlock/easy_unlock_key_manager.h b/chrome/browser/ash/login/easy_unlock/easy_unlock_key_manager.h index 08f647b..ee5f5bab 100644 --- a/chrome/browser/ash/login/easy_unlock/easy_unlock_key_manager.h +++ b/chrome/browser/ash/login/easy_unlock/easy_unlock_key_manager.h
@@ -11,8 +11,8 @@ #include <memory> #include <string> -#include "base/callback.h" #include "base/containers/circular_deque.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/values.h" #include "chrome/browser/ash/login/easy_unlock/easy_unlock_get_keys_operation.h"
diff --git a/chrome/browser/ash/login/easy_unlock/easy_unlock_notification_controller.h b/chrome/browser/ash/login/easy_unlock/easy_unlock_notification_controller.h index 2416416..8ae743f 100644 --- a/chrome/browser/ash/login/easy_unlock/easy_unlock_notification_controller.h +++ b/chrome/browser/ash/login/easy_unlock/easy_unlock_notification_controller.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "ui/message_center/public/cpp/notification.h" #include "ui/message_center/public/cpp/notification_delegate.h"
diff --git a/chrome/browser/ash/login/easy_unlock/easy_unlock_refresh_keys_operation.h b/chrome/browser/ash/login/easy_unlock/easy_unlock_refresh_keys_operation.h index b25a554..7108f64 100644 --- a/chrome/browser/ash/login/easy_unlock/easy_unlock_refresh_keys_operation.h +++ b/chrome/browser/ash/login/easy_unlock/easy_unlock_refresh_keys_operation.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ash/login/easy_unlock/easy_unlock_types.h" #include "chromeos/ash/components/login/auth/public/user_context.h"
diff --git a/chrome/browser/ash/login/easy_unlock/easy_unlock_remove_keys_operation.cc b/chrome/browser/ash/login/easy_unlock/easy_unlock_remove_keys_operation.cc index 4ae252c..2ef4089 100644 --- a/chrome/browser/ash/login/easy_unlock/easy_unlock_remove_keys_operation.cc +++ b/chrome/browser/ash/login/easy_unlock/easy_unlock_remove_keys_operation.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ash/login/easy_unlock/easy_unlock_remove_keys_operation.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "chromeos/ash/components/cryptohome/common_types.h" #include "google_apis/gaia/gaia_auth_util.h"
diff --git a/chrome/browser/ash/login/easy_unlock/easy_unlock_remove_keys_operation.h b/chrome/browser/ash/login/easy_unlock/easy_unlock_remove_keys_operation.h index 0dcb812..54dd05a8 100644 --- a/chrome/browser/ash/login/easy_unlock/easy_unlock_remove_keys_operation.h +++ b/chrome/browser/ash/login/easy_unlock/easy_unlock_remove_keys_operation.h
@@ -7,7 +7,7 @@ #include <stddef.h> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "chromeos/ash/components/login/auth/public/user_context.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/chrome/browser/ash/login/easy_unlock/easy_unlock_service.cc b/chrome/browser/ash/login/easy_unlock/easy_unlock_service.cc index b73ab56..cc0d5ba 100644 --- a/chrome/browser/ash/login/easy_unlock/easy_unlock_service.cc +++ b/chrome/browser/ash/login/easy_unlock/easy_unlock_service.cc
@@ -9,9 +9,9 @@ #include "ash/constants/ash_features.h" #include "ash/public/cpp/smartlock_state.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/guid.h" #include "base/logging.h" #include "base/metrics/histogram_macros.h"
diff --git a/chrome/browser/ash/login/easy_unlock/easy_unlock_service.h b/chrome/browser/ash/login/easy_unlock/easy_unlock_service.h index c928f835..6bc7bdf 100644 --- a/chrome/browser/ash/login/easy_unlock/easy_unlock_service.h +++ b/chrome/browser/ash/login/easy_unlock/easy_unlock_service.h
@@ -9,7 +9,7 @@ #include <set> #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "build/build_config.h" #include "chrome/browser/ash/login/easy_unlock/chrome_proximity_auth_client.h"
diff --git a/chrome/browser/ash/login/easy_unlock/easy_unlock_service_regular.cc b/chrome/browser/ash/login/easy_unlock/easy_unlock_service_regular.cc index 6c32944..f522dc6f 100644 --- a/chrome/browser/ash/login/easy_unlock/easy_unlock_service_regular.cc +++ b/chrome/browser/ash/login/easy_unlock/easy_unlock_service_regular.cc
@@ -11,8 +11,8 @@ #include "apps/app_lifetime_monitor_factory.h" #include "base/base64url.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/json/json_string_value_serializer.h" #include "base/linux_util.h" #include "base/logging.h"
diff --git a/chrome/browser/ash/login/easy_unlock/easy_unlock_service_regular.h b/chrome/browser/ash/login/easy_unlock/easy_unlock_service_regular.h index 0857a4f..77582ce 100644 --- a/chrome/browser/ash/login/easy_unlock/easy_unlock_service_regular.h +++ b/chrome/browser/ash/login/easy_unlock/easy_unlock_service_regular.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/time/time.h" #include "build/build_config.h" #include "chrome/browser/ash/login/easy_unlock/easy_unlock_service.h"
diff --git a/chrome/browser/ash/login/easy_unlock/easy_unlock_service_regular_unittest.cc b/chrome/browser/ash/login/easy_unlock/easy_unlock_service_regular_unittest.cc index a9921d5..4714f9b 100644 --- a/chrome/browser/ash/login/easy_unlock/easy_unlock_service_regular_unittest.cc +++ b/chrome/browser/ash/login/easy_unlock/easy_unlock_service_regular_unittest.cc
@@ -12,7 +12,7 @@ #include <utility> #include "ash/constants/ash_features.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/ptr_util.h" #include "base/run_loop.h"
diff --git a/chrome/browser/ash/login/easy_unlock/easy_unlock_tpm_key_manager.cc b/chrome/browser/ash/login/easy_unlock/easy_unlock_tpm_key_manager.cc index e5658b8..566866d 100644 --- a/chrome/browser/ash/login/easy_unlock/easy_unlock_tpm_key_manager.cc +++ b/chrome/browser/ash/login/easy_unlock/easy_unlock_tpm_key_manager.cc
@@ -10,7 +10,7 @@ #include <utility> #include "base/base64.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/memory/ref_counted.h"
diff --git a/chrome/browser/ash/login/easy_unlock/easy_unlock_tpm_key_manager.h b/chrome/browser/ash/login/easy_unlock/easy_unlock_tpm_key_manager.h index 746b4fa..cf8d219d 100644 --- a/chrome/browser/ash/login/easy_unlock/easy_unlock_tpm_key_manager.h +++ b/chrome/browser/ash/login/easy_unlock/easy_unlock_tpm_key_manager.h
@@ -10,7 +10,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "components/account_id/account_id.h" #include "components/keyed_service/core/keyed_service.h"
diff --git a/chrome/browser/ash/login/easy_unlock/easy_unlock_tpm_key_manager_unittest.cc b/chrome/browser/ash/login/easy_unlock/easy_unlock_tpm_key_manager_unittest.cc index e0171f3d..9d42a51 100644 --- a/chrome/browser/ash/login/easy_unlock/easy_unlock_tpm_key_manager_unittest.cc +++ b/chrome/browser/ash/login/easy_unlock/easy_unlock_tpm_key_manager_unittest.cc
@@ -9,8 +9,8 @@ #include <memory> #include "base/base64.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/ptr_util.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ash/login/easy_unlock/smartlock_state_handler.cc b/chrome/browser/ash/login/easy_unlock/smartlock_state_handler.cc index 2c36ee70..f8c0150 100644 --- a/chrome/browser/ash/login/easy_unlock/smartlock_state_handler.cc +++ b/chrome/browser/ash/login/easy_unlock/smartlock_state_handler.cc
@@ -10,7 +10,7 @@ #include "ash/constants/ash_features.h" #include "ash/public/cpp/smartlock_state.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h" #include "chrome/browser/ash/login/easy_unlock/easy_unlock_metrics.h"
diff --git a/chrome/browser/ash/login/enable_debugging_browsertest.cc b/chrome/browser/ash/login/enable_debugging_browsertest.cc index ed57074f..e0726e9 100644 --- a/chrome/browser/ash/login/enable_debugging_browsertest.cc +++ b/chrome/browser/ash/login/enable_debugging_browsertest.cc
@@ -5,8 +5,8 @@ #include <string> #include "ash/constants/ash_switches.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/json/json_file_value_serializer.h" #include "base/location.h" #include "base/path_service.h"
diff --git a/chrome/browser/ash/login/enrollment/auto_enrollment_check_screen.cc b/chrome/browser/ash/login/enrollment/auto_enrollment_check_screen.cc index a6498d5d..8118fd37 100644 --- a/chrome/browser/ash/login/enrollment/auto_enrollment_check_screen.cc +++ b/chrome/browser/ash/login/enrollment/auto_enrollment_check_screen.cc
@@ -4,9 +4,9 @@ #include "chrome/browser/ash/login/enrollment/auto_enrollment_check_screen.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/notreached.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/ash/login/enrollment/auto_enrollment_check_screen.h b/chrome/browser/ash/login/enrollment/auto_enrollment_check_screen.h index 8839209c..f8e64177 100644 --- a/chrome/browser/ash/login/enrollment/auto_enrollment_check_screen.h +++ b/chrome/browser/ash/login/enrollment/auto_enrollment_check_screen.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ash/login/enrollment/auto_enrollment_check_screen_view.h"
diff --git a/chrome/browser/ash/login/enrollment/auto_enrollment_controller.cc b/chrome/browser/ash/login/enrollment/auto_enrollment_controller.cc index d1cbacb..242efc78 100644 --- a/chrome/browser/ash/login/enrollment/auto_enrollment_controller.cc +++ b/chrome/browser/ash/login/enrollment/auto_enrollment_controller.cc
@@ -7,10 +7,10 @@ #include <memory> #include "ash/constants/ash_switches.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check_is_test.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h"
diff --git a/chrome/browser/ash/login/enrollment/auto_enrollment_controller.h b/chrome/browser/ash/login/enrollment/auto_enrollment_controller.h index b9418289..87c22d6 100644 --- a/chrome/browser/ash/login/enrollment/auto_enrollment_controller.h +++ b/chrome/browser/ash/login/enrollment/auto_enrollment_controller.h
@@ -9,8 +9,8 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/callback_list.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/timer/timer.h" #include "chrome/browser/ash/policy/enrollment/auto_enrollment_client.h"
diff --git a/chrome/browser/ash/login/enrollment/enrollment_embedded_policy_server_browsertest.cc b/chrome/browser/ash/login/enrollment/enrollment_embedded_policy_server_browsertest.cc index bc75814..043aea3 100644 --- a/chrome/browser/ash/login/enrollment/enrollment_embedded_policy_server_browsertest.cc +++ b/chrome/browser/ash/login/enrollment/enrollment_embedded_policy_server_browsertest.cc
@@ -7,9 +7,9 @@ #include "ash/constants/ash_features.h" #include "ash/constants/ash_switches.h" #include "ash/public/cpp/login_screen_test_api.h" -#include "base/bind.h" #include "base/check.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/test/gtest_util.h" #include "base/values.h" #include "build/build_config.h"
diff --git a/chrome/browser/ash/login/enrollment/enrollment_screen.cc b/chrome/browser/ash/login/enrollment/enrollment_screen.cc index 1859288b..6505849 100644 --- a/chrome/browser/ash/login/enrollment/enrollment_screen.cc +++ b/chrome/browser/ash/login/enrollment/enrollment_screen.cc
@@ -8,10 +8,10 @@ #include "ash/constants/ash_features.h" #include "ash/constants/ash_switches.h" -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/check_is_test.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/logging.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/ash/login/enrollment/enrollment_screen.h b/chrome/browser/ash/login/enrollment/enrollment_screen.h index 5df6d7457..f91cb9a 100644 --- a/chrome/browser/ash/login/enrollment/enrollment_screen.h +++ b/chrome/browser/ash/login/enrollment/enrollment_screen.h
@@ -8,8 +8,8 @@ #include <memory> #include <string> -#include "base/callback.h" #include "base/cancelable_callback.h" +#include "base/functional/callback.h" #include "base/gtest_prod_util.h" #include "base/memory/weak_ptr.h" #include "base/timer/timer.h"
diff --git a/chrome/browser/ash/login/enrollment/enrollment_screen_unittest.cc b/chrome/browser/ash/login/enrollment/enrollment_screen_unittest.cc index 9e4be128..f933788 100644 --- a/chrome/browser/ash/login/enrollment/enrollment_screen_unittest.cc +++ b/chrome/browser/ash/login/enrollment/enrollment_screen_unittest.cc
@@ -5,9 +5,9 @@ #include "chrome/browser/ash/login/enrollment/enrollment_screen.h" #include "ash/constants/ash_switches.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/task/single_thread_task_runner.h" #include "base/test/task_environment.h" #include "base/time/time.h"
diff --git a/chrome/browser/ash/login/enrollment/enterprise_enrollment_helper.h b/chrome/browser/ash/login/enrollment/enterprise_enrollment_helper.h index 3a21ab5..b05e967 100644 --- a/chrome/browser/ash/login/enrollment/enterprise_enrollment_helper.h +++ b/chrome/browser/ash/login/enrollment/enterprise_enrollment_helper.h
@@ -9,7 +9,7 @@ #include <memory> #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "components/policy/core/common/cloud/cloud_policy_constants.h" class GoogleServiceAuthError;
diff --git a/chrome/browser/ash/login/enrollment/enterprise_enrollment_helper_impl.cc b/chrome/browser/ash/login/enrollment/enterprise_enrollment_helper_impl.cc index 2428a89f..e241a3a 100644 --- a/chrome/browser/ash/login/enrollment/enterprise_enrollment_helper_impl.cc +++ b/chrome/browser/ash/login/enrollment/enterprise_enrollment_helper_impl.cc
@@ -6,9 +6,9 @@ #include <memory> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/logging.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/ash/login/enrollment/enterprise_enrollment_helper_impl.h b/chrome/browser/ash/login/enrollment/enterprise_enrollment_helper_impl.h index de40863..16456a5 100644 --- a/chrome/browser/ash/login/enrollment/enterprise_enrollment_helper_impl.h +++ b/chrome/browser/ash/login/enrollment/enterprise_enrollment_helper_impl.h
@@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/gtest_prod_util.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ash/login/enrollment/enterprise_enrollment_helper.h"
diff --git a/chrome/browser/ash/login/enrollment/enterprise_enrollment_helper_mock.h b/chrome/browser/ash/login/enrollment/enterprise_enrollment_helper_mock.h index 2e61aaa..381a643 100644 --- a/chrome/browser/ash/login/enrollment/enterprise_enrollment_helper_mock.h +++ b/chrome/browser/ash/login/enrollment/enterprise_enrollment_helper_mock.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/callback.h" -#include "base/callback_forward.h" +#include "base/functional/callback.h" +#include "base/functional/callback_forward.h" #include "chrome/browser/ash/login/enrollment/enterprise_enrollment_helper.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/ash/login/enterprise_enrollment_browsertest.cc b/chrome/browser/ash/login/enterprise_enrollment_browsertest.cc index 9f3f41b6..c0213c02b 100644 --- a/chrome/browser/ash/login/enterprise_enrollment_browsertest.cc +++ b/chrome/browser/ash/login/enterprise_enrollment_browsertest.cc
@@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/base64.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/json/json_reader.h" #include "base/json/string_escape.h" #include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/ash/login/eula_browsertest.cc b/chrome/browser/ash/login/eula_browsertest.cc index fdce96f..0b94ca8 100644 --- a/chrome/browser/ash/login/eula_browsertest.cc +++ b/chrome/browser/ash/login/eula_browsertest.cc
@@ -8,8 +8,8 @@ #include <utility> #include "ash/constants/ash_features.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/run_loop.h" #include "base/strings/string_util.h" #include "base/test/bind.h"
diff --git a/chrome/browser/ash/login/existing_user_controller.cc b/chrome/browser/ash/login/existing_user_controller.cc index c0d819a..7abf7a5 100644 --- a/chrome/browser/ash/login/existing_user_controller.cc +++ b/chrome/browser/ash/login/existing_user_controller.cc
@@ -17,11 +17,11 @@ #include "ash/public/cpp/login_screen.h" #include "ash/public/cpp/notification_utils.h" #include "base/barrier_closure.h" -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/metrics/histogram_functions.h" #include "base/scoped_observation.h"
diff --git a/chrome/browser/ash/login/existing_user_controller_browsertest.cc b/chrome/browser/ash/login/existing_user_controller_browsertest.cc index 2f2356d..1dc6525 100644 --- a/chrome/browser/ash/login/existing_user_controller_browsertest.cc +++ b/chrome/browser/ash/login/existing_user_controller_browsertest.cc
@@ -10,11 +10,11 @@ #include "ash/constants/ash_features.h" #include "ash/constants/ash_switches.h" #include "ash/public/cpp/login_screen_test_api.h" -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/memory/ref_counted.h" #include "base/path_service.h"
diff --git a/chrome/browser/ash/login/extensions/login_screen_extensions_content_script_manager.cc b/chrome/browser/ash/login/extensions/login_screen_extensions_content_script_manager.cc index 310a2b5..b0aab2a9 100644 --- a/chrome/browser/ash/login/extensions/login_screen_extensions_content_script_manager.cc +++ b/chrome/browser/ash/login/extensions/login_screen_extensions_content_script_manager.cc
@@ -4,9 +4,9 @@ #include "chrome/browser/ash/login/extensions/login_screen_extensions_content_script_manager.h" -#include "base/bind.h" #include "base/check.h" #include "base/check_is_test.h" +#include "base/functional/bind.h" #include "base/task/sequenced_task_runner.h" #include "base/values.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/ash/login/extensions/login_screen_extensions_lifetime_manager.cc b/chrome/browser/ash/login/extensions/login_screen_extensions_lifetime_manager.cc index 6561869..f983746d 100644 --- a/chrome/browser/ash/login/extensions/login_screen_extensions_lifetime_manager.cc +++ b/chrome/browser/ash/login/extensions/login_screen_extensions_lifetime_manager.cc
@@ -4,11 +4,11 @@ #include "chrome/browser/ash/login/extensions/login_screen_extensions_lifetime_manager.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check.h" #include "base/check_is_test.h" #include "base/check_op.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/task/sequenced_task_runner.h" #include "base/values.h"
diff --git a/chrome/browser/ash/login/gaia_reauth_token_fetcher.cc b/chrome/browser/ash/login/gaia_reauth_token_fetcher.cc index 5028e2d..ff964b0a 100644 --- a/chrome/browser/ash/login/gaia_reauth_token_fetcher.cc +++ b/chrome/browser/ash/login/gaia_reauth_token_fetcher.cc
@@ -7,9 +7,9 @@ #include <string> #include "ash/constants/ash_switches.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/json/json_reader.h" #include "base/metrics/histogram_functions.h" #include "base/time/time.h"
diff --git a/chrome/browser/ash/login/gaia_reauth_token_fetcher.h b/chrome/browser/ash/login/gaia_reauth_token_fetcher.h index 88074177..5da5792 100644 --- a/chrome/browser/ash/login/gaia_reauth_token_fetcher.h +++ b/chrome/browser/ash/login/gaia_reauth_token_fetcher.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/timer/elapsed_timer.h" #include "services/network/public/cpp/simple_url_loader.h"
diff --git a/chrome/browser/ash/login/helper.cc b/chrome/browser/ash/login/helper.cc index 8e2b82a..9dbc4fd 100644 --- a/chrome/browser/ash/login/helper.cc +++ b/chrome/browser/ash/login/helper.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ash/login/lock/screen_locker.cc b/chrome/browser/ash/login/lock/screen_locker.cc index b4ffabc..b0c6b333 100644 --- a/chrome/browser/ash/login/lock/screen_locker.cc +++ b/chrome/browser/ash/login/lock/screen_locker.cc
@@ -8,9 +8,9 @@ #include "ash/constants/ash_pref_names.h" #include "ash/public/cpp/login_screen.h" #include "ash/public/cpp/login_screen_model.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/lazy_instance.h" #include "base/location.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/ash/login/lock/screen_locker.h b/chrome/browser/ash/login/lock/screen_locker.h index deb2a6d..966b948d1 100644 --- a/chrome/browser/ash/login/lock/screen_locker.h +++ b/chrome/browser/ash/login/lock/screen_locker.h
@@ -11,7 +11,7 @@ #include <vector> #include "ash/public/cpp/login_types.h" -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/task/sequenced_task_runner_helpers.h"
diff --git a/chrome/browser/ash/login/lock/screen_locker_browsertest.cc b/chrome/browser/ash/login/lock/screen_locker_browsertest.cc index 8e1e8cb4..8535698 100644 --- a/chrome/browser/ash/login/lock/screen_locker_browsertest.cc +++ b/chrome/browser/ash/login/lock/screen_locker_browsertest.cc
@@ -8,7 +8,7 @@ #include "ash/constants/ash_pref_names.h" #include "ash/wm/window_state.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "build/build_config.h" #include "chrome/browser/ash/login/lock/screen_locker_tester.h"
diff --git a/chrome/browser/ash/login/lock/screen_locker_tester.h b/chrome/browser/ash/login/lock/screen_locker_tester.h index 100fb8c..141520a 100644 --- a/chrome/browser/ash/login/lock/screen_locker_tester.h +++ b/chrome/browser/ash/login/lock/screen_locker_tester.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/scoped_observation.h" #include "components/session_manager/core/session_manager.h" #include "components/session_manager/core/session_manager_observer.h"
diff --git a/chrome/browser/ash/login/lock/screen_locker_unittest.cc b/chrome/browser/ash/login/lock/screen_locker_unittest.cc index d713340..f668086 100644 --- a/chrome/browser/ash/login/lock/screen_locker_unittest.cc +++ b/chrome/browser/ash/login/lock/screen_locker_unittest.cc
@@ -8,8 +8,8 @@ #include "ash/public/cpp/login_screen_model.h" #include "ash/public/cpp/login_types.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "chrome/browser/ash/accessibility/accessibility_manager.h" #include "chrome/browser/ash/input_method/mock_input_method_manager_impl.h"
diff --git a/chrome/browser/ash/login/lock/views_screen_locker.cc b/chrome/browser/ash/login/lock/views_screen_locker.cc index 8c97fd1..aaebcb7 100644 --- a/chrome/browser/ash/login/lock/views_screen_locker.cc +++ b/chrome/browser/ash/login/lock/views_screen_locker.cc
@@ -10,8 +10,8 @@ #include "ash/public/cpp/login_screen.h" #include "ash/public/cpp/login_screen_model.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/i18n/time_formatting.h" #include "base/location.h" #include "base/metrics/histogram_macros.h"
diff --git a/chrome/browser/ash/login/lock/views_screen_locker.h b/chrome/browser/ash/login/lock/views_screen_locker.h index cd7b4a92..3c8e67003 100644 --- a/chrome/browser/ash/login/lock/views_screen_locker.h +++ b/chrome/browser/ash/login/lock/views_screen_locker.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_ASH_LOGIN_LOCK_VIEWS_SCREEN_LOCKER_H_ #define CHROME_BROWSER_ASH_LOGIN_LOCK_VIEWS_SCREEN_LOCKER_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h" #include "chrome/browser/ash/lock_screen_apps/focus_cycler_delegate.h"
diff --git a/chrome/browser/ash/login/login_browsertest.cc b/chrome/browser/ash/login/login_browsertest.cc index 78c8552..7afd0462 100644 --- a/chrome/browser/ash/login/login_browsertest.cc +++ b/chrome/browser/ash/login/login_browsertest.cc
@@ -12,8 +12,8 @@ #include "ash/system/status_area_widget.h" #include "ash/system/status_area_widget_test_helper.h" #include "ash/system/unified/unified_system_tray.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/strings/string_split.h" #include "base/test/scoped_feature_list.h"
diff --git a/chrome/browser/ash/login/login_manager_test.cc b/chrome/browser/ash/login/login_manager_test.cc index 48b871b..34f92a0 100644 --- a/chrome/browser/ash/login/login_manager_test.cc +++ b/chrome/browser/ash/login/login_manager_test.cc
@@ -9,10 +9,10 @@ #include "ash/constants/ash_switches.h" #include "ash/metrics/login_unlock_throughput_recorder.h" #include "ash/shell.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "chrome/browser/ash/login/existing_user_controller.h" #include "chrome/browser/ash/login/session/user_session_manager.h" #include "chrome/browser/ash/login/session/user_session_manager_test_api.h"
diff --git a/chrome/browser/ash/login/login_screen_extensions_storage_cleaner.cc b/chrome/browser/ash/login/login_screen_extensions_storage_cleaner.cc index 7f5e021..202fb64 100644 --- a/chrome/browser/ash/login/login_screen_extensions_storage_cleaner.cc +++ b/chrome/browser/ash/login/login_screen_extensions_storage_cleaner.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/string_util.h" #include "base/values.h" #include "chrome/browser/ash/profiles/profile_helper.h"
diff --git a/chrome/browser/ash/login/login_screen_policy_browsertest.cc b/chrome/browser/ash/login/login_screen_policy_browsertest.cc index 1ff1a44..41b5ca8 100644 --- a/chrome/browser/ash/login/login_screen_policy_browsertest.cc +++ b/chrome/browser/ash/login/login_screen_policy_browsertest.cc
@@ -9,8 +9,8 @@ #include "ash/public/cpp/login_screen_test_api.h" #include "ash/public/cpp/login_types.h" #include "ash/public/cpp/system_tray_test_api.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ash/login/login_utils_browsertest.cc b/chrome/browser/ash/login/login_utils_browsertest.cc index 2771a160..86de239 100644 --- a/chrome/browser/ash/login/login_utils_browsertest.cc +++ b/chrome/browser/ash/login/login_utils_browsertest.cc
@@ -4,7 +4,7 @@ #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/task/thread_pool.h" #include "chrome/browser/ash/login/login_manager_test.h"
diff --git a/chrome/browser/ash/login/marketing_backend_connector.cc b/chrome/browser/ash/login/marketing_backend_connector.cc index 0122204..5a05a5e 100644 --- a/chrome/browser/ash/login/marketing_backend_connector.cc +++ b/chrome/browser/ash/login/marketing_backend_connector.cc
@@ -7,8 +7,8 @@ #include <cstddef> #include "ash/constants/ash_switches.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/callback_helpers.h" #include "base/json/json_writer.h" #include "base/metrics/histogram_functions.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/ash/login/marketing_backend_connector.h b/chrome/browser/ash/login/marketing_backend_connector.h index f38e31a..5f36cf3 100644 --- a/chrome/browser/ash/login/marketing_backend_connector.h +++ b/chrome/browser/ash/login/marketing_backend_connector.h
@@ -8,9 +8,9 @@ #include <memory> #include <string> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_forward.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_forward.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_refptr.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ash/login/onboarding_user_activity_counter.h b/chrome/browser/ash/login/onboarding_user_activity_counter.h index 0168cff..8980c5b 100644 --- a/chrome/browser/ash/login/onboarding_user_activity_counter.h +++ b/chrome/browser/ash/login/onboarding_user_activity_counter.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_ASH_LOGIN_ONBOARDING_USER_ACTIVITY_COUNTER_H_ #define CHROME_BROWSER_ASH_LOGIN_ONBOARDING_USER_ACTIVITY_COUNTER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/time/time.h" #include "base/timer/timer.h" #include "components/session_manager/core/session_manager.h"
diff --git a/chrome/browser/ash/login/onboarding_user_activity_counter_unittest.cc b/chrome/browser/ash/login/onboarding_user_activity_counter_unittest.cc index a5035fc..ca27c94 100644 --- a/chrome/browser/ash/login/onboarding_user_activity_counter_unittest.cc +++ b/chrome/browser/ash/login/onboarding_user_activity_counter_unittest.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ash/login/onboarding_user_activity_counter.h" #include <memory> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/time/time.h"
diff --git a/chrome/browser/ash/login/oobe_browsertest.cc b/chrome/browser/ash/login/oobe_browsertest.cc index 8f1ea59..5d261655 100644 --- a/chrome/browser/ash/login/oobe_browsertest.cc +++ b/chrome/browser/ash/login/oobe_browsertest.cc
@@ -8,8 +8,8 @@ #include "ash/public/cpp/test/shell_test_api.h" #include "ash/shell.h" #include "base/auto_reset.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/task/single_thread_task_runner.h" #include "base/test/scoped_feature_list.h"
diff --git a/chrome/browser/ash/login/oobe_configuration.cc b/chrome/browser/ash/login/oobe_configuration.cc index 42d98b1..f96a84f 100644 --- a/chrome/browser/ash/login/oobe_configuration.cc +++ b/chrome/browser/ash/login/oobe_configuration.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ash/login/oobe_configuration.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/json/json_reader.h" #include "base/logging.h" #include "chrome/browser/ash/login/configuration_keys.h"
diff --git a/chrome/browser/ash/login/oobe_interactive_ui_test.cc b/chrome/browser/ash/login/oobe_interactive_ui_test.cc index 79cbfc0..b2b5dcb 100644 --- a/chrome/browser/ash/login/oobe_interactive_ui_test.cc +++ b/chrome/browser/ash/login/oobe_interactive_ui_test.cc
@@ -13,8 +13,8 @@ #include "ash/constants/ash_switches.h" #include "ash/public/cpp/login_screen_test_api.h" #include "ash/public/cpp/test/shell_test_api.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/strings/stringprintf.h" #include "base/test/scoped_feature_list.h" #include "base/values.h"
diff --git a/chrome/browser/ash/login/oobe_localization_browsertest.cc b/chrome/browser/ash/login/oobe_localization_browsertest.cc index 23249ff..31322e4e 100644 --- a/chrome/browser/ash/login/oobe_localization_browsertest.cc +++ b/chrome/browser/ash/login/oobe_localization_browsertest.cc
@@ -4,7 +4,7 @@ #include <stddef.h> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h" #include "base/task/task_runner.h"
diff --git a/chrome/browser/ash/login/oobe_quick_start/connectivity/clients/target_forced_update_client.h b/chrome/browser/ash/login/oobe_quick_start/connectivity/clients/target_forced_update_client.h index 1629754..96db0f8 100644 --- a/chrome/browser/ash/login/oobe_quick_start/connectivity/clients/target_forced_update_client.h +++ b/chrome/browser/ash/login/oobe_quick_start/connectivity/clients/target_forced_update_client.h
@@ -7,7 +7,7 @@ #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/ash/login/oobe_quick_start/connectivity/quick_start_decoder.h" #include "chrome/browser/ash/login/oobe_quick_start/connectivity/target_device_client_base.h" #include "chrome/browser/nearby_sharing/public/cpp/nearby_connection.h"
diff --git a/chrome/browser/ash/login/oobe_quick_start/connectivity/fast_pair_advertiser.cc b/chrome/browser/ash/login/oobe_quick_start/connectivity/fast_pair_advertiser.cc index 9912d30..0e33ecf 100644 --- a/chrome/browser/ash/login/oobe_quick_start/connectivity/fast_pair_advertiser.cc +++ b/chrome/browser/ash/login/oobe_quick_start/connectivity/fast_pair_advertiser.cc
@@ -6,7 +6,7 @@ #include <string> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/metrics/histogram_functions.h" #include "chrome/browser/ash/login/oobe_quick_start/connectivity/random_session_id.h"
diff --git a/chrome/browser/ash/login/oobe_quick_start/connectivity/fast_pair_advertiser.h b/chrome/browser/ash/login/oobe_quick_start/connectivity/fast_pair_advertiser.h index e2ae5f6..2ae63c8 100644 --- a/chrome/browser/ash/login/oobe_quick_start/connectivity/fast_pair_advertiser.h +++ b/chrome/browser/ash/login/oobe_quick_start/connectivity/fast_pair_advertiser.h
@@ -8,7 +8,7 @@ #include <memory> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "device/bluetooth/bluetooth_adapter.h" #include "device/bluetooth/bluetooth_advertisement.h"
diff --git a/chrome/browser/ash/login/oobe_quick_start/connectivity/fast_pair_advertiser_unittest.cc b/chrome/browser/ash/login/oobe_quick_start/connectivity/fast_pair_advertiser_unittest.cc index 4090625..8b253c82 100644 --- a/chrome/browser/ash/login/oobe_quick_start/connectivity/fast_pair_advertiser_unittest.cc +++ b/chrome/browser/ash/login/oobe_quick_start/connectivity/fast_pair_advertiser_unittest.cc
@@ -8,7 +8,7 @@ #include <utility> #include <vector> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/metrics/histogram_base.h" #include "base/test/bind.h"
diff --git a/chrome/browser/ash/login/oobe_quick_start/connectivity/quick_start_decoder.cc b/chrome/browser/ash/login/oobe_quick_start/connectivity/quick_start_decoder.cc index 18f83247b..543c113 100644 --- a/chrome/browser/ash/login/oobe_quick_start/connectivity/quick_start_decoder.cc +++ b/chrome/browser/ash/login/oobe_quick_start/connectivity/quick_start_decoder.cc
@@ -4,9 +4,9 @@ #include "chrome/browser/ash/login/oobe_quick_start/connectivity/quick_start_decoder.h" -#include "base/callback.h" #include "base/containers/fixed_flat_set.h" #include "base/containers/flat_tree.h" +#include "base/functional/callback.h" #include "base/json/json_reader.h" #include "base/logging.h" #include "base/values.h"
diff --git a/chrome/browser/ash/login/oobe_quick_start/connectivity/target_device_connection_broker.h b/chrome/browser/ash/login/oobe_quick_start/connectivity/target_device_connection_broker.h index 332a501..182a2fcb 100644 --- a/chrome/browser/ash/login/oobe_quick_start/connectivity/target_device_connection_broker.h +++ b/chrome/browser/ash/login/oobe_quick_start/connectivity/target_device_connection_broker.h
@@ -7,7 +7,7 @@ #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" namespace ash::quick_start {
diff --git a/chrome/browser/ash/login/oobe_quick_start/connectivity/target_device_connection_broker_impl.cc b/chrome/browser/ash/login/oobe_quick_start/connectivity/target_device_connection_broker_impl.cc index 0cf0e22b..49211e8 100644 --- a/chrome/browser/ash/login/oobe_quick_start/connectivity/target_device_connection_broker_impl.cc +++ b/chrome/browser/ash/login/oobe_quick_start/connectivity/target_device_connection_broker_impl.cc
@@ -7,8 +7,8 @@ #include <memory> #include <vector> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h"
diff --git a/chrome/browser/ash/login/oobe_quick_start/connectivity/target_device_connection_broker_impl_unittest.cc b/chrome/browser/ash/login/oobe_quick_start/connectivity/target_device_connection_broker_impl_unittest.cc index 91a351b..4dc5b1c 100644 --- a/chrome/browser/ash/login/oobe_quick_start/connectivity/target_device_connection_broker_impl_unittest.cc +++ b/chrome/browser/ash/login/oobe_quick_start/connectivity/target_device_connection_broker_impl_unittest.cc
@@ -6,8 +6,8 @@ #include <array> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/test/task_environment.h" #include "chrome/browser/ash/login/oobe_quick_start/connectivity/fast_pair_advertiser.h" #include "chrome/browser/ash/login/oobe_quick_start/connectivity/random_session_id.h"
diff --git a/chrome/browser/ash/login/oobe_quick_start/target_device_bootstrap_controller.cc b/chrome/browser/ash/login/oobe_quick_start/target_device_bootstrap_controller.cc index 7aa75fa..a1a80def6 100644 --- a/chrome/browser/ash/login/oobe_quick_start/target_device_bootstrap_controller.cc +++ b/chrome/browser/ash/login/oobe_quick_start/target_device_bootstrap_controller.cc
@@ -4,9 +4,9 @@ #include "chrome/browser/ash/login/oobe_quick_start/target_device_bootstrap_controller.h" -#include "base/bind.h" #include "base/check_op.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/login/oobe_quick_start/connectivity/authenticated_connection.h" #include "chrome/browser/ash/login/oobe_quick_start/connectivity/incoming_connection.h" #include "chrome/browser/ash/login/oobe_quick_start/connectivity/target_device_connection_broker.h"
diff --git a/chrome/browser/ash/login/password_change_browsertest.cc b/chrome/browser/ash/login/password_change_browsertest.cc index b25da7e..64f3e4d0 100644 --- a/chrome/browser/ash/login/password_change_browsertest.cc +++ b/chrome/browser/ash/login/password_change_browsertest.cc
@@ -9,10 +9,10 @@ #include "ash/constants/ash_features.h" #include "ash/public/cpp/login_screen_test_api.h" #include "base/auto_reset.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/run_loop.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h"
diff --git a/chrome/browser/ash/login/profile_auth_data.cc b/chrome/browser/ash/login/profile_auth_data.cc index 28bc89c2..ec53ad35 100644 --- a/chrome/browser/ash/login/profile_auth_data.cc +++ b/chrome/browser/ash/login/profile_auth_data.cc
@@ -5,8 +5,8 @@ #include "chrome/browser/ash/login/profile_auth_data.h" #include "base/barrier_closure.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/unguessable_token.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/net/system_network_context_manager.h"
diff --git a/chrome/browser/ash/login/profile_auth_data.h b/chrome/browser/ash/login/profile_auth_data.h index ab23897..d53cd6d 100644 --- a/chrome/browser/ash/login/profile_auth_data.h +++ b/chrome/browser/ash/login/profile_auth_data.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_ASH_LOGIN_PROFILE_AUTH_DATA_H_ #define CHROME_BROWSER_ASH_LOGIN_PROFILE_AUTH_DATA_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/time/time.h" namespace base {
diff --git a/chrome/browser/ash/login/profile_auth_data_unittest.cc b/chrome/browser/ash/login/profile_auth_data_unittest.cc index 0daf57c..775dd50 100644 --- a/chrome/browser/ash/login/profile_auth_data_unittest.cc +++ b/chrome/browser/ash/login/profile_auth_data_unittest.cc
@@ -8,9 +8,9 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" #include "base/test/bind.h"
diff --git a/chrome/browser/ash/login/proxy_auth_dialog_browsertest.cc b/chrome/browser/ash/login/proxy_auth_dialog_browsertest.cc index ba173df..9a8c976 100644 --- a/chrome/browser/ash/login/proxy_auth_dialog_browsertest.cc +++ b/chrome/browser/ash/login/proxy_auth_dialog_browsertest.cc
@@ -3,9 +3,9 @@ // found in the LICENSE file. #include "ash/public/cpp/login_screen_test_api.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/login/login_manager_test.h" #include "chrome/browser/ash/login/test/js_checker.h" #include "chrome/browser/ash/login/test/login_manager_mixin.h"
diff --git a/chrome/browser/ash/login/quick_unlock/auth_token.cc b/chrome/browser/ash/login/quick_unlock/auth_token.cc index 86b849e..d92777e 100644 --- a/chrome/browser/ash/login/quick_unlock/auth_token.cc +++ b/chrome/browser/ash/login/quick_unlock/auth_token.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ash/login/quick_unlock/auth_token.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/task/single_thread_task_runner.h" #include "chromeos/ash/components/login/auth/public/user_context.h"
diff --git a/chrome/browser/ash/login/quick_unlock/pin_backend.cc b/chrome/browser/ash/login/quick_unlock/pin_backend.cc index 3610740..5a8b8ea 100644 --- a/chrome/browser/ash/login/quick_unlock/pin_backend.cc +++ b/chrome/browser/ash/login/quick_unlock/pin_backend.cc
@@ -6,7 +6,7 @@ #include "ash/constants/ash_features.h" #include "base/base64.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/metrics/histogram_functions.h" #include "base/strings/string_util.h"
diff --git a/chrome/browser/ash/login/quick_unlock/pin_backend.h b/chrome/browser/ash/login/quick_unlock/pin_backend.h index 7f6abd6a..d37ac66 100644 --- a/chrome/browser/ash/login/quick_unlock/pin_backend.h +++ b/chrome/browser/ash/login/quick_unlock/pin_backend.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "chromeos/ash/components/login/auth/public/auth_callbacks.h" #include "chromeos/ash/components/login/auth/public/key.h" #include "components/prefs/pref_service.h"
diff --git a/chrome/browser/ash/login/quick_unlock/pin_storage_cryptohome.cc b/chrome/browser/ash/login/quick_unlock/pin_storage_cryptohome.cc index 4088b8187..2662166 100644 --- a/chrome/browser/ash/login/quick_unlock/pin_storage_cryptohome.cc +++ b/chrome/browser/ash/login/quick_unlock/pin_storage_cryptohome.cc
@@ -6,7 +6,7 @@ #include "ash/constants/ash_features.h" #include "ash/constants/ash_pref_names.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/task/single_thread_task_runner.h" #include "chrome/browser/ash/login/quick_unlock/auth_token.h"
diff --git a/chrome/browser/ash/login/quick_unlock/pin_storage_cryptohome.h b/chrome/browser/ash/login/quick_unlock/pin_storage_cryptohome.h index d31cfac..2a72fac 100644 --- a/chrome/browser/ash/login/quick_unlock/pin_storage_cryptohome.h +++ b/chrome/browser/ash/login/quick_unlock/pin_storage_cryptohome.h
@@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ash/login/quick_unlock/pin_salt_storage.h" #include "chromeos/ash/components/login/auth/auth_factor_editor.h"
diff --git a/chrome/browser/ash/login/quick_unlock/pin_storage_cryptohome_unittest.cc b/chrome/browser/ash/login/quick_unlock/pin_storage_cryptohome_unittest.cc index fcd12ab2..1b0b36e 100644 --- a/chrome/browser/ash/login/quick_unlock/pin_storage_cryptohome_unittest.cc +++ b/chrome/browser/ash/login/quick_unlock/pin_storage_cryptohome_unittest.cc
@@ -7,7 +7,7 @@ #include <vector> #include "ash/constants/ash_features.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/run_loop.h" #include "base/test/scoped_feature_list.h"
diff --git a/chrome/browser/ash/login/saml/in_session_password_change_manager.cc b/chrome/browser/ash/login/saml/in_session_password_change_manager.cc index e9ec0a9c..5cb68b7c 100644 --- a/chrome/browser/ash/login/saml/in_session_password_change_manager.cc +++ b/chrome/browser/ash/login/saml/in_session_password_change_manager.cc
@@ -7,8 +7,8 @@ #include "ash/constants/ash_features.h" #include "ash/public/cpp/session/session_activation_observer.h" #include "ash/public/cpp/session/session_controller.h" -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "chrome/browser/ash/login/auth/chrome_safe_mode_delegate.h" #include "chrome/browser/ash/login/login_pref_names.h"
diff --git a/chrome/browser/ash/login/saml/in_session_password_sync_manager.cc b/chrome/browser/ash/login/saml/in_session_password_sync_manager.cc index 015e3f72..45e9956 100644 --- a/chrome/browser/ash/login/saml/in_session_password_sync_manager.cc +++ b/chrome/browser/ash/login/saml/in_session_password_sync_manager.cc
@@ -8,9 +8,9 @@ #include "ash/constants/ash_features.h" #include "ash/constants/ash_switches.h" -#include "base/callback.h" #include "base/check.h" #include "base/command_line.h" +#include "base/functional/callback.h" #include "base/functional/callback_helpers.h" #include "base/time/default_clock.h" #include "chrome/browser/ash/login/auth/chrome_safe_mode_delegate.h"
diff --git a/chrome/browser/ash/login/saml/in_session_password_sync_manager.h b/chrome/browser/ash/login/saml/in_session_password_sync_manager.h index ba05a5d..ffb6c21 100644 --- a/chrome/browser/ash/login/saml/in_session_password_sync_manager.h +++ b/chrome/browser/ash/login/saml/in_session_password_sync_manager.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/time/clock.h" #include "chrome/browser/ash/login/saml/password_sync_token_fetcher.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ash/login/saml/password_expiry_notification.cc b/chrome/browser/ash/login/saml/password_expiry_notification.cc index 14eb9d2..9fabd12 100644 --- a/chrome/browser/ash/login/saml/password_expiry_notification.cc +++ b/chrome/browser/ash/login/saml/password_expiry_notification.cc
@@ -12,7 +12,7 @@ #include "ash/public/cpp/notification_utils.h" #include "ash/public/cpp/session/session_activation_observer.h" #include "ash/public/cpp/session/session_controller.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/no_destructor.h" #include "base/strings/string_util.h" #include "base/task/task_traits.h"
diff --git a/chrome/browser/ash/login/saml/password_sync_token_fetcher.cc b/chrome/browser/ash/login/saml/password_sync_token_fetcher.cc index 29f5eb0b..f547dd3 100644 --- a/chrome/browser/ash/login/saml/password_sync_token_fetcher.cc +++ b/chrome/browser/ash/login/saml/password_sync_token_fetcher.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/json/json_string_value_serializer.h" #include "base/json/json_writer.h" #include "base/logging.h"
diff --git a/chrome/browser/ash/login/saml/password_sync_token_fetcher.h b/chrome/browser/ash/login/saml/password_sync_token_fetcher.h index 98c4b5a..242a172 100644 --- a/chrome/browser/ash/login/saml/password_sync_token_fetcher.h +++ b/chrome/browser/ash/login/saml/password_sync_token_fetcher.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/values.h" #include "components/signin/public/identity_manager/access_token_info.h"
diff --git a/chrome/browser/ash/login/saml/public_saml_url_fetcher.cc b/chrome/browser/ash/login/saml/public_saml_url_fetcher.cc index f997240..89646fb 100644 --- a/chrome/browser/ash/login/saml/public_saml_url_fetcher.cc +++ b/chrome/browser/ash/login/saml/public_saml_url_fetcher.cc
@@ -7,7 +7,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "chrome/browser/ash/arc/arc_optin_uma.h" #include "chrome/browser/ash/policy/core/browser_policy_connector_ash.h"
diff --git a/chrome/browser/ash/login/saml/public_saml_url_fetcher.h b/chrome/browser/ash/login/saml/public_saml_url_fetcher.h index 3759a96..9733162 100644 --- a/chrome/browser/ash/login/saml/public_saml_url_fetcher.h +++ b/chrome/browser/ash/login/saml/public_saml_url_fetcher.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "components/account_id/account_id.h" #include "components/policy/core/common/cloud/cloud_policy_constants.h"
diff --git a/chrome/browser/ash/login/saml/saml_browsertest.cc b/chrome/browser/ash/login/saml/saml_browsertest.cc index e2c7f13..040277e 100644 --- a/chrome/browser/ash/login/saml/saml_browsertest.cc +++ b/chrome/browser/ash/login/saml/saml_browsertest.cc
@@ -10,10 +10,10 @@ #include "ash/constants/ash_features.h" #include "ash/constants/ash_switches.h" #include "ash/public/cpp/login_screen_test_api.h" -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/memory/ref_counted.h" #include "base/run_loop.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 6b4f976..b1614687 100644 --- a/chrome/browser/ash/login/saml/security_token_saml_test.cc +++ b/chrome/browser/ash/login/saml/security_token_saml_test.cc
@@ -10,8 +10,8 @@ #include "ash/constants/ash_features.h" #include "ash/constants/ash_switches.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/memory/weak_ptr.h" #include "base/run_loop.h" #include "base/values.h"
diff --git a/chrome/browser/ash/login/saml/test_client_cert_saml_idp_mixin.cc b/chrome/browser/ash/login/saml/test_client_cert_saml_idp_mixin.cc index 023b2738..3c8ccb8 100644 --- a/chrome/browser/ash/login/saml/test_client_cert_saml_idp_mixin.cc +++ b/chrome/browser/ash/login/saml/test_client_cert_saml_idp_mixin.cc
@@ -8,9 +8,9 @@ #include <string> #include <vector> -#include "base/bind.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/path_service.h" #include "base/strings/string_util.h" #include "base/threading/thread_restrictions.h"
diff --git a/chrome/browser/ash/login/screens/active_directory_login_screen.h b/chrome/browser/ash/login/screens/active_directory_login_screen.h index 7b8d641..2d49dce1 100644 --- a/chrome/browser/ash/login/screens/active_directory_login_screen.h +++ b/chrome/browser/ash/login/screens/active_directory_login_screen.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/scoped_observation.h" #include "base/values.h"
diff --git a/chrome/browser/ash/login/screens/active_directory_password_change_screen.cc b/chrome/browser/ash/login/screens/active_directory_password_change_screen.cc index 5118144..40e3054 100644 --- a/chrome/browser/ash/login/screens/active_directory_password_change_screen.cc +++ b/chrome/browser/ash/login/screens/active_directory_password_change_screen.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ash/login/ui/login_display_host.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/ash/login/screens/app_downloading_screen.h b/chrome/browser/ash/login/screens/app_downloading_screen.h index 5c8a519..f3c12e9 100644 --- a/chrome/browser/ash/login/screens/app_downloading_screen.h +++ b/chrome/browser/ash/login/screens/app_downloading_screen.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_ASH_LOGIN_SCREENS_APP_DOWNLOADING_SCREEN_H_ #define CHROME_BROWSER_ASH_LOGIN_SCREENS_APP_DOWNLOADING_SCREEN_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ash/login/screens/base_screen.h"
diff --git a/chrome/browser/ash/login/screens/app_downloading_screen_browsertest.cc b/chrome/browser/ash/login/screens/app_downloading_screen_browsertest.cc index 4168377..abc7f998 100644 --- a/chrome/browser/ash/login/screens/app_downloading_screen_browsertest.cc +++ b/chrome/browser/ash/login/screens/app_downloading_screen_browsertest.cc
@@ -8,7 +8,7 @@ #include "ash/components/arc/arc_prefs.h" #include "ash/constants/ash_features.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/strings/string_piece.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ash/login/screens/arc_terms_of_service_screen.h b/chrome/browser/ash/login/screens/arc_terms_of_service_screen.h index 94dae08..c8d11da 100644 --- a/chrome/browser/ash/login/screens/arc_terms_of_service_screen.h +++ b/chrome/browser/ash/login/screens/arc_terms_of_service_screen.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ash/login/screens/base_screen.h" #include "chrome/browser/ui/webui/ash/login/arc_terms_of_service_screen_handler.h"
diff --git a/chrome/browser/ash/login/screens/assistant_optin_flow_screen.h b/chrome/browser/ash/login/screens/assistant_optin_flow_screen.h index 25cde9e..3357eaa 100644 --- a/chrome/browser/ash/login/screens/assistant_optin_flow_screen.h +++ b/chrome/browser/ash/login/screens/assistant_optin_flow_screen.h
@@ -8,8 +8,8 @@ #include <string> #include "base/auto_reset.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ash/login/screens/base_screen.h"
diff --git a/chrome/browser/ash/login/screens/assistant_optin_flow_screen_browsertest.cc b/chrome/browser/ash/login/screens/assistant_optin_flow_screen_browsertest.cc index fa6e4c4..3f15ac1 100644 --- a/chrome/browser/ash/login/screens/assistant_optin_flow_screen_browsertest.cc +++ b/chrome/browser/ash/login/screens/assistant_optin_flow_screen_browsertest.cc
@@ -7,8 +7,8 @@ #include <memory> #include <set> -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/path_service.h" #include "base/run_loop.h" #include "base/strings/string_piece.h"
diff --git a/chrome/browser/ash/login/screens/choobe_screen.h b/chrome/browser/ash/login/screens/choobe_screen.h index 51697fb6..1f48992e 100644 --- a/chrome/browser/ash/login/screens/choobe_screen.h +++ b/chrome/browser/ash/login/screens/choobe_screen.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ash/login/choobe_flow_controller.h" #include "chrome/browser/ash/login/screens/base_screen.h"
diff --git a/chrome/browser/ash/login/screens/chrome_user_selection_screen.cc b/chrome/browser/ash/login/screens/chrome_user_selection_screen.cc index 0ae9c1f..5a3afb4 100644 --- a/chrome/browser/ash/login/screens/chrome_user_selection_screen.cc +++ b/chrome/browser/ash/login/screens/chrome_user_selection_screen.cc
@@ -7,8 +7,8 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/notreached.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ash/login/screens/chromevox_hint/chromevox_hint_detector.cc b/chrome/browser/ash/login/screens/chromevox_hint/chromevox_hint_detector.cc index 40c5903..e2ef8ba3 100644 --- a/chrome/browser/ash/login/screens/chromevox_hint/chromevox_hint_detector.cc +++ b/chrome/browser/ash/login/screens/chromevox_hint/chromevox_hint_detector.cc
@@ -6,9 +6,9 @@ #include "ash/constants/ash_features.h" #include "ash/constants/ash_switches.h" -#include "base/bind.h" #include "base/check.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/idle_detector.h" #include "chromeos/dbus/constants/dbus_switches.h"
diff --git a/chrome/browser/ash/login/screens/consolidated_consent_screen.cc b/chrome/browser/ash/login/screens/consolidated_consent_screen.cc index 07921da..1d641e5 100644 --- a/chrome/browser/ash/login/screens/consolidated_consent_screen.cc +++ b/chrome/browser/ash/login/screens/consolidated_consent_screen.cc
@@ -7,9 +7,9 @@ #include "ash/components/arc/arc_prefs.h" #include "ash/constants/ash_features.h" #include "ash/constants/ash_switches.h" -#include "base/bind.h" #include "base/check_op.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/hash/sha1.h" #include "base/i18n/timezone.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/ash/login/screens/cryptohome_recovery_screen.h b/chrome/browser/ash/login/screens/cryptohome_recovery_screen.h index e65d1d5..95ccdb8 100644 --- a/chrome/browser/ash/login/screens/cryptohome_recovery_screen.h +++ b/chrome/browser/ash/login/screens/cryptohome_recovery_screen.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_ASH_LOGIN_SCREENS_CRYPTOHOME_RECOVERY_SCREEN_H_ #define CHROME_BROWSER_ASH_LOGIN_SCREENS_CRYPTOHOME_RECOVERY_SCREEN_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ash/login/screens/base_screen.h" #include "components/account_id/account_id.h"
diff --git a/chrome/browser/ash/login/screens/cryptohome_recovery_setup_screen.h b/chrome/browser/ash/login/screens/cryptohome_recovery_setup_screen.h index 4447ee47..8e37d5d2 100644 --- a/chrome/browser/ash/login/screens/cryptohome_recovery_setup_screen.h +++ b/chrome/browser/ash/login/screens/cryptohome_recovery_setup_screen.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_ASH_LOGIN_SCREENS_CRYPTOHOME_RECOVERY_SETUP_SCREEN_H_ #define CHROME_BROWSER_ASH_LOGIN_SCREENS_CRYPTOHOME_RECOVERY_SETUP_SCREEN_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ash/login/quick_unlock/auth_token.h" #include "chrome/browser/ash/login/screens/base_screen.h"
diff --git a/chrome/browser/ash/login/screens/demo_preferences_screen.h b/chrome/browser/ash/login/screens/demo_preferences_screen.h index d08dc078..1c1a475 100644 --- a/chrome/browser/ash/login/screens/demo_preferences_screen.h +++ b/chrome/browser/ash/login/screens/demo_preferences_screen.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ash/login/screens/base_screen.h"
diff --git a/chrome/browser/ash/login/screens/demo_setup_screen.cc b/chrome/browser/ash/login/screens/demo_setup_screen.cc index fbe5a2e0..d70fd8d 100644 --- a/chrome/browser/ash/login/screens/demo_setup_screen.cc +++ b/chrome/browser/ash/login/screens/demo_setup_screen.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ash/login/screens/demo_setup_screen.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ash/login/wizard_controller.h" #include "chrome/browser/ui/webui/ash/login/demo_setup_screen_handler.h"
diff --git a/chrome/browser/ash/login/screens/demo_setup_screen.h b/chrome/browser/ash/login/screens/demo_setup_screen.h index 1c68e30d..933e2f7f 100644 --- a/chrome/browser/ash/login/screens/demo_setup_screen.h +++ b/chrome/browser/ash/login/screens/demo_setup_screen.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/values.h" #include "chrome/browser/ash/login/demo_mode/demo_setup_controller.h"
diff --git a/chrome/browser/ash/login/screens/edu_coexistence_login_browsertest.cc b/chrome/browser/ash/login/screens/edu_coexistence_login_browsertest.cc index a8a2ba1..0c8c830 100644 --- a/chrome/browser/ash/login/screens/edu_coexistence_login_browsertest.cc +++ b/chrome/browser/ash/login/screens/edu_coexistence_login_browsertest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ash/login/screens/edu_coexistence_login_screen.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/run_loop.h" #include "chrome/browser/ash/login/test/embedded_policy_test_server_mixin.h" #include "chrome/browser/ash/login/test/login_manager_mixin.h"
diff --git a/chrome/browser/ash/login/screens/edu_coexistence_login_screen.h b/chrome/browser/ash/login/screens/edu_coexistence_login_screen.h index 1591309..0eb5dc46 100644 --- a/chrome/browser/ash/login/screens/edu_coexistence_login_screen.h +++ b/chrome/browser/ash/login/screens/edu_coexistence_login_screen.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_ASH_LOGIN_SCREENS_EDU_COEXISTENCE_LOGIN_SCREEN_H_ #define CHROME_BROWSER_ASH_LOGIN_SCREENS_EDU_COEXISTENCE_LOGIN_SCREEN_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/scoped_observation.h" #include "chrome/browser/ash/login/screens/base_screen.h" #include "chrome/browser/ash/login/ui/login_display_host.h"
diff --git a/chrome/browser/ash/login/screens/enable_adb_sideloading_screen.h b/chrome/browser/ash/login/screens/enable_adb_sideloading_screen.h index 754438c..4c9b9c7e 100644 --- a/chrome/browser/ash/login/screens/enable_adb_sideloading_screen.h +++ b/chrome/browser/ash/login/screens/enable_adb_sideloading_screen.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_ASH_LOGIN_SCREENS_ENABLE_ADB_SIDELOADING_SCREEN_H_ #define CHROME_BROWSER_ASH_LOGIN_SCREENS_ENABLE_ADB_SIDELOADING_SCREEN_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ash/login/help_app_launcher.h" #include "chrome/browser/ash/login/screens/base_screen.h"
diff --git a/chrome/browser/ash/login/screens/enable_debugging_screen.h b/chrome/browser/ash/login/screens/enable_debugging_screen.h index b9ea311..32f1d93 100644 --- a/chrome/browser/ash/login/screens/enable_debugging_screen.h +++ b/chrome/browser/ash/login/screens/enable_debugging_screen.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ash/login/screens/base_screen.h" #include "chrome/browser/ui/webui/ash/login/enable_debugging_screen_handler.h"
diff --git a/chrome/browser/ash/login/screens/encryption_migration_screen.cc b/chrome/browser/ash/login/screens/encryption_migration_screen.cc index 28c15acdb..26a3c33 100644 --- a/chrome/browser/ash/login/screens/encryption_migration_screen.cc +++ b/chrome/browser/ash/login/screens/encryption_migration_screen.cc
@@ -9,10 +9,10 @@ #include <utility> #include "ash/constants/ash_switches.h" -#include "base/bind.h" #include "base/check.h" #include "base/command_line.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/ash/login/screens/encryption_migration_screen.h b/chrome/browser/ash/login/screens/encryption_migration_screen.h index cef03e69..34edfd2 100644 --- a/chrome/browser/ash/login/screens/encryption_migration_screen.h +++ b/chrome/browser/ash/login/screens/encryption_migration_screen.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "base/scoped_observation.h" #include "chrome/browser/ash/login/screens/base_screen.h"
diff --git a/chrome/browser/ash/login/screens/encryption_migration_screen_unittest.cc b/chrome/browser/ash/login/screens/encryption_migration_screen_unittest.cc index 28646587..78e3fa2d 100644 --- a/chrome/browser/ash/login/screens/encryption_migration_screen_unittest.cc +++ b/chrome/browser/ash/login/screens/encryption_migration_screen_unittest.cc
@@ -6,7 +6,7 @@ #include <tuple> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/test/task_environment.h" #include "base/test/test_future.h"
diff --git a/chrome/browser/ash/login/screens/error_screen.cc b/chrome/browser/ash/login/screens/error_screen.cc index 72b4caff..4e52d72 100644 --- a/chrome/browser/ash/login/screens/error_screen.cc +++ b/chrome/browser/ash/login/screens/error_screen.cc
@@ -6,10 +6,10 @@ #include <memory> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "chrome/browser/app_mode/app_mode_utils.h" #include "chrome/browser/apps/app_service/app_launch_params.h"
diff --git a/chrome/browser/ash/login/screens/eula_screen.cc b/chrome/browser/ash/login/screens/eula_screen.cc index 2eaae740..e674434 100644 --- a/chrome/browser/ash/login/screens/eula_screen.cc +++ b/chrome/browser/ash/login/screens/eula_screen.cc
@@ -6,9 +6,9 @@ #include "ash/constants/ash_features.h" #include "ash/constants/ash_switches.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/histogram_functions.h" #include "base/notreached.h" #include "chrome/browser/ash/customization/customization_document.h"
diff --git a/chrome/browser/ash/login/screens/eula_screen.h b/chrome/browser/ash/login/screens/eula_screen.h index d2a8551b..a3dd434 100644 --- a/chrome/browser/ash/login/screens/eula_screen.h +++ b/chrome/browser/ash/login/screens/eula_screen.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/ash/login/screens/base_screen.h" #include "url/gurl.h"
diff --git a/chrome/browser/ash/login/screens/family_link_notice_screen.h b/chrome/browser/ash/login/screens/family_link_notice_screen.h index 3fd9cd4a..c437be11 100644 --- a/chrome/browser/ash/login/screens/family_link_notice_screen.h +++ b/chrome/browser/ash/login/screens/family_link_notice_screen.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ash/login/screens/base_screen.h"
diff --git a/chrome/browser/ash/login/screens/fingerprint_setup_screen.h b/chrome/browser/ash/login/screens/fingerprint_setup_screen.h index 952be13..6378f44 100644 --- a/chrome/browser/ash/login/screens/fingerprint_setup_screen.h +++ b/chrome/browser/ash/login/screens/fingerprint_setup_screen.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ash/login/screens/base_screen.h" #include "mojo/public/cpp/bindings/receiver.h"
diff --git a/chrome/browser/ash/login/screens/gaia_screen.h b/chrome/browser/ash/login/screens/gaia_screen.h index 6fa2f7a..b121cfd 100644 --- a/chrome/browser/ash/login/screens/gaia_screen.h +++ b/chrome/browser/ash/login/screens/gaia_screen.h
@@ -9,8 +9,8 @@ #include "ash/public/cpp/screen_backlight_observer.h" #include "ash/system/power/backlights_forced_off_setter.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/scoped_observation.h" #include "base/values.h"
diff --git a/chrome/browser/ash/login/screens/gesture_navigation_screen.h b/chrome/browser/ash/login/screens/gesture_navigation_screen.h index f14b48a..1d2bdda82 100644 --- a/chrome/browser/ash/login/screens/gesture_navigation_screen.h +++ b/chrome/browser/ash/login/screens/gesture_navigation_screen.h
@@ -8,7 +8,7 @@ #include <map> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h" #include "chrome/browser/ash/login/screens/base_screen.h"
diff --git a/chrome/browser/ash/login/screens/gesture_navigation_screen_browsertest.cc b/chrome/browser/ash/login/screens/gesture_navigation_screen_browsertest.cc index 63982852..ae6f156 100644 --- a/chrome/browser/ash/login/screens/gesture_navigation_screen_browsertest.cc +++ b/chrome/browser/ash/login/screens/gesture_navigation_screen_browsertest.cc
@@ -11,7 +11,7 @@ #include "ash/constants/ash_pref_names.h" #include "ash/constants/ash_switches.h" #include "ash/public/cpp/test/shell_test_api.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/test/metrics/histogram_tester.h" #include "chrome/browser/ash/accessibility/accessibility_manager.h"
diff --git a/chrome/browser/ash/login/screens/hid_detection_screen.cc b/chrome/browser/ash/login/screens/hid_detection_screen.cc index 9cc98e2b..04a17ae3 100644 --- a/chrome/browser/ash/login/screens/hid_detection_screen.cc +++ b/chrome/browser/ash/login/screens/hid_detection_screen.cc
@@ -9,9 +9,9 @@ #include "ash/constants/ash_features.h" #include "ash/constants/ash_switches.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/weak_ptr.h" #include "base/no_destructor.h" #include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/ash/login/screens/hid_detection_screen.h b/chrome/browser/ash/login/screens/hid_detection_screen.h index b0c51ef..35f46e3 100644 --- a/chrome/browser/ash/login/screens/hid_detection_screen.h +++ b/chrome/browser/ash/login/screens/hid_detection_screen.h
@@ -12,8 +12,8 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/containers/flat_map.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/timer/elapsed_timer.h" #include "chrome/browser/ash/login/screens/base_screen.h"
diff --git a/chrome/browser/ash/login/screens/hid_detection_screen_browsertest.cc b/chrome/browser/ash/login/screens/hid_detection_screen_browsertest.cc index 0f605b9..a4b2790 100644 --- a/chrome/browser/ash/login/screens/hid_detection_screen_browsertest.cc +++ b/chrome/browser/ash/login/screens/hid_detection_screen_browsertest.cc
@@ -4,8 +4,8 @@ #include "ash/constants/ash_features.h" #include "ash/constants/ash_switches.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/histogram_functions.h" #include "base/run_loop.h" #include "base/strings/strcat.h"
diff --git a/chrome/browser/ash/login/screens/kiosk_autolaunch_screen.h b/chrome/browser/ash/login/screens/kiosk_autolaunch_screen.h index 516d850..d383976 100644 --- a/chrome/browser/ash/login/screens/kiosk_autolaunch_screen.h +++ b/chrome/browser/ash/login/screens/kiosk_autolaunch_screen.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ash/login/screens/base_screen.h"
diff --git a/chrome/browser/ash/login/screens/kiosk_enable_screen.h b/chrome/browser/ash/login/screens/kiosk_enable_screen.h index b6e99046..4be25bd 100644 --- a/chrome/browser/ash/login/screens/kiosk_enable_screen.h +++ b/chrome/browser/ash/login/screens/kiosk_enable_screen.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_ASH_LOGIN_SCREENS_KIOSK_ENABLE_SCREEN_H_ #define CHROME_BROWSER_ASH_LOGIN_SCREENS_KIOSK_ENABLE_SCREEN_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ash/app_mode/kiosk_app_manager.h" #include "chrome/browser/ash/login/screens/base_screen.h"
diff --git a/chrome/browser/ash/login/screens/lacros_data_migration_screen.h b/chrome/browser/ash/login/screens/lacros_data_migration_screen.h index a64293c4..8542a46 100644 --- a/chrome/browser/ash/login/screens/lacros_data_migration_screen.h +++ b/chrome/browser/ash/login/screens/lacros_data_migration_screen.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_ASH_LOGIN_SCREENS_LACROS_DATA_MIGRATION_SCREEN_H_ #define CHROME_BROWSER_ASH_LOGIN_SCREENS_LACROS_DATA_MIGRATION_SCREEN_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "base/scoped_observation.h" #include "chrome/browser/ash/crosapi/browser_data_migrator.h"
diff --git a/chrome/browser/ash/login/screens/locale_switch_notification.h b/chrome/browser/ash/login/screens/locale_switch_notification.h index 241d36a..4e81664e 100644 --- a/chrome/browser/ash/login/screens/locale_switch_notification.h +++ b/chrome/browser/ash/login/screens/locale_switch_notification.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/time/time.h" #include "chrome/browser/ash/base/locale_util.h"
diff --git a/chrome/browser/ash/login/screens/management_transition_screen.cc b/chrome/browser/ash/login/screens/management_transition_screen.cc index 9760f89..d502f2e 100644 --- a/chrome/browser/ash/login/screens/management_transition_screen.cc +++ b/chrome/browser/ash/login/screens/management_transition_screen.cc
@@ -8,7 +8,7 @@ #include "ash/components/arc/arc_prefs.h" #include "ash/components/arc/session/arc_management_transition.h" #include "ash/public/cpp/login_screen.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/metrics/histogram_functions.h" #include "chrome/browser/ash/arc/arc_util.h"
diff --git a/chrome/browser/ash/login/screens/management_transition_screen.h b/chrome/browser/ash/login/screens/management_transition_screen.h index 713d1dc..7eacdce 100644 --- a/chrome/browser/ash/login/screens/management_transition_screen.h +++ b/chrome/browser/ash/login/screens/management_transition_screen.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_ASH_LOGIN_SCREENS_MANAGEMENT_TRANSITION_SCREEN_H_ #define CHROME_BROWSER_ASH_LOGIN_SCREENS_MANAGEMENT_TRANSITION_SCREEN_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h" #include "base/timer/timer.h"
diff --git a/chrome/browser/ash/login/screens/marketing_opt_in_screen.cc b/chrome/browser/ash/login/screens/marketing_opt_in_screen.cc index 0a09901..0d96a3b 100644 --- a/chrome/browser/ash/login/screens/marketing_opt_in_screen.cc +++ b/chrome/browser/ash/login/screens/marketing_opt_in_screen.cc
@@ -12,9 +12,9 @@ #include "ash/constants/ash_pref_names.h" #include "ash/constants/ash_switches.h" #include "ash/public/cpp/login_screen.h" -#include "base/bind.h" #include "base/check_op.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/weak_ptr.h" #include "base/metrics/histogram_functions.h"
diff --git a/chrome/browser/ash/login/screens/marketing_opt_in_screen.h b/chrome/browser/ash/login/screens/marketing_opt_in_screen.h index 52b89ea..7030b59 100644 --- a/chrome/browser/ash/login/screens/marketing_opt_in_screen.h +++ b/chrome/browser/ash/login/screens/marketing_opt_in_screen.h
@@ -8,9 +8,9 @@ #include <memory> #include <unordered_set> -#include "base/bind.h" -#include "base/callback.h" #include "base/containers/flat_set.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/timer/timer.h" #include "chrome/browser/ash/login/screens/base_screen.h"
diff --git a/chrome/browser/ash/login/screens/marketing_opt_in_screen_browsertest.cc b/chrome/browser/ash/login/screens/marketing_opt_in_screen_browsertest.cc index 7388673..2b1e99cf 100644 --- a/chrome/browser/ash/login/screens/marketing_opt_in_screen_browsertest.cc +++ b/chrome/browser/ash/login/screens/marketing_opt_in_screen_browsertest.cc
@@ -12,8 +12,8 @@ #include "ash/constants/ash_pref_names.h" #include "ash/public/cpp/shelf_test_api.h" #include "ash/public/cpp/test/shell_test_api.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/test/metrics/histogram_tester.h" #include "chrome/browser/ash/accessibility/accessibility_manager.h"
diff --git a/chrome/browser/ash/login/screens/multidevice_setup_screen.h b/chrome/browser/ash/login/screens/multidevice_setup_screen.h index e856903c..34657c0 100644 --- a/chrome/browser/ash/login/screens/multidevice_setup_screen.h +++ b/chrome/browser/ash/login/screens/multidevice_setup_screen.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ash/login/screens/base_screen.h"
diff --git a/chrome/browser/ash/login/screens/multidevice_setup_screen_browsertest.cc b/chrome/browser/ash/login/screens/multidevice_setup_screen_browsertest.cc index b73e680..fe983be0 100644 --- a/chrome/browser/ash/login/screens/multidevice_setup_screen_browsertest.cc +++ b/chrome/browser/ash/login/screens/multidevice_setup_screen_browsertest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ash/login/screens/multidevice_setup_screen.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "chrome/browser/ash/login/screen_manager.h" #include "chrome/browser/ash/login/test/js_checker.h"
diff --git a/chrome/browser/ash/login/screens/network_screen.cc b/chrome/browser/ash/login/screens/network_screen.cc index 744188a0..248b41c 100644 --- a/chrome/browser/ash/login/screens/network_screen.cc +++ b/chrome/browser/ash/login/screens/network_screen.cc
@@ -6,7 +6,7 @@ #include "ash/constants/ash_features.h" #include "ash/constants/ash_switches.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "chrome/browser/ash/login/demo_mode/demo_setup_controller.h" #include "chrome/browser/ash/login/helper.h"
diff --git a/chrome/browser/ash/login/screens/network_screen.h b/chrome/browser/ash/login/screens/network_screen.h index 05b09977..03b8c8c 100644 --- a/chrome/browser/ash/login/screens/network_screen.h +++ b/chrome/browser/ash/login/screens/network_screen.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/gtest_prod_util.h" #include "base/memory/weak_ptr.h" #include "base/scoped_observation.h"
diff --git a/chrome/browser/ash/login/screens/network_screen_browsertest.cc b/chrome/browser/ash/login/screens/network_screen_browsertest.cc index e6016aa..6bb08e64 100644 --- a/chrome/browser/ash/login/screens/network_screen_browsertest.cc +++ b/chrome/browser/ash/login/screens/network_screen_browsertest.cc
@@ -8,8 +8,8 @@ #include "ash/constants/ash_features.h" #include "ash/constants/ash_switches.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/test/scoped_feature_list.h" #include "chrome/browser/ash/login/enrollment/enrollment_screen.h"
diff --git a/chrome/browser/ash/login/screens/network_screen_unittest.cc b/chrome/browser/ash/login/screens/network_screen_unittest.cc index b20478c..72057d5 100644 --- a/chrome/browser/ash/login/screens/network_screen_unittest.cc +++ b/chrome/browser/ash/login/screens/network_screen_unittest.cc
@@ -8,8 +8,8 @@ #include "ash/constants/ash_features.h" #include "ash/constants/ash_switches.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "base/test/scoped_mock_time_message_loop_task_runner.h" #include "chrome/browser/ash/login/mock_network_state_helper.h"
diff --git a/chrome/browser/ash/login/screens/offline_login_screen.cc b/chrome/browser/ash/login/screens/offline_login_screen.cc index 50349ea..d8de7ea 100644 --- a/chrome/browser/ash/login/screens/offline_login_screen.cc +++ b/chrome/browser/ash/login/screens/offline_login_screen.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ash/login/screens/offline_login_screen.h" -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "base/time/default_clock.h" #include "base/time/time.h"
diff --git a/chrome/browser/ash/login/screens/offline_login_screen.h b/chrome/browser/ash/login/screens/offline_login_screen.h index a9c7193e..7ce3be5 100644 --- a/chrome/browser/ash/login/screens/offline_login_screen.h +++ b/chrome/browser/ash/login/screens/offline_login_screen.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/scoped_observation.h" #include "chrome/browser/ash/idle_detector.h" #include "chrome/browser/ash/login/screens/base_screen.h"
diff --git a/chrome/browser/ash/login/screens/packaged_license_screen.h b/chrome/browser/ash/login/screens/packaged_license_screen.h index d6a1c34..75584d4 100644 --- a/chrome/browser/ash/login/screens/packaged_license_screen.h +++ b/chrome/browser/ash/login/screens/packaged_license_screen.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ash/login/screens/base_screen.h"
diff --git a/chrome/browser/ash/login/screens/packaged_license_screen_browsertest.cc b/chrome/browser/ash/login/screens/packaged_license_screen_browsertest.cc index 7913e6f9..aedcd51 100644 --- a/chrome/browser/ash/login/screens/packaged_license_screen_browsertest.cc +++ b/chrome/browser/ash/login/screens/packaged_license_screen_browsertest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ash/login/screens/packaged_license_screen.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "chrome/browser/ash/login/screen_manager.h" #include "chrome/browser/ash/login/test/js_checker.h"
diff --git a/chrome/browser/ash/login/screens/parental_handoff_screen.h b/chrome/browser/ash/login/screens/parental_handoff_screen.h index 46bdabf..ac6265fe81 100644 --- a/chrome/browser/ash/login/screens/parental_handoff_screen.h +++ b/chrome/browser/ash/login/screens/parental_handoff_screen.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ash/login/screens/base_screen.h"
diff --git a/chrome/browser/ash/login/screens/parental_handoff_screen_browsertest.cc b/chrome/browser/ash/login/screens/parental_handoff_screen_browsertest.cc index 60269f1..25bfd52 100644 --- a/chrome/browser/ash/login/screens/parental_handoff_screen_browsertest.cc +++ b/chrome/browser/ash/login/screens/parental_handoff_screen_browsertest.cc
@@ -8,7 +8,7 @@ #include "ash/constants/ash_features.h" #include "base/auto_reset.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/run_loop.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h"
diff --git a/chrome/browser/ash/login/screens/pin_setup_screen.h b/chrome/browser/ash/login/screens/pin_setup_screen.h index c8ac43d..b271b5a 100644 --- a/chrome/browser/ash/login/screens/pin_setup_screen.h +++ b/chrome/browser/ash/login/screens/pin_setup_screen.h
@@ -8,7 +8,7 @@ #include <string> #include "base/auto_reset.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/timer/timer.h" #include "chrome/browser/ash/login/screens/base_screen.h"
diff --git a/chrome/browser/ash/login/screens/pin_setup_screen_browsertest.cc b/chrome/browser/ash/login/screens/pin_setup_screen_browsertest.cc index 876d7c7..adc4c63b 100644 --- a/chrome/browser/ash/login/screens/pin_setup_screen_browsertest.cc +++ b/chrome/browser/ash/login/screens/pin_setup_screen_browsertest.cc
@@ -7,7 +7,7 @@ #include "ash/constants/ash_features.h" #include "ash/constants/ash_pref_names.h" #include "ash/public/cpp/test/shell_test_api.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "chrome/browser/ash/login/screen_manager.h" #include "chrome/browser/ash/login/test/js_checker.h"
diff --git a/chrome/browser/ash/login/screens/quick_start_screen.h b/chrome/browser/ash/login/screens/quick_start_screen.h index 36ea3e11..c9ebae3 100644 --- a/chrome/browser/ash/login/screens/quick_start_screen.h +++ b/chrome/browser/ash/login/screens/quick_start_screen.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ash/login/oobe_quick_start/target_device_bootstrap_controller.h" #include "chrome/browser/ash/login/screens/base_screen.h"
diff --git a/chrome/browser/ash/login/screens/recommend_apps/fake_recommend_apps_fetcher_delegate.h b/chrome/browser/ash/login/screens/recommend_apps/fake_recommend_apps_fetcher_delegate.h index 3678c1ca..3b26e2d 100644 --- a/chrome/browser/ash/login/screens/recommend_apps/fake_recommend_apps_fetcher_delegate.h +++ b/chrome/browser/ash/login/screens/recommend_apps/fake_recommend_apps_fetcher_delegate.h
@@ -7,7 +7,7 @@ #include "chrome/browser/ash/login/screens/recommend_apps/recommend_apps_fetcher_delegate.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/values.h" namespace ash {
diff --git a/chrome/browser/ash/login/screens/recommend_apps/recommend_apps_fetcher.cc b/chrome/browser/ash/login/screens/recommend_apps/recommend_apps_fetcher.cc index f9172f4..585851e 100644 --- a/chrome/browser/ash/login/screens/recommend_apps/recommend_apps_fetcher.cc +++ b/chrome/browser/ash/login/screens/recommend_apps/recommend_apps_fetcher.cc
@@ -6,8 +6,8 @@ #include "ash/constants/ash_switches.h" #include "ash/public/ash_interfaces.h" -#include "base/callback.h" #include "base/command_line.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/strings/string_number_conversions.h" #include "base/system/sys_info.h"
diff --git a/chrome/browser/ash/login/screens/recommend_apps/recommend_apps_fetcher.h b/chrome/browser/ash/login/screens/recommend_apps/recommend_apps_fetcher.h index b292a4bb4..453fe87 100644 --- a/chrome/browser/ash/login/screens/recommend_apps/recommend_apps_fetcher.h +++ b/chrome/browser/ash/login/screens/recommend_apps/recommend_apps_fetcher.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" namespace ash { class RecommendAppsFetcherDelegate;
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 5471e50..2af482a 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
@@ -5,7 +5,7 @@ #include "chrome/browser/ash/login/screens/recommend_apps/recommend_apps_fetcher_impl.h" #include "base/base64url.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/json/json_reader.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.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 bb1ec74a..6203d76 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
@@ -10,7 +10,7 @@ #include <vector> #include "ash/components/arc/arc_features_parser.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h" #include "base/timer/timer.h"
diff --git a/chrome/browser/ash/login/screens/recommend_apps/scoped_test_recommend_apps_fetcher_factory.h b/chrome/browser/ash/login/screens/recommend_apps/scoped_test_recommend_apps_fetcher_factory.h index be89f06..7f25f72 100644 --- a/chrome/browser/ash/login/screens/recommend_apps/scoped_test_recommend_apps_fetcher_factory.h +++ b/chrome/browser/ash/login/screens/recommend_apps/scoped_test_recommend_apps_fetcher_factory.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_ASH_LOGIN_SCREENS_RECOMMEND_APPS_SCOPED_TEST_RECOMMEND_APPS_FETCHER_FACTORY_H_ #define CHROME_BROWSER_ASH_LOGIN_SCREENS_RECOMMEND_APPS_SCOPED_TEST_RECOMMEND_APPS_FETCHER_FACTORY_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/ash/login/screens/recommend_apps/recommend_apps_fetcher.h" namespace ash {
diff --git a/chrome/browser/ash/login/screens/recommend_apps_screen.h b/chrome/browser/ash/login/screens/recommend_apps_screen.h index 6fd6158..93d281b 100644 --- a/chrome/browser/ash/login/screens/recommend_apps_screen.h +++ b/chrome/browser/ash/login/screens/recommend_apps_screen.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/apps/app_discovery_service/app_discovery_service.h" #include "chrome/browser/ash/login/screens/base_screen.h"
diff --git a/chrome/browser/ash/login/screens/recommend_apps_screen_browsertest.cc b/chrome/browser/ash/login/screens/recommend_apps_screen_browsertest.cc index ff7485e..3577eb0 100644 --- a/chrome/browser/ash/login/screens/recommend_apps_screen_browsertest.cc +++ b/chrome/browser/ash/login/screens/recommend_apps_screen_browsertest.cc
@@ -8,7 +8,7 @@ #include <vector> #include "ash/components/arc/arc_prefs.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/json/json_reader.h" #include "base/run_loop.h" #include "base/strings/string_piece.h"
diff --git a/chrome/browser/ash/login/screens/recovery_eligibility_screen.cc b/chrome/browser/ash/login/screens/recovery_eligibility_screen.cc index a23a33e7..66b0bea 100644 --- a/chrome/browser/ash/login/screens/recovery_eligibility_screen.cc +++ b/chrome/browser/ash/login/screens/recovery_eligibility_screen.cc
@@ -6,7 +6,7 @@ #include "ash/constants/ash_features.h" #include "ash/constants/ash_pref_names.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/ash/login/wizard_context.h" #include "chrome/browser/policy/profile_policy_connector.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ash/login/screens/recovery_eligibility_screen.h b/chrome/browser/ash/login/screens/recovery_eligibility_screen.h index 46b7974..a85a349 100644 --- a/chrome/browser/ash/login/screens/recovery_eligibility_screen.h +++ b/chrome/browser/ash/login/screens/recovery_eligibility_screen.h
@@ -7,7 +7,7 @@ #include "chrome/browser/ash/login/screens/base_screen.h" -#include "base/callback.h" +#include "base/functional/callback.h" namespace ash {
diff --git a/chrome/browser/ash/login/screens/reset_screen.cc b/chrome/browser/ash/login/screens/reset_screen.cc index 4bbb456..5aa8198 100644 --- a/chrome/browser/ash/login/screens/reset_screen.cc +++ b/chrome/browser/ash/login/screens/reset_screen.cc
@@ -10,9 +10,9 @@ #include "ash/public/cpp/login_accelerators.h" #include "ash/public/cpp/login_screen.h" #include "ash/public/cpp/scoped_guest_button_blocker.h" -#include "base/bind.h" #include "base/check_op.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/memory/weak_ptr.h" #include "base/metrics/histogram_macros.h" #include "base/values.h"
diff --git a/chrome/browser/ash/login/screens/reset_screen.h b/chrome/browser/ash/login/screens/reset_screen.h index e9f11d34..d8a5bb9 100644 --- a/chrome/browser/ash/login/screens/reset_screen.h +++ b/chrome/browser/ash/login/screens/reset_screen.h
@@ -10,7 +10,7 @@ #include <string> #include "ash/public/cpp/login_accelerators.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ash/login/help_app_launcher.h" #include "chrome/browser/ash/login/screens/base_screen.h"
diff --git a/chrome/browser/ash/login/screens/signin_fatal_error_screen.h b/chrome/browser/ash/login/screens/signin_fatal_error_screen.h index ffa969b..baebea1d4 100644 --- a/chrome/browser/ash/login/screens/signin_fatal_error_screen.h +++ b/chrome/browser/ash/login/screens/signin_fatal_error_screen.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "base/values.h"
diff --git a/chrome/browser/ash/login/screens/sync_consent_browsertest.cc b/chrome/browser/ash/login/screens/sync_consent_browsertest.cc index d88114a..68487a4 100644 --- a/chrome/browser/ash/login/screens/sync_consent_browsertest.cc +++ b/chrome/browser/ash/login/screens/sync_consent_browsertest.cc
@@ -6,7 +6,7 @@ #include "ash/constants/ash_pref_names.h" #include "ash/constants/ash_switches.h" #include "base/auto_reset.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/test/scoped_feature_list.h"
diff --git a/chrome/browser/ash/login/screens/sync_consent_screen.cc b/chrome/browser/ash/login/screens/sync_consent_screen.cc index f98e60e..59555c7f 100644 --- a/chrome/browser/ash/login/screens/sync_consent_screen.cc +++ b/chrome/browser/ash/login/screens/sync_consent_screen.cc
@@ -9,11 +9,11 @@ #include "ash/constants/ash_features.h" #include "ash/constants/ash_pref_names.h" #include "ash/constants/ash_switches.h" -#include "base/bind.h" #include "base/check.h" #include "base/check_is_test.h" #include "base/check_op.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/memory/weak_ptr.h" #include "base/metrics/histogram_functions.h" #include "chrome/browser/ash/account_manager/account_apps_availability.h"
diff --git a/chrome/browser/ash/login/screens/terms_of_service_screen.cc b/chrome/browser/ash/login/screens/terms_of_service_screen.cc index a6a115d..7592ab7 100644 --- a/chrome/browser/ash/login/screens/terms_of_service_screen.cc +++ b/chrome/browser/ash/login/screens/terms_of_service_screen.cc
@@ -8,10 +8,10 @@ #include <utility> #include "ash/constants/ash_features.h" -#include "base/bind.h" #include "base/check.h" #include "base/files/file_util.h" #include "base/files/important_file_writer.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/no_destructor.h" #include "base/strings/escape.h"
diff --git a/chrome/browser/ash/login/screens/terms_of_service_screen.h b/chrome/browser/ash/login/screens/terms_of_service_screen.h index 29513fc..62c8515 100644 --- a/chrome/browser/ash/login/screens/terms_of_service_screen.h +++ b/chrome/browser/ash/login/screens/terms_of_service_screen.h
@@ -7,8 +7,8 @@ #include <memory> -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/timer/timer.h" #include "chrome/browser/ash/login/screens/base_screen.h"
diff --git a/chrome/browser/ash/login/screens/terms_of_service_screen_browsertest.cc b/chrome/browser/ash/login/screens/terms_of_service_screen_browsertest.cc index 4f35a49..5c29be8 100644 --- a/chrome/browser/ash/login/screens/terms_of_service_screen_browsertest.cc +++ b/chrome/browser/ash/login/screens/terms_of_service_screen_browsertest.cc
@@ -6,8 +6,8 @@ #include "ash/constants/ash_features.h" #include "ash/public/cpp/login_screen_test_api.h" -#include "base/bind.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/threading/thread_restrictions.h" #include "chrome/browser/ash/login/existing_user_controller.h"
diff --git a/chrome/browser/ash/login/screens/update_required_screen.cc b/chrome/browser/ash/login/screens/update_required_screen.cc index a0d4c17..c1367db 100644 --- a/chrome/browser/ash/login/screens/update_required_screen.cc +++ b/chrome/browser/ash/login/screens/update_required_screen.cc
@@ -10,7 +10,7 @@ #include "ash/constants/ash_switches.h" #include "ash/public/cpp/login_screen.h" #include "ash/public/cpp/system_tray.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/time/default_clock.h" #include "chrome/browser/ash/login/error_screens_histogram_helper.h"
diff --git a/chrome/browser/ash/login/screens/update_required_screen.h b/chrome/browser/ash/login/screens/update_required_screen.h index 8d90101..64faba90 100644 --- a/chrome/browser/ash/login/screens/update_required_screen.h +++ b/chrome/browser/ash/login/screens/update_required_screen.h
@@ -9,7 +9,7 @@ #include <set> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/scoped_observation.h" #include "base/time/time.h"
diff --git a/chrome/browser/ash/login/screens/update_required_screen_browsertest.cc b/chrome/browser/ash/login/screens/update_required_screen_browsertest.cc index 664d5e8..f518b9fc 100644 --- a/chrome/browser/ash/login/screens/update_required_screen_browsertest.cc +++ b/chrome/browser/ash/login/screens/update_required_screen_browsertest.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/json/json_writer.h" #include "base/run_loop.h" #include "base/time/default_clock.h"
diff --git a/chrome/browser/ash/login/screens/update_required_screen_unittest.cc b/chrome/browser/ash/login/screens/update_required_screen_unittest.cc index aefe51a5..06812e6 100644 --- a/chrome/browser/ash/login/screens/update_required_screen_unittest.cc +++ b/chrome/browser/ash/login/screens/update_required_screen_unittest.cc
@@ -7,8 +7,8 @@ #include <memory> #include "ash/constants/ash_switches.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/callback_helpers.h" #include "base/test/scoped_mock_time_message_loop_task_runner.h" #include "chrome/browser/ash/login/screens/mock_error_screen.h" #include "chrome/browser/ash/login/startup_utils.h"
diff --git a/chrome/browser/ash/login/screens/update_screen.cc b/chrome/browser/ash/login/screens/update_screen.cc index be8940a..aed854d 100644 --- a/chrome/browser/ash/login/screens/update_screen.cc +++ b/chrome/browser/ash/login/screens/update_screen.cc
@@ -7,7 +7,7 @@ #include <algorithm> #include "ash/constants/ash_features.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/i18n/number_formatting.h" #include "base/logging.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/ash/login/screens/update_screen.h b/chrome/browser/ash/login/screens/update_screen.h index 3b76a57..74457e2 100644 --- a/chrome/browser/ash/login/screens/update_screen.h +++ b/chrome/browser/ash/login/screens/update_screen.h
@@ -8,8 +8,8 @@ #include <memory> #include <string> -#include "base/callback.h" #include "base/containers/fixed_flat_set.h" +#include "base/functional/callback.h" #include "base/gtest_prod_util.h" #include "base/memory/weak_ptr.h" #include "base/scoped_observation.h"
diff --git a/chrome/browser/ash/login/screens/update_screen_browsertest.cc b/chrome/browser/ash/login/screens/update_screen_browsertest.cc index c812769..306ee8ed 100644 --- a/chrome/browser/ash/login/screens/update_screen_browsertest.cc +++ b/chrome/browser/ash/login/screens/update_screen_browsertest.cc
@@ -7,7 +7,7 @@ #include <memory> #include "ash/constants/ash_features.h" -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/run_loop.h" #include "base/test/scoped_feature_list.h" #include "base/test/scoped_mock_time_message_loop_task_runner.h"
diff --git a/chrome/browser/ash/login/screens/user_selection_screen.cc b/chrome/browser/ash/login/screens/user_selection_screen.cc index 2373610a..526e6d37 100644 --- a/chrome/browser/ash/login/screens/user_selection_screen.cc +++ b/chrome/browser/ash/login/screens/user_selection_screen.cc
@@ -13,9 +13,9 @@ #include "ash/constants/ash_features.h" #include "ash/constants/ash_pref_names.h" #include "ash/constants/ash_switches.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/logging.h" #include "base/metrics/histogram_macros.h"
diff --git a/chrome/browser/ash/login/screens/welcome_screen.cc b/chrome/browser/ash/login/screens/welcome_screen.cc index f977775..9930465 100644 --- a/chrome/browser/ash/login/screens/welcome_screen.cc +++ b/chrome/browser/ash/login/screens/welcome_screen.cc
@@ -9,10 +9,10 @@ #include "ash/constants/ash_features.h" #include "ash/constants/ash_switches.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/memory/weak_ptr.h" #include "base/metrics/histogram_functions.h"
diff --git a/chrome/browser/ash/login/screens/welcome_screen.h b/chrome/browser/ash/login/screens/welcome_screen.h index 08ef91b..b2872891 100644 --- a/chrome/browser/ash/login/screens/welcome_screen.h +++ b/chrome/browser/ash/login/screens/welcome_screen.h
@@ -10,8 +10,8 @@ #include "ash/public/cpp/locale_update_controller.h" #include "ash/public/cpp/system_tray_observer.h" -#include "base/callback.h" #include "base/callback_list.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" #include "chrome/browser/ash/accessibility/accessibility_manager.h"
diff --git a/chrome/browser/ash/login/screens/welcome_screen_browsertest.cc b/chrome/browser/ash/login/screens/welcome_screen_browsertest.cc index 4f70fa8..b55cb0e4 100644 --- a/chrome/browser/ash/login/screens/welcome_screen_browsertest.cc +++ b/chrome/browser/ash/login/screens/welcome_screen_browsertest.cc
@@ -9,9 +9,9 @@ #include "ash/constants/ash_switches.h" #include "ash/public/cpp/system_tray_test_api.h" #include "ash/public/cpp/test/shell_test_api.h" -#include "base/bind.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/path_service.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_path_override.h"
diff --git a/chrome/browser/ash/login/screens/wrong_hwid_screen.h b/chrome/browser/ash/login/screens/wrong_hwid_screen.h index c1ff8cf..350c3b16 100644 --- a/chrome/browser/ash/login/screens/wrong_hwid_screen.h +++ b/chrome/browser/ash/login/screens/wrong_hwid_screen.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_ASH_LOGIN_SCREENS_WRONG_HWID_SCREEN_H_ #define CHROME_BROWSER_ASH_LOGIN_SCREENS_WRONG_HWID_SCREEN_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ash/login/screens/base_screen.h"
diff --git a/chrome/browser/ash/login/security_token_login_browsertest.cc b/chrome/browser/ash/login/security_token_login_browsertest.cc index 7dbbfa6e..15a1fa49 100644 --- a/chrome/browser/ash/login/security_token_login_browsertest.cc +++ b/chrome/browser/ash/login/security_token_login_browsertest.cc
@@ -13,9 +13,9 @@ #include "ash/public/cpp/login_screen_test_api.h" #include "ash/public/cpp/session/session_controller.h" #include "ash/public/cpp/session/session_observer.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/containers/span.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/ash/login/security_token_pin_dialog_host_login_impl.cc b/chrome/browser/ash/login/security_token_pin_dialog_host_login_impl.cc index 41af77a..c9d5921 100644 --- a/chrome/browser/ash/login/security_token_pin_dialog_host_login_impl.cc +++ b/chrome/browser/ash/login/security_token_pin_dialog_host_login_impl.cc
@@ -9,8 +9,8 @@ #include "ash/public/cpp/login_screen.h" #include "ash/public/cpp/login_screen_model.h" #include "ash/public/cpp/login_types.h" -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" namespace ash {
diff --git a/chrome/browser/ash/login/security_token_pin_dialog_host_login_impl.h b/chrome/browser/ash/login/security_token_pin_dialog_host_login_impl.h index ff263da8..b4ca6b765 100644 --- a/chrome/browser/ash/login/security_token_pin_dialog_host_login_impl.h +++ b/chrome/browser/ash/login/security_token_pin_dialog_host_login_impl.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/certificate_provider/security_token_pin_dialog_host.h"
diff --git a/chrome/browser/ash/login/security_token_session_controller.cc b/chrome/browser/ash/login/security_token_session_controller.cc index 8de39ff..e16005d 100644 --- a/chrome/browser/ash/login/security_token_session_controller.cc +++ b/chrome/browser/ash/login/security_token_session_controller.cc
@@ -9,10 +9,10 @@ #include "ash/constants/notifier_catalogs.h" #include "ash/public/cpp/notification_utils.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/flat_map.h" #include "base/containers/flat_set.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/notreached.h" #include "base/strings/utf_string_conversions.h" #include "base/time/time.h"
diff --git a/chrome/browser/ash/login/session/chrome_session_manager.cc b/chrome/browser/ash/login/session/chrome_session_manager.cc index b500088..2fca1db 100644 --- a/chrome/browser/ash/login/session/chrome_session_manager.cc +++ b/chrome/browser/ash/login/session/chrome_session_manager.cc
@@ -9,9 +9,9 @@ #include "ash/constants/ash_features.h" #include "ash/constants/ash_switches.h" #include "ash/webui/shimless_rma/shimless_rma.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/task/single_thread_task_runner.h" #include "chrome/browser/ash/account_manager/account_manager_util.h"
diff --git a/chrome/browser/ash/login/session/user_session_initializer.h b/chrome/browser/ash/login/session/user_session_initializer.h index a6154a7..ff15b547 100644 --- a/chrome/browser/ash/login/session/user_session_initializer.h +++ b/chrome/browser/ash/login/session/user_session_initializer.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/time/time.h" #include "components/session_manager/core/session_manager_observer.h" #include "components/user_manager/user.h"
diff --git a/chrome/browser/ash/login/session/user_session_manager.cc b/chrome/browser/ash/login/session/user_session_manager.cc index 4a922b5..82308c1 100644 --- a/chrome/browser/ash/login/session/user_session_manager.cc +++ b/chrome/browser/ash/login/session/user_session_manager.cc
@@ -17,12 +17,12 @@ #include "ash/constants/ash_features.h" #include "ash/constants/ash_switches.h" #include "base/base_paths.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/containers/contains.h" #include "base/debug/dump_without_crashing.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/logging.h" #include "base/memory/ptr_util.h"
diff --git a/chrome/browser/ash/login/session/user_session_manager.h b/chrome/browser/ash/login/session/user_session_manager.h index 6072755..d2e6987 100644 --- a/chrome/browser/ash/login/session/user_session_manager.h +++ b/chrome/browser/ash/login/session/user_session_manager.h
@@ -13,9 +13,9 @@ #include <vector> #include "ash/components/arc/net/always_on_vpn_manager.h" -#include "base/callback.h" #include "base/containers/flat_map.h" #include "base/containers/flat_set.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "base/memory/singleton.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/ash/login/session/user_session_manager_test.cc b/chrome/browser/ash/login/session/user_session_manager_test.cc index 2801e1af..f04db45 100644 --- a/chrome/browser/ash/login/session/user_session_manager_test.cc +++ b/chrome/browser/ash/login/session/user_session_manager_test.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ash/login/session/user_session_manager.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/ash/login/demo_mode/demo_session.h" #include "chrome/browser/ash/login/users/fake_chrome_user_manager.h"
diff --git a/chrome/browser/ash/login/shill_profile_loading_browsertest.cc b/chrome/browser/ash/login/shill_profile_loading_browsertest.cc index 1cbdd4f..8d5bf50 100644 --- a/chrome/browser/ash/login/shill_profile_loading_browsertest.cc +++ b/chrome/browser/ash/login/shill_profile_loading_browsertest.cc
@@ -15,7 +15,7 @@ // unmanaged user case and the managed user with/without network policy cases. #include "ash/public/cpp/login_screen_test_api.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/functional/bind_internal.h" #include "base/run_loop.h" #include "chrome/browser/ash/login/login_manager_test.h"
diff --git a/chrome/browser/ash/login/signin/auth_error_observer.cc b/chrome/browser/ash/login/signin/auth_error_observer.cc index fe394a0..3569b627 100644 --- a/chrome/browser/ash/login/signin/auth_error_observer.cc +++ b/chrome/browser/ash/login/signin/auth_error_observer.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ash/login/signin/auth_error_observer.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/user_metrics.h" #include "base/metrics/user_metrics_action.h" #include "chrome/browser/ash/login/reauth_stats.h"
diff --git a/chrome/browser/ash/login/signin/oauth2_browsertest.cc b/chrome/browser/ash/login/signin/oauth2_browsertest.cc index 1441ed4..5228ec9 100644 --- a/chrome/browser/ash/login/signin/oauth2_browsertest.cc +++ b/chrome/browser/ash/login/signin/oauth2_browsertest.cc
@@ -9,7 +9,7 @@ #include "ash/constants/ash_switches.h" #include "ash/public/cpp/login_screen_test_api.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted.h" #include "base/path_service.h" #include "base/run_loop.h"
diff --git a/chrome/browser/ash/login/signin/oauth2_token_fetcher.cc b/chrome/browser/ash/login/signin/oauth2_token_fetcher.cc index 88c560a..9fb1f1e 100644 --- a/chrome/browser/ash/login/signin/oauth2_token_fetcher.cc +++ b/chrome/browser/ash/login/signin/oauth2_token_fetcher.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ash/login/signin/oauth2_token_fetcher.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/strings/string_util.h" #include "chromeos/ash/components/network/network_handler.h"
diff --git a/chrome/browser/ash/login/signin/oauth2_token_fetcher.h b/chrome/browser/ash/login/signin/oauth2_token_fetcher.h index 997a243b..4d55f2b6 100644 --- a/chrome/browser/ash/login/signin/oauth2_token_fetcher.h +++ b/chrome/browser/ash/login/signin/oauth2_token_fetcher.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "google_apis/gaia/gaia_auth_consumer.h"
diff --git a/chrome/browser/ash/login/signin/oauth2_token_initializer.h b/chrome/browser/ash/login/signin/oauth2_token_initializer.h index 65ec5c1..db3d98d9 100644 --- a/chrome/browser/ash/login/signin/oauth2_token_initializer.h +++ b/chrome/browser/ash/login/signin/oauth2_token_initializer.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/ash/login/signin/oauth2_token_fetcher.h" #include "chromeos/ash/components/login/auth/public/user_context.h"
diff --git a/chrome/browser/ash/login/signin/offline_signin_limiter.cc b/chrome/browser/ash/login/signin/offline_signin_limiter.cc index 6c5eafa3..eb14b6f 100644 --- a/chrome/browser/ash/login/signin/offline_signin_limiter.cc +++ b/chrome/browser/ash/login/signin/offline_signin_limiter.cc
@@ -8,9 +8,9 @@ #include <utility> #include "ash/constants/ash_switches.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/notreached.h" #include "base/power_monitor/power_monitor.h"
diff --git a/chrome/browser/ash/login/signin/signin_error_notifier.cc b/chrome/browser/ash/login/signin/signin_error_notifier.cc index dac0932..137c326 100644 --- a/chrome/browser/ash/login/signin/signin_error_notifier.cc +++ b/chrome/browser/ash/login/signin/signin_error_notifier.cc
@@ -9,7 +9,7 @@ #include "ash/constants/notifier_catalogs.h" #include "ash/public/cpp/notification_utils.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h"
diff --git a/chrome/browser/ash/login/signin/token_handle_fetcher.cc b/chrome/browser/ash/login/signin/token_handle_fetcher.cc index 7fca4c2..6da19819 100644 --- a/chrome/browser/ash/login/signin/token_handle_fetcher.cc +++ b/chrome/browser/ash/login/signin/token_handle_fetcher.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "chrome/browser/ash/login/signin/token_handle_util.h" #include "chrome/browser/ash/profiles/profile_helper.h"
diff --git a/chrome/browser/ash/login/signin/token_handle_fetcher.h b/chrome/browser/ash/login/signin/token_handle_fetcher.h index 600e4fe..40f0a8b8 100644 --- a/chrome/browser/ash/login/signin/token_handle_fetcher.h +++ b/chrome/browser/ash/login/signin/token_handle_fetcher.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/time/time.h" #include "components/account_id/account_id.h" #include "components/keyed_service/core/keyed_service_shutdown_notifier.h"
diff --git a/chrome/browser/ash/login/signin/token_handle_util.h b/chrome/browser/ash/login/signin/token_handle_util.h index a74d5b0..9b43ca7 100644 --- a/chrome/browser/ash/login/signin/token_handle_util.h +++ b/chrome/browser/ash/login/signin/token_handle_util.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/callback.h" #include "base/containers/flat_map.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h" #include "base/values.h"
diff --git a/chrome/browser/ash/login/signin_partition_manager.cc b/chrome/browser/ash/login/signin_partition_manager.cc index bc92740..5c0aa78 100644 --- a/chrome/browser/ash/login/signin_partition_manager.cc +++ b/chrome/browser/ash/login/signin_partition_manager.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ash/login/signin_partition_manager.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/guid.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/net/system_network_context_manager.h"
diff --git a/chrome/browser/ash/login/signin_partition_manager.h b/chrome/browser/ash/login/signin_partition_manager.h index b9e2946..cc406a46 100644 --- a/chrome/browser/ash/login/signin_partition_manager.h +++ b/chrome/browser/ash/login/signin_partition_manager.h
@@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/singleton.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/profiles/profile_keyed_service_factory.h"
diff --git a/chrome/browser/ash/login/signin_partition_manager_unittest.cc b/chrome/browser/ash/login/signin_partition_manager_unittest.cc index c7e5942..e5c45fa 100644 --- a/chrome/browser/ash/login/signin_partition_manager_unittest.cc +++ b/chrome/browser/ash/login/signin_partition_manager_unittest.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/ptr_util.h" #include "base/run_loop.h" #include "base/threading/thread_task_runner_handle.h"
diff --git a/chrome/browser/ash/login/startup_utils.cc b/chrome/browser/ash/login/startup_utils.cc index 99b3389..a3d6173 100644 --- a/chrome/browser/ash/login/startup_utils.cc +++ b/chrome/browser/ash/login/startup_utils.cc
@@ -9,10 +9,10 @@ #include "ash/components/arc/arc_prefs.h" #include "ash/constants/ash_features.h" #include "ash/constants/ash_switches.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/path_service.h" #include "base/system/sys_info.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/ash/login/startup_utils.h b/chrome/browser/ash/login/startup_utils.h index 6393ed7..9e18380 100644 --- a/chrome/browser/ash/login/startup_utils.h +++ b/chrome/browser/ash/login/startup_utils.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" class PrefRegistrySimple;
diff --git a/chrome/browser/ash/login/test/device_state_mixin.cc b/chrome/browser/ash/login/test/device_state_mixin.cc index 4d6d4266..9444108 100644 --- a/chrome/browser/ash/login/test/device_state_mixin.cc +++ b/chrome/browser/ash/login/test/device_state_mixin.cc
@@ -8,8 +8,8 @@ #include <vector> #include "ash/constants/ash_paths.h" -#include "base/callback.h" #include "base/files/file_util.h" +#include "base/functional/callback.h" #include "base/json/json_writer.h" #include "base/numerics/safe_conversions.h" #include "base/path_service.h"
diff --git a/chrome/browser/ash/login/test/enrollment_helper_mixin.cc b/chrome/browser/ash/login/test/enrollment_helper_mixin.cc index 359cade..bc017f8 100644 --- a/chrome/browser/ash/login/test/enrollment_helper_mixin.cc +++ b/chrome/browser/ash/login/test/enrollment_helper_mixin.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ash/login/test/enrollment_helper_mixin.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/login/enrollment/enrollment_screen.h" #include "chrome/browser/ash/login/enrollment/enterprise_enrollment_helper.h" #include "chrome/browser/ash/login/enrollment/enterprise_enrollment_helper_mock.h"
diff --git a/chrome/browser/ash/login/test/fake_arc_tos_mixin.cc b/chrome/browser/ash/login/test/fake_arc_tos_mixin.cc index 6dd733b5..619ba7d 100644 --- a/chrome/browser/ash/login/test/fake_arc_tos_mixin.cc +++ b/chrome/browser/ash/login/test/fake_arc_tos_mixin.cc
@@ -5,7 +5,7 @@ #include "chrome/browser/ash/login/test/fake_arc_tos_mixin.h" #include "ash/constants/ash_switches.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "net/test/embedded_test_server/embedded_test_server.h" #include "net/test/embedded_test_server/http_request.h" #include "net/test/embedded_test_server/http_response.h"
diff --git a/chrome/browser/ash/login/test/fake_eula_mixin.cc b/chrome/browser/ash/login/test/fake_eula_mixin.cc index 8b27de4..67864863 100644 --- a/chrome/browser/ash/login/test/fake_eula_mixin.cc +++ b/chrome/browser/ash/login/test/fake_eula_mixin.cc
@@ -5,7 +5,7 @@ #include "chrome/browser/ash/login/test/fake_eula_mixin.h" #include "ash/constants/ash_switches.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "build/branding_buildflags.h" #include "build/build_config.h" #include "url/gurl.h"
diff --git a/chrome/browser/ash/login/test/fake_recovery_service_mixin.cc b/chrome/browser/ash/login/test/fake_recovery_service_mixin.cc index 9381b30..35f52d3 100644 --- a/chrome/browser/ash/login/test/fake_recovery_service_mixin.cc +++ b/chrome/browser/ash/login/test/fake_recovery_service_mixin.cc
@@ -5,7 +5,7 @@ #include "chrome/browser/ash/login/test/fake_recovery_service_mixin.h" #include "ash/constants/ash_switches.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "url/gurl.h" namespace ash {
diff --git a/chrome/browser/ash/login/test/hid_controller_mixin.cc b/chrome/browser/ash/login/test/hid_controller_mixin.cc index bd7c702..22ab40d 100644 --- a/chrome/browser/ash/login/test/hid_controller_mixin.cc +++ b/chrome/browser/ash/login/test/hid_controller_mixin.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "chrome/browser/ash/login/screens/hid_detection_screen.h" #include "device/bluetooth/bluetooth_adapter_factory.h" #include "services/device/public/cpp/hid/fake_input_service_linux.h"
diff --git a/chrome/browser/ash/login/test/js_checker.cc b/chrome/browser/ash/login/test/js_checker.cc index 77a183b8..78d23ab6 100644 --- a/chrome/browser/ash/login/test/js_checker.cc +++ b/chrome/browser/ash/login/test/js_checker.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ash/login/test/js_checker.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/json/string_escape.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/ash/login/test/test_predicate_waiter.h"
diff --git a/chrome/browser/ash/login/test/oobe_base_test.cc b/chrome/browser/ash/login/test/oobe_base_test.cc index bf282aa..377e96a8 100644 --- a/chrome/browser/ash/login/test/oobe_base_test.cc +++ b/chrome/browser/ash/login/test/oobe_base_test.cc
@@ -8,8 +8,8 @@ #include "ash/constants/ash_features.h" #include "ash/constants/ash_switches.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/ash/login/test/oobe_configuration_waiter.h b/chrome/browser/ash/login/test/oobe_configuration_waiter.h index 049377e..3c87025 100644 --- a/chrome/browser/ash/login/test/oobe_configuration_waiter.h +++ b/chrome/browser/ash/login/test/oobe_configuration_waiter.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_ASH_LOGIN_TEST_OOBE_CONFIGURATION_WAITER_H_ #define CHROME_BROWSER_ASH_LOGIN_TEST_OOBE_CONFIGURATION_WAITER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/ash/login/oobe_configuration.h" namespace ash {
diff --git a/chrome/browser/ash/login/test/oobe_window_visibility_waiter.h b/chrome/browser/ash/login/test/oobe_window_visibility_waiter.h index 8a9eb109..2fa21ac2 100644 --- a/chrome/browser/ash/login/test/oobe_window_visibility_waiter.h +++ b/chrome/browser/ash/login/test/oobe_window_visibility_waiter.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_ASH_LOGIN_TEST_OOBE_WINDOW_VISIBILITY_WAITER_H_ #define CHROME_BROWSER_ASH_LOGIN_TEST_OOBE_WINDOW_VISIBILITY_WAITER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/scoped_observation.h" #include "ui/aura/window.h" #include "ui/aura/window_observer.h"
diff --git a/chrome/browser/ash/login/test/scoped_policy_update.h b/chrome/browser/ash/login/test/scoped_policy_update.h index cc6aa6a..1e90ff2 100644 --- a/chrome/browser/ash/login/test/scoped_policy_update.h +++ b/chrome/browser/ash/login/test/scoped_policy_update.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_ASH_LOGIN_TEST_SCOPED_POLICY_UPDATE_H_ #define CHROME_BROWSER_ASH_LOGIN_TEST_SCOPED_POLICY_UPDATE_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/ash/policy/core/device_policy_builder.h" #include "components/policy/core/common/cloud/test/policy_builder.h"
diff --git a/chrome/browser/ash/login/test/session_manager_state_waiter.h b/chrome/browser/ash/login/test/session_manager_state_waiter.h index 2521f56..f9e733d1 100644 --- a/chrome/browser/ash/login/test/session_manager_state_waiter.h +++ b/chrome/browser/ash/login/test/session_manager_state_waiter.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_ASH_LOGIN_TEST_SESSION_MANAGER_STATE_WAITER_H_ #define CHROME_BROWSER_ASH_LOGIN_TEST_SESSION_MANAGER_STATE_WAITER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/scoped_observation.h" #include "components/session_manager/core/session_manager.h" #include "components/session_manager/core/session_manager_observer.h"
diff --git a/chrome/browser/ash/login/test/test_predicate_waiter.cc b/chrome/browser/ash/login/test/test_predicate_waiter.cc index 493e3e6..876306a 100644 --- a/chrome/browser/ash/login/test/test_predicate_waiter.cc +++ b/chrome/browser/ash/login/test/test_predicate_waiter.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ash/login/test/test_predicate_waiter.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/ash/login/test/test_predicate_waiter.h b/chrome/browser/ash/login/test/test_predicate_waiter.h index 3185223..1a39226d 100644 --- a/chrome/browser/ash/login/test/test_predicate_waiter.h +++ b/chrome/browser/ash/login/test/test_predicate_waiter.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_ASH_LOGIN_TEST_TEST_PREDICATE_WAITER_H_ #define CHROME_BROWSER_ASH_LOGIN_TEST_TEST_PREDICATE_WAITER_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/run_loop.h" #include "base/timer/timer.h" #include "chrome/browser/ash/login/test/test_condition_waiter.h"
diff --git a/chrome/browser/ash/login/test/user_policy_mixin.cc b/chrome/browser/ash/login/test/user_policy_mixin.cc index d4fc072f..1a01c36 100644 --- a/chrome/browser/ash/login/test/user_policy_mixin.cc +++ b/chrome/browser/ash/login/test/user_policy_mixin.cc
@@ -7,9 +7,9 @@ #include <utility> #include "ash/constants/ash_paths.h" -#include "base/bind.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/path_service.h" #include "base/threading/thread_restrictions.h" #include "chrome/browser/ash/login/test/embedded_policy_test_server_mixin.h"
diff --git a/chrome/browser/ash/login/ui/login_display_host.cc b/chrome/browser/ash/login/ui/login_display_host.cc index e63e8bdc..88c89345 100644 --- a/chrome/browser/ash/login/ui/login_display_host.cc +++ b/chrome/browser/ash/login/ui/login_display_host.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ash/login/ui/login_display_host.h" -#include "base/callback.h" +#include "base/functional/callback.h" namespace ash {
diff --git a/chrome/browser/ash/login/ui/login_display_host.h b/chrome/browser/ash/login/ui/login_display_host.h index 69f435d..8ebb565 100644 --- a/chrome/browser/ash/login/ui/login_display_host.h +++ b/chrome/browser/ash/login/ui/login_display_host.h
@@ -9,7 +9,7 @@ #include <string> #include "ash/public/cpp/login_accelerators.h" -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "base/observer_list_types.h" #include "chrome/browser/ash/customization/customization_document.h"
diff --git a/chrome/browser/ash/login/ui/login_display_host_common.cc b/chrome/browser/ash/login/ui/login_display_host_common.cc index 045a1a8..2dc3749 100644 --- a/chrome/browser/ash/login/ui/login_display_host_common.cc +++ b/chrome/browser/ash/login/ui/login_display_host_common.cc
@@ -8,11 +8,11 @@ #include "ash/constants/ash_features.h" #include "ash/public/cpp/login_accelerators.h" -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/check_deref.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/notreached.h" #include "chrome/browser/ash/app_mode/kiosk_app_types.h" #include "chrome/browser/ash/language_preferences.h"
diff --git a/chrome/browser/ash/login/ui/login_display_host_mojo.cc b/chrome/browser/ash/login/ui/login_display_host_mojo.cc index 59f86e44..9568df1 100644 --- a/chrome/browser/ash/login/ui/login_display_host_mojo.cc +++ b/chrome/browser/ash/login/ui/login_display_host_mojo.cc
@@ -12,9 +12,9 @@ #include "ash/public/cpp/login_screen.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/shell.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/metrics/histogram_macros.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/ash/login/ui/login_display_host_mojo.h b/chrome/browser/ash/login/ui/login_display_host_mojo.h index 313742f..692434de 100644 --- a/chrome/browser/ash/login/ui/login_display_host_mojo.h +++ b/chrome/browser/ash/login/ui/login_display_host_mojo.h
@@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" #include "base/scoped_observation.h"
diff --git a/chrome/browser/ash/login/ui/login_display_host_webui.cc b/chrome/browser/ash/login/ui/login_display_host_webui.cc index 755552c..281494f 100644 --- a/chrome/browser/ash/login/ui/login_display_host_webui.cc +++ b/chrome/browser/ash/login/ui/login_display_host_webui.cc
@@ -17,8 +17,8 @@ #include "ash/public/cpp/login_screen_model.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/shell.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/metrics/histogram_functions.h"
diff --git a/chrome/browser/ash/login/ui/login_display_mojo.cc b/chrome/browser/ash/login/ui/login_display_mojo.cc index afea64a..d5bcdca 100644 --- a/chrome/browser/ash/login/ui/login_display_mojo.cc +++ b/chrome/browser/ash/login/ui/login_display_mojo.cc
@@ -7,7 +7,7 @@ #include "ash/public/cpp/login_screen.h" #include "ash/public/cpp/login_screen_model.h" #include "ash/public/cpp/login_types.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/app_mode/kiosk_app_manager.h" #include "chrome/browser/ash/login/challenge_response_auth_keys_loader.h" #include "chrome/browser/ash/login/existing_user_controller.h"
diff --git a/chrome/browser/ash/login/ui/login_screen_extension_ui/create_options.h b/chrome/browser/ash/login/ui/login_screen_extension_ui/create_options.h index 8f09bf7..1208051c 100644 --- a/chrome/browser/ash/login/ui/login_screen_extension_ui/create_options.h +++ b/chrome/browser/ash/login/ui/login_screen_extension_ui/create_options.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "url/gurl.h" namespace ash {
diff --git a/chrome/browser/ash/login/ui/login_screen_extension_ui/dialog_delegate.h b/chrome/browser/ash/login/ui/login_screen_extension_ui/dialog_delegate.h index 8d9ca26e..1cdd4e2 100644 --- a/chrome/browser/ash/login/ui/login_screen_extension_ui/dialog_delegate.h +++ b/chrome/browser/ash/login/ui/login_screen_extension_ui/dialog_delegate.h
@@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "ui/base/ui_base_types.h" #include "ui/gfx/native_widget_types.h" #include "ui/web_dialogs/web_dialog_delegate.h"
diff --git a/chrome/browser/ash/login/ui/login_screen_extension_ui/web_dialog_view_unittest.cc b/chrome/browser/ash/login/ui/login_screen_extension_ui/web_dialog_view_unittest.cc index 8472b983..f0ff446 100644 --- a/chrome/browser/ash/login/ui/login_screen_extension_ui/web_dialog_view_unittest.cc +++ b/chrome/browser/ash/login/ui/login_screen_extension_ui/web_dialog_view_unittest.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "chrome/browser/ash/login/ui/login_screen_extension_ui/create_options.h" #include "chrome/browser/ash/login/ui/login_screen_extension_ui/dialog_delegate.h" #include "chrome/browser/ui/ash/test_login_screen.h"
diff --git a/chrome/browser/ash/login/ui/signin_ui.h b/chrome/browser/ash/login/ui/signin_ui.h index 9d7953b..d40e4587 100644 --- a/chrome/browser/ash/login/ui/signin_ui.h +++ b/chrome/browser/ash/login/ui/signin_ui.h
@@ -6,7 +6,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/ash/login/oobe_screen.h" #include "chrome/browser/ash/login/screens/encryption_migration_mode.h" #include "chromeos/ash/components/login/auth/public/user_context.h"
diff --git a/chrome/browser/ash/login/ui/user_adding_screen.cc b/chrome/browser/ash/login/ui/user_adding_screen.cc index 0f4e744..211665e 100644 --- a/chrome/browser/ash/login/ui/user_adding_screen.cc +++ b/chrome/browser/ash/login/ui/user_adding_screen.cc
@@ -5,7 +5,7 @@ #include "chrome/browser/ash/login/ui/user_adding_screen.h" #include "ash/constants/ash_features.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/singleton.h" #include "base/observer_list.h" #include "chrome/browser/ash/login/helper.h"
diff --git a/chrome/browser/ash/login/ui/webui_login_view.cc b/chrome/browser/ash/login/ui/webui_login_view.cc index edc298e..4273aaff 100644 --- a/chrome/browser/ash/login/ui/webui_login_view.cc +++ b/chrome/browser/ash/login/ui/webui_login_view.cc
@@ -9,8 +9,8 @@ #include "ash/public/cpp/login_accelerators.h" #include "ash/public/cpp/login_screen.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/i18n/rtl.h" #include "base/logging.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ash/login/user_flow.cc b/chrome/browser/ash/login/user_flow.cc index b3869637..08eb3b8 100644 --- a/chrome/browser/ash/login/user_flow.cc +++ b/chrome/browser/ash/login/user_flow.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ash/login/user_flow.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/task/single_thread_task_runner.h" #include "chrome/browser/ash/login/users/chrome_user_manager.h"
diff --git a/chrome/browser/ash/login/users/affiliation.cc b/chrome/browser/ash/login/users/affiliation.cc index 0a17d80..dd06ade 100644 --- a/chrome/browser/ash/login/users/affiliation.cc +++ b/chrome/browser/ash/login/users/affiliation.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ash/login/users/affiliation.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "chrome/browser/ash/policy/core/browser_policy_connector_ash.h" #include "chrome/browser/ash/policy/core/device_local_account.h" #include "chrome/browser/ash/settings/device_settings_service.h"
diff --git a/chrome/browser/ash/login/users/affiliation.h b/chrome/browser/ash/login/users/affiliation.h index be9914d9..389cd84 100644 --- a/chrome/browser/ash/login/users/affiliation.h +++ b/chrome/browser/ash/login/users/affiliation.h
@@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" class AccountId;
diff --git a/chrome/browser/ash/login/users/avatar/fake_user_image_file_selector.h b/chrome/browser/ash/login/users/avatar/fake_user_image_file_selector.h index 40faefe..e3aac95 100644 --- a/chrome/browser/ash/login/users/avatar/fake_user_image_file_selector.h +++ b/chrome/browser/ash/login/users/avatar/fake_user_image_file_selector.h
@@ -7,7 +7,7 @@ #include "chrome/browser/ash/login/users/avatar/user_image_file_selector.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "content/public/browser/web_ui.h" namespace ash {
diff --git a/chrome/browser/ash/login/users/avatar/user_image_file_selector.h b/chrome/browser/ash/login/users/avatar/user_image_file_selector.h index 1782f9c..932c8b7 100644 --- a/chrome/browser/ash/login/users/avatar/user_image_file_selector.h +++ b/chrome/browser/ash/login/users/avatar/user_image_file_selector.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_ASH_LOGIN_USERS_AVATAR_USER_IMAGE_FILE_SELECTOR_H_ #define CHROME_BROWSER_ASH_LOGIN_USERS_AVATAR_USER_IMAGE_FILE_SELECTOR_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "content/public/browser/web_ui.h" #include "ui/gfx/native_widget_types.h"
diff --git a/chrome/browser/ash/login/users/avatar/user_image_loader.cc b/chrome/browser/ash/login/users/avatar/user_image_loader.cc index bb019ec..5c450b1b 100644 --- a/chrome/browser/ash/login/users/avatar/user_image_loader.cc +++ b/chrome/browser/ash/login/users/avatar/user_image_loader.cc
@@ -8,10 +8,10 @@ #include <utility> #include "ash/public/cpp/image_downloader.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/metrics/histogram_functions.h" #include "base/task/sequenced_task_runner.h"
diff --git a/chrome/browser/ash/login/users/avatar/user_image_loader.h b/chrome/browser/ash/login/users/avatar/user_image_loader.h index b178ac5..afb7eb1 100644 --- a/chrome/browser/ash/login/users/avatar/user_image_loader.h +++ b/chrome/browser/ash/login/users/avatar/user_image_loader.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/callback_forward.h" #include "base/files/file_path.h" +#include "base/functional/callback_forward.h" #include "base/memory/ref_counted.h" #include "chrome/browser/image_decoder/image_decoder.h" #include "url/gurl.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 93f5f88..f3090a4 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
@@ -12,10 +12,10 @@ #include "ash/constants/ash_features.h" #include "ash/public/cpp/image_downloader.h" #include "ash/webui/personalization_app/mojom/personalization_app.mojom.h" -#include "base/bind.h" #include "base/check.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/metrics/histogram_functions.h" #include "base/path_service.h"
diff --git a/chrome/browser/ash/login/users/avatar/user_image_sync_observer.cc b/chrome/browser/ash/login/users/avatar/user_image_sync_observer.cc index 7d8c5f3..7c4124ff 100644 --- a/chrome/browser/ash/login/users/avatar/user_image_sync_observer.cc +++ b/chrome/browser/ash/login/users/avatar/user_image_sync_observer.cc
@@ -7,7 +7,7 @@ #include <memory> #include "ash/constants/ash_features.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/login/users/avatar/user_image_manager.h" #include "chrome/browser/ash/login/users/chrome_user_manager.h" #include "chrome/browser/ash/login/users/default_user_image/default_user_images.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 d482155..bfb4dc9 100644 --- a/chrome/browser/ash/login/users/chrome_user_manager_impl.cc +++ b/chrome/browser/ash/login/users/chrome_user_manager_impl.cc
@@ -16,8 +16,6 @@ #include "ash/constants/ash_pref_names.h" #include "ash/constants/ash_switches.h" #include "ash/public/cpp/session/session_controller.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/compiler_specific.h" #include "base/containers/adapters.h" @@ -25,6 +23,8 @@ #include "base/containers/span.h" #include "base/feature_list.h" #include "base/format_macros.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/logging.h" #include "base/memory/ptr_util.h"
diff --git a/chrome/browser/ash/login/users/fake_chrome_user_manager.cc b/chrome/browser/ash/login/users/fake_chrome_user_manager.cc index 6b21853..17a8677 100644 --- a/chrome/browser/ash/login/users/fake_chrome_user_manager.cc +++ b/chrome/browser/ash/login/users/fake_chrome_user_manager.cc
@@ -9,8 +9,8 @@ #include <utility> #include "ash/constants/ash_switches.h" -#include "base/callback.h" #include "base/command_line.h" +#include "base/functional/callback.h" #include "base/ranges/algorithm.h" #include "base/system/sys_info.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/ash/login/users/fake_chrome_user_manager.h b/chrome/browser/ash/login/users/fake_chrome_user_manager.h index 25bc0732..bb16b8c 100644 --- a/chrome/browser/ash/login/users/fake_chrome_user_manager.h +++ b/chrome/browser/ash/login/users/fake_chrome_user_manager.h
@@ -9,7 +9,7 @@ #include <memory> #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "build/chromeos_buildflags.h" #include "chrome/browser/ash/login/user_flow.h"
diff --git a/chrome/browser/ash/login/users/multi_profile_user_controller.cc b/chrome/browser/ash/login/users/multi_profile_user_controller.cc index ca9d67f..7b7a39d 100644 --- a/chrome/browser/ash/login/users/multi_profile_user_controller.cc +++ b/chrome/browser/ash/login/users/multi_profile_user_controller.cc
@@ -7,7 +7,7 @@ #include <utility> #include "ash/public/cpp/login_types.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/login/users/multi_profile_user_controller_delegate.h" #include "chrome/browser/ash/profiles/profile_helper.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ash/login/users/multi_profile_user_controller_unittest.cc b/chrome/browser/ash/login/users/multi_profile_user_controller_unittest.cc index 0cabd8f..d50dbef 100644 --- a/chrome/browser/ash/login/users/multi_profile_user_controller_unittest.cc +++ b/chrome/browser/ash/login/users/multi_profile_user_controller_unittest.cc
@@ -8,7 +8,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/memory/ref_counted.h" #include "base/run_loop.h"
diff --git a/chrome/browser/ash/login/users/supervised_user_manager.h b/chrome/browser/ash/login/users/supervised_user_manager.h index 128efc3..7d6d3f4 100644 --- a/chrome/browser/ash/login/users/supervised_user_manager.h +++ b/chrome/browser/ash/login/users/supervised_user_manager.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/values.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ash/login/users/supervised_user_manager_impl.cc b/chrome/browser/ash/login/users/supervised_user_manager_impl.cc index cb57bdb2..de39ae7 100644 --- a/chrome/browser/ash/login/users/supervised_user_manager_impl.cc +++ b/chrome/browser/ash/login/users/supervised_user_manager_impl.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h"
diff --git a/chrome/browser/ash/login/users/wallpaper_policy_browsertest.cc b/chrome/browser/ash/login/users/wallpaper_policy_browsertest.cc index f9f6eff..4b9eca4 100644 --- a/chrome/browser/ash/login/users/wallpaper_policy_browsertest.cc +++ b/chrome/browser/ash/login/users/wallpaper_policy_browsertest.cc
@@ -11,11 +11,11 @@ #include "ash/constants/ash_paths.h" #include "ash/constants/ash_switches.h" #include "ash/public/cpp/wallpaper/wallpaper_controller_observer.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/compiler_specific.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/json/json_writer.h" #include "base/memory/weak_ptr.h" #include "base/numerics/safe_conversions.h"
diff --git a/chrome/browser/ash/login/version_info_updater.cc b/chrome/browser/ash/login/version_info_updater.cc index 688f9932..acaf131 100644 --- a/chrome/browser/ash/login/version_info_updater.cc +++ b/chrome/browser/ash/login/version_info_updater.cc
@@ -7,9 +7,9 @@ #include <vector> #include "ash/constants/ash_features.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/system/sys_info.h"
diff --git a/chrome/browser/ash/login/version_updater/version_updater.cc b/chrome/browser/ash/login/version_updater/version_updater.cc index 325c227b..6e74b7f 100644 --- a/chrome/browser/ash/login/version_updater/version_updater.cc +++ b/chrome/browser/ash/login/version_updater/version_updater.cc
@@ -9,7 +9,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/threading/thread_task_runner_handle.h" #include "base/time/default_tick_clock.h"
diff --git a/chrome/browser/ash/login/webview_login_browsertest.cc b/chrome/browser/ash/login/webview_login_browsertest.cc index 32721e4..ab03faa 100644 --- a/chrome/browser/ash/login/webview_login_browsertest.cc +++ b/chrome/browser/ash/login/webview_login_browsertest.cc
@@ -9,10 +9,10 @@ #include "ash/constants/ash_features.h" #include "ash/constants/ash_switches.h" #include "ash/public/cpp/login_screen_test_api.h" -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/guid.h" #include "base/json/json_writer.h" #include "base/memory/scoped_refptr.h"
diff --git a/chrome/browser/ash/login/wizard_controller.cc b/chrome/browser/ash/login/wizard_controller.cc index 5a1f6f1c..8d2b4091 100644 --- a/chrome/browser/ash/login/wizard_controller.cc +++ b/chrome/browser/ash/login/wizard_controller.cc
@@ -19,10 +19,10 @@ #include "ash/components/arc/session/arc_bridge_service.h" #include "ash/constants/ash_features.h" #include "ash/constants/ash_switches.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/json/json_string_value_serializer.h" #include "base/location.h" #include "base/logging.h"
diff --git a/chrome/browser/ash/login/wizard_controller_browsertest.cc b/chrome/browser/ash/login/wizard_controller_browsertest.cc index fb533afd..b2bd31f 100644 --- a/chrome/browser/ash/login/wizard_controller_browsertest.cc +++ b/chrome/browser/ash/login/wizard_controller_browsertest.cc
@@ -7,9 +7,9 @@ #include "ash/constants/ash_features.h" #include "ash/constants/ash_switches.h" #include "ash/public/cpp/login_screen_test_api.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/ash/memory_metrics.cc b/chrome/browser/ash/memory_metrics.cc index 422d5c9..999a4d02 100644 --- a/chrome/browser/ash/memory_metrics.cc +++ b/chrome/browser/ash/memory_metrics.cc
@@ -12,9 +12,9 @@ #include <vector> #include "ash/constants/ash_switches.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/metrics/histogram.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h"
diff --git a/chrome/browser/ash/mobile/mobile_activator.cc b/chrome/browser/ash/mobile/mobile_activator.cc index b120b09..b4bf302 100644 --- a/chrome/browser/ash/mobile/mobile_activator.cc +++ b/chrome/browser/ash/mobile/mobile_activator.cc
@@ -8,9 +8,9 @@ #include <map> #include <string> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/json/json_reader.h" #include "base/location.h" #include "base/logging.h"
diff --git a/chrome/browser/ash/nearby/nearby_dependencies_provider.cc b/chrome/browser/ash/nearby/nearby_dependencies_provider.cc index ebd89f4..6c6461f 100644 --- a/chrome/browser/ash/nearby/nearby_dependencies_provider.cc +++ b/chrome/browser/ash/nearby/nearby_dependencies_provider.cc
@@ -5,9 +5,9 @@ #include "chrome/browser/ash/nearby/nearby_dependencies_provider.h" #include "ash/public/cpp/network_config_service.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/nearby/bluetooth_adapter_manager.h" #include "chrome/browser/nearby_sharing/common/nearby_share_features.h" #include "chrome/browser/nearby_sharing/common/nearby_share_switches.h"
diff --git a/chrome/browser/ash/nearby/nearby_process_manager_impl.h b/chrome/browser/ash/nearby/nearby_process_manager_impl.h index fb504244..04fae50c 100644 --- a/chrome/browser/ash/nearby/nearby_process_manager_impl.h +++ b/chrome/browser/ash/nearby/nearby_process_manager_impl.h
@@ -7,8 +7,8 @@ #include <memory> -#include "base/callback.h" #include "base/containers/flat_map.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/timer/timer.h" #include "base/unguessable_token.h"
diff --git a/chrome/browser/ash/net/client_cert_filter.cc b/chrome/browser/ash/net/client_cert_filter.cc index 6001282..d547a7d 100644 --- a/chrome/browser/ash/net/client_cert_filter.cc +++ b/chrome/browser/ash/net/client_cert_filter.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "content/public/browser/browser_task_traits.h" #include "crypto/nss_util_internal.h" #include "crypto/scoped_nss_types.h"
diff --git a/chrome/browser/ash/net/client_cert_filter.h b/chrome/browser/ash/net/client_cert_filter.h index 62ebdc45..3f01a090 100644 --- a/chrome/browser/ash/net/client_cert_filter.h +++ b/chrome/browser/ash/net/client_cert_filter.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/ash/net/client_cert_store_ash.cc b/chrome/browser/ash/net/client_cert_store_ash.cc index c437c65..96f027d 100644 --- a/chrome/browser/ash/net/client_cert_store_ash.cc +++ b/chrome/browser/ash/net/client_cert_store_ash.cc
@@ -9,9 +9,9 @@ #include <iterator> #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/task/thread_pool.h" #include "base/threading/scoped_blocking_call.h"
diff --git a/chrome/browser/ash/net/client_cert_store_ash_unittest.cc b/chrome/browser/ash/net/client_cert_store_ash_unittest.cc index 762b4ed..4dc5c28 100644 --- a/chrome/browser/ash/net/client_cert_store_ash_unittest.cc +++ b/chrome/browser/ash/net/client_cert_store_ash_unittest.cc
@@ -7,10 +7,10 @@ #include <memory> #include <string> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/memory/ptr_util.h" #include "base/memory/ref_counted.h"
diff --git a/chrome/browser/ash/net/delay_network_call.cc b/chrome/browser/ash/net/delay_network_call.cc index 09a314a5..8a00e181 100644 --- a/chrome/browser/ash/net/delay_network_call.cc +++ b/chrome/browser/ash/net/delay_network_call.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/time/time.h" #include "chromeos/ash/components/network/network_handler.h"
diff --git a/chrome/browser/ash/net/delay_network_call.h b/chrome/browser/ash/net/delay_network_call.h index e491543c3..5dd306e 100644 --- a/chrome/browser/ash/net/delay_network_call.h +++ b/chrome/browser/ash/net/delay_network_call.h
@@ -7,7 +7,7 @@ #ifndef CHROME_BROWSER_ASH_NET_DELAY_NETWORK_CALL_H_ #define CHROME_BROWSER_ASH_NET_DELAY_NETWORK_CALL_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" namespace base { class TimeDelta;
diff --git a/chrome/browser/ash/net/dns_over_https/templates_uri_resolver_impl_unittest.cc b/chrome/browser/ash/net/dns_over_https/templates_uri_resolver_impl_unittest.cc index 640f6383..9c9a5f9 100644 --- a/chrome/browser/ash/net/dns_over_https/templates_uri_resolver_impl_unittest.cc +++ b/chrome/browser/ash/net/dns_over_https/templates_uri_resolver_impl_unittest.cc
@@ -5,7 +5,7 @@ #include "chrome/browser/ash/net/dns_over_https/templates_uri_resolver_impl.h" #include "ash/constants/ash_features.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/stringprintf.h" #include "base/test/scoped_feature_list.h" #include "base/values.h"
diff --git a/chrome/browser/ash/net/network_diagnostics/arc_dns_resolution_routine.cc b/chrome/browser/ash/net/network_diagnostics/arc_dns_resolution_routine.cc index 32042ca..f74c73f2 100644 --- a/chrome/browser/ash/net/network_diagnostics/arc_dns_resolution_routine.cc +++ b/chrome/browser/ash/net/network_diagnostics/arc_dns_resolution_routine.cc
@@ -6,7 +6,7 @@ #include <utility> #include "ash/components/arc/session/arc_service_manager.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/net/network_diagnostics/arc_dns_resolution_routine.h" #include "chrome/browser/ash/net/network_diagnostics/network_diagnostics_util.h" #include "net/dns/public/dns_protocol.h"
diff --git a/chrome/browser/ash/net/network_diagnostics/arc_http_routine.cc b/chrome/browser/ash/net/network_diagnostics/arc_http_routine.cc index 91646fd5c..2f7816a 100644 --- a/chrome/browser/ash/net/network_diagnostics/arc_http_routine.cc +++ b/chrome/browser/ash/net/network_diagnostics/arc_http_routine.cc
@@ -6,7 +6,7 @@ #include <utility> #include "ash/components/arc/session/arc_service_manager.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/net/network_diagnostics/arc_http_routine.h" #include "chrome/browser/ash/net/network_diagnostics/network_diagnostics_util.h" #include "net/http/http_status_code.h"
diff --git a/chrome/browser/ash/net/network_diagnostics/arc_ping_routine.cc b/chrome/browser/ash/net/network_diagnostics/arc_ping_routine.cc index 32b3031..bdcc165 100644 --- a/chrome/browser/ash/net/network_diagnostics/arc_ping_routine.cc +++ b/chrome/browser/ash/net/network_diagnostics/arc_ping_routine.cc
@@ -7,7 +7,7 @@ #include <utility> #include "ash/components/arc/session/arc_service_manager.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/net/network_diagnostics/arc_ping_routine.h" #include "chrome/browser/ash/net/network_diagnostics/network_diagnostics_util.h" #include "chromeos/services/network_config/in_process_instance.h"
diff --git a/chrome/browser/ash/net/network_diagnostics/captive_portal_routine.cc b/chrome/browser/ash/net/network_diagnostics/captive_portal_routine.cc index e092c8f..0182200 100644 --- a/chrome/browser/ash/net/network_diagnostics/captive_portal_routine.cc +++ b/chrome/browser/ash/net/network_diagnostics/captive_portal_routine.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "chromeos/services/network_config/in_process_instance.h" #include "chromeos/services/network_config/public/cpp/cros_network_config_util.h"
diff --git a/chrome/browser/ash/net/network_diagnostics/captive_portal_routine.h b/chrome/browser/ash/net/network_diagnostics/captive_portal_routine.h index 2b83fd6..2eee787 100644 --- a/chrome/browser/ash/net/network_diagnostics/captive_portal_routine.h +++ b/chrome/browser/ash/net/network_diagnostics/captive_portal_routine.h
@@ -7,7 +7,7 @@ #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/ash/net/network_diagnostics/network_diagnostics_routine.h" #include "chromeos/services/network_config/public/mojom/cros_network_config.mojom.h" #include "mojo/public/cpp/bindings/remote.h"
diff --git a/chrome/browser/ash/net/network_diagnostics/dns_latency_routine.cc b/chrome/browser/ash/net/network_diagnostics/dns_latency_routine.cc index c3aabbaf..c3982231 100644 --- a/chrome/browser/ash/net/network_diagnostics/dns_latency_routine.cc +++ b/chrome/browser/ash/net/network_diagnostics/dns_latency_routine.cc
@@ -10,7 +10,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/rand_util.h" #include "base/time/default_tick_clock.h" #include "chrome/browser/ash/net/network_diagnostics/network_diagnostics_util.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 a9a3eceb..f0603a1 100644 --- a/chrome/browser/ash/net/network_diagnostics/dns_latency_routine.h +++ b/chrome/browser/ash/net/network_diagnostics/dns_latency_routine.h
@@ -7,7 +7,7 @@ #include <vector> -#include "base/callback.h" +#include "base/functional/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"
diff --git a/chrome/browser/ash/net/network_diagnostics/dns_resolution_routine.cc b/chrome/browser/ash/net/network_diagnostics/dns_resolution_routine.cc index a007cac..c06caed2 100644 --- a/chrome/browser/ash/net/network_diagnostics/dns_resolution_routine.cc +++ b/chrome/browser/ash/net/network_diagnostics/dns_resolution_routine.cc
@@ -7,8 +7,8 @@ #include <iterator> #include <utility> -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/values.h" #include "chrome/browser/ash/profiles/profile_helper.h" #include "chrome/browser/profiles/profile_manager.h"
diff --git a/chrome/browser/ash/net/network_diagnostics/dns_resolution_routine.h b/chrome/browser/ash/net/network_diagnostics/dns_resolution_routine.h index 248139a..02fd45423 100644 --- a/chrome/browser/ash/net/network_diagnostics/dns_resolution_routine.h +++ b/chrome/browser/ash/net/network_diagnostics/dns_resolution_routine.h
@@ -7,7 +7,7 @@ #include <vector> -#include "base/callback.h" +#include "base/functional/callback.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/network_diagnostics/dns_resolver_present_routine.cc b/chrome/browser/ash/net/network_diagnostics/dns_resolver_present_routine.cc index caca8a9..8636ac6 100644 --- a/chrome/browser/ash/net/network_diagnostics/dns_resolver_present_routine.cc +++ b/chrome/browser/ash/net/network_diagnostics/dns_resolver_present_routine.cc
@@ -8,7 +8,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "chromeos/services/network_config/in_process_instance.h" #include "chromeos/services/network_config/public/cpp/cros_network_config_util.h" #include "components/onc/onc_constants.h"
diff --git a/chrome/browser/ash/net/network_diagnostics/dns_resolver_present_routine.h b/chrome/browser/ash/net/network_diagnostics/dns_resolver_present_routine.h index a9704ff..4634925 100644 --- a/chrome/browser/ash/net/network_diagnostics/dns_resolver_present_routine.h +++ b/chrome/browser/ash/net/network_diagnostics/dns_resolver_present_routine.h
@@ -7,7 +7,7 @@ #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/ash/net/network_diagnostics/network_diagnostics_routine.h" #include "chromeos/services/network_config/public/mojom/cros_network_config.mojom.h" #include "mojo/public/cpp/bindings/remote.h"
diff --git a/chrome/browser/ash/net/network_diagnostics/fake_tcp_connected_socket.cc b/chrome/browser/ash/net/network_diagnostics/fake_tcp_connected_socket.cc index 3c605bb2..556e62b 100644 --- a/chrome/browser/ash/net/network_diagnostics/fake_tcp_connected_socket.cc +++ b/chrome/browser/ash/net/network_diagnostics/fake_tcp_connected_socket.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "mojo/public/cpp/system/data_pipe.h" #include "services/network/public/mojom/tls_socket.mojom.h"
diff --git a/chrome/browser/ash/net/network_diagnostics/gateway_can_be_pinged_routine.cc b/chrome/browser/ash/net/network_diagnostics/gateway_can_be_pinged_routine.cc index b404797b..757e653 100644 --- a/chrome/browser/ash/net/network_diagnostics/gateway_can_be_pinged_routine.cc +++ b/chrome/browser/ash/net/network_diagnostics/gateway_can_be_pinged_routine.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/json/json_reader.h" #include "base/values.h" #include "chromeos/ash/components/dbus/debug_daemon/debug_daemon_client.h"
diff --git a/chrome/browser/ash/net/network_diagnostics/has_secure_wifi_connection_routine.cc b/chrome/browser/ash/net/network_diagnostics/has_secure_wifi_connection_routine.cc index 3c9680e..c63e77c5 100644 --- a/chrome/browser/ash/net/network_diagnostics/has_secure_wifi_connection_routine.cc +++ b/chrome/browser/ash/net/network_diagnostics/has_secure_wifi_connection_routine.cc
@@ -7,8 +7,8 @@ #include <iterator> #include <utility> -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "chromeos/services/network_config/in_process_instance.h" #include "chromeos/services/network_config/public/cpp/cros_network_config_util.h" #include "mojo/public/cpp/bindings/pending_receiver.h"
diff --git a/chrome/browser/ash/net/network_diagnostics/has_secure_wifi_connection_routine.h b/chrome/browser/ash/net/network_diagnostics/has_secure_wifi_connection_routine.h index 0ad4d53..a643993 100644 --- a/chrome/browser/ash/net/network_diagnostics/has_secure_wifi_connection_routine.h +++ b/chrome/browser/ash/net/network_diagnostics/has_secure_wifi_connection_routine.h
@@ -7,7 +7,7 @@ #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/ash/net/network_diagnostics/network_diagnostics_routine.h" #include "chromeos/services/network_config/public/mojom/cros_network_config.mojom.h" #include "mojo/public/cpp/bindings/remote.h"
diff --git a/chrome/browser/ash/net/network_diagnostics/host_resolver.cc b/chrome/browser/ash/net/network_diagnostics/host_resolver.cc index f8a6ea3..3e415d3 100644 --- a/chrome/browser/ash/net/network_diagnostics/host_resolver.cc +++ b/chrome/browser/ash/net/network_diagnostics/host_resolver.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "net/base/net_errors.h" #include "net/base/network_anonymization_key.h" #include "net/dns/public/dns_config_overrides.h"
diff --git a/chrome/browser/ash/net/network_diagnostics/host_resolver.h b/chrome/browser/ash/net/network_diagnostics/host_resolver.h index 62f5a9b..5d2dfcb5 100644 --- a/chrome/browser/ash/net/network_diagnostics/host_resolver.h +++ b/chrome/browser/ash/net/network_diagnostics/host_resolver.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_ASH_NET_NETWORK_DIAGNOSTICS_HOST_RESOLVER_H_ #define CHROME_BROWSER_ASH_NET_NETWORK_DIAGNOSTICS_HOST_RESOLVER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "mojo/public/cpp/bindings/receiver.h" #include "mojo/public/cpp/bindings/remote.h" #include "net/base/host_port_pair.h"
diff --git a/chrome/browser/ash/net/network_diagnostics/host_resolver_unittest.cc b/chrome/browser/ash/net/network_diagnostics/host_resolver_unittest.cc index 5ce7670..9c48cc3 100644 --- a/chrome/browser/ash/net/network_diagnostics/host_resolver_unittest.cc +++ b/chrome/browser/ash/net/network_diagnostics/host_resolver_unittest.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "chrome/browser/ash/net/network_diagnostics/fake_host_resolver.h" #include "chrome/browser/ash/net/network_diagnostics/fake_network_context.h"
diff --git a/chrome/browser/ash/net/network_diagnostics/http_firewall_routine.cc b/chrome/browser/ash/net/network_diagnostics/http_firewall_routine.cc index f5e587e..3008b83 100644 --- a/chrome/browser/ash/net/network_diagnostics/http_firewall_routine.cc +++ b/chrome/browser/ash/net/network_diagnostics/http_firewall_routine.cc
@@ -8,7 +8,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/ranges/algorithm.h" #include "chrome/browser/ash/net/network_diagnostics/network_diagnostics_util.h" #include "chrome/browser/profiles/profile_manager.h"
diff --git a/chrome/browser/ash/net/network_diagnostics/http_firewall_routine.h b/chrome/browser/ash/net/network_diagnostics/http_firewall_routine.h index 627bb97e..7f459b8 100644 --- a/chrome/browser/ash/net/network_diagnostics/http_firewall_routine.h +++ b/chrome/browser/ash/net/network_diagnostics/http_firewall_routine.h
@@ -8,7 +8,7 @@ #include <memory> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ash/net/network_diagnostics/network_diagnostics_routine.h" #include "chrome/browser/ash/net/network_diagnostics/tls_prober.h"
diff --git a/chrome/browser/ash/net/network_diagnostics/http_firewall_routine_unittest.cc b/chrome/browser/ash/net/network_diagnostics/http_firewall_routine_unittest.cc index d9bbcfd..83969a7 100644 --- a/chrome/browser/ash/net/network_diagnostics/http_firewall_routine_unittest.cc +++ b/chrome/browser/ash/net/network_diagnostics/http_firewall_routine_unittest.cc
@@ -7,8 +7,8 @@ #include <memory> #include <utility> -#include "base/callback_helpers.h" #include "base/containers/circular_deque.h" +#include "base/functional/callback_helpers.h" #include "chrome/browser/ash/net/network_diagnostics/fake_host_resolver.h" #include "chrome/browser/ash/net/network_diagnostics/fake_network_context.h" #include "content/public/browser/browser_task_traits.h"
diff --git a/chrome/browser/ash/net/network_diagnostics/http_request_manager.cc b/chrome/browser/ash/net/network_diagnostics/http_request_manager.cc index d951c08..4d541357 100644 --- a/chrome/browser/ash/net/network_diagnostics/http_request_manager.cc +++ b/chrome/browser/ash/net/network_diagnostics/http_request_manager.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/profiles/profile.h" #include "content/public/browser/storage_partition.h" #include "net/base/load_flags.h"
diff --git a/chrome/browser/ash/net/network_diagnostics/http_request_manager.h b/chrome/browser/ash/net/network_diagnostics/http_request_manager.h index 60aa67dd..901bb9a 100644 --- a/chrome/browser/ash/net/network_diagnostics/http_request_manager.h +++ b/chrome/browser/ash/net/network_diagnostics/http_request_manager.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/time/time.h" #include "net/http/http_response_headers.h"
diff --git a/chrome/browser/ash/net/network_diagnostics/http_request_manager_unittest.cc b/chrome/browser/ash/net/network_diagnostics/http_request_manager_unittest.cc index 38acc3e5..4297632 100644 --- a/chrome/browser/ash/net/network_diagnostics/http_request_manager_unittest.cc +++ b/chrome/browser/ash/net/network_diagnostics/http_request_manager_unittest.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "content/public/test/browser_task_environment.h"
diff --git a/chrome/browser/ash/net/network_diagnostics/https_firewall_routine.cc b/chrome/browser/ash/net/network_diagnostics/https_firewall_routine.cc index 4fee093c..29d484a9 100644 --- a/chrome/browser/ash/net/network_diagnostics/https_firewall_routine.cc +++ b/chrome/browser/ash/net/network_diagnostics/https_firewall_routine.cc
@@ -8,7 +8,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/ranges/algorithm.h" #include "chrome/browser/ash/net/network_diagnostics/network_diagnostics_util.h" #include "chrome/browser/profiles/profile_manager.h"
diff --git a/chrome/browser/ash/net/network_diagnostics/https_firewall_routine.h b/chrome/browser/ash/net/network_diagnostics/https_firewall_routine.h index 2814e78..c8ee880 100644 --- a/chrome/browser/ash/net/network_diagnostics/https_firewall_routine.h +++ b/chrome/browser/ash/net/network_diagnostics/https_firewall_routine.h
@@ -8,7 +8,7 @@ #include <memory> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ash/net/network_diagnostics/network_diagnostics_routine.h" #include "chrome/browser/ash/net/network_diagnostics/tls_prober.h"
diff --git a/chrome/browser/ash/net/network_diagnostics/https_firewall_routine_unittest.cc b/chrome/browser/ash/net/network_diagnostics/https_firewall_routine_unittest.cc index 74aa208d..09e1e58 100644 --- a/chrome/browser/ash/net/network_diagnostics/https_firewall_routine_unittest.cc +++ b/chrome/browser/ash/net/network_diagnostics/https_firewall_routine_unittest.cc
@@ -7,8 +7,8 @@ #include <memory> #include <utility> -#include "base/callback_helpers.h" #include "base/containers/circular_deque.h" +#include "base/functional/callback_helpers.h" #include "chrome/browser/ash/net/network_diagnostics/fake_host_resolver.h" #include "chrome/browser/ash/net/network_diagnostics/fake_network_context.h" #include "content/public/browser/browser_task_traits.h"
diff --git a/chrome/browser/ash/net/network_diagnostics/https_latency_routine.cc b/chrome/browser/ash/net/network_diagnostics/https_latency_routine.cc index 694525d..a6e1a7db 100644 --- a/chrome/browser/ash/net/network_diagnostics/https_latency_routine.cc +++ b/chrome/browser/ash/net/network_diagnostics/https_latency_routine.cc
@@ -8,7 +8,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/time/default_tick_clock.h" #include "chrome/browser/ash/net/network_diagnostics/network_diagnostics_util.h" #include "chrome/browser/profiles/profile_manager.h"
diff --git a/chrome/browser/ash/net/network_diagnostics/lan_connectivity_routine.cc b/chrome/browser/ash/net/network_diagnostics/lan_connectivity_routine.cc index 546220f..704badea 100644 --- a/chrome/browser/ash/net/network_diagnostics/lan_connectivity_routine.cc +++ b/chrome/browser/ash/net/network_diagnostics/lan_connectivity_routine.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "chromeos/services/network_config/in_process_instance.h" #include "chromeos/services/network_config/public/cpp/cros_network_config_util.h" #include "mojo/public/cpp/bindings/pending_receiver.h"
diff --git a/chrome/browser/ash/net/network_diagnostics/lan_connectivity_routine.h b/chrome/browser/ash/net/network_diagnostics/lan_connectivity_routine.h index 28c106c7..c3fa3987 100644 --- a/chrome/browser/ash/net/network_diagnostics/lan_connectivity_routine.h +++ b/chrome/browser/ash/net/network_diagnostics/lan_connectivity_routine.h
@@ -7,7 +7,7 @@ #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/ash/net/network_diagnostics/network_diagnostics_routine.h" #include "chromeos/services/network_config/public/mojom/cros_network_config.mojom.h" #include "mojo/public/cpp/bindings/remote.h"
diff --git a/chrome/browser/ash/net/network_diagnostics/network_diagnostics.cc b/chrome/browser/ash/net/network_diagnostics/network_diagnostics.cc index b510796..b929bb0 100644 --- a/chrome/browser/ash/net/network_diagnostics/network_diagnostics.cc +++ b/chrome/browser/ash/net/network_diagnostics/network_diagnostics.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/net/network_diagnostics/arc_dns_resolution_routine.h" #include "chrome/browser/ash/net/network_diagnostics/arc_http_routine.h" #include "chrome/browser/ash/net/network_diagnostics/arc_ping_routine.h"
diff --git a/chrome/browser/ash/net/network_diagnostics/network_diagnostics_routine.h b/chrome/browser/ash/net/network_diagnostics/network_diagnostics_routine.h index a3e0df2..a1bfe26 100644 --- a/chrome/browser/ash/net/network_diagnostics/network_diagnostics_routine.h +++ b/chrome/browser/ash/net/network_diagnostics/network_diagnostics_routine.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_ASH_NET_NETWORK_DIAGNOSTICS_NETWORK_DIAGNOSTICS_ROUTINE_H_ #define CHROME_BROWSER_ASH_NET_NETWORK_DIAGNOSTICS_NETWORK_DIAGNOSTICS_ROUTINE_H_ -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "chromeos/services/network_health/public/mojom/network_diagnostics.mojom.h" namespace ash {
diff --git a/chrome/browser/ash/net/network_diagnostics/signal_strength_routine.cc b/chrome/browser/ash/net/network_diagnostics/signal_strength_routine.cc index da4d056..37ab117 100644 --- a/chrome/browser/ash/net/network_diagnostics/signal_strength_routine.cc +++ b/chrome/browser/ash/net/network_diagnostics/signal_strength_routine.cc
@@ -7,7 +7,7 @@ #include <algorithm> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "chromeos/services/network_config/in_process_instance.h" #include "chromeos/services/network_config/public/cpp/cros_network_config_util.h" #include "mojo/public/cpp/bindings/pending_receiver.h"
diff --git a/chrome/browser/ash/net/network_diagnostics/signal_strength_routine.h b/chrome/browser/ash/net/network_diagnostics/signal_strength_routine.h index 0009c132..1dee669f 100644 --- a/chrome/browser/ash/net/network_diagnostics/signal_strength_routine.h +++ b/chrome/browser/ash/net/network_diagnostics/signal_strength_routine.h
@@ -7,7 +7,7 @@ #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/ash/net/network_diagnostics/network_diagnostics_routine.h" #include "chromeos/services/network_config/public/mojom/cros_network_config.mojom.h" #include "mojo/public/cpp/bindings/remote.h"
diff --git a/chrome/browser/ash/net/network_diagnostics/tls_prober.cc b/chrome/browser/ash/net/network_diagnostics/tls_prober.cc index 8057263..5c3559b 100644 --- a/chrome/browser/ash/net/network_diagnostics/tls_prober.cc +++ b/chrome/browser/ash/net/network_diagnostics/tls_prober.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/task/task_runner.h" #include "base/threading/sequenced_task_runner_handle.h" #include "chrome/browser/ash/net/network_diagnostics/network_diagnostics_util.h"
diff --git a/chrome/browser/ash/net/network_diagnostics/tls_prober.h b/chrome/browser/ash/net/network_diagnostics/tls_prober.h index b26a9f82..457a1af 100644 --- a/chrome/browser/ash/net/network_diagnostics/tls_prober.h +++ b/chrome/browser/ash/net/network_diagnostics/tls_prober.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_ASH_NET_NETWORK_DIAGNOSTICS_TLS_PROBER_H_ #define CHROME_BROWSER_ASH_NET_NETWORK_DIAGNOSTICS_TLS_PROBER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "base/task/sequenced_task_runner.h"
diff --git a/chrome/browser/ash/net/network_diagnostics/tls_prober_unittest.cc b/chrome/browser/ash/net/network_diagnostics/tls_prober_unittest.cc index 745482d7..01d6d46 100644 --- a/chrome/browser/ash/net/network_diagnostics/tls_prober_unittest.cc +++ b/chrome/browser/ash/net/network_diagnostics/tls_prober_unittest.cc
@@ -8,7 +8,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/strings/string_number_conversions.h" #include "chrome/browser/ash/net/network_diagnostics/fake_host_resolver.h"
diff --git a/chrome/browser/ash/net/network_diagnostics/udp_prober.cc b/chrome/browser/ash/net/network_diagnostics/udp_prober.cc index 253509b..c87eead 100644 --- a/chrome/browser/ash/net/network_diagnostics/udp_prober.cc +++ b/chrome/browser/ash/net/network_diagnostics/udp_prober.cc
@@ -8,8 +8,8 @@ #include <memory> #include <utility> -#include "base/callback.h" #include "base/containers/span.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h"
diff --git a/chrome/browser/ash/net/network_diagnostics/udp_prober.h b/chrome/browser/ash/net/network_diagnostics/udp_prober.h index bb659059..f7b1cdb 100644 --- a/chrome/browser/ash/net/network_diagnostics/udp_prober.h +++ b/chrome/browser/ash/net/network_diagnostics/udp_prober.h
@@ -8,8 +8,8 @@ #include <cstdint> #include <memory> -#include "base/callback.h" #include "base/containers/span.h" +#include "base/functional/callback.h" #include "base/time/time.h" #include "net/base/host_port_pair.h" #include "net/traffic_annotation/network_traffic_annotation.h"
diff --git a/chrome/browser/ash/net/network_diagnostics/udp_prober_unittest.cc b/chrome/browser/ash/net/network_diagnostics/udp_prober_unittest.cc index 80da8c2..c9e7e59 100644 --- a/chrome/browser/ash/net/network_diagnostics/udp_prober_unittest.cc +++ b/chrome/browser/ash/net/network_diagnostics/udp_prober_unittest.cc
@@ -9,8 +9,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/containers/span.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/test/bind.h" #include "base/time/time.h"
diff --git a/chrome/browser/ash/net/network_diagnostics/video_conferencing_routine.h b/chrome/browser/ash/net/network_diagnostics/video_conferencing_routine.h index bdfc894..39ecd0d 100644 --- a/chrome/browser/ash/net/network_diagnostics/video_conferencing_routine.h +++ b/chrome/browser/ash/net/network_diagnostics/video_conferencing_routine.h
@@ -9,8 +9,8 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/containers/span.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h" #include "chrome/browser/ash/net/network_diagnostics/network_diagnostics_routine.h"
diff --git a/chrome/browser/ash/net/network_portal_detector_impl.cc b/chrome/browser/ash/net/network_portal_detector_impl.cc index 2f55e62c..e41e067 100644 --- a/chrome/browser/ash/net/network_portal_detector_impl.cc +++ b/chrome/browser/ash/net/network_portal_detector_impl.cc
@@ -7,8 +7,8 @@ #include <algorithm> #include <memory> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/metrics/histogram_functions.h"
diff --git a/chrome/browser/ash/net/network_portal_detector_impl.h b/chrome/browser/ash/net/network_portal_detector_impl.h index f4fd3d3..3619b14 100644 --- a/chrome/browser/ash/net/network_portal_detector_impl.h +++ b/chrome/browser/ash/net/network_portal_detector_impl.h
@@ -9,8 +9,8 @@ #include <memory> #include <string> -#include "base/callback_forward.h" #include "base/cancelable_callback.h" +#include "base/functional/callback_forward.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/ash/net/network_portal_detector_impl_browsertest.cc b/chrome/browser/ash/net/network_portal_detector_impl_browsertest.cc index 61fbc9d..368b1824 100644 --- a/chrome/browser/ash/net/network_portal_detector_impl_browsertest.cc +++ b/chrome/browser/ash/net/network_portal_detector_impl_browsertest.cc
@@ -7,10 +7,10 @@ #include <memory> #include "ash/constants/ash_features.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/ash/net/network_portal_detector_impl_unittest.cc b/chrome/browser/ash/net/network_portal_detector_impl_unittest.cc index 9b86873..32cb1c2 100644 --- a/chrome/browser/ash/net/network_portal_detector_impl_unittest.cc +++ b/chrome/browser/ash/net/network_portal_detector_impl_unittest.cc
@@ -8,10 +8,10 @@ #include <memory> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/memory/ptr_util.h" #include "base/metrics/histogram_base.h"
diff --git a/chrome/browser/ash/net/network_portal_detector_test_impl.cc b/chrome/browser/ash/net/network_portal_detector_test_impl.cc index e2e2907..f68e83a5 100644 --- a/chrome/browser/ash/net/network_portal_detector_test_impl.cc +++ b/chrome/browser/ash/net/network_portal_detector_test_impl.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "chromeos/ash/components/network/network_handler.h" #include "chromeos/ash/components/network/network_state.h"
diff --git a/chrome/browser/ash/net/network_portal_detector_test_impl.h b/chrome/browser/ash/net/network_portal_detector_test_impl.h index d35a40332..db5f825 100644 --- a/chrome/browser/ash/net/network_portal_detector_test_impl.h +++ b/chrome/browser/ash/net/network_portal_detector_test_impl.h
@@ -10,7 +10,7 @@ #include <string> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "chromeos/ash/components/network/portal_detector/network_portal_detector.h" namespace ash {
diff --git a/chrome/browser/ash/net/network_throttling_observer.cc b/chrome/browser/ash/net/network_throttling_observer.cc index 90cfc9f..db6e950 100644 --- a/chrome/browser/ash/net/network_throttling_observer.cc +++ b/chrome/browser/ash/net/network_throttling_observer.cc
@@ -7,7 +7,7 @@ #include <algorithm> #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/system/sys_info.h" #include "base/values.h" #include "chrome/common/pref_names.h"
diff --git a/chrome/browser/ash/net/rollback_network_config/rollback_network_config.cc b/chrome/browser/ash/net/rollback_network_config/rollback_network_config.cc index 49fcdad..bae86d0 100644 --- a/chrome/browser/ash/net/rollback_network_config/rollback_network_config.cc +++ b/chrome/browser/ash/net/rollback_network_config/rollback_network_config.cc
@@ -8,8 +8,8 @@ #include <utility> #include "base/barrier_closure.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/logging.h"
diff --git a/chrome/browser/ash/net/secure_dns_manager.cc b/chrome/browser/ash/net/secure_dns_manager.cc index 30f203a..2b831d7e 100644 --- a/chrome/browser/ash/net/secure_dns_manager.cc +++ b/chrome/browser/ash/net/secure_dns_manager.cc
@@ -8,9 +8,9 @@ #include <map> #include <string> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check_is_test.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h"
diff --git a/chrome/browser/ash/net/secure_dns_manager_unittest.cc b/chrome/browser/ash/net/secure_dns_manager_unittest.cc index a1803776..a2bfe92 100644 --- a/chrome/browser/ash/net/secure_dns_manager_unittest.cc +++ b/chrome/browser/ash/net/secure_dns_manager_unittest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ash/net/secure_dns_manager.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/ptr_util.h" #include "base/run_loop.h"
diff --git a/chrome/browser/ash/net/system_proxy_manager.cc b/chrome/browser/ash/net/system_proxy_manager.cc index 737a9ccf..272c1a1 100644 --- a/chrome/browser/ash/net/system_proxy_manager.cc +++ b/chrome/browser/ash/net/system_proxy_manager.cc
@@ -8,9 +8,9 @@ #include "ash/components/arc/arc_prefs.h" #include "ash/constants/ash_features.h" -#include "base/bind.h" #include "base/containers/contains.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/memory/weak_ptr.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ash/net/system_proxy_manager.h b/chrome/browser/ash/net/system_proxy_manager.h index 0446ecb..32f9370 100644 --- a/chrome/browser/ash/net/system_proxy_manager.h +++ b/chrome/browser/ash/net/system_proxy_manager.h
@@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "base/scoped_observation.h" #include "chrome/browser/extensions/api/settings_private/prefs_util.h"
diff --git a/chrome/browser/ash/net/system_proxy_manager_browsertest.cc b/chrome/browser/ash/net/system_proxy_manager_browsertest.cc index 6123e2b..9e0c3d8 100644 --- a/chrome/browser/ash/net/system_proxy_manager_browsertest.cc +++ b/chrome/browser/ash/net/system_proxy_manager_browsertest.cc
@@ -7,7 +7,7 @@ #include <set> #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h" #include "base/task/current_thread.h"
diff --git a/chrome/browser/ash/net/traffic_counters_handler_unittest.cc b/chrome/browser/ash/net/traffic_counters_handler_unittest.cc index 96b2357..3a27b8bb 100644 --- a/chrome/browser/ash/net/traffic_counters_handler_unittest.cc +++ b/chrome/browser/ash/net/traffic_counters_handler_unittest.cc
@@ -4,7 +4,7 @@ #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/test/task_environment.h" #include "base/time/clock.h" #include "base/time/time.h"
diff --git a/chrome/browser/ash/network_change_manager_client.cc b/chrome/browser/ash/network_change_manager_client.cc index aa05a1f..bd87630 100644 --- a/chrome/browser/ash/network_change_manager_client.cc +++ b/chrome/browser/ash/network_change_manager_client.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ash/network_change_manager_client.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chromeos/ash/components/dbus/dbus_thread_manager.h" #include "chromeos/ash/components/network/network_event_log.h" #include "chromeos/ash/components/network/network_state.h"
diff --git a/chrome/browser/ash/night_light/night_light_client.cc b/chrome/browser/ash/night_light/night_light_client.cc index 2229cda9..38162412 100644 --- a/chrome/browser/ash/night_light/night_light_client.cc +++ b/chrome/browser/ash/night_light/night_light_client.cc
@@ -6,7 +6,7 @@ #include <algorithm> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/time/clock.h" #include "services/network/public/cpp/shared_url_loader_factory.h"
diff --git a/chrome/browser/ash/note_taking_helper.cc b/chrome/browser/ash/note_taking_helper.cc index 96e28423..17bbce7f 100644 --- a/chrome/browser/ash/note_taking_helper.cc +++ b/chrome/browser/ash/note_taking_helper.cc
@@ -24,12 +24,12 @@ #include "ash/components/arc/session/connection_holder.h" #include "ash/constants/ash_switches.h" #include "ash/public/cpp/stylus_utils.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check.h" #include "base/command_line.h" #include "base/containers/contains.h" #include "base/debug/dump_without_crashing.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/memory/scoped_refptr.h" #include "base/metrics/histogram_base.h"
diff --git a/chrome/browser/ash/note_taking_helper.h b/chrome/browser/ash/note_taking_helper.h index ad464d3..3daff994 100644 --- a/chrome/browser/ash/note_taking_helper.h +++ b/chrome/browser/ash/note_taking_helper.h
@@ -11,7 +11,7 @@ #include <vector> #include "ash/components/arc/mojom/intent_helper.mojom-forward.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" #include "base/scoped_multi_source_observation.h"
diff --git a/chrome/browser/ash/note_taking_helper_unittest.cc b/chrome/browser/ash/note_taking_helper_unittest.cc index 81bf9a6..95951bf 100644 --- a/chrome/browser/ash/note_taking_helper_unittest.cc +++ b/chrome/browser/ash/note_taking_helper_unittest.cc
@@ -19,9 +19,9 @@ #include "ash/components/arc/test/fake_file_system_instance.h" #include "ash/constants/ash_switches.h" #include "ash/public/cpp/note_taking_client.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/memory/scoped_refptr.h" #include "base/run_loop.h" #include "base/strings/string_util.h"
diff --git a/chrome/browser/ash/notifications/adb_sideloading_policy_change_notification.cc b/chrome/browser/ash/notifications/adb_sideloading_policy_change_notification.cc index 55a3965..42c93e60 100644 --- a/chrome/browser/ash/notifications/adb_sideloading_policy_change_notification.cc +++ b/chrome/browser/ash/notifications/adb_sideloading_policy_change_notification.cc
@@ -8,7 +8,7 @@ #include "ash/constants/notifier_catalogs.h" #include "ash/public/cpp/notification_utils.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/ash/policy/core/browser_policy_connector_ash.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/ash/notifications/debugd_notification_handler.cc b/chrome/browser/ash/notifications/debugd_notification_handler.cc index dd9592e..00348e0 100644 --- a/chrome/browser/ash/notifications/debugd_notification_handler.cc +++ b/chrome/browser/ash/notifications/debugd_notification_handler.cc
@@ -10,8 +10,8 @@ #include "ash/public/cpp/notification_utils.h" #include "ash/resources/vector_icons/vector_icons.h" #include "ash/strings/grit/ash_strings.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/memory/ref_counted.h" #include "chromeos/ash/components/dbus/debug_daemon/debug_daemon_client.h"
diff --git a/chrome/browser/ash/notifications/echo_dialog_view.h b/chrome/browser/ash/notifications/echo_dialog_view.h index 295d4fa..ee67cfc 100644 --- a/chrome/browser/ash/notifications/echo_dialog_view.h +++ b/chrome/browser/ash/notifications/echo_dialog_view.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_ASH_NOTIFICATIONS_ECHO_DIALOG_VIEW_H_ #define CHROME_BROWSER_ASH_NOTIFICATIONS_ECHO_DIALOG_VIEW_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "ui/base/metadata/metadata_header_macros.h" #include "ui/views/controls/button/image_button.h" #include "ui/views/window/dialog_delegate.h"
diff --git a/chrome/browser/ash/notifications/low_disk_notification.cc b/chrome/browser/ash/notifications/low_disk_notification.cc index bec752d..d0ad052 100644 --- a/chrome/browser/ash/notifications/low_disk_notification.cc +++ b/chrome/browser/ash/notifications/low_disk_notification.cc
@@ -8,7 +8,7 @@ #include "ash/constants/notifier_catalogs.h" #include "ash/public/cpp/notification_utils.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "chrome/app/vector_icons/vector_icons.h" #include "chrome/browser/ash/settings/cros_settings.h"
diff --git a/chrome/browser/ash/notifications/low_disk_notification_unittest.cc b/chrome/browser/ash/notifications/low_disk_notification_unittest.cc index fbedf8e..79b1e4f 100644 --- a/chrome/browser/ash/notifications/low_disk_notification_unittest.cc +++ b/chrome/browser/ash/notifications/low_disk_notification_unittest.cc
@@ -8,7 +8,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/time/time.h" #include "chrome/browser/ash/settings/cros_settings.h" #include "chrome/browser/notifications/notification_display_service_tester.h"
diff --git a/chrome/browser/ash/notifications/multi_capture_notification.cc b/chrome/browser/ash/notifications/multi_capture_notification.cc index 8e59f49..5d851cf6 100644 --- a/chrome/browser/ash/notifications/multi_capture_notification.cc +++ b/chrome/browser/ash/notifications/multi_capture_notification.cc
@@ -10,7 +10,7 @@ #include "ash/public/cpp/notification_utils.h" #include "ash/resources/vector_icons/vector_icons.h" #include "ash/shell.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/notreached.h" #include "base/strings/strcat.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ash/notifications/multi_capture_notification_unittest.cc b/chrome/browser/ash/notifications/multi_capture_notification_unittest.cc index bace76c..4ced30f4 100644 --- a/chrome/browser/ash/notifications/multi_capture_notification_unittest.cc +++ b/chrome/browser/ash/notifications/multi_capture_notification_unittest.cc
@@ -5,7 +5,7 @@ #include "chrome/browser/ash/notifications/multi_capture_notification.h" #include "ash/shell.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/strcat.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/notifications/notification_display_service_tester.h"
diff --git a/chrome/browser/ash/notifications/request_system_proxy_credentials_view.cc b/chrome/browser/ash/notifications/request_system_proxy_credentials_view.cc index e483aed8..4f0c528d 100644 --- a/chrome/browser/ash/notifications/request_system_proxy_credentials_view.cc +++ b/chrome/browser/ash/notifications/request_system_proxy_credentials_view.cc
@@ -7,8 +7,8 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/i18n/number_formatting.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ash/notifications/request_system_proxy_credentials_view.h b/chrome/browser/ash/notifications/request_system_proxy_credentials_view.h index 892d566..41cfb1f8 100644 --- a/chrome/browser/ash/notifications/request_system_proxy_credentials_view.h +++ b/chrome/browser/ash/notifications/request_system_proxy_credentials_view.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "ui/base/metadata/metadata_header_macros.h" #include "ui/base/ui_base_types.h" #include "ui/views/view.h"
diff --git a/chrome/browser/ash/notifications/request_system_proxy_credentials_view_unittest.cc b/chrome/browser/ash/notifications/request_system_proxy_credentials_view_unittest.cc index 4812d8a3..6970ca0 100644 --- a/chrome/browser/ash/notifications/request_system_proxy_credentials_view_unittest.cc +++ b/chrome/browser/ash/notifications/request_system_proxy_credentials_view_unittest.cc
@@ -7,8 +7,8 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/browser.h"
diff --git a/chrome/browser/ash/notifications/screen_capture_notification_ui_ash.cc b/chrome/browser/ash/notifications/screen_capture_notification_ui_ash.cc index 23397e7..ad85e44 100644 --- a/chrome/browser/ash/notifications/screen_capture_notification_ui_ash.cc +++ b/chrome/browser/ash/notifications/screen_capture_notification_ui_ash.cc
@@ -6,8 +6,8 @@ #include "ash/shell.h" #include "ash/system/tray/system_tray_notifier.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" namespace ash {
diff --git a/chrome/browser/ash/notifications/system_proxy_notification.h b/chrome/browser/ash/notifications/system_proxy_notification.h index a6ab9ae..84e17867 100644 --- a/chrome/browser/ash/notifications/system_proxy_notification.h +++ b/chrome/browser/ash/notifications/system_proxy_notification.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_ASH_NOTIFICATIONS_SYSTEM_PROXY_NOTIFICATION_H_ #define CHROME_BROWSER_ASH_NOTIFICATIONS_SYSTEM_PROXY_NOTIFICATION_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "chromeos/ash/components/dbus/system_proxy/system_proxy_service.pb.h"
diff --git a/chrome/browser/ash/notifications/tpm_auto_update_notification.cc b/chrome/browser/ash/notifications/tpm_auto_update_notification.cc index c830173a..2a33d60 100644 --- a/chrome/browser/ash/notifications/tpm_auto_update_notification.cc +++ b/chrome/browser/ash/notifications/tpm_auto_update_notification.cc
@@ -8,7 +8,7 @@ #include "ash/constants/notifier_catalogs.h" #include "ash/public/cpp/notification_utils.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/notifications/system_notification_helper.h" #include "chrome/common/pref_names.h" #include "chrome/grit/generated_resources.h"
diff --git a/chrome/browser/ash/notifications/update_required_notification.cc b/chrome/browser/ash/notifications/update_required_notification.cc index 0cbd43ed..8d77cbd 100644 --- a/chrome/browser/ash/notifications/update_required_notification.cc +++ b/chrome/browser/ash/notifications/update_required_notification.cc
@@ -6,7 +6,7 @@ #include "ash/constants/notifier_catalogs.h" #include "ash/public/cpp/notification_utils.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/i18n/message_formatter.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/ash/notifications/update_required_notification.h b/chrome/browser/ash/notifications/update_required_notification.h index 8341ddf..55b90ad 100644 --- a/chrome/browser/ash/notifications/update_required_notification.h +++ b/chrome/browser/ash/notifications/update_required_notification.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h" #include "chrome/browser/ash/policy/handlers/minimum_version_policy_handler.h"
diff --git a/chrome/browser/ash/os_feedback/chrome_os_feedback_delegate.cc b/chrome/browser/ash/os_feedback/chrome_os_feedback_delegate.cc index 31267436..279429e9 100644 --- a/chrome/browser/ash/os_feedback/chrome_os_feedback_delegate.cc +++ b/chrome/browser/ash/os_feedback/chrome_os_feedback_delegate.cc
@@ -11,7 +11,7 @@ #include "ash/shell.h" #include "ash/webui/os_feedback_ui/backend/histogram_util.h" #include "ash/webui/os_feedback_ui/mojom/os_feedback_ui.mojom.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/memory/ref_counted_memory.h"
diff --git a/chrome/browser/ash/os_feedback/chrome_os_feedback_delegate_browsertest.cc b/chrome/browser/ash/os_feedback/chrome_os_feedback_delegate_browsertest.cc index 9672d1e..18528ea 100644 --- a/chrome/browser/ash/os_feedback/chrome_os_feedback_delegate_browsertest.cc +++ b/chrome/browser/ash/os_feedback/chrome_os_feedback_delegate_browsertest.cc
@@ -12,9 +12,9 @@ #include "ash/webui/diagnostics_ui/url_constants.h" #include "ash/webui/help_app_ui/url_constants.h" #include "ash/webui/os_feedback_ui/url_constants.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "base/memory/ref_counted_memory.h" #include "base/notreached.h"
diff --git a/chrome/browser/ash/os_feedback/os_feedback_screenshot_manager.cc b/chrome/browser/ash/os_feedback/os_feedback_screenshot_manager.cc index 188cdaa..1c0d25f3 100644 --- a/chrome/browser/ash/os_feedback/os_feedback_screenshot_manager.cc +++ b/chrome/browser/ash/os_feedback/os_feedback_screenshot_manager.cc
@@ -7,7 +7,7 @@ #include <utility> #include "ash/shell.h" #include "base/barrier_callback.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/memory/ref_counted_memory.h"
diff --git a/chrome/browser/ash/os_feedback/os_feedback_screenshot_manager.h b/chrome/browser/ash/os_feedback/os_feedback_screenshot_manager.h index d3bfbe55..d631e51 100644 --- a/chrome/browser/ash/os_feedback/os_feedback_screenshot_manager.h +++ b/chrome/browser/ash/os_feedback/os_feedback_screenshot_manager.h
@@ -7,7 +7,7 @@ #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted_memory.h" #include "base/memory/scoped_refptr.h" #include "base/memory/singleton.h"
diff --git a/chrome/browser/ash/os_feedback/os_feedback_screenshot_manager_unittest.cc b/chrome/browser/ash/os_feedback/os_feedback_screenshot_manager_unittest.cc index 8d38888..3a66a38d 100644 --- a/chrome/browser/ash/os_feedback/os_feedback_screenshot_manager_unittest.cc +++ b/chrome/browser/ash/os_feedback/os_feedback_screenshot_manager_unittest.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted.h" #include "base/memory/ref_counted_memory.h" #include "base/test/task_environment.h"
diff --git a/chrome/browser/ash/ownership/owner_key_loader.h b/chrome/browser/ash/ownership/owner_key_loader.h index 1d9884cf..f69df66 100644 --- a/chrome/browser/ash/ownership/owner_key_loader.h +++ b/chrome/browser/ash/ownership/owner_key_loader.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_ASH_OWNERSHIP_OWNER_KEY_LOADER_H_ #define CHROME_BROWSER_ASH_OWNERSHIP_OWNER_KEY_LOADER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "components/ownership/owner_key_util.h"
diff --git a/chrome/browser/ash/ownership/owner_settings_service_ash.cc b/chrome/browser/ash/ownership/owner_settings_service_ash.cc index ff2b7c1d..841b369 100644 --- a/chrome/browser/ash/ownership/owner_settings_service_ash.cc +++ b/chrome/browser/ash/ownership/owner_settings_service_ash.cc
@@ -12,11 +12,11 @@ #include <utility> #include "ash/constants/ash_switches.h" -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/memory/ptr_util.h" #include "base/metrics/histogram_functions.h"
diff --git a/chrome/browser/ash/ownership/owner_settings_service_ash.h b/chrome/browser/ash/ownership/owner_settings_service_ash.h index 3bcfe86..ac5f3b2 100644 --- a/chrome/browser/ash/ownership/owner_settings_service_ash.h +++ b/chrome/browser/ash/ownership/owner_settings_service_ash.h
@@ -9,7 +9,7 @@ #include <unordered_map> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/scoped_observation.h" #include "base/values.h" #include "chrome/browser/ash/settings/device_settings_service.h"
diff --git a/chrome/browser/ash/ownership/owner_settings_service_ash_unittest.cc b/chrome/browser/ash/ownership/owner_settings_service_ash_unittest.cc index b929538a..da1caa4 100644 --- a/chrome/browser/ash/ownership/owner_settings_service_ash_unittest.cc +++ b/chrome/browser/ash/ownership/owner_settings_service_ash_unittest.cc
@@ -7,9 +7,9 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/containers/contains.h" #include "base/containers/queue.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_path_override.h"
diff --git a/chrome/browser/ash/phonehub/camera_roll_download_manager_impl.cc b/chrome/browser/ash/phonehub/camera_roll_download_manager_impl.cc index 182c4d4..9197576a 100644 --- a/chrome/browser/ash/phonehub/camera_roll_download_manager_impl.cc +++ b/chrome/browser/ash/phonehub/camera_roll_download_manager_impl.cc
@@ -7,13 +7,13 @@ #include <utility> #include "ash/public/cpp/holding_space/holding_space_progress.h" -#include "base/bind.h" #include "base/check.h" #include "base/containers/flat_map.h" #include "base/files/file.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/safe_base_name.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/ash/platform_keys/chaps_util.cc b/chrome/browser/ash/platform_keys/chaps_util.cc index c3b1461..6d553c5 100644 --- a/chrome/browser/ash/platform_keys/chaps_util.cc +++ b/chrome/browser/ash/platform_keys/chaps_util.cc
@@ -6,7 +6,7 @@ #include <ostream> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/no_destructor.h" #include "chrome/browser/ash/platform_keys/chaps_slot_session.h" #include "chrome/browser/ash/platform_keys/chaps_util_impl.h"
diff --git a/chrome/browser/ash/platform_keys/chaps_util.h b/chrome/browser/ash/platform_keys/chaps_util.h index 8730ded9..7770895 100644 --- a/chrome/browser/ash/platform_keys/chaps_util.h +++ b/chrome/browser/ash/platform_keys/chaps_util.h
@@ -9,7 +9,7 @@ #include <memory> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "crypto/scoped_nss_types.h" namespace ash {
diff --git a/chrome/browser/ash/platform_keys/chaps_util_impl.cc b/chrome/browser/ash/platform_keys/chaps_util_impl.cc index 246e501..d621637 100644 --- a/chrome/browser/ash/platform_keys/chaps_util_impl.cc +++ b/chrome/browser/ash/platform_keys/chaps_util_impl.cc
@@ -14,9 +14,9 @@ #include <string> #include <vector> -#include "base/bind.h" -#include "base/callback.h" #include "base/check.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/strings/string_piece.h" #include "chrome/browser/ash/platform_keys/chaps_slot_session.h"
diff --git a/chrome/browser/ash/platform_keys/chaps_util_impl.h b/chrome/browser/ash/platform_keys/chaps_util_impl.h index 85f888b..752b6b9 100644 --- a/chrome/browser/ash/platform_keys/chaps_util_impl.h +++ b/chrome/browser/ash/platform_keys/chaps_util_impl.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "chrome/browser/ash/platform_keys/chaps_slot_session.h" #include "chrome/browser/ash/platform_keys/chaps_util.h" #include "crypto/scoped_nss_types.h"
diff --git a/chrome/browser/ash/platform_keys/key_permissions/arc_key_permissions_manager_delegate.cc b/chrome/browser/ash/platform_keys/key_permissions/arc_key_permissions_manager_delegate.cc index e156f21..1051aef9 100644 --- a/chrome/browser/ash/platform_keys/key_permissions/arc_key_permissions_manager_delegate.cc +++ b/chrome/browser/ash/platform_keys/key_permissions/arc_key_permissions_manager_delegate.cc
@@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/observer_list_types.h" #include "chrome/browser/ash/app_list/arc/arc_app_list_prefs.h" #include "chrome/browser/ash/arc/arc_util.h"
diff --git a/chrome/browser/ash/platform_keys/key_permissions/key_permissions_manager.h b/chrome/browser/ash/platform_keys/key_permissions/key_permissions_manager.h index 7932de2..3f3c2229 100644 --- a/chrome/browser/ash/platform_keys/key_permissions/key_permissions_manager.h +++ b/chrome/browser/ash/platform_keys/key_permissions/key_permissions_manager.h
@@ -9,7 +9,7 @@ #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "chrome/browser/platform_keys/platform_keys.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/chrome/browser/ash/platform_keys/key_permissions/key_permissions_manager_impl.cc b/chrome/browser/ash/platform_keys/key_permissions/key_permissions_manager_impl.cc index 71d805d..0077a49 100644 --- a/chrome/browser/ash/platform_keys/key_permissions/key_permissions_manager_impl.cc +++ b/chrome/browser/ash/platform_keys/key_permissions/key_permissions_manager_impl.cc
@@ -10,9 +10,9 @@ #include <string> #include <vector> -#include "base/bind.h" #include "base/containers/contains.h" #include "base/containers/queue.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/metrics/histogram_functions.h" #include "base/observer_list_types.h"
diff --git a/chrome/browser/ash/platform_keys/key_permissions/key_permissions_manager_impl.h b/chrome/browser/ash/platform_keys/key_permissions/key_permissions_manager_impl.h index fe30d5c..9303cd8 100644 --- a/chrome/browser/ash/platform_keys/key_permissions/key_permissions_manager_impl.h +++ b/chrome/browser/ash/platform_keys/key_permissions/key_permissions_manager_impl.h
@@ -11,8 +11,8 @@ #include <string> #include <vector> -#include "base/callback_forward.h" #include "base/containers/queue.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "base/observer_list_types.h" #include "base/scoped_observation.h"
diff --git a/chrome/browser/ash/platform_keys/key_permissions/key_permissions_service.h b/chrome/browser/ash/platform_keys/key_permissions/key_permissions_service.h index 74cad8c..a01e99c4 100644 --- a/chrome/browser/ash/platform_keys/key_permissions/key_permissions_service.h +++ b/chrome/browser/ash/platform_keys/key_permissions/key_permissions_service.h
@@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "chrome/browser/platform_keys/platform_keys.h" #include "components/keyed_service/core/keyed_service.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/chrome/browser/ash/platform_keys/key_permissions/key_permissions_service_impl.cc b/chrome/browser/ash/platform_keys/key_permissions/key_permissions_service_impl.cc index 0c1164e4..0019b9b2 100644 --- a/chrome/browser/ash/platform_keys/key_permissions/key_permissions_service_impl.cc +++ b/chrome/browser/ash/platform_keys/key_permissions/key_permissions_service_impl.cc
@@ -13,9 +13,9 @@ #include <vector> #include "base/base64.h" -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_forward.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_forward.h" #include "base/logging.h" #include "base/values.h" #include "chrome/browser/ash/platform_keys/key_permissions/key_permissions_manager_impl.h"
diff --git a/chrome/browser/ash/platform_keys/key_permissions/key_permissions_service_impl.h b/chrome/browser/ash/platform_keys/key_permissions/key_permissions_service_impl.h index 504fb65e..8d8cc5b 100644 --- a/chrome/browser/ash/platform_keys/key_permissions/key_permissions_service_impl.h +++ b/chrome/browser/ash/platform_keys/key_permissions/key_permissions_service_impl.h
@@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ash/platform_keys/key_permissions/key_permissions_service.h"
diff --git a/chrome/browser/ash/platform_keys/key_permissions/mock_key_permissions_manager.h b/chrome/browser/ash/platform_keys/key_permissions/mock_key_permissions_manager.h index 6cb23611..4bd49bdb 100644 --- a/chrome/browser/ash/platform_keys/key_permissions/mock_key_permissions_manager.h +++ b/chrome/browser/ash/platform_keys/key_permissions/mock_key_permissions_manager.h
@@ -10,7 +10,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/ash/platform_keys/key_permissions/key_permissions_manager.h" #include "testing/gmock/include/gmock/gmock.h"
diff --git a/chrome/browser/ash/platform_keys/key_permissions/mock_key_permissions_service.h b/chrome/browser/ash/platform_keys/key_permissions/mock_key_permissions_service.h index 0b81b80..1024a33 100644 --- a/chrome/browser/ash/platform_keys/key_permissions/mock_key_permissions_service.h +++ b/chrome/browser/ash/platform_keys/key_permissions/mock_key_permissions_service.h
@@ -10,7 +10,7 @@ #include <string> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "chrome/browser/ash/platform_keys/key_permissions/key_permissions_service.h" #include "chrome/browser/platform_keys/platform_keys.h" #include "content/public/browser/browser_context.h"
diff --git a/chrome/browser/ash/platform_keys/mock_platform_keys_service.h b/chrome/browser/ash/platform_keys/mock_platform_keys_service.h index 5d5c4f98..0d7625f 100644 --- a/chrome/browser/ash/platform_keys/mock_platform_keys_service.h +++ b/chrome/browser/ash/platform_keys/mock_platform_keys_service.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/ash/platform_keys/platform_keys_service.h" #include "testing/gmock/include/gmock/gmock.h"
diff --git a/chrome/browser/ash/platform_keys/platform_keys_service.cc b/chrome/browser/ash/platform_keys/platform_keys_service.cc index 321342f..31fe056 100644 --- a/chrome/browser/ash/platform_keys/platform_keys_service.cc +++ b/chrome/browser/ash/platform_keys/platform_keys_service.cc
@@ -7,8 +7,8 @@ #include <map> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/task/thread_pool.h" #include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/ash/platform_keys/platform_keys_service.h b/chrome/browser/ash/platform_keys/platform_keys_service.h index 8983052..89ecb3c 100644 --- a/chrome/browser/ash/platform_keys/platform_keys_service.h +++ b/chrome/browser/ash/platform_keys/platform_keys_service.h
@@ -11,7 +11,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.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 969737e..1dd5257 100644 --- a/chrome/browser/ash/platform_keys/platform_keys_service_browsertest.cc +++ b/chrome/browser/ash/platform_keys/platform_keys_service_browsertest.cc
@@ -10,10 +10,10 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" #include "base/containers/span.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/memory/weak_ptr.h" #include "base/run_loop.h"
diff --git a/chrome/browser/ash/platform_keys/platform_keys_service_factory.cc b/chrome/browser/ash/platform_keys/platform_keys_service_factory.cc index 2ed12f95..750ed91 100644 --- a/chrome/browser/ash/platform_keys/platform_keys_service_factory.cc +++ b/chrome/browser/ash/platform_keys/platform_keys_service_factory.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ash/platform_keys/platform_keys_service_factory.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/memory/scoped_refptr.h" #include "base/memory/singleton.h" #include "base/scoped_observation.h"
diff --git a/chrome/browser/ash/platform_keys/platform_keys_service_nss.cc b/chrome/browser/ash/platform_keys/platform_keys_service_nss.cc index fd7ccae..c1cd966 100644 --- a/chrome/browser/ash/platform_keys/platform_keys_service_nss.cc +++ b/chrome/browser/ash/platform_keys/platform_keys_service_nss.cc
@@ -18,10 +18,10 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/logging.h" #include "base/strings/string_piece.h"
diff --git a/chrome/browser/ash/platform_keys/platform_keys_service_test_util.h b/chrome/browser/ash/platform_keys/platform_keys_service_test_util.h index 08d3a10..6dc42a6 100644 --- a/chrome/browser/ash/platform_keys/platform_keys_service_test_util.h +++ b/chrome/browser/ash/platform_keys/platform_keys_service_test_util.h
@@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "base/test/test_future.h" #include "chrome/browser/ash/platform_keys/chaps_util.h"
diff --git a/chrome/browser/ash/plugin_vm/mock_plugin_vm_manager.h b/chrome/browser/ash/plugin_vm/mock_plugin_vm_manager.h index 109faf5..fccf338 100644 --- a/chrome/browser/ash/plugin_vm/mock_plugin_vm_manager.h +++ b/chrome/browser/ash/plugin_vm/mock_plugin_vm_manager.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_ASH_PLUGIN_VM_MOCK_PLUGIN_VM_MANAGER_H_ #define CHROME_BROWSER_ASH_PLUGIN_VM_MOCK_PLUGIN_VM_MANAGER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/ash/plugin_vm/plugin_vm_manager.h" #include "testing/gmock/include/gmock/gmock.h"
diff --git a/chrome/browser/ash/plugin_vm/plugin_vm_diagnostics.h b/chrome/browser/ash/plugin_vm/plugin_vm_diagnostics.h index 4407b8d..c43d9c64 100644 --- a/chrome/browser/ash/plugin_vm/plugin_vm_diagnostics.h +++ b/chrome/browser/ash/plugin_vm/plugin_vm_diagnostics.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_ASH_PLUGIN_VM_PLUGIN_VM_DIAGNOSTICS_H_ #define CHROME_BROWSER_ASH_PLUGIN_VM_PLUGIN_VM_DIAGNOSTICS_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "chrome/browser/ash/guest_os/guest_os_diagnostics.mojom-forward.h" namespace plugin_vm {
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 0059896..88ae9958b 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
@@ -9,8 +9,8 @@ #include <memory> #include <string> -#include "base/bind.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/memory/scoped_refptr.h" #include "base/strings/string_number_conversions.h" #include "base/task/sequenced_task_runner.h"
diff --git a/chrome/browser/ash/plugin_vm/plugin_vm_drive_image_download_service.h b/chrome/browser/ash/plugin_vm/plugin_vm_drive_image_download_service.h index 8cd6f31..1db61be 100644 --- a/chrome/browser/ash/plugin_vm/plugin_vm_drive_image_download_service.h +++ b/chrome/browser/ash/plugin_vm/plugin_vm_drive_image_download_service.h
@@ -12,8 +12,8 @@ #include <memory> #include <string> -#include "base/callback_forward.h" #include "base/files/file_util.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ash/plugin_vm/plugin_vm_installer.h" #include "crypto/secure_hash.h"
diff --git a/chrome/browser/ash/plugin_vm/plugin_vm_features.h b/chrome/browser/ash/plugin_vm/plugin_vm_features.h index fc4fcfce..33e012c 100644 --- a/chrome/browser/ash/plugin_vm/plugin_vm_features.h +++ b/chrome/browser/ash/plugin_vm/plugin_vm_features.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" class Profile;
diff --git a/chrome/browser/ash/plugin_vm/plugin_vm_files.h b/chrome/browser/ash/plugin_vm/plugin_vm_files.h index 7f4b174d..0f2532a 100644 --- a/chrome/browser/ash/plugin_vm/plugin_vm_files.h +++ b/chrome/browser/ash/plugin_vm/plugin_vm_files.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_ASH_PLUGIN_VM_PLUGIN_VM_FILES_H_ #define CHROME_BROWSER_ASH_PLUGIN_VM_PLUGIN_VM_FILES_H_ -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "storage/browser/file_system/file_system_url.h" #include "third_party/abseil-cpp/absl/types/variant.h"
diff --git a/chrome/browser/ash/plugin_vm/plugin_vm_files_unittest.cc b/chrome/browser/ash/plugin_vm/plugin_vm_files_unittest.cc index 568b73b2..dc829ba 100644 --- a/chrome/browser/ash/plugin_vm/plugin_vm_files_unittest.cc +++ b/chrome/browser/ash/plugin_vm/plugin_vm_files_unittest.cc
@@ -5,8 +5,8 @@ #include "chrome/browser/ash/plugin_vm/plugin_vm_files.h" #include "ash/public/cpp/shelf_model.h" -#include "base/bind.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/test/bind.h" #include "base/test/mock_callback.h" #include "base/test/scoped_running_on_chromeos.h"
diff --git a/chrome/browser/ash/plugin_vm/plugin_vm_image_download_client.cc b/chrome/browser/ash/plugin_vm/plugin_vm_image_download_client.cc index 2db5a1e..a99a5dc 100644 --- a/chrome/browser/ash/plugin_vm/plugin_vm_image_download_client.cc +++ b/chrome/browser/ash/plugin_vm/plugin_vm_image_download_client.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ash/plugin_vm/plugin_vm_image_download_client.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/sequenced_task_runner.h" #include "chrome/browser/ash/plugin_vm/plugin_vm_installer.h" #include "chrome/browser/ash/plugin_vm/plugin_vm_installer_factory.h"
diff --git a/chrome/browser/ash/plugin_vm/plugin_vm_installer.cc b/chrome/browser/ash/plugin_vm/plugin_vm_installer.cc index 9d37d62a..3d2af79 100644 --- a/chrome/browser/ash/plugin_vm/plugin_vm_installer.cc +++ b/chrome/browser/ash/plugin_vm/plugin_vm_installer.cc
@@ -7,10 +7,10 @@ #include <memory> #include <string> -#include "base/bind.h" #include "base/files/file.h" #include "base/files/file_util.h" #include "base/files/scoped_file.h" +#include "base/functional/bind.h" #include "base/guid.h" #include "base/strings/string_util.h" #include "base/task/task_traits.h"
diff --git a/chrome/browser/ash/plugin_vm/plugin_vm_license_checker.cc b/chrome/browser/ash/plugin_vm/plugin_vm_license_checker.cc index e4c5bc1..5051131 100644 --- a/chrome/browser/ash/plugin_vm/plugin_vm_license_checker.cc +++ b/chrome/browser/ash/plugin_vm/plugin_vm_license_checker.cc
@@ -6,7 +6,7 @@ #include <cstddef> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/metrics/histogram_functions.h"
diff --git a/chrome/browser/ash/plugin_vm/plugin_vm_license_checker.h b/chrome/browser/ash/plugin_vm/plugin_vm_license_checker.h index 39b2d68..1f72ff8e 100644 --- a/chrome/browser/ash/plugin_vm/plugin_vm_license_checker.h +++ b/chrome/browser/ash/plugin_vm/plugin_vm_license_checker.h
@@ -8,9 +8,9 @@ #include <memory> #include <string> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_forward.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/profiles/profile.h" #include "components/signin/public/identity_manager/primary_account_access_token_fetcher.h"
diff --git a/chrome/browser/ash/plugin_vm/plugin_vm_manager.h b/chrome/browser/ash/plugin_vm/plugin_vm_manager.h index b6e89d0..2f72146 100644 --- a/chrome/browser/ash/plugin_vm/plugin_vm_manager.h +++ b/chrome/browser/ash/plugin_vm/plugin_vm_manager.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "chromeos/ash/components/dbus/vm_plugin_dispatcher/vm_plugin_dispatcher.pb.h" #include "components/keyed_service/core/keyed_service.h"
diff --git a/chrome/browser/ash/plugin_vm/plugin_vm_manager_impl.cc b/chrome/browser/ash/plugin_vm/plugin_vm_manager_impl.cc index 4a397b5a..90d810c 100644 --- a/chrome/browser/ash/plugin_vm/plugin_vm_manager_impl.cc +++ b/chrome/browser/ash/plugin_vm/plugin_vm_manager_impl.cc
@@ -5,8 +5,8 @@ #include "chrome/browser/ash/plugin_vm/plugin_vm_manager_impl.h" #include "ash/constants/ash_features.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "chrome/app/vector_icons/vector_icons.h" #include "chrome/browser/ash/guest_os/guest_id.h" #include "chrome/browser/ash/guest_os/guest_os_share_path.h"
diff --git a/chrome/browser/ash/plugin_vm/plugin_vm_manager_impl_unittest.cc b/chrome/browser/ash/plugin_vm/plugin_vm_manager_impl_unittest.cc index f6670ac1..a4a3d81 100644 --- a/chrome/browser/ash/plugin_vm/plugin_vm_manager_impl_unittest.cc +++ b/chrome/browser/ash/plugin_vm/plugin_vm_manager_impl_unittest.cc
@@ -5,8 +5,8 @@ #include "chrome/browser/ash/plugin_vm/plugin_vm_manager_impl.h" #include "ash/public/cpp/shelf_model.h" -#include "base/callback_helpers.h" #include "base/files/file_util.h" +#include "base/functional/callback_helpers.h" #include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/mock_callback.h"
diff --git a/chrome/browser/ash/plugin_vm/plugin_vm_util.cc b/chrome/browser/ash/plugin_vm/plugin_vm_util.cc index ad604e7..f63e869 100644 --- a/chrome/browser/ash/plugin_vm/plugin_vm_util.cc +++ b/chrome/browser/ash/plugin_vm/plugin_vm_util.cc
@@ -7,8 +7,8 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/no_destructor.h" #include "base/observer_list.h" #include "base/strings/pattern.h"
diff --git a/chrome/browser/ash/plugin_vm/plugin_vm_util.h b/chrome/browser/ash/plugin_vm/plugin_vm_util.h index ca21e14..91e6b0b 100644 --- a/chrome/browser/ash/plugin_vm/plugin_vm_util.h +++ b/chrome/browser/ash/plugin_vm/plugin_vm_util.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/observer_list_types.h" #include "chrome/browser/ash/settings/cros_settings.h" #include "components/prefs/pref_change_registrar.h"
diff --git a/chrome/browser/ash/policy/active_directory/active_directory_join_delegate.h b/chrome/browser/ash/policy/active_directory/active_directory_join_delegate.h index 3b3e6d3..ce102357 100644 --- a/chrome/browser/ash/policy/active_directory/active_directory_join_delegate.h +++ b/chrome/browser/ash/policy/active_directory/active_directory_join_delegate.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" namespace policy {
diff --git a/chrome/browser/ash/policy/active_directory/active_directory_migration_manager.cc b/chrome/browser/ash/policy/active_directory/active_directory_migration_manager.cc index 44ad22ed..00b28df 100644 --- a/chrome/browser/ash/policy/active_directory/active_directory_migration_manager.cc +++ b/chrome/browser/ash/policy/active_directory/active_directory_migration_manager.cc
@@ -7,7 +7,7 @@ #include <utility> #include "ash/constants/ash_pref_names.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/time/time.h" #include "chrome/common/pref_names.h"
diff --git a/chrome/browser/ash/policy/active_directory/active_directory_migration_manager.h b/chrome/browser/ash/policy/active_directory/active_directory_migration_manager.h index caf2ba45..76c0ec9 100644 --- a/chrome/browser/ash/policy/active_directory/active_directory_migration_manager.h +++ b/chrome/browser/ash/policy/active_directory/active_directory_migration_manager.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "components/session_manager/core/session_manager_observer.h"
diff --git a/chrome/browser/ash/policy/active_directory/active_directory_migration_manager_unittest.cc b/chrome/browser/ash/policy/active_directory/active_directory_migration_manager_unittest.cc index 060f22c..3ea0873 100644 --- a/chrome/browser/ash/policy/active_directory/active_directory_migration_manager_unittest.cc +++ b/chrome/browser/ash/policy/active_directory/active_directory_migration_manager_unittest.cc
@@ -5,7 +5,7 @@ #include "chrome/browser/ash/policy/active_directory/active_directory_migration_manager.h" #include "ash/constants/ash_pref_names.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/test/task_environment.h" #include "base/time/time.h"
diff --git a/chrome/browser/ash/policy/active_directory/active_directory_policy_manager_unittest.cc b/chrome/browser/ash/policy/active_directory/active_directory_policy_manager_unittest.cc index 9cb4bce..3c48def 100644 --- a/chrome/browser/ash/policy/active_directory/active_directory_policy_manager_unittest.cc +++ b/chrome/browser/ash/policy/active_directory/active_directory_policy_manager_unittest.cc
@@ -9,8 +9,8 @@ #include <utility> #include "ash/constants/ash_features.h" -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/test/scoped_feature_list.h" #include "base/test/task_environment.h"
diff --git a/chrome/browser/ash/policy/active_directory/component_active_directory_policy_browsertest.cc b/chrome/browser/ash/policy/active_directory/component_active_directory_policy_browsertest.cc index 12d13b06..f7e7c073 100644 --- a/chrome/browser/ash/policy/active_directory/component_active_directory_policy_browsertest.cc +++ b/chrome/browser/ash/policy/active_directory/component_active_directory_policy_browsertest.cc
@@ -5,9 +5,9 @@ #include <string> #include "ash/constants/ash_switches.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted.h" #include "base/path_service.h" #include "chrome/browser/extensions/extension_browsertest.h"
diff --git a/chrome/browser/ash/policy/active_directory/component_active_directory_policy_retriever.cc b/chrome/browser/ash/policy/active_directory/component_active_directory_policy_retriever.cc index 30edb90..3abd1fb 100644 --- a/chrome/browser/ash/policy/active_directory/component_active_directory_policy_retriever.cc +++ b/chrome/browser/ash/policy/active_directory/component_active_directory_policy_retriever.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ash/policy/active_directory/component_active_directory_policy_retriever.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/weak_ptr.h" #include "chromeos/ash/components/dbus/session_manager/session_manager_client.h"
diff --git a/chrome/browser/ash/policy/active_directory/component_active_directory_policy_retriever.h b/chrome/browser/ash/policy/active_directory/component_active_directory_policy_retriever.h index fd648ef..5c1ccf4 100644 --- a/chrome/browser/ash/policy/active_directory/component_active_directory_policy_retriever.h +++ b/chrome/browser/ash/policy/active_directory/component_active_directory_policy_retriever.h
@@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "chromeos/ash/components/dbus/login_manager/policy_descriptor.pb.h" #include "chromeos/ash/components/dbus/session_manager/session_manager_client.h"
diff --git a/chrome/browser/ash/policy/active_directory/component_active_directory_policy_retriever_unittest.cc b/chrome/browser/ash/policy/active_directory/component_active_directory_policy_retriever_unittest.cc index b31f97b0..e18269f 100644 --- a/chrome/browser/ash/policy/active_directory/component_active_directory_policy_retriever_unittest.cc +++ b/chrome/browser/ash/policy/active_directory/component_active_directory_policy_retriever_unittest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ash/policy/active_directory/component_active_directory_policy_retriever.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/test/task_environment.h" #include "chromeos/ash/components/dbus/session_manager/fake_session_manager_client.h" #include "chromeos/ash/components/dbus/session_manager/session_manager_client.h"
diff --git a/chrome/browser/ash/policy/active_directory/component_active_directory_policy_service.cc b/chrome/browser/ash/policy/active_directory/component_active_directory_policy_service.cc index e98c613a..96aec61e 100644 --- a/chrome/browser/ash/policy/active_directory/component_active_directory_policy_service.cc +++ b/chrome/browser/ash/policy/active_directory/component_active_directory_policy_service.cc
@@ -6,7 +6,7 @@ #include <iterator> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/json/json_reader.h" #include "base/logging.h" #include "base/strings/string_util.h"
diff --git a/chrome/browser/ash/policy/active_directory/component_active_directory_policy_service_unittest.cc b/chrome/browser/ash/policy/active_directory/component_active_directory_policy_service_unittest.cc index ade27e0..49605e6e 100644 --- a/chrome/browser/ash/policy/active_directory/component_active_directory_policy_service_unittest.cc +++ b/chrome/browser/ash/policy/active_directory/component_active_directory_policy_service_unittest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ash/policy/active_directory/component_active_directory_policy_service.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/test/task_environment.h" #include "chromeos/ash/components/dbus/session_manager/fake_session_manager_client.h" #include "chromeos/ash/components/dbus/session_manager/session_manager_client.h"
diff --git a/chrome/browser/ash/policy/affiliation/user_affiliation_browsertest.cc b/chrome/browser/ash/policy/affiliation/user_affiliation_browsertest.cc index fdf9520..94d872b8 100644 --- a/chrome/browser/ash/policy/affiliation/user_affiliation_browsertest.cc +++ b/chrome/browser/ash/policy/affiliation/user_affiliation_browsertest.cc
@@ -6,8 +6,8 @@ #include <ostream> #include "ash/constants/ash_switches.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/strings/stringprintf.h" #include "chrome/browser/ash/login/test/device_state_mixin.h"
diff --git a/chrome/browser/ash/policy/arc/android_management_client.cc b/chrome/browser/ash/policy/arc/android_management_client.cc index 5a8ff16..5449c22 100644 --- a/chrome/browser/ash/policy/arc/android_management_client.cc +++ b/chrome/browser/ash/policy/arc/android_management_client.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/guid.h" #include "base/logging.h" #include "components/policy/core/common/cloud/device_management_service.h"
diff --git a/chrome/browser/ash/policy/arc/android_management_client.h b/chrome/browser/ash/policy/arc/android_management_client.h index d34e35e..f0d7cbd 100644 --- a/chrome/browser/ash/policy/arc/android_management_client.h +++ b/chrome/browser/ash/policy/arc/android_management_client.h
@@ -9,7 +9,7 @@ #include <ostream> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "components/policy/core/common/cloud/cloud_policy_constants.h"
diff --git a/chrome/browser/ash/policy/arc/android_management_client_unittest.cc b/chrome/browser/ash/policy/arc/android_management_client_unittest.cc index 9b05e88..fd5efc0 100644 --- a/chrome/browser/ash/policy/arc/android_management_client_unittest.cc +++ b/chrome/browser/ash/policy/arc/android_management_client_unittest.cc
@@ -5,8 +5,8 @@ #include <memory> #include <string> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ref_counted.h" #include "base/run_loop.h" #include "base/test/mock_callback.h"
diff --git a/chrome/browser/ash/policy/arc/fake_android_management_client.cc b/chrome/browser/ash/policy/arc/fake_android_management_client.cc index d330287..66cfcc6 100644 --- a/chrome/browser/ash/policy/arc/fake_android_management_client.cc +++ b/chrome/browser/ash/policy/arc/fake_android_management_client.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/ash/policy/arc/unaffiliated_arc_allowed_browsertest.cc b/chrome/browser/ash/policy/arc/unaffiliated_arc_allowed_browsertest.cc index ebfa597..920344c 100644 --- a/chrome/browser/ash/policy/arc/unaffiliated_arc_allowed_browsertest.cc +++ b/chrome/browser/ash/policy/arc/unaffiliated_arc_allowed_browsertest.cc
@@ -6,8 +6,8 @@ #include "ash/components/arc/test/arc_util_test_support.h" #include "ash/constants/ash_features.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h" #include "chrome/browser/ash/arc/arc_util.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 62e475a..8f5c2345 100644 --- a/chrome/browser/ash/policy/core/browser_policy_connector_ash.cc +++ b/chrome/browser/ash/policy/core/browser_policy_connector_ash.cc
@@ -9,11 +9,11 @@ #include <utility> #include "ash/constants/ash_paths.h" -#include "base/bind.h" #include "base/check.h" #include "base/command_line.h" #include "base/feature_list.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/ptr_util.h" #include "base/notreached.h"
diff --git a/chrome/browser/ash/policy/core/cached_policy_key_loader.cc b/chrome/browser/ash/policy/core/cached_policy_key_loader.cc index 0bd4d38..29350cc 100644 --- a/chrome/browser/ash/policy/core/cached_policy_key_loader.cc +++ b/chrome/browser/ash/policy/core/cached_policy_key_loader.cc
@@ -8,9 +8,9 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/logging.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/ash/policy/core/cached_policy_key_loader.h b/chrome/browser/ash/policy/core/cached_policy_key_loader.h index 3494fe4..ac692e2 100644 --- a/chrome/browser/ash/policy/core/cached_policy_key_loader.h +++ b/chrome/browser/ash/policy/core/cached_policy_key_loader.h
@@ -8,8 +8,8 @@ #include <string> #include <vector> -#include "base/callback_forward.h" #include "base/files/file_path.h" +#include "base/functional/callback_forward.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h"
diff --git a/chrome/browser/ash/policy/core/cached_policy_key_loader_unittest.cc b/chrome/browser/ash/policy/core/cached_policy_key_loader_unittest.cc index a489f8d..2b18a1d 100644 --- a/chrome/browser/ash/policy/core/cached_policy_key_loader_unittest.cc +++ b/chrome/browser/ash/policy/core/cached_policy_key_loader_unittest.cc
@@ -6,12 +6,12 @@ #include <memory> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/task/single_thread_task_runner.h" #include "base/test/task_environment.h" #include "chromeos/ash/components/cryptohome/cryptohome_parameters.h"
diff --git a/chrome/browser/ash/policy/core/device_cloud_policy_browsertest.cc b/chrome/browser/ash/policy/core/device_cloud_policy_browsertest.cc index f794aee..3059d64 100644 --- a/chrome/browser/ash/policy/core/device_cloud_policy_browsertest.cc +++ b/chrome/browser/ash/policy/core/device_cloud_policy_browsertest.cc
@@ -7,11 +7,11 @@ #include <utility> #include "ash/constants/ash_switches.h" -#include "base/bind.h" #include "base/check.h" #include "base/command_line.h" #include "base/files/dir_reader_posix.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted.h" #include "base/run_loop.h" #include "base/values.h"
diff --git a/chrome/browser/ash/policy/core/device_cloud_policy_manager_ash.cc b/chrome/browser/ash/policy/core/device_cloud_policy_manager_ash.cc index 99a5456a..1bc9bdc 100644 --- a/chrome/browser/ash/policy/core/device_cloud_policy_manager_ash.cc +++ b/chrome/browser/ash/policy/core/device_cloud_policy_manager_ash.cc
@@ -12,11 +12,11 @@ #include "ash/constants/ash_features.h" #include "ash/constants/ash_paths.h" #include "ash/constants/ash_switches.h" -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/path_service.h" #include "base/strings/string_number_conversions.h" #include "base/system/sys_info.h"
diff --git a/chrome/browser/ash/policy/core/device_cloud_policy_manager_ash.h b/chrome/browser/ash/policy/core/device_cloud_policy_manager_ash.h index 18330c2..2cd6fd80 100644 --- a/chrome/browser/ash/policy/core/device_cloud_policy_manager_ash.h +++ b/chrome/browser/ash/policy/core/device_cloud_policy_manager_ash.h
@@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/ref_counted.h" #include "base/observer_list.h" #include "base/scoped_observation_traits.h"
diff --git a/chrome/browser/ash/policy/core/device_cloud_policy_manager_ash_unittest.cc b/chrome/browser/ash/policy/core/device_cloud_policy_manager_ash_unittest.cc index 2fbb122..880ab18 100644 --- a/chrome/browser/ash/policy/core/device_cloud_policy_manager_ash_unittest.cc +++ b/chrome/browser/ash/policy/core/device_cloud_policy_manager_ash_unittest.cc
@@ -11,10 +11,10 @@ #include <utility> #include "ash/constants/ash_switches.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/memory/ref_counted.h" #include "base/run_loop.h"
diff --git a/chrome/browser/ash/policy/core/device_cloud_policy_store_ash.cc b/chrome/browser/ash/policy/core/device_cloud_policy_store_ash.cc index edd3315..5d16cd46 100644 --- a/chrome/browser/ash/policy/core/device_cloud_policy_store_ash.cc +++ b/chrome/browser/ash/policy/core/device_cloud_policy_store_ash.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h"
diff --git a/chrome/browser/ash/policy/core/device_cloud_policy_store_ash_unittest.cc b/chrome/browser/ash/policy/core/device_cloud_policy_store_ash_unittest.cc index d88cca1..8c80bf4 100644 --- a/chrome/browser/ash/policy/core/device_cloud_policy_store_ash_unittest.cc +++ b/chrome/browser/ash/policy/core/device_cloud_policy_store_ash_unittest.cc
@@ -9,9 +9,9 @@ #include <string> #include "ash/constants/ash_switches.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h" #include "chrome/browser/ash/settings/device_settings_test_helper.h"
diff --git a/chrome/browser/ash/policy/core/device_local_account_browsertest.cc b/chrome/browser/ash/policy/core/device_local_account_browsertest.cc index 1d9127f..e0cc284 100644 --- a/chrome/browser/ash/policy/core/device_local_account_browsertest.cc +++ b/chrome/browser/ash/policy/core/device_local_account_browsertest.cc
@@ -19,12 +19,12 @@ #include "ash/shell.h" #include "ash/system/session/logout_confirmation_controller.h" #include "ash/system/session/logout_confirmation_dialog.h" -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_forward.h" #include "base/command_line.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_forward.h" #include "base/json/json_writer.h" #include "base/location.h" #include "base/memory/ref_counted.h"
diff --git a/chrome/browser/ash/policy/core/device_local_account_external_cache.cc b/chrome/browser/ash/policy/core/device_local_account_external_cache.cc index 217a132a2..01d282e 100644 --- a/chrome/browser/ash/policy/core/device_local_account_external_cache.cc +++ b/chrome/browser/ash/policy/core/device_local_account_external_cache.cc
@@ -6,9 +6,9 @@ #include <memory> -#include "base/callback_forward.h" #include "base/check_is_test.h" #include "base/files/file_path.h" +#include "base/functional/callback_forward.h" #include "base/memory/scoped_refptr.h" #include "base/values.h" #include "chrome/browser/ash/crosapi/crosapi_ash.h"
diff --git a/chrome/browser/ash/policy/core/device_local_account_external_cache.h b/chrome/browser/ash/policy/core/device_local_account_external_cache.h index c3bcad0..c00b4538d 100644 --- a/chrome/browser/ash/policy/core/device_local_account_external_cache.h +++ b/chrome/browser/ash/policy/core/device_local_account_external_cache.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_ASH_POLICY_CORE_DEVICE_LOCAL_ACCOUNT_EXTERNAL_CACHE_H_ #define CHROME_BROWSER_ASH_POLICY_CORE_DEVICE_LOCAL_ACCOUNT_EXTERNAL_CACHE_H_ -#include "base/callback_forward.h" #include "base/files/file_path.h" +#include "base/functional/callback_forward.h" #include "base/memory/scoped_refptr.h" #include "base/values.h" #include "chrome/browser/ash/extensions/external_cache_delegate.h"
diff --git a/chrome/browser/ash/policy/core/device_local_account_external_cache_unittest.cc b/chrome/browser/ash/policy/core/device_local_account_external_cache_unittest.cc index 02f5690..d6cf203 100644 --- a/chrome/browser/ash/policy/core/device_local_account_external_cache_unittest.cc +++ b/chrome/browser/ash/policy/core/device_local_account_external_cache_unittest.cc
@@ -8,10 +8,10 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/path_service.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/ash/policy/core/device_local_account_policy_broker.cc b/chrome/browser/ash/policy/core/device_local_account_policy_broker.cc index 58ed0c3b..0aad656b 100644 --- a/chrome/browser/ash/policy/core/device_local_account_policy_broker.cc +++ b/chrome/browser/ash/policy/core/device_local_account_policy_broker.cc
@@ -6,7 +6,7 @@ #include <memory> #include "ash/constants/ash_paths.h" -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/scoped_refptr.h" #include "base/path_service.h" #include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/ash/policy/core/device_local_account_policy_broker.h b/chrome/browser/ash/policy/core/device_local_account_policy_broker.h index 329185c..a49ab23 100644 --- a/chrome/browser/ash/policy/core/device_local_account_policy_broker.h +++ b/chrome/browser/ash/policy/core/device_local_account_policy_broker.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/values.h" #include "chrome/browser/ash/policy/core/device_local_account.h" #include "chrome/browser/ash/policy/core/device_local_account_extension_tracker.h"
diff --git a/chrome/browser/ash/policy/core/device_local_account_policy_provider.cc b/chrome/browser/ash/policy/core/device_local_account_policy_provider.cc index 0679ee62..bb15af2 100644 --- a/chrome/browser/ash/policy/core/device_local_account_policy_provider.cc +++ b/chrome/browser/ash/policy/core/device_local_account_policy_provider.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/values.h" #include "chrome/browser/ash/policy/external_data/device_local_account_external_data_manager.h" #include "chromeos/dbus/power/power_policy_controller.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 26db2ed..09a90f45 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
@@ -9,12 +9,12 @@ #include <vector> #include "ash/constants/ash_paths.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check_op.h" #include "base/containers/contains.h" #include "base/files/file_enumerator.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/path_service.h" #include "base/strings/string_number_conversions.h" #include "base/task/sequenced_task_runner.h"
diff --git a/chrome/browser/ash/policy/core/device_local_account_policy_service.h b/chrome/browser/ash/policy/core/device_local_account_policy_service.h index 440bb76..83dbd4ec 100644 --- a/chrome/browser/ash/policy/core/device_local_account_policy_service.h +++ b/chrome/browser/ash/policy/core/device_local_account_policy_service.h
@@ -10,8 +10,8 @@ #include <set> #include <string> -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/ash/policy/core/device_local_account_policy_service_unittest.cc b/chrome/browser/ash/policy/core/device_local_account_policy_service_unittest.cc index 02f0e3e..ac299ca 100644 --- a/chrome/browser/ash/policy/core/device_local_account_policy_service_unittest.cc +++ b/chrome/browser/ash/policy/core/device_local_account_policy_service_unittest.cc
@@ -9,12 +9,12 @@ #include <utility> #include "ash/constants/ash_paths.h" -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/path_service.h" #include "base/run_loop.h" #include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/ash/policy/core/device_local_account_policy_store.cc b/chrome/browser/ash/policy/core/device_local_account_policy_store.cc index 313ac4ff..b4ec8cf 100644 --- a/chrome/browser/ash/policy/core/device_local_account_policy_store.cc +++ b/chrome/browser/ash/policy/core/device_local_account_policy_store.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/sequence_checker.h" #include "base/task/sequenced_task_runner.h" #include "chrome/browser/ash/policy/value_validation/onc_user_policy_value_validator.h"
diff --git a/chrome/browser/ash/policy/core/device_local_account_policy_store.h b/chrome/browser/ash/policy/core/device_local_account_policy_store.h index 0e58b50..29a4283 100644 --- a/chrome/browser/ash/policy/core/device_local_account_policy_store.h +++ b/chrome/browser/ash/policy/core/device_local_account_policy_store.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ash/settings/device_settings_service.h"
diff --git a/chrome/browser/ash/policy/core/device_policy_decoder.cc b/chrome/browser/ash/policy/core/device_policy_decoder.cc index 05d301b..6e0ee701 100644 --- a/chrome/browser/ash/policy/core/device_policy_decoder.cc +++ b/chrome/browser/ash/policy/core/device_policy_decoder.cc
@@ -9,7 +9,7 @@ #include <string> #include <utility> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/json/json_reader.h" #include "base/logging.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/ash/policy/core/device_policy_decoder_unittest.cc b/chrome/browser/ash/policy/core/device_policy_decoder_unittest.cc index 5ab9e23..104b61e 100644 --- a/chrome/browser/ash/policy/core/device_policy_decoder_unittest.cc +++ b/chrome/browser/ash/policy/core/device_policy_decoder_unittest.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "components/policy/core/common/policy_bundle.h"
diff --git a/chrome/browser/ash/policy/core/dm_token_storage.cc b/chrome/browser/ash/policy/core/dm_token_storage.cc index 1c32d94..2af78679 100644 --- a/chrome/browser/ash/policy/core/dm_token_storage.cc +++ b/chrome/browser/ash/policy/core/dm_token_storage.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ash/policy/core/dm_token_storage.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/task/thread_pool.h" #include "chrome/browser/ash/settings/token_encryptor.h"
diff --git a/chrome/browser/ash/policy/core/dm_token_storage.h b/chrome/browser/ash/policy/core/dm_token_storage.h index 8c134bd..7a0765d 100644 --- a/chrome/browser/ash/policy/core/dm_token_storage.h +++ b/chrome/browser/ash/policy/core/dm_token_storage.h
@@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" class PrefRegistrySimple;
diff --git a/chrome/browser/ash/policy/core/dm_token_storage_unittest.cc b/chrome/browser/ash/policy/core/dm_token_storage_unittest.cc index 0280f2f..11808b117 100644 --- a/chrome/browser/ash/policy/core/dm_token_storage_unittest.cc +++ b/chrome/browser/ash/policy/core/dm_token_storage_unittest.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/run_loop.h" #include "chrome/test/base/scoped_testing_local_state.h" #include "chrome/test/base/testing_browser_process.h"
diff --git a/chrome/browser/ash/policy/core/fake_device_cloud_policy_manager.cc b/chrome/browser/ash/policy/core/fake_device_cloud_policy_manager.cc index 0093fd4f..c177cef6 100644 --- a/chrome/browser/ash/policy/core/fake_device_cloud_policy_manager.cc +++ b/chrome/browser/ash/policy/core/fake_device_cloud_policy_manager.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/ash/policy/core/device_cloud_policy_store_ash.h" #include "components/policy/core/common/cloud/mock_cloud_external_data_manager.h"
diff --git a/chrome/browser/ash/policy/core/policy_oauth2_token_fetcher.cc b/chrome/browser/ash/policy/core/policy_oauth2_token_fetcher.cc index 11f2daee..f1e3400 100644 --- a/chrome/browser/ash/policy/core/policy_oauth2_token_fetcher.cc +++ b/chrome/browser/ash/policy/core/policy_oauth2_token_fetcher.cc
@@ -8,8 +8,8 @@ #include <vector> #include "ash/constants/ash_switches.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/weak_ptr.h" #include "base/strings/string_util.h"
diff --git a/chrome/browser/ash/policy/core/policy_oauth2_token_fetcher.h b/chrome/browser/ash/policy/core/policy_oauth2_token_fetcher.h index 6693ec65..58f3f392 100644 --- a/chrome/browser/ash/policy/core/policy_oauth2_token_fetcher.h +++ b/chrome/browser/ash/policy/core/policy_oauth2_token_fetcher.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "google_apis/gaia/gaia_auth_consumer.h"
diff --git a/chrome/browser/ash/policy/core/user_cloud_policy_manager_ash.cc b/chrome/browser/ash/policy/core/user_cloud_policy_manager_ash.cc index f42deeb5..611411a 100644 --- a/chrome/browser/ash/policy/core/user_cloud_policy_manager_ash.cc +++ b/chrome/browser/ash/policy/core/user_cloud_policy_manager_ash.cc
@@ -9,10 +9,10 @@ #include <utility> #include "ash/constants/ash_switches.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/memory/singleton.h" #include "base/metrics/histogram_functions.h"
diff --git a/chrome/browser/ash/policy/core/user_cloud_policy_manager_ash.h b/chrome/browser/ash/policy/core/user_cloud_policy_manager_ash.h index 96dfe385..aea91bc 100644 --- a/chrome/browser/ash/policy/core/user_cloud_policy_manager_ash.h +++ b/chrome/browser/ash/policy/core/user_cloud_policy_manager_ash.h
@@ -8,8 +8,8 @@ #include <memory> #include <string> -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/scoped_observation.h"
diff --git a/chrome/browser/ash/policy/core/user_cloud_policy_manager_ash_unittest.cc b/chrome/browser/ash/policy/core/user_cloud_policy_manager_ash_unittest.cc index 334693bb..198e393a 100644 --- a/chrome/browser/ash/policy/core/user_cloud_policy_manager_ash_unittest.cc +++ b/chrome/browser/ash/policy/core/user_cloud_policy_manager_ash_unittest.cc
@@ -8,9 +8,9 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_refptr.h"
diff --git a/chrome/browser/ash/policy/core/user_cloud_policy_store_ash.cc b/chrome/browser/ash/policy/core/user_cloud_policy_store_ash.cc index 148cfdf..2d00ae16 100644 --- a/chrome/browser/ash/policy/core/user_cloud_policy_store_ash.cc +++ b/chrome/browser/ash/policy/core/user_cloud_policy_store_ash.cc
@@ -6,9 +6,9 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/debug/dump_without_crashing.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/sequence_checker.h" #include "base/task/sequenced_task_runner.h"
diff --git a/chrome/browser/ash/policy/core/user_cloud_policy_store_ash_unittest.cc b/chrome/browser/ash/policy/core/user_cloud_policy_store_ash_unittest.cc index 5da571b..854c0509 100644 --- a/chrome/browser/ash/policy/core/user_cloud_policy_store_ash_unittest.cc +++ b/chrome/browser/ash/policy/core/user_cloud_policy_store_ash_unittest.cc
@@ -10,9 +10,9 @@ #include <memory> #include <string> -#include "base/bind.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/memory/weak_ptr.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/ash/policy/core/user_cloud_policy_token_forwarder.cc b/chrome/browser/ash/policy/core/user_cloud_policy_token_forwarder.cc index 39746674..bd2f302 100644 --- a/chrome/browser/ash/policy/core/user_cloud_policy_token_forwarder.cc +++ b/chrome/browser/ash/policy/core/user_cloud_policy_token_forwarder.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ash/policy/core/user_cloud_policy_token_forwarder.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/metrics/histogram_macros.h"
diff --git a/chrome/browser/ash/policy/core/user_cloud_policy_token_forwarder_unittest.cc b/chrome/browser/ash/policy/core/user_cloud_policy_token_forwarder_unittest.cc index 751d484..2c0ce14 100644 --- a/chrome/browser/ash/policy/core/user_cloud_policy_token_forwarder_unittest.cc +++ b/chrome/browser/ash/policy/core/user_cloud_policy_token_forwarder_unittest.cc
@@ -7,8 +7,8 @@ #include <memory> #include <string> -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/memory/scoped_refptr.h" #include "base/strings/utf_string_conversions.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 b73512cd..fdb357e 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
@@ -8,10 +8,10 @@ #include "ash/components/arc/arc_features.h" #include "ash/constants/ash_switches.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/feature_list.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/path_service.h"
diff --git a/chrome/browser/ash/policy/display/display_resolution_handler.cc b/chrome/browser/ash/policy/display/display_resolution_handler.cc index e57ba06..6c2436a 100644 --- a/chrome/browser/ash/policy/display/display_resolution_handler.cc +++ b/chrome/browser/ash/policy/display/display_resolution_handler.cc
@@ -7,7 +7,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/values.h" #include "chrome/browser/ash/settings/cros_settings.h" #include "chromeos/ash/components/settings/cros_settings_names.h"
diff --git a/chrome/browser/ash/policy/display/display_resolution_handler_browsertest.cc b/chrome/browser/ash/policy/display/display_resolution_handler_browsertest.cc index a7ea201..fc94e22b 100644 --- a/chrome/browser/ash/policy/display/display_resolution_handler_browsertest.cc +++ b/chrome/browser/ash/policy/display/display_resolution_handler_browsertest.cc
@@ -7,8 +7,8 @@ #include "ash/constants/ash_switches.h" #include "ash/display/display_configuration_controller.h" #include "ash/shell.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/ash/policy/display/display_rotation_default_handler.cc b/chrome/browser/ash/policy/display/display_rotation_default_handler.cc index a2b4b592..a468b4f 100644 --- a/chrome/browser/ash/policy/display/display_rotation_default_handler.cc +++ b/chrome/browser/ash/policy/display/display_rotation_default_handler.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" namespace policy {
diff --git a/chrome/browser/ash/policy/display/display_rotation_default_handler_browsertest.cc b/chrome/browser/ash/policy/display/display_rotation_default_handler_browsertest.cc index 131b6c3..83d9af9 100644 --- a/chrome/browser/ash/policy/display/display_rotation_default_handler_browsertest.cc +++ b/chrome/browser/ash/policy/display/display_rotation_default_handler_browsertest.cc
@@ -9,8 +9,8 @@ #include "ash/constants/ash_switches.h" #include "ash/display/display_configuration_controller.h" #include "ash/shell.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/ash/policy/display/display_settings_handler.cc b/chrome/browser/ash/policy/display/display_settings_handler.cc index 809a918..5b3005b 100644 --- a/chrome/browser/ash/policy/display/display_settings_handler.cc +++ b/chrome/browser/ash/policy/display/display_settings_handler.cc
@@ -7,8 +7,8 @@ #include <utility> #include "ash/public/ash_interfaces.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/memory/ref_counted.h" #include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/ash/policy/dlp/dlp_content_manager_ash.cc b/chrome/browser/ash/policy/dlp/dlp_content_manager_ash.cc index bf02cec..3c8cf93c 100644 --- a/chrome/browser/ash/policy/dlp/dlp_content_manager_ash.cc +++ b/chrome/browser/ash/policy/dlp/dlp_content_manager_ash.cc
@@ -9,12 +9,12 @@ #include <vector> #include "ash/public/cpp/privacy_screen_dlp_helper.h" -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/check.h" #include "base/containers/contains.h" #include "base/containers/cxx20_erase.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/weak_ptr.h" #include "base/notreached.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/ash/policy/dlp/dlp_content_manager_ash.h b/chrome/browser/ash/policy/dlp/dlp_content_manager_ash.h index 1da9569..9a4a224 100644 --- a/chrome/browser/ash/policy/dlp/dlp_content_manager_ash.h +++ b/chrome/browser/ash/policy/dlp/dlp_content_manager_ash.h
@@ -10,8 +10,8 @@ #include <utility> #include "ash/public/cpp/capture_mode/capture_mode_delegate.h" -#include "base/callback.h" #include "base/containers/flat_map.h" +#include "base/functional/callback.h" #include "base/time/time.h" #include "chrome/browser/ash/policy/dlp/dlp_window_observer.h" #include "chrome/browser/chromeos/policy/dlp/dlp_confidential_contents.h"
diff --git a/chrome/browser/ash/policy/dlp/dlp_content_manager_ash_browsertest.cc b/chrome/browser/ash/policy/dlp/dlp_content_manager_ash_browsertest.cc index 8ec6f6e..278de812 100644 --- a/chrome/browser/ash/policy/dlp/dlp_content_manager_ash_browsertest.cc +++ b/chrome/browser/ash/policy/dlp/dlp_content_manager_ash_browsertest.cc
@@ -9,8 +9,8 @@ #include <memory> #include <string> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool/thread_pool_instance.h"
diff --git a/chrome/browser/ash/policy/dlp/dlp_content_manager_ash_unittest.cc b/chrome/browser/ash/policy/dlp/dlp_content_manager_ash_unittest.cc index cd00d74..397fb71 100644 --- a/chrome/browser/ash/policy/dlp/dlp_content_manager_ash_unittest.cc +++ b/chrome/browser/ash/policy/dlp/dlp_content_manager_ash_unittest.cc
@@ -7,8 +7,8 @@ #include <memory> #include "ash/public/cpp/privacy_screen_dlp_helper.h" -#include "base/bind.h" -#include "base/callback_forward.h" +#include "base/functional/bind.h" +#include "base/functional/callback_forward.h" #include "base/memory/ptr_util.h" #include "base/task/thread_pool.h" #include "base/test/metrics/histogram_tester.h"
diff --git a/chrome/browser/ash/policy/dlp/dlp_files_controller.cc b/chrome/browser/ash/policy/dlp/dlp_files_controller.cc index 82cf141..a6916fc 100644 --- a/chrome/browser/ash/policy/dlp/dlp_files_controller.cc +++ b/chrome/browser/ash/policy/dlp/dlp_files_controller.cc
@@ -14,7 +14,6 @@ #include <vector> #include "ash/public/cpp/new_window_delegate.h" -#include "base/bind.h" #include "base/check.h" #include "base/containers/contains.h" #include "base/containers/flat_map.h"
diff --git a/chrome/browser/ash/policy/dlp/dlp_files_controller.h b/chrome/browser/ash/policy/dlp/dlp_files_controller.h index 8ba5895..7b2cc877 100644 --- a/chrome/browser/ash/policy/dlp/dlp_files_controller.h +++ b/chrome/browser/ash/policy/dlp/dlp_files_controller.h
@@ -8,9 +8,9 @@ #include <memory> #include <vector> -#include "base/callback_forward.h" #include "base/containers/flat_map.h" #include "base/files/file_path.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/chromeos/policy/dlp/dlp_rules_manager.h" #include "chromeos/dbus/dlp/dlp_service.pb.h"
diff --git a/chrome/browser/ash/policy/dlp/dlp_files_controller_browsertest.cc b/chrome/browser/ash/policy/dlp/dlp_files_controller_browsertest.cc index 1d24b422..2a2b14a 100644 --- a/chrome/browser/ash/policy/dlp/dlp_files_controller_browsertest.cc +++ b/chrome/browser/ash/policy/dlp/dlp_files_controller_browsertest.cc
@@ -4,8 +4,8 @@ #include <vector> -#include "base/callback_forward.h" #include "base/files/file_path.h" +#include "base/functional/callback_forward.h" #include "base/strings/string_piece_forward.h" #include "chrome/browser/file_select_helper.h" #include "chrome/browser/ui/browser.h"
diff --git a/chrome/browser/ash/policy/dlp/dlp_files_controller_unittest.cc b/chrome/browser/ash/policy/dlp/dlp_files_controller_unittest.cc index 9358da3..af073ee 100644 --- a/chrome/browser/ash/policy/dlp/dlp_files_controller_unittest.cc +++ b/chrome/browser/ash/policy/dlp/dlp_files_controller_unittest.cc
@@ -12,7 +12,6 @@ #include <utility> #include <vector> -#include "base/callback.h" #include "base/check.h" #include "base/files/file.h" #include "base/files/file_path.h" @@ -20,6 +19,7 @@ #include "base/files/scoped_file.h" #include "base/files/scoped_temp_dir.h" #include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/functional/callback_forward.h" #include "base/memory/scoped_refptr.h" #include "base/run_loop.h"
diff --git a/chrome/browser/ash/policy/enrollment/account_status_check_fetcher.cc b/chrome/browser/ash/policy/enrollment/account_status_check_fetcher.cc index 044af91..940f728 100644 --- a/chrome/browser/ash/policy/enrollment/account_status_check_fetcher.cc +++ b/chrome/browser/ash/policy/enrollment/account_status_check_fetcher.cc
@@ -7,7 +7,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/guid.h" #include "base/logging.h" #include "base/metrics/histogram_functions.h"
diff --git a/chrome/browser/ash/policy/enrollment/account_status_check_fetcher.h b/chrome/browser/ash/policy/enrollment/account_status_check_fetcher.h index 05f88c6..2bc33b9f 100644 --- a/chrome/browser/ash/policy/enrollment/account_status_check_fetcher.h +++ b/chrome/browser/ash/policy/enrollment/account_status_check_fetcher.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "components/policy/core/common/cloud/cloud_policy_constants.h" #include "components/policy/core/common/cloud/device_management_service.h"
diff --git a/chrome/browser/ash/policy/enrollment/account_status_check_fetcher_unittest.cc b/chrome/browser/ash/policy/enrollment/account_status_check_fetcher_unittest.cc index 53a7842..0a968145 100644 --- a/chrome/browser/ash/policy/enrollment/account_status_check_fetcher_unittest.cc +++ b/chrome/browser/ash/policy/enrollment/account_status_check_fetcher_unittest.cc
@@ -7,9 +7,9 @@ #include <memory> #include <string> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/histogram_functions.h" #include "base/run_loop.h" #include "base/test/metrics/histogram_tester.h"
diff --git a/chrome/browser/ash/policy/enrollment/auto_enrollment_client.h b/chrome/browser/ash/policy/enrollment/auto_enrollment_client.h index fb60026..75f29af0 100644 --- a/chrome/browser/ash/policy/enrollment/auto_enrollment_client.h +++ b/chrome/browser/ash/policy/enrollment/auto_enrollment_client.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" class PrefService;
diff --git a/chrome/browser/ash/policy/enrollment/auto_enrollment_client_impl.cc b/chrome/browser/ash/policy/enrollment/auto_enrollment_client_impl.cc index 9b0fb4ff..f3ba08c 100644 --- a/chrome/browser/ash/policy/enrollment/auto_enrollment_client_impl.cc +++ b/chrome/browser/ash/policy/enrollment/auto_enrollment_client_impl.cc
@@ -8,9 +8,9 @@ #include <memory> #include <string> -#include "base/bind.h" -#include "base/callback.h" #include "base/check.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/guid.h" #include "base/location.h" #include "base/logging.h"
diff --git a/chrome/browser/ash/policy/enrollment/auto_enrollment_client_impl_unittest.cc b/chrome/browser/ash/policy/enrollment/auto_enrollment_client_impl_unittest.cc index 91772308..1335a1e4 100644 --- a/chrome/browser/ash/policy/enrollment/auto_enrollment_client_impl_unittest.cc +++ b/chrome/browser/ash/policy/enrollment/auto_enrollment_client_impl_unittest.cc
@@ -12,10 +12,10 @@ #include <vector> #include "ash/constants/ash_switches.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/path_service.h" #include "base/run_loop.h"
diff --git a/chrome/browser/ash/policy/enrollment/device_cloud_policy_initializer.cc b/chrome/browser/ash/policy/enrollment/device_cloud_policy_initializer.cc index 285adfe..91aa0ce 100644 --- a/chrome/browser/ash/policy/enrollment/device_cloud_policy_initializer.cc +++ b/chrome/browser/ash/policy/enrollment/device_cloud_policy_initializer.cc
@@ -8,7 +8,7 @@ #include <utility> #include "ash/constants/ash_switches.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "chrome/browser/ash/policy/core/device_cloud_policy_client_factory_ash.h" #include "chrome/browser/ash/policy/core/device_cloud_policy_manager_ash.h"
diff --git a/chrome/browser/ash/policy/enrollment/device_cloud_policy_initializer.h b/chrome/browser/ash/policy/enrollment/device_cloud_policy_initializer.h index 14e77e511..c3bd425 100644 --- a/chrome/browser/ash/policy/enrollment/device_cloud_policy_initializer.h +++ b/chrome/browser/ash/policy/enrollment/device_cloud_policy_initializer.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/ref_counted.h" #include "base/scoped_observation.h" #include "chrome/browser/ash/policy/core/device_cloud_policy_manager_ash.h"
diff --git a/chrome/browser/ash/policy/enrollment/enrollment_handler.cc b/chrome/browser/ash/policy/enrollment/enrollment_handler.cc index a0eec732..d938c179 100644 --- a/chrome/browser/ash/policy/enrollment/enrollment_handler.cc +++ b/chrome/browser/ash/policy/enrollment/enrollment_handler.cc
@@ -9,8 +9,8 @@ #include "ash/constants/ash_features.h" #include "ash/constants/ash_switches.h" #include "base/base64.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/guid.h" #include "base/location.h" #include "base/logging.h"
diff --git a/chrome/browser/ash/policy/enrollment/enrollment_handler.h b/chrome/browser/ash/policy/enrollment/enrollment_handler.h index 5437aa05..7563121 100644 --- a/chrome/browser/ash/policy/enrollment/enrollment_handler.h +++ b/chrome/browser/ash/policy/enrollment/enrollment_handler.h
@@ -8,8 +8,8 @@ #include <memory> #include <string> -#include "base/callback.h" -#include "base/callback_forward.h" +#include "base/functional/callback.h" +#include "base/functional/callback_forward.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ash/policy/core/device_cloud_policy_validator.h"
diff --git a/chrome/browser/ash/policy/enrollment/fake_auto_enrollment_client.h b/chrome/browser/ash/policy/enrollment/fake_auto_enrollment_client.h index cf0ebba..aeec66380 100644 --- a/chrome/browser/ash/policy/enrollment/fake_auto_enrollment_client.h +++ b/chrome/browser/ash/policy/enrollment/fake_auto_enrollment_client.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/ash/policy/enrollment/auto_enrollment_client.h" class PrefService;
diff --git a/chrome/browser/ash/policy/enrollment/psm/rlwe_dmserver_client.h b/chrome/browser/ash/policy/enrollment/psm/rlwe_dmserver_client.h index a6e09e5..92909d6 100644 --- a/chrome/browser/ash/policy/enrollment/psm/rlwe_dmserver_client.h +++ b/chrome/browser/ash/policy/enrollment/psm/rlwe_dmserver_client.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_ASH_POLICY_ENROLLMENT_PSM_RLWE_DMSERVER_CLIENT_H_ #define CHROME_BROWSER_ASH_POLICY_ENROLLMENT_PSM_RLWE_DMSERVER_CLIENT_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/time/time.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/chrome/browser/ash/policy/enrollment/psm/rlwe_dmserver_client_impl.h b/chrome/browser/ash/policy/enrollment/psm/rlwe_dmserver_client_impl.h index b1dcd0d5..e281956 100644 --- a/chrome/browser/ash/policy/enrollment/psm/rlwe_dmserver_client_impl.h +++ b/chrome/browser/ash/policy/enrollment/psm/rlwe_dmserver_client_impl.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/sequence_checker.h" #include "base/time/time.h"
diff --git a/chrome/browser/ash/policy/enrollment/tpm_enrollment_key_signing_service.cc b/chrome/browser/ash/policy/enrollment/tpm_enrollment_key_signing_service.cc index 68bb5f0..b5c1c27 100644 --- a/chrome/browser/ash/policy/enrollment/tpm_enrollment_key_signing_service.cc +++ b/chrome/browser/ash/policy/enrollment/tpm_enrollment_key_signing_service.cc
@@ -7,7 +7,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "chromeos/ash/components/dbus/attestation/attestation.pb.h" #include "chromeos/ash/components/dbus/attestation/attestation_client.h" #include "chromeos/ash/components/dbus/attestation/interface.pb.h"
diff --git a/chrome/browser/ash/policy/enrollment/tpm_enrollment_key_signing_service_unittest.cc b/chrome/browser/ash/policy/enrollment/tpm_enrollment_key_signing_service_unittest.cc index b3b228f3..f5430d9 100644 --- a/chrome/browser/ash/policy/enrollment/tpm_enrollment_key_signing_service_unittest.cc +++ b/chrome/browser/ash/policy/enrollment/tpm_enrollment_key_signing_service_unittest.cc
@@ -6,9 +6,9 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_forward.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_forward.h" #include "base/run_loop.h" #include "base/test/task_environment.h" #include "chromeos/ash/components/dbus/attestation/attestation.pb.h"
diff --git a/chrome/browser/ash/policy/external_data/cloud_external_data_manager_base.cc b/chrome/browser/ash/policy/external_data/cloud_external_data_manager_base.cc index fa7e95a..be2bc665 100644 --- a/chrome/browser/ash/policy/external_data/cloud_external_data_manager_base.cc +++ b/chrome/browser/ash/policy/external_data/cloud_external_data_manager_base.cc
@@ -12,13 +12,13 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/callback_list.h" #include "base/check_op.h" #include "base/containers/contains.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/notreached.h" #include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/ash/policy/external_data/cloud_external_data_manager_base_test_util.cc b/chrome/browser/ash/policy/external_data/cloud_external_data_manager_base_test_util.cc index b5834d9d..2ea8621d 100644 --- a/chrome/browser/ash/policy/external_data/cloud_external_data_manager_base_test_util.cc +++ b/chrome/browser/ash/policy/external_data/cloud_external_data_manager_base_test_util.cc
@@ -7,9 +7,9 @@ #include <memory> #include <utility> -#include "base/callback.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/callback.h" #include "base/json/json_writer.h" #include "base/memory/weak_ptr.h" #include "base/path_service.h"
diff --git a/chrome/browser/ash/policy/external_data/cloud_external_data_manager_base_test_util.h b/chrome/browser/ash/policy/external_data/cloud_external_data_manager_base_test_util.h index 43643f9..63319f0f 100644 --- a/chrome/browser/ash/policy/external_data/cloud_external_data_manager_base_test_util.h +++ b/chrome/browser/ash/policy/external_data/cloud_external_data_manager_base_test_util.h
@@ -8,8 +8,8 @@ #include <memory> #include <string> -#include "base/callback_forward.h" #include "base/files/file_path.h" +#include "base/functional/callback_forward.h" namespace base { class Value;
diff --git a/chrome/browser/ash/policy/external_data/cloud_external_data_manager_base_unittest.cc b/chrome/browser/ash/policy/external_data/cloud_external_data_manager_base_unittest.cc index 6f7f898d..282b96e 100644 --- a/chrome/browser/ash/policy/external_data/cloud_external_data_manager_base_unittest.cc +++ b/chrome/browser/ash/policy/external_data/cloud_external_data_manager_base_unittest.cc
@@ -8,10 +8,10 @@ #include <memory> #include <string> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/strings/string_number_conversions.h" #include "base/test/task_environment.h"
diff --git a/chrome/browser/ash/policy/external_data/cloud_external_data_policy_observer.cc b/chrome/browser/ash/policy/external_data/cloud_external_data_policy_observer.cc index 70897ec..4b2a1b4 100644 --- a/chrome/browser/ash/policy/external_data/cloud_external_data_policy_observer.cc +++ b/chrome/browser/ash/policy/external_data/cloud_external_data_policy_observer.cc
@@ -9,9 +9,9 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/values.h" #include "chrome/browser/ash/policy/core/device_local_account.h" #include "chrome/browser/ash/policy/handlers/configuration_policy_handler_ash.h"
diff --git a/chrome/browser/ash/policy/external_data/device_cloud_external_data_policy_observer.cc b/chrome/browser/ash/policy/external_data/device_cloud_external_data_policy_observer.cc index e4d8e7c..c3aa351 100644 --- a/chrome/browser/ash/policy/external_data/device_cloud_external_data_policy_observer.cc +++ b/chrome/browser/ash/policy/external_data/device_cloud_external_data_policy_observer.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ash/policy/external_data/device_cloud_external_data_policy_observer.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/policy/handlers/configuration_policy_handler_ash.h" #include "components/policy/core/browser/policy_error_map.h" #include "components/policy/core/common/external_data_fetcher.h"
diff --git a/chrome/browser/ash/policy/external_data/device_cloud_external_data_policy_observer_browsertest.cc b/chrome/browser/ash/policy/external_data/device_cloud_external_data_policy_observer_browsertest.cc index d3f9900..ce49c2a 100644 --- a/chrome/browser/ash/policy/external_data/device_cloud_external_data_policy_observer_browsertest.cc +++ b/chrome/browser/ash/policy/external_data/device_cloud_external_data_policy_observer_browsertest.cc
@@ -7,9 +7,9 @@ #include <memory> #include <string> -#include "base/bind.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/path_service.h" #include "chrome/browser/ash/policy/core/browser_policy_connector_ash.h" #include "chrome/browser/ash/policy/core/device_policy_cros_browser_test.h"
diff --git a/chrome/browser/ash/policy/external_data/device_local_account_external_data_service.cc b/chrome/browser/ash/policy/external_data/device_local_account_external_data_service.cc index 5655e5b9..6448277 100644 --- a/chrome/browser/ash/policy/external_data/device_local_account_external_data_service.cc +++ b/chrome/browser/ash/policy/external_data/device_local_account_external_data_service.cc
@@ -9,10 +9,10 @@ #include <utility> #include "ash/constants/ash_paths.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/path_service.h" #include "base/task/sequenced_task_runner.h"
diff --git a/chrome/browser/ash/policy/external_data/device_policy_cloud_external_data_manager_browsertest.cc b/chrome/browser/ash/policy/external_data/device_policy_cloud_external_data_manager_browsertest.cc index c1cf194..881e64a 100644 --- a/chrome/browser/ash/policy/external_data/device_policy_cloud_external_data_manager_browsertest.cc +++ b/chrome/browser/ash/policy/external_data/device_policy_cloud_external_data_manager_browsertest.cc
@@ -6,10 +6,10 @@ #include <string> #include "ash/constants/ash_paths.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/ptr_util.h" #include "base/path_service.h" #include "base/run_loop.h"
diff --git a/chrome/browser/ash/policy/external_data/handlers/device_wilco_dtc_configuration_external_data_handler_browsertest.cc b/chrome/browser/ash/policy/external_data/handlers/device_wilco_dtc_configuration_external_data_handler_browsertest.cc index bcad0f2a..14e6c51 100644 --- a/chrome/browser/ash/policy/external_data/handlers/device_wilco_dtc_configuration_external_data_handler_browsertest.cc +++ b/chrome/browser/ash/policy/external_data/handlers/device_wilco_dtc_configuration_external_data_handler_browsertest.cc
@@ -6,9 +6,9 @@ #include <memory> #include <string> -#include "base/bind.h" -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/run_loop.h" #include "base/test/scoped_feature_list.h" #include "chrome/browser/ash/policy/core/browser_policy_connector_ash.h"
diff --git a/chrome/browser/ash/policy/external_data/user_cloud_external_data_manager_browsertest.cc b/chrome/browser/ash/policy/external_data/user_cloud_external_data_manager_browsertest.cc index 41c8ad2..c09cf211 100644 --- a/chrome/browser/ash/policy/external_data/user_cloud_external_data_manager_browsertest.cc +++ b/chrome/browser/ash/policy/external_data/user_cloud_external_data_manager_browsertest.cc
@@ -5,10 +5,10 @@ #include <memory> #include <string> -#include "base/bind.h" -#include "base/callback.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/json/json_writer.h" #include "base/path_service.h" #include "base/run_loop.h"
diff --git a/chrome/browser/ash/policy/handlers/adb_sideloading_allowance_mode_policy_handler.cc b/chrome/browser/ash/policy/handlers/adb_sideloading_allowance_mode_policy_handler.cc index 953afb9..059c2c9d 100644 --- a/chrome/browser/ash/policy/handlers/adb_sideloading_allowance_mode_policy_handler.cc +++ b/chrome/browser/ash/policy/handlers/adb_sideloading_allowance_mode_policy_handler.cc
@@ -7,8 +7,8 @@ #include <utility> #include "ash/constants/ash_features.h" -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/time/time.h" #include "base/timer/timer.h" #include "base/values.h"
diff --git a/chrome/browser/ash/policy/handlers/adb_sideloading_allowance_mode_policy_handler.h b/chrome/browser/ash/policy/handlers/adb_sideloading_allowance_mode_policy_handler.h index 4671f9d..119df3e 100644 --- a/chrome/browser/ash/policy/handlers/adb_sideloading_allowance_mode_policy_handler.h +++ b/chrome/browser/ash/policy/handlers/adb_sideloading_allowance_mode_policy_handler.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/scoped_observation.h" #include "chrome/browser/ash/notifications/adb_sideloading_policy_change_notification.h"
diff --git a/chrome/browser/ash/policy/handlers/adb_sideloading_allowance_mode_policy_handler_unittest.cc b/chrome/browser/ash/policy/handlers/adb_sideloading_allowance_mode_policy_handler_unittest.cc index 4280dd6..b2e11ab1 100644 --- a/chrome/browser/ash/policy/handlers/adb_sideloading_allowance_mode_policy_handler_unittest.cc +++ b/chrome/browser/ash/policy/handlers/adb_sideloading_allowance_mode_policy_handler_unittest.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/timer/mock_timer.h" #include "chrome/browser/ash/login/users/fake_chrome_user_manager.h"
diff --git a/chrome/browser/ash/policy/handlers/bluetooth_policy_handler.cc b/chrome/browser/ash/policy/handlers/bluetooth_policy_handler.cc index 099887b..6efe603 100644 --- a/chrome/browser/ash/policy/handlers/bluetooth_policy_handler.cc +++ b/chrome/browser/ash/policy/handlers/bluetooth_policy_handler.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ash/policy/handlers/bluetooth_policy_handler.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ref_counted.h" #include "base/syslog_logging.h" #include "base/values.h"
diff --git a/chrome/browser/ash/policy/handlers/configuration_policy_handler_ash.cc b/chrome/browser/ash/policy/handlers/configuration_policy_handler_ash.cc index e108b39b..db78dba1 100644 --- a/chrome/browser/ash/policy/handlers/configuration_policy_handler_ash.cc +++ b/chrome/browser/ash/policy/handlers/configuration_policy_handler_ash.cc
@@ -11,9 +11,9 @@ #include <vector> #include "ash/constants/ash_pref_names.h" -#include "base/callback.h" #include "base/check.h" #include "base/containers/contains.h" +#include "base/functional/callback.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/notreached.h"
diff --git a/chrome/browser/ash/policy/handlers/configuration_policy_handler_ash_unittest.cc b/chrome/browser/ash/policy/handlers/configuration_policy_handler_ash_unittest.cc index 408ea7814..e6ee8aa 100644 --- a/chrome/browser/ash/policy/handlers/configuration_policy_handler_ash_unittest.cc +++ b/chrome/browser/ash/policy/handlers/configuration_policy_handler_ash_unittest.cc
@@ -9,7 +9,7 @@ #include "ash/components/arc/arc_prefs.h" #include "ash/constants/ash_pref_names.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/json/json_reader.h" #include "base/values.h" #include "chrome/browser/ui/ash/shelf/chrome_shelf_prefs.h"
diff --git a/chrome/browser/ash/policy/handlers/device_dock_mac_address_source_handler.cc b/chrome/browser/ash/policy/handlers/device_dock_mac_address_source_handler.cc index e43987b..99c11779 100644 --- a/chrome/browser/ash/policy/handlers/device_dock_mac_address_source_handler.cc +++ b/chrome/browser/ash/policy/handlers/device_dock_mac_address_source_handler.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ash/policy/handlers/device_dock_mac_address_source_handler.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "chromeos/ash/components/network/network_device_handler.h" #include "chromeos/ash/components/settings/cros_settings_names.h"
diff --git a/chrome/browser/ash/policy/handlers/device_name_policy_handler_impl.cc b/chrome/browser/ash/policy/handlers/device_name_policy_handler_impl.cc index a700e44..af00469 100644 --- a/chrome/browser/ash/policy/handlers/device_name_policy_handler_impl.cc +++ b/chrome/browser/ash/policy/handlers/device_name_policy_handler_impl.cc
@@ -5,7 +5,7 @@ #include "chrome/browser/ash/policy/handlers/device_name_policy_handler_impl.h" #include "ash/constants/ash_features.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/string_piece.h" #include "chrome/browser/ash/policy/core/browser_policy_connector_ash.h" #include "chrome/browser/ash/policy/handlers/device_name_policy_handler_name_generator.h"
diff --git a/chrome/browser/ash/policy/handlers/device_quirks_policy_browsertest.cc b/chrome/browser/ash/policy/handlers/device_quirks_policy_browsertest.cc index b77b777..50c0d57 100644 --- a/chrome/browser/ash/policy/handlers/device_quirks_policy_browsertest.cc +++ b/chrome/browser/ash/policy/handlers/device_quirks_policy_browsertest.cc
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/bind.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "chrome/browser/ash/policy/core/device_policy_cros_browser_test.h" #include "chrome/browser/ash/settings/cros_settings.h"
diff --git a/chrome/browser/ash/policy/handlers/device_system_use_24hour_clock_browsertest.cc b/chrome/browser/ash/policy/handlers/device_system_use_24hour_clock_browsertest.cc index 6f4ed7196..8d94ddf 100644 --- a/chrome/browser/ash/policy/handlers/device_system_use_24hour_clock_browsertest.cc +++ b/chrome/browser/ash/policy/handlers/device_system_use_24hour_clock_browsertest.cc
@@ -4,8 +4,8 @@ #include "ash/constants/ash_switches.h" #include "ash/public/cpp/system_tray_test_api.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/ash/policy/handlers/device_wifi_allowed_handler.cc b/chrome/browser/ash/policy/handlers/device_wifi_allowed_handler.cc index 62ba0c2..9de98ed 100644 --- a/chrome/browser/ash/policy/handlers/device_wifi_allowed_handler.cc +++ b/chrome/browser/ash/policy/handlers/device_wifi_allowed_handler.cc
@@ -6,7 +6,7 @@ #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "chromeos/ash/components/network/network_handler.h" #include "chromeos/ash/components/network/prohibited_technologies_handler.h" #include "chromeos/ash/components/settings/cros_settings_names.h"
diff --git a/chrome/browser/ash/policy/handlers/extension_cache_unittest.cc b/chrome/browser/ash/policy/handlers/extension_cache_unittest.cc index 74e7f204..0813aef 100644 --- a/chrome/browser/ash/policy/handlers/extension_cache_unittest.cc +++ b/chrome/browser/ash/policy/handlers/extension_cache_unittest.cc
@@ -6,9 +6,9 @@ #include <memory> -#include "base/bind.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/time/time.h" #include "chrome/browser/ash/settings/scoped_testing_cros_settings.h"
diff --git a/chrome/browser/ash/policy/handlers/lock_to_single_user_manager.cc b/chrome/browser/ash/policy/handlers/lock_to_single_user_manager.cc index 140ae1e..00ad28dd 100644 --- a/chrome/browser/ash/policy/handlers/lock_to_single_user_manager.cc +++ b/chrome/browser/ash/policy/handlers/lock_to_single_user_manager.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ash/policy/handlers/lock_to_single_user_manager.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/metrics/histogram_functions.h" #include "chrome/browser/ash/crostini/crostini_manager.h"
diff --git a/chrome/browser/ash/policy/handlers/minimum_version_policy_handler.cc b/chrome/browser/ash/policy/handlers/minimum_version_policy_handler.cc index 1a02557..463e774 100644 --- a/chrome/browser/ash/policy/handlers/minimum_version_policy_handler.cc +++ b/chrome/browser/ash/policy/handlers/minimum_version_policy_handler.cc
@@ -11,7 +11,7 @@ #include "ash/constants/ash_features.h" #include "ash/constants/ash_switches.h" #include "ash/public/cpp/system_tray.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/numerics/safe_conversions.h"
diff --git a/chrome/browser/ash/policy/handlers/power_policy_browsertest.cc b/chrome/browser/ash/policy/handlers/power_policy_browsertest.cc index eebc88c..5f15e76 100644 --- a/chrome/browser/ash/policy/handlers/power_policy_browsertest.cc +++ b/chrome/browser/ash/policy/handlers/power_policy_browsertest.cc
@@ -8,12 +8,12 @@ #include <vector> #include "ash/constants/ash_switches.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" #include "base/compiler_specific.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/numerics/safe_conversions.h" #include "base/path_service.h"
diff --git a/chrome/browser/ash/policy/handlers/site_isolation_flag_handling_browsertest.cc b/chrome/browser/ash/policy/handlers/site_isolation_flag_handling_browsertest.cc index d145bfa..0a70adf 100644 --- a/chrome/browser/ash/policy/handlers/site_isolation_flag_handling_browsertest.cc +++ b/chrome/browser/ash/policy/handlers/site_isolation_flag_handling_browsertest.cc
@@ -7,9 +7,9 @@ #include <string> #include <vector> -#include "base/bind.h" #include "base/command_line.h" #include "base/containers/cxx20_erase.h" +#include "base/functional/bind.h" #include "base/strings/string_util.h" #include "chrome/browser/ash/login/existing_user_controller.h" #include "chrome/browser/ash/login/session/user_session_manager.h"
diff --git a/chrome/browser/ash/policy/handlers/system_proxy_handler.cc b/chrome/browser/ash/policy/handlers/system_proxy_handler.cc index c3f969c..6b2f6d0 100644 --- a/chrome/browser/ash/policy/handlers/system_proxy_handler.cc +++ b/chrome/browser/ash/policy/handlers/system_proxy_handler.cc
@@ -6,7 +6,7 @@ #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/values.h" #include "chrome/browser/ash/net/system_proxy_manager.h" #include "chrome/browser/ash/settings/cros_settings.h"
diff --git a/chrome/browser/ash/policy/handlers/tpm_auto_update_mode_policy_handler.cc b/chrome/browser/ash/policy/handlers/tpm_auto_update_mode_policy_handler.cc index 578a2c5..edf217e 100644 --- a/chrome/browser/ash/policy/handlers/tpm_auto_update_mode_policy_handler.cc +++ b/chrome/browser/ash/policy/handlers/tpm_auto_update_mode_policy_handler.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/time/time.h" #include "base/timer/timer.h" #include "base/values.h"
diff --git a/chrome/browser/ash/policy/handlers/tpm_auto_update_mode_policy_handler_unittest.cc b/chrome/browser/ash/policy/handlers/tpm_auto_update_mode_policy_handler_unittest.cc index c3659f1..b14d352d 100644 --- a/chrome/browser/ash/policy/handlers/tpm_auto_update_mode_policy_handler_unittest.cc +++ b/chrome/browser/ash/policy/handlers/tpm_auto_update_mode_policy_handler_unittest.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/run_loop.h" #include "base/timer/mock_timer.h"
diff --git a/chrome/browser/ash/policy/invalidation/affiliated_invalidation_service_provider_impl.cc b/chrome/browser/ash/policy/invalidation/affiliated_invalidation_service_provider_impl.cc index 446f2cc..0262217 100644 --- a/chrome/browser/ash/policy/invalidation/affiliated_invalidation_service_provider_impl.cc +++ b/chrome/browser/ash/policy/invalidation/affiliated_invalidation_service_provider_impl.cc
@@ -7,7 +7,7 @@ #include <memory> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/profiles/profile_helper.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/device_identity/device_identity_provider.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 aab3b2c..8b91ea6e 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
@@ -8,7 +8,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/memory/ref_counted.h" #include "chrome/browser/ash/login/users/fake_chrome_user_manager.h"
diff --git a/chrome/browser/ash/policy/login/blocking_login_browsertest.cc b/chrome/browser/ash/policy/login/blocking_login_browsertest.cc index db146b8..e564f8f 100644 --- a/chrome/browser/ash/policy/login/blocking_login_browsertest.cc +++ b/chrome/browser/ash/policy/login/blocking_login_browsertest.cc
@@ -6,8 +6,8 @@ #include <vector> #include "ash/constants/ash_switches.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/strings/string_util.h" #include "chrome/browser/ash/login/test/oobe_base_test.h"
diff --git a/chrome/browser/ash/policy/login/device_login_screen_policy_browsertest.cc b/chrome/browser/ash/policy/login/device_login_screen_policy_browsertest.cc index 691a0fe..5117987 100644 --- a/chrome/browser/ash/policy/login/device_login_screen_policy_browsertest.cc +++ b/chrome/browser/ash/policy/login/device_login_screen_policy_browsertest.cc
@@ -7,10 +7,10 @@ #include "ash/constants/ash_pref_names.h" #include "ash/constants/ash_switches.h" #include "ash/public/cpp/login_screen_test_api.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/ash/policy/login/login_profile_policy_provider.cc b/chrome/browser/ash/policy/login/login_profile_policy_provider.cc index c1190b7..529bc6e 100644 --- a/chrome/browser/ash/policy/login/login_profile_policy_provider.cc +++ b/chrome/browser/ash/policy/login/login_profile_policy_provider.cc
@@ -8,8 +8,8 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/values.h" #include "chromeos/dbus/power/power_policy_controller.h" #include "components/policy/core/browser/policy_error_map.h"
diff --git a/chrome/browser/ash/policy/login/login_screen_accessibility_policy_browsertest.cc b/chrome/browser/ash/policy/login/login_screen_accessibility_policy_browsertest.cc index 8c107da1..84231c8 100644 --- a/chrome/browser/ash/policy/login/login_screen_accessibility_policy_browsertest.cc +++ b/chrome/browser/ash/policy/login/login_screen_accessibility_policy_browsertest.cc
@@ -7,10 +7,10 @@ #include "ash/constants/ash_pref_names.h" #include "ash/constants/ash_switches.h" #include "ash/public/cpp/accessibility_controller.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/ash/policy/login/login_screen_default_policy_browsertest.cc b/chrome/browser/ash/policy/login/login_screen_default_policy_browsertest.cc index 055f1c3..b89d9a6 100644 --- a/chrome/browser/ash/policy/login/login_screen_default_policy_browsertest.cc +++ b/chrome/browser/ash/policy/login/login_screen_default_policy_browsertest.cc
@@ -6,10 +6,10 @@ #include "ash/constants/ash_pref_names.h" #include "ash/constants/ash_switches.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/ash/policy/login/signin_profile_extensions_policy_browsertest.cc b/chrome/browser/ash/policy/login/signin_profile_extensions_policy_browsertest.cc index 54de980..06b7a74 100644 --- a/chrome/browser/ash/policy/login/signin_profile_extensions_policy_browsertest.cc +++ b/chrome/browser/ash/policy/login/signin_profile_extensions_policy_browsertest.cc
@@ -6,10 +6,10 @@ #include <string> #include "ash/constants/ash_paths.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/path_service.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/ash/policy/login/signin_profile_extensions_policy_test_base.cc b/chrome/browser/ash/policy/login/signin_profile_extensions_policy_test_base.cc index 498a17e..0a34eed 100644 --- a/chrome/browser/ash/policy/login/signin_profile_extensions_policy_test_base.cc +++ b/chrome/browser/ash/policy/login/signin_profile_extensions_policy_test_base.cc
@@ -5,8 +5,8 @@ #include "chrome/browser/ash/policy/login/signin_profile_extensions_policy_test_base.h" #include "ash/constants/ash_switches.h" -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/strings/string_util.h" #include "chrome/browser/ash/profiles/profile_helper.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/ash/policy/login/wildcard_login_checker.cc b/chrome/browser/ash/policy/login/wildcard_login_checker.cc index 80d64dcd..8eeee38 100644 --- a/chrome/browser/ash/policy/login/wildcard_login_checker.cc +++ b/chrome/browser/ash/policy/login/wildcard_login_checker.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/values.h" #include "chrome/browser/ash/policy/core/policy_oauth2_token_fetcher.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/ash/policy/login/wildcard_login_checker.h b/chrome/browser/ash/policy/login/wildcard_login_checker.h index 33a329e..96e6b80 100644 --- a/chrome/browser/ash/policy/login/wildcard_login_checker.h +++ b/chrome/browser/ash/policy/login/wildcard_login_checker.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/values.h" #include "components/policy/core/common/cloud/user_info_fetcher.h" #include "google_apis/gaia/google_service_auth_error.h"
diff --git a/chrome/browser/ash/policy/networking/network_policy_application_browsertest.cc b/chrome/browser/ash/policy/networking/network_policy_application_browsertest.cc index d0bad53b..af484b8 100644 --- a/chrome/browser/ash/policy/networking/network_policy_application_browsertest.cc +++ b/chrome/browser/ash/policy/networking/network_policy_application_browsertest.cc
@@ -10,8 +10,8 @@ #include <vector> #include "ash/constants/ash_switches.h" -#include "base/callback.h" #include "base/command_line.h" +#include "base/functional/callback.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/ash/policy/networking/policy_certs_browsertest.cc b/chrome/browser/ash/policy/networking/policy_certs_browsertest.cc index 31d8110..e0195b72 100644 --- a/chrome/browser/ash/policy/networking/policy_certs_browsertest.cc +++ b/chrome/browser/ash/policy/networking/policy_certs_browsertest.cc
@@ -6,11 +6,11 @@ #include <string> #include "ash/constants/ash_switches.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/json/json_writer.h" #include "base/path_service.h" #include "base/run_loop.h"
diff --git a/chrome/browser/ash/policy/off_hours/device_off_hours_controller.cc b/chrome/browser/ash/policy/off_hours/device_off_hours_controller.cc index 2faacd5..750e34db 100644 --- a/chrome/browser/ash/policy/off_hours/device_off_hours_controller.cc +++ b/chrome/browser/ash/policy/off_hours/device_off_hours_controller.cc
@@ -8,7 +8,7 @@ #include <tuple> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/time/default_clock.h" #include "base/time/tick_clock.h"
diff --git a/chrome/browser/ash/policy/remote_commands/crd_host_delegate.cc b/chrome/browser/ash/policy/remote_commands/crd_host_delegate.cc index a36c2e7f..5bbcf4a 100644 --- a/chrome/browser/ash/policy/remote_commands/crd_host_delegate.cc +++ b/chrome/browser/ash/policy/remote_commands/crd_host_delegate.cc
@@ -6,8 +6,8 @@ #include <string> -#include "base/bind.h" -#include "base/callback_forward.h" +#include "base/functional/bind.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ash/policy/remote_commands/crd_logging.h" #include "chrome/browser/ash/policy/remote_commands/crd_remote_command_utils.h"
diff --git a/chrome/browser/ash/policy/remote_commands/crd_host_delegate.h b/chrome/browser/ash/policy/remote_commands/crd_host_delegate.h index 8860184..5789f98 100644 --- a/chrome/browser/ash/policy/remote_commands/crd_host_delegate.h +++ b/chrome/browser/ash/policy/remote_commands/crd_host_delegate.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "chrome/browser/ash/policy/remote_commands/device_command_start_crd_session_job.h" #include "remoting/host/chromeos/chromeos_enterprise_params.h" #include "remoting/host/mojom/remote_support.mojom-forward.h"
diff --git a/chrome/browser/ash/policy/remote_commands/crd_host_delegate_unittest.cc b/chrome/browser/ash/policy/remote_commands/crd_host_delegate_unittest.cc index dcdd2713..17b2983 100644 --- a/chrome/browser/ash/policy/remote_commands/crd_host_delegate_unittest.cc +++ b/chrome/browser/ash/policy/remote_commands/crd_host_delegate_unittest.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ash/policy/remote_commands/crd_host_delegate.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/run_loop.h" #include "base/test/task_environment.h" #include "base/test/test_future.h"
diff --git a/chrome/browser/ash/policy/remote_commands/device_command_fetch_status_job.cc b/chrome/browser/ash/policy/remote_commands/device_command_fetch_status_job.cc index 7904488..b229f3b3 100644 --- a/chrome/browser/ash/policy/remote_commands/device_command_fetch_status_job.cc +++ b/chrome/browser/ash/policy/remote_commands/device_command_fetch_status_job.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/syslog_logging.h" #include "base/task/single_thread_task_runner.h" #include "chrome/browser/ash/policy/core/browser_policy_connector_ash.h"
diff --git a/chrome/browser/ash/policy/remote_commands/device_command_get_available_routines_job.cc b/chrome/browser/ash/policy/remote_commands/device_command_get_available_routines_job.cc index d781b56..86174fa 100644 --- a/chrome/browser/ash/policy/remote_commands/device_command_get_available_routines_job.cc +++ b/chrome/browser/ash/policy/remote_commands/device_command_get_available_routines_job.cc
@@ -8,7 +8,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/json/json_writer.h" #include "base/syslog_logging.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/ash/policy/remote_commands/device_command_get_routine_update_job.cc b/chrome/browser/ash/policy/remote_commands/device_command_get_routine_update_job.cc index b6c14d1..f7a6e5b 100644 --- a/chrome/browser/ash/policy/remote_commands/device_command_get_routine_update_job.cc +++ b/chrome/browser/ash/policy/remote_commands/device_command_get_routine_update_job.cc
@@ -9,7 +9,7 @@ #include <type_traits> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/numerics/safe_conversions.h"
diff --git a/chrome/browser/ash/policy/remote_commands/device_command_reboot_job.cc b/chrome/browser/ash/policy/remote_commands/device_command_reboot_job.cc index 8b0eafaa..633adcf 100644 --- a/chrome/browser/ash/policy/remote_commands/device_command_reboot_job.cc +++ b/chrome/browser/ash/policy/remote_commands/device_command_reboot_job.cc
@@ -6,7 +6,7 @@ #include <algorithm> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/syslog_logging.h"
diff --git a/chrome/browser/ash/policy/remote_commands/device_command_refresh_machine_certificate_job.cc b/chrome/browser/ash/policy/remote_commands/device_command_refresh_machine_certificate_job.cc index a2588e0..a7c5bc6d 100644 --- a/chrome/browser/ash/policy/remote_commands/device_command_refresh_machine_certificate_job.cc +++ b/chrome/browser/ash/policy/remote_commands/device_command_refresh_machine_certificate_job.cc
@@ -6,7 +6,7 @@ #include <algorithm> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/syslog_logging.h"
diff --git a/chrome/browser/ash/policy/remote_commands/device_command_remote_powerwash_job.cc b/chrome/browser/ash/policy/remote_commands/device_command_remote_powerwash_job.cc index ac85f17..e92dc5a 100644 --- a/chrome/browser/ash/policy/remote_commands/device_command_remote_powerwash_job.cc +++ b/chrome/browser/ash/policy/remote_commands/device_command_remote_powerwash_job.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/syslog_logging.h" #include "base/task/sequenced_task_runner.h" #include "base/time/time.h"
diff --git a/chrome/browser/ash/policy/remote_commands/device_command_remote_powerwash_job_unittest.cc b/chrome/browser/ash/policy/remote_commands/device_command_remote_powerwash_job_unittest.cc index 00d8678..3b34ac9 100644 --- a/chrome/browser/ash/policy/remote_commands/device_command_remote_powerwash_job_unittest.cc +++ b/chrome/browser/ash/policy/remote_commands/device_command_remote_powerwash_job_unittest.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/run_loop.h" #include "base/task/sequenced_task_runner.h"
diff --git a/chrome/browser/ash/policy/remote_commands/device_command_reset_euicc_job.cc b/chrome/browser/ash/policy/remote_commands/device_command_reset_euicc_job.cc index 9cbac01..5736055 100644 --- a/chrome/browser/ash/policy/remote_commands/device_command_reset_euicc_job.cc +++ b/chrome/browser/ash/policy/remote_commands/device_command_reset_euicc_job.cc
@@ -9,7 +9,7 @@ #include "ash/constants/notifier_catalogs.h" #include "ash/public/cpp/notification_utils.h" #include "ash/strings/grit/ash_strings.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.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 5272732..79ee47b 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
@@ -9,7 +9,7 @@ #include <type_traits> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/notreached.h"
diff --git a/chrome/browser/ash/policy/remote_commands/device_command_screenshot_job.cc b/chrome/browser/ash/policy/remote_commands/device_command_screenshot_job.cc index bd0272e..0259fe5a 100644 --- a/chrome/browser/ash/policy/remote_commands/device_command_screenshot_job.cc +++ b/chrome/browser/ash/policy/remote_commands/device_command_screenshot_job.cc
@@ -9,7 +9,7 @@ #include "ash/shell.h" #include "base/barrier_callback.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/ash/policy/remote_commands/device_command_screenshot_job.h b/chrome/browser/ash/policy/remote_commands/device_command_screenshot_job.h index 7c2064a..a6bada4 100644 --- a/chrome/browser/ash/policy/remote_commands/device_command_screenshot_job.h +++ b/chrome/browser/ash/policy/remote_commands/device_command_screenshot_job.h
@@ -12,7 +12,7 @@ #include <string> #include <utility> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "base/memory/ref_counted_memory.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/ash/policy/remote_commands/device_command_screenshot_job_unittest.cc b/chrome/browser/ash/policy/remote_commands/device_command_screenshot_job_unittest.cc index c3199497..692ff6e5 100644 --- a/chrome/browser/ash/policy/remote_commands/device_command_screenshot_job_unittest.cc +++ b/chrome/browser/ash/policy/remote_commands/device_command_screenshot_job_unittest.cc
@@ -8,7 +8,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/json/json_writer.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/ash/policy/remote_commands/device_command_set_volume_job.cc b/chrome/browser/ash/policy/remote_commands/device_command_set_volume_job.cc index 405ebe1..fde6a5f8 100644 --- a/chrome/browser/ash/policy/remote_commands/device_command_set_volume_job.cc +++ b/chrome/browser/ash/policy/remote_commands/device_command_set_volume_job.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/json/json_reader.h" #include "base/syslog_logging.h" #include "base/task/single_thread_task_runner.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 e3893a79..9b469c6 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
@@ -6,8 +6,8 @@ #include <memory> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/json/json_writer.h" #include "base/memory/ptr_util.h" #include "base/run_loop.h"
diff --git a/chrome/browser/ash/policy/remote_commands/device_command_wipe_users_job.cc b/chrome/browser/ash/policy/remote_commands/device_command_wipe_users_job.cc index 7c449b6..3258c688 100644 --- a/chrome/browser/ash/policy/remote_commands/device_command_wipe_users_job.cc +++ b/chrome/browser/ash/policy/remote_commands/device_command_wipe_users_job.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ash/policy/remote_commands/device_command_wipe_users_job.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/time/time.h" #include "chrome/browser/ash/system/user_removal_manager.h" #include "components/policy/core/common/remote_commands/remote_commands_service.h"
diff --git a/chrome/browser/ash/policy/remote_commands/device_command_wipe_users_job_unittest.cc b/chrome/browser/ash/policy/remote_commands/device_command_wipe_users_job_unittest.cc index 84d2069..f606dbb 100644 --- a/chrome/browser/ash/policy/remote_commands/device_command_wipe_users_job_unittest.cc +++ b/chrome/browser/ash/policy/remote_commands/device_command_wipe_users_job_unittest.cc
@@ -7,9 +7,9 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/run_loop.h" #include "base/task/sequenced_task_runner.h"
diff --git a/chrome/browser/ash/policy/remote_commands/screenshot_delegate.cc b/chrome/browser/ash/policy/remote_commands/screenshot_delegate.cc index bba4497..cca15a6 100644 --- a/chrome/browser/ash/policy/remote_commands/screenshot_delegate.cc +++ b/chrome/browser/ash/policy/remote_commands/screenshot_delegate.cc
@@ -6,7 +6,7 @@ #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/syslog_logging.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/ash/policy/remote_commands/user_command_arc_job.cc b/chrome/browser/ash/policy/remote_commands/user_command_arc_job.cc index 6aea2e3..4d2d509 100644 --- a/chrome/browser/ash/policy/remote_commands/user_command_arc_job.cc +++ b/chrome/browser/ash/policy/remote_commands/user_command_arc_job.cc
@@ -7,7 +7,7 @@ #include <utility> #include "ash/components/arc/mojom/policy.mojom.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/ref_counted.h" #include "base/syslog_logging.h"
diff --git a/chrome/browser/ash/policy/remote_commands/user_command_arc_job_unittest.cc b/chrome/browser/ash/policy/remote_commands/user_command_arc_job_unittest.cc index 1636ce6..d701c0d7 100644 --- a/chrome/browser/ash/policy/remote_commands/user_command_arc_job_unittest.cc +++ b/chrome/browser/ash/policy/remote_commands/user_command_arc_job_unittest.cc
@@ -11,8 +11,8 @@ #include "ash/components/arc/session/arc_service_manager.h" #include "ash/components/arc/session/connection_holder.h" #include "ash/components/arc/test/fake_policy_instance.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/time/time.h" #include "chrome/browser/ash/arc/policy/arc_policy_bridge.h"
diff --git a/chrome/browser/ash/policy/reporting/app_install_event_log_manager_wrapper.cc b/chrome/browser/ash/policy/reporting/app_install_event_log_manager_wrapper.cc index d940d60..14548f8 100644 --- a/chrome/browser/ash/policy/reporting/app_install_event_log_manager_wrapper.cc +++ b/chrome/browser/ash/policy/reporting/app_install_event_log_manager_wrapper.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ash/policy/reporting/app_install_event_log_manager_wrapper.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/task/single_thread_task_runner.h" #include "chrome/browser/ash/policy/core/user_cloud_policy_manager_ash.h"
diff --git a/chrome/browser/ash/policy/reporting/app_install_event_log_manager_wrapper_unittest.cc b/chrome/browser/ash/policy/reporting/app_install_event_log_manager_wrapper_unittest.cc index d37ddff6..2a89c7db 100644 --- a/chrome/browser/ash/policy/reporting/app_install_event_log_manager_wrapper_unittest.cc +++ b/chrome/browser/ash/policy/reporting/app_install_event_log_manager_wrapper_unittest.cc
@@ -5,10 +5,10 @@ #include "chrome/browser/ash/policy/reporting/app_install_event_log_manager_wrapper.h" #include "ash/components/arc/arc_prefs.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/memory/ref_counted.h" #include "base/run_loop.h"
diff --git a/chrome/browser/ash/policy/reporting/arc_app_install_event_log_uploader.cc b/chrome/browser/ash/policy/reporting/arc_app_install_event_log_uploader.cc index a26f8fa..4d259ca 100644 --- a/chrome/browser/ash/policy/reporting/arc_app_install_event_log_uploader.cc +++ b/chrome/browser/ash/policy/reporting/arc_app_install_event_log_uploader.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ash/policy/reporting/arc_app_install_event_log_uploader.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/task/single_thread_task_runner.h" #include "base/time/time.h" #include "base/values.h"
diff --git a/chrome/browser/ash/policy/reporting/arc_app_install_event_log_uploader.h b/chrome/browser/ash/policy/reporting/arc_app_install_event_log_uploader.h index af486ed4..1818c97 100644 --- a/chrome/browser/ash/policy/reporting/arc_app_install_event_log_uploader.h +++ b/chrome/browser/ash/policy/reporting/arc_app_install_event_log_uploader.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_ASH_POLICY_REPORTING_ARC_APP_INSTALL_EVENT_LOG_UPLOADER_H_ #define CHROME_BROWSER_ASH_POLICY_REPORTING_ARC_APP_INSTALL_EVENT_LOG_UPLOADER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ash/policy/reporting/install_event_log_uploader_base.h" #include "components/policy/core/common/cloud/cloud_policy_client.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 fbbd7e95..0eefb6a 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
@@ -10,8 +10,8 @@ #include <iterator> #include "ash/components/arc/arc_prefs.h" -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/location.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 cc277c0a..0fcc9ddd 100644 --- a/chrome/browser/ash/policy/reporting/install_event_log_manager.cc +++ b/chrome/browser/ash/policy/reporting/install_event_log_manager.cc
@@ -5,10 +5,10 @@ #include "chrome/browser/ash/policy/reporting/install_event_log_manager.h" #include "ash/constants/ash_switches.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check_op.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_traits.h"
diff --git a/chrome/browser/ash/policy/reporting/metrics_reporting/cros_reporting_settings.h b/chrome/browser/ash/policy/reporting/metrics_reporting/cros_reporting_settings.h index e598b0e3..041cfec 100644 --- a/chrome/browser/ash/policy/reporting/metrics_reporting/cros_reporting_settings.h +++ b/chrome/browser/ash/policy/reporting/metrics_reporting/cros_reporting_settings.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/callback_forward.h" #include "base/callback_list.h" +#include "base/functional/callback_forward.h" #include "components/reporting/metrics/reporting_settings.h" namespace reporting {
diff --git a/chrome/browser/ash/policy/reporting/metrics_reporting/mojo_service_events_observer_base.h b/chrome/browser/ash/policy/reporting/metrics_reporting/mojo_service_events_observer_base.h index 60c60696..822a550 100644 --- a/chrome/browser/ash/policy/reporting/metrics_reporting/mojo_service_events_observer_base.h +++ b/chrome/browser/ash/policy/reporting/metrics_reporting/mojo_service_events_observer_base.h
@@ -7,7 +7,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/weak_ptr.h" #include "components/reporting/metrics/metric_event_observer.h" #include "components/reporting/proto/synced/metric_data.pb.h"
diff --git a/chrome/browser/ash/policy/reporting/metrics_reporting/network/wifi_signal_strength_rssi_fetcher.cc b/chrome/browser/ash/policy/reporting/metrics_reporting/network/wifi_signal_strength_rssi_fetcher.cc index 8a472797..2539adad 100644 --- a/chrome/browser/ash/policy/reporting/metrics_reporting/network/wifi_signal_strength_rssi_fetcher.cc +++ b/chrome/browser/ash/policy/reporting/metrics_reporting/network/wifi_signal_strength_rssi_fetcher.cc
@@ -7,12 +7,12 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/check.h" #include "base/containers/contains.h" #include "base/containers/flat_map.h" #include "base/containers/queue.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/values.h" #include "chromeos/ash/components/login/login_state/login_state.h"
diff --git a/chrome/browser/ash/policy/reporting/metrics_reporting/network/wifi_signal_strength_rssi_fetcher.h b/chrome/browser/ash/policy/reporting/metrics_reporting/network/wifi_signal_strength_rssi_fetcher.h index 1df72e3..7d5da2b 100644 --- a/chrome/browser/ash/policy/reporting/metrics_reporting/network/wifi_signal_strength_rssi_fetcher.h +++ b/chrome/browser/ash/policy/reporting/metrics_reporting/network/wifi_signal_strength_rssi_fetcher.h
@@ -7,9 +7,9 @@ #include <string> -#include "base/callback.h" #include "base/containers/flat_map.h" #include "base/containers/queue.h" +#include "base/functional/callback.h" namespace reporting {
diff --git a/chrome/browser/ash/policy/reporting/user_added_removed/user_added_removed_reporter_unittest.cc b/chrome/browser/ash/policy/reporting/user_added_removed/user_added_removed_reporter_unittest.cc index 9fa1a69a..7bf841f 100644 --- a/chrome/browser/ash/policy/reporting/user_added_removed/user_added_removed_reporter_unittest.cc +++ b/chrome/browser/ash/policy/reporting/user_added_removed/user_added_removed_reporter_unittest.cc
@@ -8,7 +8,7 @@ #include <string> #include <utility> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/memory/weak_ptr.h" #include "base/strings/string_piece.h" #include "base/task/sequenced_task_runner.h"
diff --git a/chrome/browser/ash/policy/reporting/user_event_reporter_helper.h b/chrome/browser/ash/policy/reporting/user_event_reporter_helper.h index cea1aa5e..e7f1ef9 100644 --- a/chrome/browser/ash/policy/reporting/user_event_reporter_helper.h +++ b/chrome/browser/ash/policy/reporting/user_event_reporter_helper.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/sequenced_task_runner.h" #include "components/reporting/client/report_queue.h" #include "components/reporting/client/report_queue_configuration.h"
diff --git a/chrome/browser/ash/policy/rsu/lookup_key_uploader.cc b/chrome/browser/ash/policy/rsu/lookup_key_uploader.cc index e769f48..903c4be 100644 --- a/chrome/browser/ash/policy/rsu/lookup_key_uploader.cc +++ b/chrome/browser/ash/policy/rsu/lookup_key_uploader.cc
@@ -5,7 +5,7 @@ #include "chrome/browser/ash/policy/rsu/lookup_key_uploader.h" #include "base/base64.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/strcat.h" #include "base/time/default_clock.h" #include "chrome/browser/ash/policy/core/device_cloud_policy_store_ash.h"
diff --git a/chrome/browser/ash/policy/scheduled_task_handler/device_scheduled_reboot_handler.cc b/chrome/browser/ash/policy/scheduled_task_handler/device_scheduled_reboot_handler.cc index 72723818..686b446 100644 --- a/chrome/browser/ash/policy/scheduled_task_handler/device_scheduled_reboot_handler.cc +++ b/chrome/browser/ash/policy/scheduled_task_handler/device_scheduled_reboot_handler.cc
@@ -11,10 +11,10 @@ #include <utility> #include "ash/constants/ash_features.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/logging.h" #include "base/memory/ptr_util.h"
diff --git a/chrome/browser/ash/policy/scheduled_task_handler/device_scheduled_update_checker.cc b/chrome/browser/ash/policy/scheduled_task_handler/device_scheduled_update_checker.cc index 3c66156f4..426ad55a 100644 --- a/chrome/browser/ash/policy/scheduled_task_handler/device_scheduled_update_checker.cc +++ b/chrome/browser/ash/policy/scheduled_task_handler/device_scheduled_update_checker.cc
@@ -10,9 +10,9 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/logging.h" #include "base/memory/ptr_util.h"
diff --git a/chrome/browser/ash/policy/scheduled_task_handler/reboot_notifications_scheduler.h b/chrome/browser/ash/policy/scheduled_task_handler/reboot_notifications_scheduler.h index 77105e9..92da7b20 100644 --- a/chrome/browser/ash/policy/scheduled_task_handler/reboot_notifications_scheduler.h +++ b/chrome/browser/ash/policy/scheduled_task_handler/reboot_notifications_scheduler.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_ASH_POLICY_SCHEDULED_TASK_HANDLER_REBOOT_NOTIFICATIONS_SCHEDULER_H_ #define CHROME_BROWSER_ASH_POLICY_SCHEDULED_TASK_HANDLER_REBOOT_NOTIFICATIONS_SCHEDULER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/scoped_observation.h" #include "base/time/time.h"
diff --git a/chrome/browser/ash/policy/scheduled_task_handler/scheduled_task_executor.h b/chrome/browser/ash/policy/scheduled_task_handler/scheduled_task_executor.h index 4b4c045..79af03a1 100644 --- a/chrome/browser/ash/policy/scheduled_task_handler/scheduled_task_executor.h +++ b/chrome/browser/ash/policy/scheduled_task_handler/scheduled_task_executor.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_ASH_POLICY_SCHEDULED_TASK_HANDLER_SCHEDULED_TASK_EXECUTOR_H_ #define CHROME_BROWSER_ASH_POLICY_SCHEDULED_TASK_HANDLER_SCHEDULED_TASK_EXECUTOR_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/time/time.h" #include "chromeos/dbus/power/native_timer.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/chrome/browser/ash/policy/scheduled_task_handler/scheduled_task_executor_impl.h b/chrome/browser/ash/policy/scheduled_task_handler/scheduled_task_executor_impl.h index a3d86ed..3adb09ec 100644 --- a/chrome/browser/ash/policy/scheduled_task_handler/scheduled_task_executor_impl.h +++ b/chrome/browser/ash/policy/scheduled_task_handler/scheduled_task_executor_impl.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/time/time.h" #include "base/values.h" #include "chrome/browser/ash/policy/scheduled_task_handler/scheduled_task_executor.h"
diff --git a/chrome/browser/ash/policy/scheduled_task_handler/scoped_wake_lock.h b/chrome/browser/ash/policy/scheduled_task_handler/scoped_wake_lock.h index d9b8aa9..4b0abc6 100644 --- a/chrome/browser/ash/policy/scheduled_task_handler/scoped_wake_lock.h +++ b/chrome/browser/ash/policy/scheduled_task_handler/scoped_wake_lock.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "mojo/public/cpp/bindings/pending_receiver.h" #include "mojo/public/cpp/bindings/remote.h" #include "services/device/public/mojom/wake_lock.mojom.h"
diff --git a/chrome/browser/ash/policy/scheduled_task_handler/task_executor_with_retries.h b/chrome/browser/ash/policy/scheduled_task_handler/task_executor_with_retries.h index e96d3e9..d7161e9 100644 --- a/chrome/browser/ash/policy/scheduled_task_handler/task_executor_with_retries.h +++ b/chrome/browser/ash/policy/scheduled_task_handler/task_executor_with_retries.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_ASH_POLICY_SCHEDULED_TASK_HANDLER_TASK_EXECUTOR_WITH_RETRIES_H_ #define CHROME_BROWSER_ASH_POLICY_SCHEDULED_TASK_HANDLER_TASK_EXECUTOR_WITH_RETRIES_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/time/time.h" #include "base/timer/timer.h"
diff --git a/chrome/browser/ash/policy/scheduled_task_handler/test/device_scheduled_update_checker_unittest.cc b/chrome/browser/ash/policy/scheduled_task_handler/test/device_scheduled_update_checker_unittest.cc index 445981a..7aec20c 100644 --- a/chrome/browser/ash/policy/scheduled_task_handler/test/device_scheduled_update_checker_unittest.cc +++ b/chrome/browser/ash/policy/scheduled_task_handler/test/device_scheduled_update_checker_unittest.cc
@@ -10,7 +10,7 @@ #include <string> #include <utility> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/json/json_reader.h" #include "base/logging.h" #include "base/memory/ptr_util.h"
diff --git a/chrome/browser/ash/policy/scheduled_task_handler/test/fake_scheduled_task_executor.cc b/chrome/browser/ash/policy/scheduled_task_handler/test/fake_scheduled_task_executor.cc index 87f89e30..0b874c92 100644 --- a/chrome/browser/ash/policy/scheduled_task_handler/test/fake_scheduled_task_executor.cc +++ b/chrome/browser/ash/policy/scheduled_task_handler/test/fake_scheduled_task_executor.cc
@@ -8,7 +8,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/ptr_util.h" #include "base/task/sequenced_task_runner.h"
diff --git a/chrome/browser/ash/policy/server_backed_state/active_directory_device_state_uploader.cc b/chrome/browser/ash/policy/server_backed_state/active_directory_device_state_uploader.cc index 4dcf334c..a3e12229 100644 --- a/chrome/browser/ash/policy/server_backed_state/active_directory_device_state_uploader.cc +++ b/chrome/browser/ash/policy/server_backed_state/active_directory_device_state_uploader.cc
@@ -7,7 +7,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "chrome/browser/ash/attestation/enrollment_certificate_uploader_impl.h" #include "chrome/browser/ash/attestation/enrollment_id_upload_manager.h"
diff --git a/chrome/browser/ash/policy/server_backed_state/active_directory_device_state_uploader.h b/chrome/browser/ash/policy/server_backed_state/active_directory_device_state_uploader.h index 3acb6ffc..051ed6a 100644 --- a/chrome/browser/ash/policy/server_backed_state/active_directory_device_state_uploader.h +++ b/chrome/browser/ash/policy/server_backed_state/active_directory_device_state_uploader.h
@@ -8,9 +8,9 @@ #include <memory> #include <string> -#include "base/bind.h" -#include "base/callback.h" #include "base/callback_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h" #include "components/policy/core/common/cloud/cloud_policy_client.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 fdc6ba7..7448760 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
@@ -7,7 +7,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/task/single_thread_task_runner.h" #include "base/test/task_environment.h"
diff --git a/chrome/browser/ash/policy/server_backed_state/server_backed_state_keys_broker.cc b/chrome/browser/ash/policy/server_backed_state/server_backed_state_keys_broker.cc index 1acc5f5e..97ae832e 100644 --- a/chrome/browser/ash/policy/server_backed_state/server_backed_state_keys_broker.cc +++ b/chrome/browser/ash/policy/server_backed_state/server_backed_state_keys_broker.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ash/policy/server_backed_state/server_backed_state_keys_broker.h" -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/ash/policy/server_backed_state/server_backed_state_keys_broker.h b/chrome/browser/ash/policy/server_backed_state/server_backed_state_keys_broker.h index 17dcc71..e278f96 100644 --- a/chrome/browser/ash/policy/server_backed_state/server_backed_state_keys_broker.h +++ b/chrome/browser/ash/policy/server_backed_state/server_backed_state_keys_broker.h
@@ -9,8 +9,8 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/callback_list.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" namespace ash {
diff --git a/chrome/browser/ash/policy/server_backed_state/server_backed_state_keys_broker_unittest.cc b/chrome/browser/ash/policy/server_backed_state/server_backed_state_keys_broker_unittest.cc index c1183f7..3ecad263 100644 --- a/chrome/browser/ash/policy/server_backed_state/server_backed_state_keys_broker_unittest.cc +++ b/chrome/browser/ash/policy/server_backed_state/server_backed_state_keys_broker_unittest.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ash/policy/server_backed_state/server_backed_state_keys_broker.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/test/scoped_mock_time_message_loop_task_runner.h" #include "base/test/task_environment.h"
diff --git a/chrome/browser/ash/policy/status_collector/activity_storage.cc b/chrome/browser/ash/policy/status_collector/activity_storage.cc index 38d53622b..b57f5ef 100644 --- a/chrome/browser/ash/policy/status_collector/activity_storage.cc +++ b/chrome/browser/ash/policy/status_collector/activity_storage.cc
@@ -9,8 +9,8 @@ #include <memory> #include "base/base64.h" -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/numerics/safe_conversions.h" #include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/ash/policy/status_collector/activity_storage.h b/chrome/browser/ash/policy/status_collector/activity_storage.h index 38be1dbb..0242688 100644 --- a/chrome/browser/ash/policy/status_collector/activity_storage.h +++ b/chrome/browser/ash/policy/status_collector/activity_storage.h
@@ -11,7 +11,7 @@ #include <string> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/time/time.h" #include "components/policy/proto/device_management_backend.pb.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 b101b94..63d5d96 100644 --- a/chrome/browser/ash/policy/status_collector/child_status_collector.cc +++ b/chrome/browser/ash/policy/status_collector/child_status_collector.cc
@@ -18,11 +18,11 @@ #include "ash/components/arc/session/arc_bridge_service.h" #include "ash/components/arc/session/arc_service_manager.h" #include "base/base64.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check.h" #include "base/feature_list.h" #include "base/format_macros.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/histogram_functions.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h"
diff --git a/chrome/browser/ash/policy/status_collector/child_status_collector.h b/chrome/browser/ash/policy/status_collector/child_status_collector.h index 1c37eb1..4a082cb 100644 --- a/chrome/browser/ash/policy/status_collector/child_status_collector.h +++ b/chrome/browser/ash/policy/status_collector/child_status_collector.h
@@ -11,7 +11,7 @@ #include <memory> #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/task/sequenced_task_runner.h"
diff --git a/chrome/browser/ash/policy/status_collector/child_status_collector_browsertest.cc b/chrome/browser/ash/policy/status_collector/child_status_collector_browsertest.cc index 4ea4777..7d4a84f6 100644 --- a/chrome/browser/ash/policy/status_collector/child_status_collector_browsertest.cc +++ b/chrome/browser/ash/policy/status_collector/child_status_collector_browsertest.cc
@@ -10,9 +10,9 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" #include "base/environment.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/ptr_util.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.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 a7be8f1e..c42dc18 100644 --- a/chrome/browser/ash/policy/status_collector/device_status_collector.cc +++ b/chrome/browser/ash/policy/status_collector/device_status_collector.cc
@@ -21,12 +21,12 @@ #include "ash/components/arc/session/arc_bridge_service.h" #include "ash/components/arc/session/arc_service_manager.h" #include "ash/constants/ash_features.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/feature_list.h" #include "base/files/file_enumerator.h" #include "base/files/file_util.h" #include "base/format_macros.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_refptr.h"
diff --git a/chrome/browser/ash/policy/status_collector/device_status_collector.h b/chrome/browser/ash/policy/status_collector/device_status_collector.h index 87dc5cb..06d1a3f 100644 --- a/chrome/browser/ash/policy/status_collector/device_status_collector.h +++ b/chrome/browser/ash/policy/status_collector/device_status_collector.h
@@ -13,9 +13,9 @@ #include <utility> #include <vector> -#include "base/callback_forward.h" #include "base/callback_list.h" #include "base/containers/circular_deque.h" +#include "base/functional/callback_forward.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/scoped_observation.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 de0b73d2..01173f6 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
@@ -14,10 +14,10 @@ #include <vector> #include "ash/constants/ash_features.h" -#include "base/bind.h" #include "base/environment.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/memory/ptr_util.h"
diff --git a/chrome/browser/ash/policy/status_collector/enterprise_activity_storage.cc b/chrome/browser/ash/policy/status_collector/enterprise_activity_storage.cc index 7cd1de9..a004a28 100644 --- a/chrome/browser/ash/policy/status_collector/enterprise_activity_storage.cc +++ b/chrome/browser/ash/policy/status_collector/enterprise_activity_storage.cc
@@ -10,7 +10,7 @@ #include <map> #include <set> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/values.h" #include "components/prefs/pref_service.h" #include "components/prefs/scoped_user_pref_update.h"
diff --git a/chrome/browser/ash/policy/status_collector/status_collector.h b/chrome/browser/ash/policy/status_collector/status_collector.h index 5fdf155..8862997 100644 --- a/chrome/browser/ash/policy/status_collector/status_collector.h +++ b/chrome/browser/ash/policy/status_collector/status_collector.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/threading/thread_checker.h" #include "base/time/clock.h" #include "base/time/default_clock.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 5d2f675..102b268 100644 --- a/chrome/browser/ash/policy/status_collector/status_collector_state.cc +++ b/chrome/browser/ash/policy/status_collector/status_collector_state.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/task_traits.h" namespace policy {
diff --git a/chrome/browser/ash/policy/uploading/heartbeat_scheduler.cc b/chrome/browser/ash/policy/uploading/heartbeat_scheduler.cc index 8b2b74f..ed2ae2df 100644 --- a/chrome/browser/ash/policy/uploading/heartbeat_scheduler.cc +++ b/chrome/browser/ash/policy/uploading/heartbeat_scheduler.cc
@@ -7,9 +7,9 @@ #include <memory> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/metrics/histogram_macros.h" #include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/ash/policy/uploading/status_uploader.cc b/chrome/browser/ash/policy/uploading/status_uploader.cc index 2730d4f5..3ee169e 100644 --- a/chrome/browser/ash/policy/uploading/status_uploader.cc +++ b/chrome/browser/ash/policy/uploading/status_uploader.cc
@@ -8,8 +8,8 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/syslog_logging.h" #include "base/system/sys_info.h"
diff --git a/chrome/browser/ash/policy/uploading/status_uploader.h b/chrome/browser/ash/policy/uploading/status_uploader.h index 7a9192b..9da94bfa 100644 --- a/chrome/browser/ash/policy/uploading/status_uploader.h +++ b/chrome/browser/ash/policy/uploading/status_uploader.h
@@ -7,9 +7,9 @@ #include <memory> -#include "base/bind.h" #include "base/callback_list.h" #include "base/cancelable_callback.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h"
diff --git a/chrome/browser/ash/policy/uploading/status_uploader_unittest.cc b/chrome/browser/ash/policy/uploading/status_uploader_unittest.cc index 6300787..41224dd3 100644 --- a/chrome/browser/ash/policy/uploading/status_uploader_unittest.cc +++ b/chrome/browser/ash/policy/uploading/status_uploader_unittest.cc
@@ -7,9 +7,9 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/test/gmock_move_support.h" #include "base/test/test_simple_task_runner.h"
diff --git a/chrome/browser/ash/policy/uploading/system_log_uploader.cc b/chrome/browser/ash/policy/uploading/system_log_uploader.cc index 4fa5cbe..410b307 100644 --- a/chrome/browser/ash/policy/uploading/system_log_uploader.cc +++ b/chrome/browser/ash/policy/uploading/system_log_uploader.cc
@@ -9,12 +9,12 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/files/file_util.h" #include "base/files/scoped_file.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/histogram_macros.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/ash/policy/uploading/upload_job_impl.cc b/chrome/browser/ash/policy/uploading/upload_job_impl.cc index 70f7477..0307dda 100644 --- a/chrome/browser/ash/policy/uploading/upload_job_impl.cc +++ b/chrome/browser/ash/policy/uploading/upload_job_impl.cc
@@ -10,7 +10,7 @@ #include <set> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/strings/stringprintf.h" #include "base/syslog_logging.h"
diff --git a/chrome/browser/ash/policy/uploading/upload_job_unittest.cc b/chrome/browser/ash/policy/uploading/upload_job_unittest.cc index 71bb76b..3e2e443 100644 --- a/chrome/browser/ash/policy/uploading/upload_job_unittest.cc +++ b/chrome/browser/ash/policy/uploading/upload_job_unittest.cc
@@ -10,9 +10,9 @@ #include <set> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/queue.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/memory/ptr_util.h" #include "base/run_loop.h"
diff --git a/chrome/browser/ash/power/auto_screen_brightness/adapter.cc b/chrome/browser/ash/power/auto_screen_brightness/adapter.cc index 9b775a3..2f820fe 100644 --- a/chrome/browser/ash/power/auto_screen_brightness/adapter.cc +++ b/chrome/browser/ash/power/auto_screen_brightness/adapter.cc
@@ -8,7 +8,7 @@ #include "ash/constants/ash_features.h" #include "ash/constants/ash_pref_names.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/ptr_util.h" #include "base/metrics/field_trial_params.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 68edcbd..b5c0d07 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
@@ -4,9 +4,9 @@ #include "chrome/browser/ash/power/auto_screen_brightness/als_file_reader.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/metrics/histogram_macros.h" #include "base/process/launch.h"
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 8cacba7..8f4980f2 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
@@ -7,9 +7,9 @@ #include <cmath> #include "ash/constants/ash_features.h" -#include "base/bind.h" #include "base/check_op.h" #include "base/cxx17_backports.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/metrics/field_trial_params.h" #include "base/metrics/histogram_macros.h"
diff --git a/chrome/browser/ash/power/auto_screen_brightness/light_provider_mojo.cc b/chrome/browser/ash/power/auto_screen_brightness/light_provider_mojo.cc index ae4ba48..f9b6510 100644 --- a/chrome/browser/ash/power/auto_screen_brightness/light_provider_mojo.cc +++ b/chrome/browser/ash/power/auto_screen_brightness/light_provider_mojo.cc
@@ -7,8 +7,8 @@ #include <iterator> #include <utility> -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/task/sequenced_task_runner.h" #include "base/time/time.h" #include "chromeos/components/sensors/ash/sensor_hal_dispatcher.h"
diff --git a/chrome/browser/ash/power/auto_screen_brightness/light_samples_observer.cc b/chrome/browser/ash/power/auto_screen_brightness/light_samples_observer.cc index f3cc00be..126b651 100644 --- a/chrome/browser/ash/power/auto_screen_brightness/light_samples_observer.cc +++ b/chrome/browser/ash/power/auto_screen_brightness/light_samples_observer.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/power/auto_screen_brightness/utils.h" namespace ash {
diff --git a/chrome/browser/ash/power/auto_screen_brightness/light_samples_observer_unittest.cc b/chrome/browser/ash/power/auto_screen_brightness/light_samples_observer_unittest.cc index 8d7055c..da96724 100644 --- a/chrome/browser/ash/power/auto_screen_brightness/light_samples_observer_unittest.cc +++ b/chrome/browser/ash/power/auto_screen_brightness/light_samples_observer_unittest.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/task_environment.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 f4ac7b3..569d8e4 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
@@ -8,9 +8,9 @@ #include <vector> #include "ash/constants/ash_features.h" -#include "base/bind.h" #include "base/check_op.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/json/json_reader.h" #include "base/json/json_value_converter.h" #include "base/memory/ptr_util.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 7913dc97..cc5917e7 100644 --- a/chrome/browser/ash/power/auto_screen_brightness/modeller_impl.cc +++ b/chrome/browser/ash/power/auto_screen_brightness/modeller_impl.cc
@@ -7,10 +7,10 @@ #include <cmath> #include "ash/constants/ash_features.h" -#include "base/bind.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/important_file_writer.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/ptr_util.h" #include "base/metrics/field_trial_params.h"
diff --git a/chrome/browser/ash/power/cpu_data_collector.cc b/chrome/browser/ash/power/cpu_data_collector.cc index 174c734..0b55fa5 100644 --- a/chrome/browser/ash/power/cpu_data_collector.cc +++ b/chrome/browser/ash/power/cpu_data_collector.cc
@@ -8,7 +8,7 @@ #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h"
diff --git a/chrome/browser/ash/power/extension_event_observer.cc b/chrome/browser/ash/power/extension_event_observer.cc index 8d73530..c0cf35f 100644 --- a/chrome/browser/ash/power/extension_event_observer.cc +++ b/chrome/browser/ash/power/extension_event_observer.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/ptr_util.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/ash/power/extension_event_observer.h b/chrome/browser/ash/power/extension_event_observer.h index 3a07c73..6470dbb 100644 --- a/chrome/browser/ash/power/extension_event_observer.h +++ b/chrome/browser/ash/power/extension_event_observer.h
@@ -12,8 +12,8 @@ #include <string> #include <unordered_map> -#include "base/callback.h" #include "base/cancelable_callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/scoped_multi_source_observation.h" #include "base/time/time.h"
diff --git a/chrome/browser/ash/power/freezer_cgroup_process_manager.cc b/chrome/browser/ash/power/freezer_cgroup_process_manager.cc index e00395e7..789a581 100644 --- a/chrome/browser/ash/power/freezer_cgroup_process_manager.cc +++ b/chrome/browser/ash/power/freezer_cgroup_process_manager.cc
@@ -6,9 +6,9 @@ #include <string> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/strings/string_number_conversions.h" #include "base/system/sys_info.h"
diff --git a/chrome/browser/ash/power/freezer_cgroup_process_manager.h b/chrome/browser/ash/power/freezer_cgroup_process_manager.h index d47a46f..fdcf827 100644 --- a/chrome/browser/ash/power/freezer_cgroup_process_manager.h +++ b/chrome/browser/ash/power/freezer_cgroup_process_manager.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "base/process/process_handle.h" #include "chrome/browser/ash/power/renderer_freezer.h"
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 cd8ffab9..ac65b2f 100644 --- a/chrome/browser/ash/power/ml/adaptive_screen_brightness_manager.cc +++ b/chrome/browser/ash/power/ml/adaptive_screen_brightness_manager.cc
@@ -8,7 +8,7 @@ #include <utility> #include "ash/constants/ash_pref_names.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/process/launch.h" #include "base/time/time.h" #include "base/timer/timer.h"
diff --git a/chrome/browser/ash/power/ml/smart_dim/builtin_worker.cc b/chrome/browser/ash/power/ml/smart_dim/builtin_worker.cc index 1f58fe32..55bf1ad 100644 --- a/chrome/browser/ash/power/ml/smart_dim/builtin_worker.cc +++ b/chrome/browser/ash/power/ml/smart_dim/builtin_worker.cc
@@ -5,8 +5,8 @@ #include "chrome/browser/ash/power/ml/smart_dim/builtin_worker.h" #include "ash/constants/ash_features.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ref_counted_memory.h" #include "chrome/browser/ash/power/ml/smart_dim/ml_agent_util.h" #include "chrome/grit/browser_resources.h"
diff --git a/chrome/browser/ash/power/ml/smart_dim/download_worker.cc b/chrome/browser/ash/power/ml/smart_dim/download_worker.cc index 5a1e67da..8bd69bf 100644 --- a/chrome/browser/ash/power/ml/smart_dim/download_worker.cc +++ b/chrome/browser/ash/power/ml/smart_dim/download_worker.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ash/power/ml/smart_dim/download_worker.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/task_traits.h" #include "base/threading/sequenced_task_runner_handle.h" #include "chrome/browser/ash/power/ml/smart_dim/metrics.h"
diff --git a/chrome/browser/ash/power/ml/user_activity_controller.h b/chrome/browser/ash/power/ml/user_activity_controller.h index ab7a894..b786924d 100644 --- a/chrome/browser/ash/power/ml/user_activity_controller.h +++ b/chrome/browser/ash/power/ml/user_activity_controller.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/ash/power/ml/idle_event_notifier.h" #include "chrome/browser/ash/power/ml/user_activity_manager.h" #include "chrome/browser/ash/power/ml/user_activity_ukm_logger_impl.h"
diff --git a/chrome/browser/ash/power/ml/user_activity_manager.cc b/chrome/browser/ash/power/ml/user_activity_manager.cc index c4d7e83..1e0fa15 100644 --- a/chrome/browser/ash/power/ml/user_activity_manager.cc +++ b/chrome/browser/ash/power/ml/user_activity_manager.cc
@@ -11,7 +11,7 @@ #include "ash/constants/ash_pref_names.h" #include "ash/shell.h" #include "ash/wm/mru_window_tracker.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/field_trial_params.h" #include "base/metrics/histogram_macros.h" #include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/ash/power/ml/user_activity_manager_unittest.cc b/chrome/browser/ash/power/ml/user_activity_manager_unittest.cc index 41d96ff..e7e79cd 100644 --- a/chrome/browser/ash/power/ml/user_activity_manager_unittest.cc +++ b/chrome/browser/ash/power/ml/user_activity_manager_unittest.cc
@@ -10,8 +10,8 @@ #include <vector> #include "ash/constants/ash_features.h" -#include "base/bind.h" #include "base/cancelable_callback.h" +#include "base/functional/bind.h" #include "base/task/sequenced_task_runner.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h"
diff --git a/chrome/browser/ash/power/process_data_collector.cc b/chrome/browser/ash/power/process_data_collector.cc index a72b705..e3419433 100644 --- a/chrome/browser/ash/power/process_data_collector.cc +++ b/chrome/browser/ash/power/process_data_collector.cc
@@ -16,12 +16,12 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/check_op.h" #include "base/cpu_reduction_experiment.h" #include "base/files/file_enumerator.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/i18n/number_formatting.h" #include "base/notreached.h" #include "base/ranges/algorithm.h"
diff --git a/chrome/browser/ash/power/process_data_collector_unittest.cc b/chrome/browser/ash/power/process_data_collector_unittest.cc index d8eec6f..2fcba20 100644 --- a/chrome/browser/ash/power/process_data_collector_unittest.cc +++ b/chrome/browser/ash/power/process_data_collector_unittest.cc
@@ -14,11 +14,11 @@ #include <unordered_set> #include <vector> -#include "base/bind.h" #include "base/files/file.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" #include "base/format_macros.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/strings/string_piece.h" #include "base/strings/string_util.h"
diff --git a/chrome/browser/ash/power/renderer_freezer.cc b/chrome/browser/ash/power/renderer_freezer.cc index 1a3de0a..5768ba6 100644 --- a/chrome/browser/ash/power/renderer_freezer.cc +++ b/chrome/browser/ash/power/renderer_freezer.cc
@@ -7,7 +7,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/process/process_handle.h" #include "chrome/browser/chrome_notification_types.h"
diff --git a/chrome/browser/ash/power/renderer_freezer.h b/chrome/browser/ash/power/renderer_freezer.h index 4567747..526cae95 100644 --- a/chrome/browser/ash/power/renderer_freezer.h +++ b/chrome/browser/ash/power/renderer_freezer.h
@@ -8,8 +8,8 @@ #include <memory> #include <set> -#include "base/callback.h" #include "base/cancelable_callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/process/kill.h" #include "chromeos/dbus/power/power_manager_client.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 b4d94e09..bb43f76 100644 --- a/chrome/browser/ash/power/smart_charging/smart_charging_manager.cc +++ b/chrome/browser/ash/power/smart_charging/smart_charging_manager.cc
@@ -6,10 +6,10 @@ #include <memory> -#include "base/bind.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/important_file_writer.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/metrics/histogram_macros.h" #include "base/task/task_traits.h"
diff --git a/chrome/browser/ash/preferences.cc b/chrome/browser/ash/preferences.cc index cbdc18b..0f5508c 100644 --- a/chrome/browser/ash/preferences.cc +++ b/chrome/browser/ash/preferences.cc
@@ -13,9 +13,9 @@ #include "ash/constants/ash_switches.h" #include "ash/public/ash_interfaces.h" #include "ash/public/cpp/ash_prefs.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/i18n/time_formatting.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h"
diff --git a/chrome/browser/ash/printing/automatic_usb_printer_configurer.cc b/chrome/browser/ash/printing/automatic_usb_printer_configurer.cc index 41d30fa..76ca605d 100644 --- a/chrome/browser/ash/printing/automatic_usb_printer_configurer.cc +++ b/chrome/browser/ash/printing/automatic_usb_printer_configurer.cc
@@ -7,7 +7,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "chrome/browser/ash/printing/usb_printer_notification_controller.h"
diff --git a/chrome/browser/ash/printing/bulk_printers_calculator.cc b/chrome/browser/ash/printing/bulk_printers_calculator.cc index 500a00cc81..cdfc8fdc 100644 --- a/chrome/browser/ash/printing/bulk_printers_calculator.cc +++ b/chrome/browser/ash/printing/bulk_printers_calculator.cc
@@ -6,8 +6,8 @@ #include <set> -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/json/json_reader.h" #include "base/logging.h" #include "base/memory/ref_counted.h"
diff --git a/chrome/browser/ash/printing/bulk_printers_calculator_unittest.cc b/chrome/browser/ash/printing/bulk_printers_calculator_unittest.cc index 9406666d..35f28a7 100644 --- a/chrome/browser/ash/printing/bulk_printers_calculator_unittest.cc +++ b/chrome/browser/ash/printing/bulk_printers_calculator_unittest.cc
@@ -7,7 +7,7 @@ #include <string> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/test/task_environment.h" #include "chromeos/printing/printer_configuration.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/ash/printing/calculators_policies_binder.h b/chrome/browser/ash/printing/calculators_policies_binder.h index 28e0233..bf45d1d1 100644 --- a/chrome/browser/ash/printing/calculators_policies_binder.h +++ b/chrome/browser/ash/printing/calculators_policies_binder.h
@@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ash/printing/bulk_printers_calculator.h"
diff --git a/chrome/browser/ash/printing/cups_print_job_manager_impl.cc b/chrome/browser/ash/printing/cups_print_job_manager_impl.cc index 9446a0f..2eb2f12 100644 --- a/chrome/browser/ash/printing/cups_print_job_manager_impl.cc +++ b/chrome/browser/ash/printing/cups_print_job_manager_impl.cc
@@ -10,9 +10,9 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/check_op.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "base/notreached.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ash/printing/cups_printers_manager.cc b/chrome/browser/ash/printing/cups_printers_manager.cc index b9b1902..ada848bb 100644 --- a/chrome/browser/ash/printing/cups_printers_manager.cc +++ b/chrome/browser/ash/printing/cups_printers_manager.cc
@@ -8,7 +8,7 @@ #include <utility> #include "ash/public/cpp/network_config_service.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "base/observer_list.h" #include "base/scoped_observation.h"
diff --git a/chrome/browser/ash/printing/cups_printers_manager.h b/chrome/browser/ash/printing/cups_printers_manager.h index c84ea4cd..3ba2ebb 100644 --- a/chrome/browser/ash/printing/cups_printers_manager.h +++ b/chrome/browser/ash/printing/cups_printers_manager.h
@@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/ref_counted.h" #include "chrome/browser/ash/printing/print_servers_manager.h" #include "chrome/browser/ash/printing/printer_installation_manager.h"
diff --git a/chrome/browser/ash/printing/cups_printers_manager_unittest.cc b/chrome/browser/ash/printing/cups_printers_manager_unittest.cc index 57fec443..419a25e 100644 --- a/chrome/browser/ash/printing/cups_printers_manager_unittest.cc +++ b/chrome/browser/ash/printing/cups_printers_manager_unittest.cc
@@ -11,11 +11,11 @@ #include <unordered_set> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/contains.h" #include "base/containers/flat_map.h" #include "base/containers/flat_set.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/task/sequenced_task_runner.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/task_environment.h"
diff --git a/chrome/browser/ash/printing/enterprise_printers_provider_unittest.cc b/chrome/browser/ash/printing/enterprise_printers_provider_unittest.cc index d229573..1088cd23 100644 --- a/chrome/browser/ash/printing/enterprise_printers_provider_unittest.cc +++ b/chrome/browser/ash/printing/enterprise_printers_provider_unittest.cc
@@ -8,8 +8,8 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/debug/dump_without_crashing.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/scoped_observation.h" #include "base/strings/string_util.h"
diff --git a/chrome/browser/ash/printing/fake_cups_print_job_manager.cc b/chrome/browser/ash/printing/fake_cups_print_job_manager.cc index d491618a..36417c4 100644 --- a/chrome/browser/ash/printing/fake_cups_print_job_manager.cc +++ b/chrome/browser/ash/printing/fake_cups_print_job_manager.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/sequenced_task_runner.h" #include "chrome/browser/ash/printing/cups_print_job.h" #include "chrome/browser/ash/printing/cups_print_job_manager.h"
diff --git a/chrome/browser/ash/printing/history/mock_print_job_history_service.h b/chrome/browser/ash/printing/history/mock_print_job_history_service.h index 9b9a928b..3f3fad7 100644 --- a/chrome/browser/ash/printing/history/mock_print_job_history_service.h +++ b/chrome/browser/ash/printing/history/mock_print_job_history_service.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_ASH_PRINTING_HISTORY_MOCK_PRINT_JOB_HISTORY_SERVICE_H_ #define CHROME_BROWSER_ASH_PRINTING_HISTORY_MOCK_PRINT_JOB_HISTORY_SERVICE_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/ash/printing/history/print_job_history_service.h" #include "testing/gmock/include/gmock/gmock.h"
diff --git a/chrome/browser/ash/printing/history/print_job_database.h b/chrome/browser/ash/printing/history/print_job_database.h index ee702c2de..9277496 100644 --- a/chrome/browser/ash/printing/history/print_job_database.h +++ b/chrome/browser/ash/printing/history/print_job_database.h
@@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" namespace ash { namespace printing::proto {
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 8f758d87..5faab38 100644 --- a/chrome/browser/ash/printing/history/print_job_database_impl.cc +++ b/chrome/browser/ash/printing/history/print_job_database_impl.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/ash/printing/history/print_job_database_impl_unittest.cc b/chrome/browser/ash/printing/history/print_job_database_impl_unittest.cc index 21b0d18..1332a5dd 100644 --- a/chrome/browser/ash/printing/history/print_job_database_impl_unittest.cc +++ b/chrome/browser/ash/printing/history/print_job_database_impl_unittest.cc
@@ -4,9 +4,9 @@ #include "chrome/browser/ash/printing/history/print_job_database_impl.h" -#include "base/bind.h" #include "base/containers/contains.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/task_environment.h"
diff --git a/chrome/browser/ash/printing/history/print_job_history_cleaner.cc b/chrome/browser/ash/printing/history/print_job_history_cleaner.cc index 9c198ab7e..c51c90b 100644 --- a/chrome/browser/ash/printing/history/print_job_history_cleaner.cc +++ b/chrome/browser/ash/printing/history/print_job_history_cleaner.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ash/printing/history/print_job_history_cleaner.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "base/task/sequenced_task_runner.h" #include "base/time/clock.h"
diff --git a/chrome/browser/ash/printing/history/print_job_history_cleaner_unittest.cc b/chrome/browser/ash/printing/history/print_job_history_cleaner_unittest.cc index 12d5b2d..fb327f5d 100644 --- a/chrome/browser/ash/printing/history/print_job_history_cleaner_unittest.cc +++ b/chrome/browser/ash/printing/history/print_job_history_cleaner_unittest.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ash/printing/history/print_job_history_cleaner.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/test/task_environment.h" #include "base/time/clock.h"
diff --git a/chrome/browser/ash/printing/history/print_job_history_service_impl.cc b/chrome/browser/ash/printing/history/print_job_history_service_impl.cc index 261d86f..8816999a 100644 --- a/chrome/browser/ash/printing/history/print_job_history_service_impl.cc +++ b/chrome/browser/ash/printing/history/print_job_history_service_impl.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ash/printing/history/print_job_history_service_impl.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/guid.h" #include "base/memory/weak_ptr.h" #include "base/metrics/histogram_macros.h"
diff --git a/chrome/browser/ash/printing/history/print_job_reporting_service_impl.cc b/chrome/browser/ash/printing/history/print_job_reporting_service_impl.cc index ba36f78..dd177eec 100644 --- a/chrome/browser/ash/printing/history/print_job_reporting_service_impl.cc +++ b/chrome/browser/ash/printing/history/print_job_reporting_service_impl.cc
@@ -7,10 +7,10 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/callback_list.h" #include "base/containers/queue.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/weak_ptr.h" #include "base/strings/string_piece.h" #include "base/task/sequenced_task_runner.h"
diff --git a/chrome/browser/ash/printing/history/print_job_reporting_service_unittest.cc b/chrome/browser/ash/printing/history/print_job_reporting_service_unittest.cc index bc5fce9f..bc41483 100644 --- a/chrome/browser/ash/printing/history/print_job_reporting_service_unittest.cc +++ b/chrome/browser/ash/printing/history/print_job_reporting_service_unittest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ash/printing/history/print_job_reporting_service.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "base/time/time.h"
diff --git a/chrome/browser/ash/printing/history/test_print_job_database.cc b/chrome/browser/ash/printing/history/test_print_job_database.cc index 911afe3..1086eb72 100644 --- a/chrome/browser/ash/printing/history/test_print_job_database.cc +++ b/chrome/browser/ash/printing/history/test_print_job_database.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ash/printing/history/test_print_job_database.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/ash/printing/history/print_job_info.pb.h" namespace ash {
diff --git a/chrome/browser/ash/printing/history/test_print_job_history_service_observer.h b/chrome/browser/ash/printing/history/test_print_job_history_service_observer.h index fe180c11..026258ed 100644 --- a/chrome/browser/ash/printing/history/test_print_job_history_service_observer.h +++ b/chrome/browser/ash/printing/history/test_print_job_history_service_observer.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_ASH_PRINTING_HISTORY_TEST_PRINT_JOB_HISTORY_SERVICE_OBSERVER_H_ #define CHROME_BROWSER_ASH_PRINTING_HISTORY_TEST_PRINT_JOB_HISTORY_SERVICE_OBSERVER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/ash/printing/history/print_job_history_service.h" namespace ash {
diff --git a/chrome/browser/ash/printing/oauth2/authorization_server_data.cc b/chrome/browser/ash/printing/oauth2/authorization_server_data.cc index e4f8b753..314242a 100644 --- a/chrome/browser/ash/printing/oauth2/authorization_server_data.cc +++ b/chrome/browser/ash/printing/oauth2/authorization_server_data.cc
@@ -9,8 +9,8 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "chrome/browser/ash/printing/oauth2/client_ids_database.h" #include "chrome/browser/ash/printing/oauth2/constants.h"
diff --git a/chrome/browser/ash/printing/oauth2/authorization_server_session.cc b/chrome/browser/ash/printing/oauth2/authorization_server_session.cc index d10f107..bf8f1e4 100644 --- a/chrome/browser/ash/printing/oauth2/authorization_server_session.cc +++ b/chrome/browser/ash/printing/oauth2/authorization_server_session.cc
@@ -8,8 +8,8 @@ #include <string> #include <vector> -#include "base/bind.h" #include "base/containers/flat_set.h" +#include "base/functional/bind.h" #include "base/strings/string_split.h" #include "chrome/browser/ash/printing/oauth2/constants.h" #include "chrome/browser/ash/printing/oauth2/http_exchange.h"
diff --git a/chrome/browser/ash/printing/oauth2/authorization_server_session.h b/chrome/browser/ash/printing/oauth2/authorization_server_session.h index a19aeed..9e4c326 100644 --- a/chrome/browser/ash/printing/oauth2/authorization_server_session.h +++ b/chrome/browser/ash/printing/oauth2/authorization_server_session.h
@@ -8,8 +8,8 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/containers/flat_set.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "chrome/browser/ash/printing/oauth2/http_exchange.h" #include "chrome/browser/ash/printing/oauth2/status_code.h"
diff --git a/chrome/browser/ash/printing/oauth2/authorization_zone_impl.cc b/chrome/browser/ash/printing/oauth2/authorization_zone_impl.cc index 2dc544b..725652a 100644 --- a/chrome/browser/ash/printing/oauth2/authorization_zone_impl.cc +++ b/chrome/browser/ash/printing/oauth2/authorization_zone_impl.cc
@@ -11,11 +11,11 @@ #include <vector> #include "base/base64.h" -#include "base/bind.h" #include "base/check_op.h" #include "base/containers/adapters.h" #include "base/containers/flat_map.h" #include "base/containers/flat_set.h" +#include "base/functional/bind.h" #include "base/ranges/algorithm.h" #include "base/strings/strcat.h" #include "base/strings/string_util.h"
diff --git a/chrome/browser/ash/printing/oauth2/authorization_zones_manager.cc b/chrome/browser/ash/printing/oauth2/authorization_zones_manager.cc index b332274..a5ff51b 100644 --- a/chrome/browser/ash/printing/oauth2/authorization_zones_manager.cc +++ b/chrome/browser/ash/printing/oauth2/authorization_zones_manager.cc
@@ -11,9 +11,9 @@ #include <utility> #include <vector> -#include "base/callback.h" #include "base/check.h" #include "base/containers/contains.h" +#include "base/functional/callback.h" #include "base/notreached.h" #include "base/strings/string_piece.h" #include "chrome/browser/ash/printing/oauth2/authorization_zone.h"
diff --git a/chrome/browser/ash/printing/oauth2/authorization_zones_manager.h b/chrome/browser/ash/printing/oauth2/authorization_zones_manager.h index 7e96d764..0d7a425 100644 --- a/chrome/browser/ash/printing/oauth2/authorization_zones_manager.h +++ b/chrome/browser/ash/printing/oauth2/authorization_zones_manager.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/ash/printing/oauth2/status_code.h" #include "components/keyed_service/core/keyed_service.h" #include "components/sync/model/model_type_store.h"
diff --git a/chrome/browser/ash/printing/oauth2/http_exchange.cc b/chrome/browser/ash/printing/oauth2/http_exchange.cc index 62d72ea..4239012c 100644 --- a/chrome/browser/ash/printing/oauth2/http_exchange.cc +++ b/chrome/browser/ash/printing/oauth2/http_exchange.cc
@@ -7,7 +7,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/notreached.h"
diff --git a/chrome/browser/ash/printing/oauth2/http_exchange.h b/chrome/browser/ash/printing/oauth2/http_exchange.h index 62b1080d..36a45fd 100644 --- a/chrome/browser/ash/printing/oauth2/http_exchange.h +++ b/chrome/browser/ash/printing/oauth2/http_exchange.h
@@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "base/strings/stringprintf.h" #include "base/values.h"
diff --git a/chrome/browser/ash/printing/oauth2/http_exchange_unittest.cc b/chrome/browser/ash/printing/oauth2/http_exchange_unittest.cc index 3c16608a..09c4227 100644 --- a/chrome/browser/ash/printing/oauth2/http_exchange_unittest.cc +++ b/chrome/browser/ash/printing/oauth2/http_exchange_unittest.cc
@@ -7,7 +7,7 @@ #include <string> #include <utility> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/test/task_environment.h" #include "net/traffic_annotation/network_traffic_annotation_test_helper.h"
diff --git a/chrome/browser/ash/printing/oauth2/ipp_endpoint_token_fetcher.cc b/chrome/browser/ash/printing/oauth2/ipp_endpoint_token_fetcher.cc index 29a53ff..94312691 100644 --- a/chrome/browser/ash/printing/oauth2/ipp_endpoint_token_fetcher.cc +++ b/chrome/browser/ash/printing/oauth2/ipp_endpoint_token_fetcher.cc
@@ -7,8 +7,8 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/containers/flat_set.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/printing/oauth2/http_exchange.h" #include "chrome/browser/ash/printing/oauth2/status_code.h" #include "chromeos/printing/uri.h"
diff --git a/chrome/browser/ash/printing/oauth2/ipp_endpoint_token_fetcher.h b/chrome/browser/ash/printing/oauth2/ipp_endpoint_token_fetcher.h index be3094d..96fe3136 100644 --- a/chrome/browser/ash/printing/oauth2/ipp_endpoint_token_fetcher.h +++ b/chrome/browser/ash/printing/oauth2/ipp_endpoint_token_fetcher.h
@@ -8,8 +8,8 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/containers/flat_set.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "chrome/browser/ash/printing/oauth2/http_exchange.h" #include "chrome/browser/ash/printing/oauth2/status_code.h"
diff --git a/chrome/browser/ash/printing/oauth2/profile_auth_servers_sync_bridge.cc b/chrome/browser/ash/printing/oauth2/profile_auth_servers_sync_bridge.cc index 76e4203..b8becc8 100644 --- a/chrome/browser/ash/printing/oauth2/profile_auth_servers_sync_bridge.cc +++ b/chrome/browser/ash/printing/oauth2/profile_auth_servers_sync_bridge.cc
@@ -9,9 +9,9 @@ #include <string> #include <vector> -#include "base/bind.h" #include "base/check.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/ptr_util.h" #include "chrome/common/channel_info.h"
diff --git a/chrome/browser/ash/printing/oauth2/status_code.h b/chrome/browser/ash/printing/oauth2/status_code.h index 707ff3c5..0b9459e4 100644 --- a/chrome/browser/ash/printing/oauth2/status_code.h +++ b/chrome/browser/ash/printing/oauth2/status_code.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/strings/string_piece.h" namespace ash::printing::oauth2 {
diff --git a/chrome/browser/ash/printing/oauth2/test_authorization_server.cc b/chrome/browser/ash/printing/oauth2/test_authorization_server.cc index 1dce2a0..8fb886d2 100644 --- a/chrome/browser/ash/printing/oauth2/test_authorization_server.cc +++ b/chrome/browser/ash/printing/oauth2/test_authorization_server.cc
@@ -8,10 +8,10 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/check.h" #include "base/containers/flat_map.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/memory/scoped_refptr.h"
diff --git a/chrome/browser/ash/printing/oauth2/test_authorization_server.h b/chrome/browser/ash/printing/oauth2/test_authorization_server.h index 76c8cbf..9996ed2 100644 --- a/chrome/browser/ash/printing/oauth2/test_authorization_server.h +++ b/chrome/browser/ash/printing/oauth2/test_authorization_server.h
@@ -7,9 +7,9 @@ #include <string> -#include "base/callback.h" #include "base/containers/flat_map.h" #include "base/containers/queue.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/test/task_environment.h" #include "base/values.h"
diff --git a/chrome/browser/ash/printing/oauth2/test_authorization_server_unittest.cc b/chrome/browser/ash/printing/oauth2/test_authorization_server_unittest.cc index c82f9dea..298fdc0 100644 --- a/chrome/browser/ash/printing/oauth2/test_authorization_server_unittest.cc +++ b/chrome/browser/ash/printing/oauth2/test_authorization_server_unittest.cc
@@ -8,9 +8,9 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/check.h" #include "base/containers/flat_map.h" +#include "base/functional/bind.h" #include "base/test/values_test_util.h" #include "base/values.h" #include "net/http/http_status_code.h"
diff --git a/chrome/browser/ash/printing/print_management/printing_manager.cc b/chrome/browser/ash/printing/print_management/printing_manager.cc index 7f99759..3a9cce8 100644 --- a/chrome/browser/ash/printing/print_management/printing_manager.cc +++ b/chrome/browser/ash/printing/print_management/printing_manager.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ash/printing/print_management/printing_manager.h" -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/printing/cups_print_job.h" #include "chrome/browser/ash/printing/history/print_job_history_service.h" #include "chrome/browser/ash/printing/history/print_job_history_service_factory.h"
diff --git a/chrome/browser/ash/printing/print_servers_manager.cc b/chrome/browser/ash/printing/print_servers_manager.cc index 01245dc4a5..53885d8 100644 --- a/chrome/browser/ash/printing/print_servers_manager.cc +++ b/chrome/browser/ash/printing/print_servers_manager.cc
@@ -8,7 +8,7 @@ #include <utility> #include "ash/public/cpp/network_config_service.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "base/observer_list.h" #include "chrome/browser/ash/printing/cups_printer_status_creator.h"
diff --git a/chrome/browser/ash/printing/print_servers_policy_provider.cc b/chrome/browser/ash/printing/print_servers_policy_provider.cc index c7520ea..e40d9aac 100644 --- a/chrome/browser/ash/printing/print_servers_policy_provider.cc +++ b/chrome/browser/ash/printing/print_servers_policy_provider.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ash/printing/print_servers_policy_provider.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/printing/print_servers_provider.h" #include "chrome/browser/ash/printing/print_servers_provider_factory.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/ash/printing/print_servers_policy_provider.h b/chrome/browser/ash/printing/print_servers_policy_provider.h index bd58136..9027c99 100644 --- a/chrome/browser/ash/printing/print_servers_policy_provider.h +++ b/chrome/browser/ash/printing/print_servers_policy_provider.h
@@ -7,7 +7,7 @@ #include <map> #include <memory> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ash/printing/print_server.h" #include "chrome/browser/ash/printing/print_servers_provider.h"
diff --git a/chrome/browser/ash/printing/print_servers_provider.cc b/chrome/browser/ash/printing/print_servers_provider.cc index c76d1ac..e559f7a 100644 --- a/chrome/browser/ash/printing/print_servers_provider.cc +++ b/chrome/browser/ash/printing/print_servers_provider.cc
@@ -7,8 +7,8 @@ #include <memory> #include <vector> -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/json/json_reader.h" #include "base/logging.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/ash/printing/print_servers_provider.h b/chrome/browser/ash/printing/print_servers_provider.h index abffbe8..e06bdba6 100644 --- a/chrome/browser/ash/printing/print_servers_provider.h +++ b/chrome/browser/ash/printing/print_servers_provider.h
@@ -9,7 +9,7 @@ #include <set> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ash/printing/print_server.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/chrome/browser/ash/printing/printer_authenticator.cc b/chrome/browser/ash/printing/printer_authenticator.cc index 312b63e9..b140a73 100644 --- a/chrome/browser/ash/printing/printer_authenticator.cc +++ b/chrome/browser/ash/printing/printer_authenticator.cc
@@ -8,8 +8,8 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/strings/string_piece.h" #include "chrome/browser/ash/printing/cups_printers_manager.h" #include "chrome/browser/ash/printing/oauth2/authorization_zones_manager.h"
diff --git a/chrome/browser/ash/printing/printer_configurer.cc b/chrome/browser/ash/printing/printer_configurer.cc index 381d39f..92646da 100644 --- a/chrome/browser/ash/printing/printer_configurer.cc +++ b/chrome/browser/ash/printing/printer_configurer.cc
@@ -9,10 +9,10 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" #include "base/containers/flat_map.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/hash/md5.h" #include "base/logging.h" #include "base/memory/ptr_util.h"
diff --git a/chrome/browser/ash/printing/printer_configurer.h b/chrome/browser/ash/printing/printer_configurer.h index f03e497..361f9e0f 100644 --- a/chrome/browser/ash/printing/printer_configurer.h +++ b/chrome/browser/ash/printing/printer_configurer.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "url/gurl.h" class Profile;
diff --git a/chrome/browser/ash/printing/printer_detector.h b/chrome/browser/ash/printing/printer_detector.h index 5831102..b1efd92 100644 --- a/chrome/browser/ash/printing/printer_detector.h +++ b/chrome/browser/ash/printing/printer_detector.h
@@ -7,7 +7,7 @@ #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "chromeos/chromeos_export.h" #include "chromeos/printing/ppd_provider.h" #include "chromeos/printing/printer_configuration.h"
diff --git a/chrome/browser/ash/printing/printer_info.h b/chrome/browser/ash/printing/printer_info.h index 0aa3cce..dc32685 100644 --- a/chrome/browser/ash/printing/printer_info.h +++ b/chrome/browser/ash/printing/printer_info.h
@@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "printing/printer_query_result.h" namespace chromeos {
diff --git a/chrome/browser/ash/printing/printer_info_cups.cc b/chrome/browser/ash/printing/printer_info_cups.cc index 55d398da..87d9512 100644 --- a/chrome/browser/ash/printing/printer_info_cups.cc +++ b/chrome/browser/ash/printing/printer_info_cups.cc
@@ -7,8 +7,8 @@ #include <array> #include <string> -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/metrics/histogram_functions.h" #include "base/ranges/algorithm.h"
diff --git a/chrome/browser/ash/printing/printer_info_stub.cc b/chrome/browser/ash/printing/printer_info_stub.cc index 7623744..af2a129 100644 --- a/chrome/browser/ash/printing/printer_info_stub.cc +++ b/chrome/browser/ash/printing/printer_info_stub.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ash/printing/printer_info.h" -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/task/sequenced_task_runner.h" #include "chromeos/printing/cups_printer_status.h" #include "printing/printer_status.h"
diff --git a/chrome/browser/ash/printing/printer_setup_util.cc b/chrome/browser/ash/printing/printer_setup_util.cc index 12422e8..4f978bd 100644 --- a/chrome/browser/ash/printing/printer_setup_util.cc +++ b/chrome/browser/ash/printing/printer_setup_util.cc
@@ -8,9 +8,9 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/metrics/histogram_functions.h" #include "base/task/task_traits.h"
diff --git a/chrome/browser/ash/printing/printer_setup_util.h b/chrome/browser/ash/printing/printer_setup_util.h index 4bab0a12..a7186a1 100644 --- a/chrome/browser/ash/printing/printer_setup_util.h +++ b/chrome/browser/ash/printing/printer_setup_util.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_ASH_PRINTING_PRINTER_SETUP_UTIL_H_ #define CHROME_BROWSER_ASH_PRINTING_PRINTER_SETUP_UTIL_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "chrome/browser/ash/printing/cups_printers_manager.h" #include "chrome/browser/ash/printing/printer_configurer.h" #include "chromeos/printing/printer_configuration.h"
diff --git a/chrome/browser/ash/printing/printers_sync_bridge.cc b/chrome/browser/ash/printing/printers_sync_bridge.cc index e7311d91..b97fe27 100644 --- a/chrome/browser/ash/printing/printers_sync_bridge.cc +++ b/chrome/browser/ash/printing/printers_sync_bridge.cc
@@ -7,8 +7,8 @@ #include <set> #include <utility> -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/metrics/histogram_functions.h" #include "chrome/browser/ash/printing/specifics_translation.h"
diff --git a/chrome/browser/ash/printing/printers_sync_bridge_unittest.cc b/chrome/browser/ash/printing/printers_sync_bridge_unittest.cc index 3e81fa7..bbf4a78 100644 --- a/chrome/browser/ash/printing/printers_sync_bridge_unittest.cc +++ b/chrome/browser/ash/printing/printers_sync_bridge_unittest.cc
@@ -6,8 +6,8 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/debug/dump_without_crashing.h" +#include "base/functional/bind.h" #include "base/test/task_environment.h" #include "chrome/browser/ash/printing/printers_sync_bridge.h" #include "components/sync/test/model_type_store_test_util.h"
diff --git a/chrome/browser/ash/printing/server_printers_fetcher.h b/chrome/browser/ash/printing/server_printers_fetcher.h index 01a056cb..35d0b50 100644 --- a/chrome/browser/ash/printing/server_printers_fetcher.h +++ b/chrome/browser/ash/printing/server_printers_fetcher.h
@@ -8,7 +8,7 @@ #include <memory> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/ash/printing/printer_detector.h" class GURL;
diff --git a/chrome/browser/ash/printing/synced_printers_manager_factory.cc b/chrome/browser/ash/printing/synced_printers_manager_factory.cc index e3817e96..0f8a3d6 100644 --- a/chrome/browser/ash/printing/synced_printers_manager_factory.cc +++ b/chrome/browser/ash/printing/synced_printers_manager_factory.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/printing/printers_sync_bridge.h" #include "chrome/browser/ash/printing/synced_printers_manager.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ash/printing/synced_printers_manager_unittest.cc b/chrome/browser/ash/printing/synced_printers_manager_unittest.cc index 68d9801..90dd89e2 100644 --- a/chrome/browser/ash/printing/synced_printers_manager_unittest.cc +++ b/chrome/browser/ash/printing/synced_printers_manager_unittest.cc
@@ -8,8 +8,8 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/debug/dump_without_crashing.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/scoped_observation.h" #include "base/strings/string_util.h"
diff --git a/chrome/browser/ash/printing/test_printer_configurer.cc b/chrome/browser/ash/printing/test_printer_configurer.cc index 87723a9..d55ed9ab 100644 --- a/chrome/browser/ash/printing/test_printer_configurer.cc +++ b/chrome/browser/ash/printing/test_printer_configurer.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ash/printing/test_printer_configurer.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/ash/printing/test_cups_printers_manager.h" #include "chromeos/printing/printer_configuration.h"
diff --git a/chrome/browser/ash/printing/usb_printer_detector.cc b/chrome/browser/ash/printing/usb_printer_detector.cc index ab12138..1425ad71 100644 --- a/chrome/browser/ash/printing/usb_printer_detector.cc +++ b/chrome/browser/ash/printing/usb_printer_detector.cc
@@ -10,8 +10,8 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/sequence_checker.h" #include "base/strings/strcat.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ash/printing/usb_printer_detector_unittest.cc b/chrome/browser/ash/printing/usb_printer_detector_unittest.cc index 0fd66d29..205e4ec 100644 --- a/chrome/browser/ash/printing/usb_printer_detector_unittest.cc +++ b/chrome/browser/ash/printing/usb_printer_detector_unittest.cc
@@ -7,7 +7,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/test/task_environment.h" #include "mojo/public/cpp/bindings/pending_remote.h"
diff --git a/chrome/browser/ash/printing/usb_printer_util.cc b/chrome/browser/ash/printing/usb_printer_util.cc index e7c3253..aaf34d0d 100644 --- a/chrome/browser/ash/printing/usb_printer_util.cc +++ b/chrome/browser/ash/printing/usb_printer_util.cc
@@ -13,8 +13,8 @@ #include <vector> #include "base/big_endian.h" -#include "base/callback_helpers.h" #include "base/containers/span.h" +#include "base/functional/callback_helpers.h" #include "base/hash/md5.h" #include "base/strings/string_piece.h" #include "base/strings/string_util.h"
diff --git a/chrome/browser/ash/printing/zeroconf_printer_detector_fuzzer.cc b/chrome/browser/ash/printing/zeroconf_printer_detector_fuzzer.cc index 612430d..d023b46 100644 --- a/chrome/browser/ash/printing/zeroconf_printer_detector_fuzzer.cc +++ b/chrome/browser/ash/printing/zeroconf_printer_detector_fuzzer.cc
@@ -10,7 +10,7 @@ #include <string> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/sequenced_task_runner.h" #include "base/test/task_environment.h" #include "chrome/browser/ash/printing/zeroconf_printer_detector.h"
diff --git a/chrome/browser/ash/printing/zeroconf_printer_detector_unittest.cc b/chrome/browser/ash/printing/zeroconf_printer_detector_unittest.cc index d8524498..456992b2 100644 --- a/chrome/browser/ash/printing/zeroconf_printer_detector_unittest.cc +++ b/chrome/browser/ash/printing/zeroconf_printer_detector_unittest.cc
@@ -13,7 +13,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/strcat.h" #include "base/strings/stringprintf.h" #include "base/test/task_environment.h"
diff --git a/chrome/browser/ash/process_snapshot_server.cc b/chrome/browser/ash/process_snapshot_server.cc index b6ec8dc1..97e06d1 100644 --- a/chrome/browser/ash/process_snapshot_server.cc +++ b/chrome/browser/ash/process_snapshot_server.cc
@@ -6,7 +6,7 @@ #include <algorithm> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/ash/profiles/profile_helper.cc b/chrome/browser/ash/profiles/profile_helper.cc index c397a3a..aaf89eb0 100644 --- a/chrome/browser/ash/profiles/profile_helper.cc +++ b/chrome/browser/ash/profiles/profile_helper.cc
@@ -11,9 +11,9 @@ #include "ash/constants/ash_switches.h" #include "base/barrier_closure.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/ranges/algorithm.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_piece.h"
diff --git a/chrome/browser/ash/profiles/profile_helper.h b/chrome/browser/ash/profiles/profile_helper.h index bee6d3b..6e143e4 100644 --- a/chrome/browser/ash/profiles/profile_helper.h +++ b/chrome/browser/ash/profiles/profile_helper.h
@@ -10,8 +10,8 @@ #include <string> #include <vector> -#include "base/callback_forward.h" #include "base/files/file_path.h" +#include "base/functional/callback_forward.h" #include "components/user_manager/user_manager.h" class IndependentOTRProfileManagerTest;
diff --git a/chrome/browser/ash/profiles/signin_profile_handler.h b/chrome/browser/ash/profiles/signin_profile_handler.h index 12994ef..8607626 100644 --- a/chrome/browser/ash/profiles/signin_profile_handler.h +++ b/chrome/browser/ash/profiles/signin_profile_handler.h
@@ -8,7 +8,7 @@ #include <stdint.h> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ash/login/signin/oauth2_login_manager.h" #include "content/public/browser/browsing_data_remover.h"
diff --git a/chrome/browser/ash/quick_pair/fast_pair_support_utils.cc b/chrome/browser/ash/quick_pair/fast_pair_support_utils.cc index 2f7275a7..5cda9325 100644 --- a/chrome/browser/ash/quick_pair/fast_pair_support_utils.cc +++ b/chrome/browser/ash/quick_pair/fast_pair_support_utils.cc
@@ -6,7 +6,7 @@ #include "ash/constants/ash_features.h" #include "ash/quick_pair/feature_status_tracker/fast_pair_support_utils.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "device/bluetooth/bluetooth_adapter.h" #include "google_apis/google_api_keys.h"
diff --git a/chrome/browser/ash/remote_apps/remote_apps_impl.cc b/chrome/browser/ash/remote_apps/remote_apps_impl.cc index fdd4803..5ee32174 100644 --- a/chrome/browser/ash/remote_apps/remote_apps_impl.cc +++ b/chrome/browser/ash/remote_apps/remote_apps_impl.cc
@@ -6,9 +6,9 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/ranges/algorithm.h" #include "chrome/browser/ash/remote_apps/remote_apps_manager.h" #include "chrome/browser/ash/remote_apps/remote_apps_manager_factory.h"
diff --git a/chrome/browser/ash/remote_apps/remote_apps_manager.cc b/chrome/browser/ash/remote_apps/remote_apps_manager.cc index 09d5612..7fabcaa 100644 --- a/chrome/browser/ash/remote_apps/remote_apps_manager.cc +++ b/chrome/browser/ash/remote_apps/remote_apps_manager.cc
@@ -8,7 +8,7 @@ #include "ash/public/cpp/app_menu_constants.h" #include "ash/public/cpp/image_downloader.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/i18n/rtl.h" #include "base/strings/utf_string_conversions.h" #include "cc/paint/paint_flags.h"
diff --git a/chrome/browser/ash/remote_apps/remote_apps_manager.h b/chrome/browser/ash/remote_apps/remote_apps_manager.h index 23fdeaa..680093f 100644 --- a/chrome/browser/ash/remote_apps/remote_apps_manager.h +++ b/chrome/browser/ash/remote_apps/remote_apps_manager.h
@@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" #include "base/scoped_observation.h"
diff --git a/chrome/browser/ash/remote_apps/remote_apps_manager_browsertest.cc b/chrome/browser/ash/remote_apps/remote_apps_manager_browsertest.cc index 675e090..9d5a80c 100644 --- a/chrome/browser/ash/remote_apps/remote_apps_manager_browsertest.cc +++ b/chrome/browser/ash/remote_apps/remote_apps_manager_browsertest.cc
@@ -18,8 +18,8 @@ #include "ash/shell.h" #include "ash/test/ash_test_base.h" #include "base/barrier_closure.h" -#include "base/callback.h" -#include "base/callback_forward.h" +#include "base/functional/callback.h" +#include "base/functional/callback_forward.h" #include "base/path_service.h" #include "base/run_loop.h" #include "base/scoped_observation.h"
diff --git a/chrome/browser/ash/remote_apps/remote_apps_model.h b/chrome/browser/ash/remote_apps/remote_apps_model.h index 10c91804..fb516bd0 100644 --- a/chrome/browser/ash/remote_apps/remote_apps_model.h +++ b/chrome/browser/ash/remote_apps/remote_apps_model.h
@@ -12,7 +12,7 @@ #include <utility> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/ash/remote_apps/id_generator.h" #include "ui/gfx/image/image_skia.h" #include "url/gurl.h"
diff --git a/chrome/browser/ash/scanning/chrome_scanning_app_delegate.cc b/chrome/browser/ash/scanning/chrome_scanning_app_delegate.cc index 17db03e..475c2cac 100644 --- a/chrome/browser/ash/scanning/chrome_scanning_app_delegate.cc +++ b/chrome/browser/ash/scanning/chrome_scanning_app_delegate.cc
@@ -7,11 +7,11 @@ #include <utility> #include "ash/constants/ash_features.h" -#include "base/bind.h" -#include "base/callback_forward.h" #include "base/check.h" #include "base/feature_list.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_forward.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "base/task/sequenced_task_runner.h"
diff --git a/chrome/browser/ash/scanning/chrome_scanning_app_delegate.h b/chrome/browser/ash/scanning/chrome_scanning_app_delegate.h index 2543cb2..1d8dc9b 100644 --- a/chrome/browser/ash/scanning/chrome_scanning_app_delegate.h +++ b/chrome/browser/ash/scanning/chrome_scanning_app_delegate.h
@@ -10,8 +10,8 @@ #include <vector> #include "ash/webui/scanning/scanning_app_delegate.h" -#include "base/callback_forward.h" #include "base/files/file_path.h" +#include "base/functional/callback_forward.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ash/scanning/scanning_file_path_helper.h"
diff --git a/chrome/browser/ash/scanning/chrome_scanning_app_delegate_unittest.cc b/chrome/browser/ash/scanning/chrome_scanning_app_delegate_unittest.cc index 6ecf433..8637d582 100644 --- a/chrome/browser/ash/scanning/chrome_scanning_app_delegate_unittest.cc +++ b/chrome/browser/ash/scanning/chrome_scanning_app_delegate_unittest.cc
@@ -7,10 +7,10 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_profile.h"
diff --git a/chrome/browser/ash/scanning/fake_lorgnette_scanner_manager.cc b/chrome/browser/ash/scanning/fake_lorgnette_scanner_manager.cc index 74d04f4..e4f4573 100644 --- a/chrome/browser/ash/scanning/fake_lorgnette_scanner_manager.cc +++ b/chrome/browser/ash/scanning/fake_lorgnette_scanner_manager.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/task/single_thread_task_runner.h" #include "third_party/re2/src/re2/re2.h"
diff --git a/chrome/browser/ash/scanning/lorgnette_scanner_manager.cc b/chrome/browser/ash/scanning/lorgnette_scanner_manager.cc index a00e53b..cf973d2 100644 --- a/chrome/browser/ash/scanning/lorgnette_scanner_manager.cc +++ b/chrome/browser/ash/scanning/lorgnette_scanner_manager.cc
@@ -10,9 +10,9 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/check.h" #include "base/containers/flat_map.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h"
diff --git a/chrome/browser/ash/scanning/lorgnette_scanner_manager.h b/chrome/browser/ash/scanning/lorgnette_scanner_manager.h index 893cccf..d618e94 100644 --- a/chrome/browser/ash/scanning/lorgnette_scanner_manager.h +++ b/chrome/browser/ash/scanning/lorgnette_scanner_manager.h
@@ -10,7 +10,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "chromeos/ash/components/dbus/lorgnette/lorgnette_service.pb.h" #include "chromeos/ash/components/dbus/lorgnette_manager/lorgnette_manager_client.h" #include "components/keyed_service/core/keyed_service.h"
diff --git a/chrome/browser/ash/scanning/lorgnette_scanner_manager_unittest.cc b/chrome/browser/ash/scanning/lorgnette_scanner_manager_unittest.cc index 2447ff6..206a48d 100644 --- a/chrome/browser/ash/scanning/lorgnette_scanner_manager_unittest.cc +++ b/chrome/browser/ash/scanning/lorgnette_scanner_manager_unittest.cc
@@ -10,9 +10,9 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/flat_map.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/test/bind.h" #include "base/test/task_environment.h"
diff --git a/chrome/browser/ash/scanning/scan_service.cc b/chrome/browser/ash/scanning/scan_service.cc index 1c6a284..7f917e9e 100644 --- a/chrome/browser/ash/scanning/scan_service.cc +++ b/chrome/browser/ash/scanning/scan_service.cc
@@ -10,12 +10,12 @@ #include "ash/constants/ash_features.h" #include "ash/webui/scanning/mojom/scanning_type_converters.h" #include "ash/webui/scanning/scanning_uma.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check.h" #include "base/check_op.h" #include "base/feature_list.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/memory/weak_ptr.h" #include "base/metrics/histogram_functions.h"
diff --git a/chrome/browser/ash/scanning/scan_service_factory_unittest.cc b/chrome/browser/ash/scanning/scan_service_factory_unittest.cc index 5801c564..9c60489 100644 --- a/chrome/browser/ash/scanning/scan_service_factory_unittest.cc +++ b/chrome/browser/ash/scanning/scan_service_factory_unittest.cc
@@ -7,8 +7,8 @@ #include <memory> #include <string> -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/scanning/fake_lorgnette_scanner_manager.h" #include "chrome/browser/ash/scanning/lorgnette_scanner_manager_factory.h" #include "chrome/browser/ash/scanning/scan_service.h"
diff --git a/chrome/browser/ash/scanning/scanner_detector.h b/chrome/browser/ash/scanning/scanner_detector.h index a6305f3a..2aedfdf 100644 --- a/chrome/browser/ash/scanning/scanner_detector.h +++ b/chrome/browser/ash/scanning/scanner_detector.h
@@ -7,7 +7,7 @@ #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "chromeos/ash/components/scanning/scanner.h" #include "chromeos/chromeos_export.h"
diff --git a/chrome/browser/ash/scanning/zeroconf_scanner_detector_unittest.cc b/chrome/browser/ash/scanning/zeroconf_scanner_detector_unittest.cc index b027170..82d2b3ed 100644 --- a/chrome/browser/ash/scanning/zeroconf_scanner_detector_unittest.cc +++ b/chrome/browser/ash/scanning/zeroconf_scanner_detector_unittest.cc
@@ -13,7 +13,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/strcat.h" #include "base/test/task_environment.h" #include "chrome/browser/ash/scanning/zeroconf_scanner_detector_utils.h"
diff --git a/chrome/browser/ash/scheduler_configuration_manager.cc b/chrome/browser/ash/scheduler_configuration_manager.cc index 2e946ace..05140fa7 100644 --- a/chrome/browser/ash/scheduler_configuration_manager.cc +++ b/chrome/browser/ash/scheduler_configuration_manager.cc
@@ -6,8 +6,8 @@ #include <string> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/metrics/field_trial_params.h" #include "chrome/common/chrome_features.h" #include "chrome/common/chrome_switches.h"
diff --git a/chrome/browser/ash/scoped_test_system_nss_key_slot_mixin.cc b/chrome/browser/ash/scoped_test_system_nss_key_slot_mixin.cc index d7126b2..e67a16f 100644 --- a/chrome/browser/ash/scoped_test_system_nss_key_slot_mixin.cc +++ b/chrome/browser/ash/scoped_test_system_nss_key_slot_mixin.cc
@@ -6,9 +6,9 @@ #include <memory> -#include "base/bind.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/path_service.h" #include "base/run_loop.h"
diff --git a/chrome/browser/ash/secure_channel/nearby_connection_broker.cc b/chrome/browser/ash/secure_channel/nearby_connection_broker.cc index 67dc4c9b..e0ba40e 100644 --- a/chrome/browser/ash/secure_channel/nearby_connection_broker.cc +++ b/chrome/browser/ash/secure_channel/nearby_connection_broker.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ash/secure_channel/nearby_connection_broker.h" -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/threading/thread_task_runner_handle.h" #include "base/time/time.h"
diff --git a/chrome/browser/ash/secure_channel/nearby_connection_broker.h b/chrome/browser/ash/secure_channel/nearby_connection_broker.h index ffae76e3..cdda0b2 100644 --- a/chrome/browser/ash/secure_channel/nearby_connection_broker.h +++ b/chrome/browser/ash/secure_channel/nearby_connection_broker.h
@@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "chromeos/ash/services/secure_channel/public/mojom/nearby_connector.mojom.h" #include "mojo/public/cpp/bindings/pending_receiver.h" #include "mojo/public/cpp/bindings/pending_remote.h"
diff --git a/chrome/browser/ash/secure_channel/nearby_connection_broker_impl.cc b/chrome/browser/ash/secure_channel/nearby_connection_broker_impl.cc index eba28c6..6f9b639 100644 --- a/chrome/browser/ash/secure_channel/nearby_connection_broker_impl.cc +++ b/chrome/browser/ash/secure_channel/nearby_connection_broker_impl.cc
@@ -8,9 +8,9 @@ #include <utility> #include "ash/constants/ash_features.h" -#include "base/bind.h" #include "base/containers/flat_map.h" #include "base/files/file.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/ptr_util.h" #include "base/memory/scoped_refptr.h"
diff --git a/chrome/browser/ash/secure_channel/nearby_connector_impl.cc b/chrome/browser/ash/secure_channel/nearby_connector_impl.cc index 93bac98..15d2225 100644 --- a/chrome/browser/ash/secure_channel/nearby_connector_impl.cc +++ b/chrome/browser/ash/secure_channel/nearby_connector_impl.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ash/secure_channel/nearby_connector_impl.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/secure_channel/nearby_connection_broker_impl.h" #include "chrome/browser/ash/secure_channel/nearby_endpoint_finder_impl.h" #include "chrome/browser/ash/secure_channel/util/histogram_util.h"
diff --git a/chrome/browser/ash/session_length_limiter.cc b/chrome/browser/ash/session_length_limiter.cc index 9a6a04c0..24ba237 100644 --- a/chrome/browser/ash/session_length_limiter.cc +++ b/chrome/browser/ash/session_length_limiter.cc
@@ -6,10 +6,10 @@ #include <algorithm> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check.h" #include "base/cxx17_backports.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/time/default_clock.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/ash/settings/cros_settings.cc b/chrome/browser/ash/settings/cros_settings.cc index 9119363..116eb72 100644 --- a/chrome/browser/ash/settings/cros_settings.cc +++ b/chrome/browser/ash/settings/cros_settings.cc
@@ -7,9 +7,9 @@ #include <stddef.h> #include "ash/constants/ash_switches.h" -#include "base/bind.h" #include "base/check_op.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/notreached.h" #include "base/ranges/algorithm.h" #include "base/strings/string_util.h"
diff --git a/chrome/browser/ash/settings/cros_settings.h b/chrome/browser/ash/settings/cros_settings.h index 7d57b6aa..c843d52d 100644 --- a/chrome/browser/ash/settings/cros_settings.h +++ b/chrome/browser/ash/settings/cros_settings.h
@@ -10,8 +10,8 @@ #include <string> #include <vector> -#include "base/callback_forward.h" #include "base/callback_list.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/sequence_checker.h" #include "base/values.h"
diff --git a/chrome/browser/ash/settings/cros_settings_unittest.cc b/chrome/browser/ash/settings/cros_settings_unittest.cc index b3ff276a..817db997 100644 --- a/chrome/browser/ash/settings/cros_settings_unittest.cc +++ b/chrome/browser/ash/settings/cros_settings_unittest.cc
@@ -9,7 +9,7 @@ #include <string> #include "ash/constants/ash_features.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/weak_ptr.h" #include "base/test/gtest_util.h" #include "base/test/metrics/histogram_tester.h"
diff --git a/chrome/browser/ash/settings/device_settings_cache.cc b/chrome/browser/ash/settings/device_settings_cache.cc index b0e23de6..31cf031c 100644 --- a/chrome/browser/ash/settings/device_settings_cache.cc +++ b/chrome/browser/ash/settings/device_settings_cache.cc
@@ -7,7 +7,7 @@ #include <string> #include "base/base64.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "chrome/common/pref_names.h" #include "components/policy/proto/device_management_backend.pb.h"
diff --git a/chrome/browser/ash/settings/device_settings_provider.cc b/chrome/browser/ash/settings/device_settings_provider.cc index 4ff96b4..9406c3c8 100644 --- a/chrome/browser/ash/settings/device_settings_provider.cc +++ b/chrome/browser/ash/settings/device_settings_provider.cc
@@ -11,11 +11,11 @@ #include <utility> #include "ash/constants/ash_features.h" -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/check.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/json/json_reader.h" #include "base/logging.h" #include "base/metrics/histogram_functions.h"
diff --git a/chrome/browser/ash/settings/device_settings_provider.h b/chrome/browser/ash/settings/device_settings_provider.h index 9fde3e5..72b864b 100644 --- a/chrome/browser/ash/settings/device_settings_provider.h +++ b/chrome/browser/ash/settings/device_settings_provider.h
@@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/gtest_prod_util.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ash/settings/device_settings_service.h"
diff --git a/chrome/browser/ash/settings/device_settings_provider_unittest.cc b/chrome/browser/ash/settings/device_settings_provider_unittest.cc index 16e3c14c2..d01ef9a7 100644 --- a/chrome/browser/ash/settings/device_settings_provider_unittest.cc +++ b/chrome/browser/ash/settings/device_settings_provider_unittest.cc
@@ -9,7 +9,7 @@ #include <utility> #include "ash/constants/ash_features.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h" #include "base/test/scoped_path_override.h"
diff --git a/chrome/browser/ash/settings/device_settings_service.cc b/chrome/browser/ash/settings/device_settings_service.cc index 3c6abad..ca4a473c 100644 --- a/chrome/browser/ash/settings/device_settings_service.cc +++ b/chrome/browser/ash/settings/device_settings_service.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/ash/settings/device_settings_service.h b/chrome/browser/ash/settings/device_settings_service.h index 71b6907..be6b9ae 100644 --- a/chrome/browser/ash/settings/device_settings_service.h +++ b/chrome/browser/ash/settings/device_settings_service.h
@@ -9,8 +9,8 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/containers/circular_deque.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "base/observer_list.h" #include "chromeos/ash/components/dbus/session_manager/session_manager_client.h"
diff --git a/chrome/browser/ash/settings/device_settings_service_unittest.cc b/chrome/browser/ash/settings/device_settings_service_unittest.cc index d87482e..f6f0280 100644 --- a/chrome/browser/ash/settings/device_settings_service_unittest.cc +++ b/chrome/browser/ash/settings/device_settings_service_unittest.cc
@@ -6,10 +6,10 @@ #include <stdint.h> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/time/time.h" #include "chrome/browser/ash/ownership/owner_settings_service_ash.h"
diff --git a/chrome/browser/ash/settings/hardware_data_usage_controller.cc b/chrome/browser/ash/settings/hardware_data_usage_controller.cc index fce62bc..7926120 100644 --- a/chrome/browser/ash/settings/hardware_data_usage_controller.cc +++ b/chrome/browser/ash/settings/hardware_data_usage_controller.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ash/settings/hardware_data_usage_controller.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/settings/cros_settings.h" #include "chromeos/ash/components/settings/cros_settings_names.h" #include "components/prefs/pref_registry_simple.h"
diff --git a/chrome/browser/ash/settings/owner_pending_setting_controller.cc b/chrome/browser/ash/settings/owner_pending_setting_controller.cc index eab739f..53931310 100644 --- a/chrome/browser/ash/settings/owner_pending_setting_controller.cc +++ b/chrome/browser/ash/settings/owner_pending_setting_controller.cc
@@ -6,7 +6,7 @@ #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "chrome/browser/ash/ownership/owner_settings_service_ash.h" #include "chrome/browser/ash/ownership/owner_settings_service_ash_factory.h"
diff --git a/chrome/browser/ash/settings/scoped_cros_settings_test_helper.cc b/chrome/browser/ash/settings/scoped_cros_settings_test_helper.cc index 9b2e178..55dec81 100644 --- a/chrome/browser/ash/settings/scoped_cros_settings_test_helper.cc +++ b/chrome/browser/ash/settings/scoped_cros_settings_test_helper.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/callback_helpers.h" #include "base/check.h" +#include "base/functional/callback_helpers.h" #include "base/values.h" #include "chrome/browser/ash/ownership/fake_owner_settings_service.h" #include "chrome/browser/ash/ownership/owner_settings_service_ash.h"
diff --git a/chrome/browser/ash/settings/session_manager_operation.cc b/chrome/browser/ash/settings/session_manager_operation.cc index 5f4364e..f1e41c4 100644 --- a/chrome/browser/ash/settings/session_manager_operation.cc +++ b/chrome/browser/ash/settings/session_manager_operation.cc
@@ -6,9 +6,9 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_traits.h"
diff --git a/chrome/browser/ash/settings/session_manager_operation.h b/chrome/browser/ash/settings/session_manager_operation.h index 322b1ff..229ec226 100644 --- a/chrome/browser/ash/settings/session_manager_operation.h +++ b/chrome/browser/ash/settings/session_manager_operation.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "chrome/browser/ash/policy/core/device_cloud_policy_validator.h" #include "chrome/browser/ash/settings/device_settings_service.h"
diff --git a/chrome/browser/ash/settings/session_manager_operation_unittest.cc b/chrome/browser/ash/settings/session_manager_operation_unittest.cc index 9104048..2612f26e 100644 --- a/chrome/browser/ash/settings/session_manager_operation_unittest.cc +++ b/chrome/browser/ash/settings/session_manager_operation_unittest.cc
@@ -11,9 +11,9 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/memory/ref_counted.h" #include "base/time/time.h"
diff --git a/chrome/browser/ash/settings/shutdown_policy_handler.cc b/chrome/browser/ash/settings/shutdown_policy_handler.cc index 1673ac3..ad3de64 100644 --- a/chrome/browser/ash/settings/shutdown_policy_handler.cc +++ b/chrome/browser/ash/settings/shutdown_policy_handler.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ash/settings/shutdown_policy_handler.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "chromeos/ash/components/settings/cros_settings_names.h" #include "chromeos/ash/components/settings/cros_settings_provider.h"
diff --git a/chrome/browser/ash/settings/shutdown_policy_handler.h b/chrome/browser/ash/settings/shutdown_policy_handler.h index 0932ef1..cad6fc6 100644 --- a/chrome/browser/ash/settings/shutdown_policy_handler.h +++ b/chrome/browser/ash/settings/shutdown_policy_handler.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_ASH_SETTINGS_SHUTDOWN_POLICY_HANDLER_H_ #define CHROME_BROWSER_ASH_SETTINGS_SHUTDOWN_POLICY_HANDLER_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ash/settings/cros_settings.h"
diff --git a/chrome/browser/ash/settings/shutdown_policy_handler_unittest.cc b/chrome/browser/ash/settings/shutdown_policy_handler_unittest.cc index 4d112126..75f48da 100644 --- a/chrome/browser/ash/settings/shutdown_policy_handler_unittest.cc +++ b/chrome/browser/ash/settings/shutdown_policy_handler_unittest.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ash/settings/shutdown_policy_handler.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "chrome/browser/ash/settings/scoped_testing_cros_settings.h" #include "chrome/browser/ash/settings/stub_cros_settings_provider.h"
diff --git a/chrome/browser/ash/settings/stats_reporting_controller.cc b/chrome/browser/ash/settings/stats_reporting_controller.cc index de6dc3c..f3a90b25 100644 --- a/chrome/browser/ash/settings/stats_reporting_controller.cc +++ b/chrome/browser/ash/settings/stats_reporting_controller.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ash/settings/stats_reporting_controller.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "chrome/browser/ash/settings/cros_settings.h" #include "chromeos/ash/components/settings/cros_settings_names.h"
diff --git a/chrome/browser/ash/settings/stats_reporting_controller_unittest.cc b/chrome/browser/ash/settings/stats_reporting_controller_unittest.cc index dc8218a..319ffb52c 100644 --- a/chrome/browser/ash/settings/stats_reporting_controller_unittest.cc +++ b/chrome/browser/ash/settings/stats_reporting_controller_unittest.cc
@@ -7,7 +7,7 @@ #include <memory> #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted.h" #include "base/values.h" #include "chrome/browser/ash/login/users/fake_chrome_user_manager.h"
diff --git a/chrome/browser/ash/settings/stub_cros_settings_provider.h b/chrome/browser/ash/settings/stub_cros_settings_provider.h index 68b4e08..d12a4aa 100644 --- a/chrome/browser/ash/settings/stub_cros_settings_provider.h +++ b/chrome/browser/ash/settings/stub_cros_settings_provider.h
@@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "chromeos/ash/components/settings/cros_settings_provider.h" #include "components/prefs/pref_value_map.h"
diff --git a/chrome/browser/ash/settings/stub_cros_settings_provider_unittest.cc b/chrome/browser/ash/settings/stub_cros_settings_provider_unittest.cc index 632948a..268637a 100644 --- a/chrome/browser/ash/settings/stub_cros_settings_provider_unittest.cc +++ b/chrome/browser/ash/settings/stub_cros_settings_provider_unittest.cc
@@ -7,8 +7,8 @@ #include <memory> #include <string> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/values.h" #include "chromeos/ash/components/settings/cros_settings_names.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/ash/shutdown_policy_browsertest.cc b/chrome/browser/ash/shutdown_policy_browsertest.cc index 62514f0f..42e19b5 100644 --- a/chrome/browser/ash/shutdown_policy_browsertest.cc +++ b/chrome/browser/ash/shutdown_policy_browsertest.cc
@@ -10,8 +10,8 @@ #include "ash/public/cpp/ash_view_ids.h" #include "ash/public/cpp/login_screen_test_api.h" #include "ash/public/cpp/system_tray_test_api.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ash/smb_client/discovery/host_locator.h b/chrome/browser/ash/smb_client/discovery/host_locator.h index 34caf3c..2de79d5 100644 --- a/chrome/browser/ash/smb_client/discovery/host_locator.h +++ b/chrome/browser/ash/smb_client/discovery/host_locator.h
@@ -8,7 +8,7 @@ #include <map> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "net/base/ip_address.h" namespace ash {
diff --git a/chrome/browser/ash/smb_client/discovery/in_memory_host_locator_unittest.cc b/chrome/browser/ash/smb_client/discovery/in_memory_host_locator_unittest.cc index f3fb6ca7..0816f40 100644 --- a/chrome/browser/ash/smb_client/discovery/in_memory_host_locator_unittest.cc +++ b/chrome/browser/ash/smb_client/discovery/in_memory_host_locator_unittest.cc
@@ -7,7 +7,7 @@ #include <map> #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "testing/gtest/include/gtest/gtest.h" namespace ash {
diff --git a/chrome/browser/ash/smb_client/discovery/mdns_host_locator.cc b/chrome/browser/ash/smb_client/discovery/mdns_host_locator.cc index 1a8be13c..038d594 100644 --- a/chrome/browser/ash/smb_client/discovery/mdns_host_locator.cc +++ b/chrome/browser/ash/smb_client/discovery/mdns_host_locator.cc
@@ -7,7 +7,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/string_util.h" #include "base/task/single_thread_task_runner.h" #include "content/public/browser/browser_task_traits.h"
diff --git a/chrome/browser/ash/smb_client/discovery/netbios_client.cc b/chrome/browser/ash/smb_client/discovery/netbios_client.cc index 0a921a3..0f8c60c 100644 --- a/chrome/browser/ash/smb_client/discovery/netbios_client.cc +++ b/chrome/browser/ash/smb_client/discovery/netbios_client.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ash/smb_client/discovery/netbios_client.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chromeos/ash/components/network/firewall_hole.h" #include "net/base/ip_endpoint.h" #include "net/traffic_annotation/network_traffic_annotation.h"
diff --git a/chrome/browser/ash/smb_client/discovery/netbios_client_interface.h b/chrome/browser/ash/smb_client/discovery/netbios_client_interface.h index c59b721..859ead3 100644 --- a/chrome/browser/ash/smb_client/discovery/netbios_client_interface.h +++ b/chrome/browser/ash/smb_client/discovery/netbios_client_interface.h
@@ -7,7 +7,7 @@ #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" namespace net { class IPAddress;
diff --git a/chrome/browser/ash/smb_client/discovery/netbios_host_locator.cc b/chrome/browser/ash/smb_client/discovery/netbios_host_locator.cc index b15b8d8..a9d8eac 100644 --- a/chrome/browser/ash/smb_client/discovery/netbios_host_locator.cc +++ b/chrome/browser/ash/smb_client/discovery/netbios_host_locator.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/strings/string_util.h" #include "base/time/time.h"
diff --git a/chrome/browser/ash/smb_client/discovery/netbios_host_locator.h b/chrome/browser/ash/smb_client/discovery/netbios_host_locator.h index b0288cd..eb92740 100644 --- a/chrome/browser/ash/smb_client/discovery/netbios_host_locator.h +++ b/chrome/browser/ash/smb_client/discovery/netbios_host_locator.h
@@ -8,7 +8,7 @@ #include <list> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/timer/timer.h" #include "chrome/browser/ash/smb_client/discovery/host_locator.h"
diff --git a/chrome/browser/ash/smb_client/discovery/netbios_host_locator_unittest.cc b/chrome/browser/ash/smb_client/discovery/netbios_host_locator_unittest.cc index 22d52c9..cc257aa 100644 --- a/chrome/browser/ash/smb_client/discovery/netbios_host_locator_unittest.cc +++ b/chrome/browser/ash/smb_client/discovery/netbios_host_locator_unittest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ash/smb_client/discovery/netbios_host_locator.h" -#include "base/bind.h" +#include "base/functional/bind.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/ash/smb_client/discovery/network_scanner.cc b/chrome/browser/ash/smb_client/discovery/network_scanner.cc index bfa57b9..b36630ca 100644 --- a/chrome/browser/ash/smb_client/discovery/network_scanner.cc +++ b/chrome/browser/ash/smb_client/discovery/network_scanner.cc
@@ -7,8 +7,8 @@ #include <map> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/strings/string_util.h" #include "chrome/browser/ash/smb_client/discovery/host_locator.h"
diff --git a/chrome/browser/ash/smb_client/discovery/network_scanner.h b/chrome/browser/ash/smb_client/discovery/network_scanner.h index 9b6b37c..4d5139c 100644 --- a/chrome/browser/ash/smb_client/discovery/network_scanner.h +++ b/chrome/browser/ash/smb_client/discovery/network_scanner.h
@@ -8,7 +8,7 @@ #include <map> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ash/smb_client/discovery/host_locator.h" #include "net/base/ip_address.h"
diff --git a/chrome/browser/ash/smb_client/discovery/network_scanner_unittest.cc b/chrome/browser/ash/smb_client/discovery/network_scanner_unittest.cc index bc876498..56c9ae3 100644 --- a/chrome/browser/ash/smb_client/discovery/network_scanner_unittest.cc +++ b/chrome/browser/ash/smb_client/discovery/network_scanner_unittest.cc
@@ -8,7 +8,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/smb_client/discovery/in_memory_host_locator.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/ash/smb_client/fileapi/smbfs_async_file_util.cc b/chrome/browser/ash/smb_client/fileapi/smbfs_async_file_util.cc index 075f8cb..3eedba2 100644 --- a/chrome/browser/ash/smb_client/fileapi/smbfs_async_file_util.cc +++ b/chrome/browser/ash/smb_client/fileapi/smbfs_async_file_util.cc
@@ -6,9 +6,9 @@ #include <utility> -#include "base/bind.h" #include "base/check_op.h" #include "base/files/file.h" +#include "base/functional/bind.h" #include "base/task/sequenced_task_runner.h" #include "chrome/browser/ash/smb_client/smb_service.h" #include "chrome/browser/ash/smb_client/smb_service_factory.h"
diff --git a/chrome/browser/ash/smb_client/smb_file_system.h b/chrome/browser/ash/smb_client/smb_file_system.h index dc1dc2e..a46426a 100644 --- a/chrome/browser/ash/smb_client/smb_file_system.h +++ b/chrome/browser/ash/smb_client/smb_file_system.h
@@ -11,8 +11,8 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/files/file.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ash/file_system_provider/abort_callback.h" #include "chrome/browser/ash/file_system_provider/provided_file_system_info.h"
diff --git a/chrome/browser/ash/smb_client/smb_kerberos_credentials_updater.h b/chrome/browser/ash/smb_client/smb_kerberos_credentials_updater.h index a8490df7..88b4a11 100644 --- a/chrome/browser/ash/smb_client/smb_kerberos_credentials_updater.h +++ b/chrome/browser/ash/smb_client/smb_kerberos_credentials_updater.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/ash/kerberos/kerberos_credentials_manager.h"
diff --git a/chrome/browser/ash/smb_client/smb_service.cc b/chrome/browser/ash/smb_client/smb_service.cc index 40d95c3..bac855c 100644 --- a/chrome/browser/ash/smb_client/smb_service.cc +++ b/chrome/browser/ash/smb_client/smb_service.cc
@@ -6,11 +6,11 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/span.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/histogram_macros.h" #include "base/strings/string_number_conversions.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/ash/smb_client/smb_service.h b/chrome/browser/ash/smb_client/smb_service.h index 0a71efb..a0c2b04 100644 --- a/chrome/browser/ash/smb_client/smb_service.h +++ b/chrome/browser/ash/smb_client/smb_service.h
@@ -11,8 +11,8 @@ #include <unordered_map> #include <vector> -#include "base/callback.h" #include "base/files/file.h" +#include "base/functional/callback.h" #include "base/gtest_prod_util.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h"
diff --git a/chrome/browser/ash/smb_client/smb_service_unittest.cc b/chrome/browser/ash/smb_client/smb_service_unittest.cc index 1684f03..f64f3ad 100644 --- a/chrome/browser/ash/smb_client/smb_service_unittest.cc +++ b/chrome/browser/ash/smb_client/smb_service_unittest.cc
@@ -10,9 +10,9 @@ #include <tuple> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/json/json_reader.h" #include "base/memory/ptr_util.h" #include "base/run_loop.h"
diff --git a/chrome/browser/ash/smb_client/smb_share_finder.cc b/chrome/browser/ash/smb_client/smb_share_finder.cc index fb5050c..f6c9bae 100644 --- a/chrome/browser/ash/smb_client/smb_share_finder.cc +++ b/chrome/browser/ash/smb_client/smb_share_finder.cc
@@ -6,7 +6,7 @@ #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/metrics/histogram_macros.h" #include "chrome/browser/ash/smb_client/discovery/mdns_host_locator.h"
diff --git a/chrome/browser/ash/smb_client/smb_share_finder.h b/chrome/browser/ash/smb_client/smb_share_finder.h index c027c9be..cb4bfbf 100644 --- a/chrome/browser/ash/smb_client/smb_share_finder.h +++ b/chrome/browser/ash/smb_client/smb_share_finder.h
@@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ash/smb_client/discovery/host_locator.h" #include "chrome/browser/ash/smb_client/discovery/network_scanner.h"
diff --git a/chrome/browser/ash/smb_client/smb_share_finder_unittest.cc b/chrome/browser/ash/smb_client/smb_share_finder_unittest.cc index 29d0620..1436ff8 100644 --- a/chrome/browser/ash/smb_client/smb_share_finder_unittest.cc +++ b/chrome/browser/ash/smb_client/smb_share_finder_unittest.cc
@@ -7,9 +7,9 @@ #include <algorithm> #include <string> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ash/smb_client/discovery/in_memory_host_locator.h" #include "chrome/browser/ash/smb_client/smb_constants.h"
diff --git a/chrome/browser/ash/smb_client/smbfs_share.cc b/chrome/browser/ash/smb_client/smbfs_share.cc index 504ff93..190e5c1 100644 --- a/chrome/browser/ash/smb_client/smbfs_share.cc +++ b/chrome/browser/ash/smb_client/smbfs_share.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ash/smb_client/smbfs_share.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/strings/strcat.h" #include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/ash/smb_client/smbfs_share.h b/chrome/browser/ash/smb_client/smbfs_share.h index 3f44437f..31f7a55 100644 --- a/chrome/browser/ash/smb_client/smbfs_share.h +++ b/chrome/browser/ash/smb_client/smbfs_share.h
@@ -8,9 +8,9 @@ #include <memory> #include <string> -#include "base/callback.h" #include "base/files/file.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/gtest_prod_util.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h"
diff --git a/chrome/browser/ash/sync/app_settings_model_type_controller.h b/chrome/browser/ash/sync/app_settings_model_type_controller.h index 0a5f93e..90f3c99 100644 --- a/chrome/browser/ash/sync/app_settings_model_type_controller.h +++ b/chrome/browser/ash/sync/app_settings_model_type_controller.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_ASH_SYNC_APP_SETTINGS_MODEL_TYPE_CONTROLLER_H_ #define CHROME_BROWSER_ASH_SYNC_APP_SETTINGS_MODEL_TYPE_CONTROLLER_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "components/prefs/pref_change_registrar.h" #include "components/sync/driver/non_ui_syncable_service_based_model_type_controller.h" #include "components/sync/model/model_type_store.h"
diff --git a/chrome/browser/ash/sync/apps_model_type_controller.h b/chrome/browser/ash/sync/apps_model_type_controller.h index 93b3fba9..67dfbd3 100644 --- a/chrome/browser/ash/sync/apps_model_type_controller.h +++ b/chrome/browser/ash/sync/apps_model_type_controller.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "components/sync/driver/model_type_controller.h" #include "components/sync/model/model_type_store.h"
diff --git a/chrome/browser/ash/sync/os_syncable_service_model_type_controller.cc b/chrome/browser/ash/sync/os_syncable_service_model_type_controller.cc index a3094145..9c72844 100644 --- a/chrome/browser/ash/sync/os_syncable_service_model_type_controller.cc +++ b/chrome/browser/ash/sync/os_syncable_service_model_type_controller.cc
@@ -7,8 +7,8 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "components/prefs/pref_service.h" #include "components/sync/base/model_type.h"
diff --git a/chrome/browser/ash/sync/os_syncable_service_model_type_controller.h b/chrome/browser/ash/sync/os_syncable_service_model_type_controller.h index 5061a7a..b9338451 100644 --- a/chrome/browser/ash/sync/os_syncable_service_model_type_controller.h +++ b/chrome/browser/ash/sync/os_syncable_service_model_type_controller.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_ASH_SYNC_OS_SYNCABLE_SERVICE_MODEL_TYPE_CONTROLLER_H_ #define CHROME_BROWSER_ASH_SYNC_OS_SYNCABLE_SERVICE_MODEL_TYPE_CONTROLLER_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "components/prefs/pref_change_registrar.h" #include "components/sync/driver/syncable_service_based_model_type_controller.h"
diff --git a/chrome/browser/ash/sync/sync_error_notifier.cc b/chrome/browser/ash/sync/sync_error_notifier.cc index b5e9164..7781405 100644 --- a/chrome/browser/ash/sync/sync_error_notifier.cc +++ b/chrome/browser/ash/sync/sync_error_notifier.cc
@@ -6,7 +6,7 @@ #include "ash/constants/notifier_catalogs.h" #include "ash/public/cpp/notification_utils.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h" #include "chrome/browser/ash/crosapi/browser_util.h"
diff --git a/chrome/browser/ash/sync/sync_error_notifier_unittest.cc b/chrome/browser/ash/sync/sync_error_notifier_unittest.cc index 55d01df..83604f03 100644 --- a/chrome/browser/ash/sync/sync_error_notifier_unittest.cc +++ b/chrome/browser/ash/sync/sync_error_notifier_unittest.cc
@@ -7,7 +7,7 @@ #include <memory> #include "ash/constants/ash_features.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/test/scoped_feature_list.h" #include "chrome/browser/ash/login/users/mock_user_manager.h" #include "chrome/browser/notifications/notification_display_service_tester.h"
diff --git a/chrome/browser/ash/system/automatic_reboot_manager.cc b/chrome/browser/ash/system/automatic_reboot_manager.cc index 4398bf1..bfffeab 100644 --- a/chrome/browser/ash/system/automatic_reboot_manager.cc +++ b/chrome/browser/ash/system/automatic_reboot_manager.cc
@@ -15,12 +15,12 @@ #include <utility> #include "ash/constants/ash_paths.h" -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_file.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/logging.h" #include "base/memory/ref_counted.h"
diff --git a/chrome/browser/ash/system/breakpad_consent_watcher.cc b/chrome/browser/ash/system/breakpad_consent_watcher.cc index ee64513..d68555a 100644 --- a/chrome/browser/ash/system/breakpad_consent_watcher.cc +++ b/chrome/browser/ash/system/breakpad_consent_watcher.cc
@@ -6,8 +6,8 @@ #include <string> -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "chrome/installer/util/google_update_settings.h" #include "components/crash/core/app/breakpad_linux.h"
diff --git a/chrome/browser/ash/system/device_disabling_browsertest.cc b/chrome/browser/ash/system/device_disabling_browsertest.cc index 5ada4ae..0f00725d 100644 --- a/chrome/browser/ash/system/device_disabling_browsertest.cc +++ b/chrome/browser/ash/system/device_disabling_browsertest.cc
@@ -7,8 +7,8 @@ #include "ash/constants/ash_switches.h" #include "ash/public/cpp/login_screen_test_api.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/scoped_refptr.h" #include "base/run_loop.h"
diff --git a/chrome/browser/ash/system/device_disabling_manager.cc b/chrome/browser/ash/system/device_disabling_manager.cc index 301425e..8bada48f 100644 --- a/chrome/browser/ash/system/device_disabling_manager.cc +++ b/chrome/browser/ash/system/device_disabling_manager.cc
@@ -6,8 +6,8 @@ #include "ash/constants/ash_features.h" #include "ash/constants/ash_switches.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/values.h" #include "chrome/browser/ash/login/existing_user_controller.h"
diff --git a/chrome/browser/ash/system/device_disabling_manager.h b/chrome/browser/ash/system/device_disabling_manager.h index 8d5754f..ed19967 100644 --- a/chrome/browser/ash/system/device_disabling_manager.h +++ b/chrome/browser/ash/system/device_disabling_manager.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" #include "chrome/browser/ash/settings/cros_settings.h"
diff --git a/chrome/browser/ash/system/device_disabling_manager_unittest.cc b/chrome/browser/ash/system/device_disabling_manager_unittest.cc index df8dcb3f..3d976b4 100644 --- a/chrome/browser/ash/system/device_disabling_manager_unittest.cc +++ b/chrome/browser/ash/system/device_disabling_manager_unittest.cc
@@ -8,9 +8,9 @@ #include "ash/constants/ash_features.h" #include "ash/constants/ash_switches.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ref_counted.h" #include "base/run_loop.h" #include "base/test/scoped_feature_list.h"
diff --git a/chrome/browser/ash/system/fake_input_device_settings.cc b/chrome/browser/ash/system/fake_input_device_settings.cc index ea3486f..7e8373a 100644 --- a/chrome/browser/ash/system/fake_input_device_settings.cc +++ b/chrome/browser/ash/system/fake_input_device_settings.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/callback.h" +#include "base/functional/callback.h" namespace ash { namespace system {
diff --git a/chrome/browser/ash/system/input_device_settings.h b/chrome/browser/ash/system/input_device_settings.h index 08df681..77defec 100644 --- a/chrome/browser/ash/system/input_device_settings.h +++ b/chrome/browser/ash/system/input_device_settings.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_ASH_SYSTEM_INPUT_DEVICE_SETTINGS_H_ #define CHROME_BROWSER_ASH_SYSTEM_INPUT_DEVICE_SETTINGS_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "third_party/abseil-cpp/absl/types/optional.h" namespace ash {
diff --git a/chrome/browser/ash/system/input_device_settings_impl_ozone.cc b/chrome/browser/ash/system/input_device_settings_impl_ozone.cc index 04be22a..2d6d703 100644 --- a/chrome/browser/ash/system/input_device_settings_impl_ozone.cc +++ b/chrome/browser/ash/system/input_device_settings_impl_ozone.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ash/system/input_device_settings.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/system/fake_input_device_settings.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/browser_process_platform_part_ash.h"
diff --git a/chrome/browser/ash/system/pointer_device_observer.cc b/chrome/browser/ash/system/pointer_device_observer.cc index 01d8acd1..97d306ae 100644 --- a/chrome/browser/ash/system/pointer_device_observer.cc +++ b/chrome/browser/ash/system/pointer_device_observer.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ash/system/pointer_device_observer.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "chrome/browser/ash/system/input_device_settings.h" #include "content/public/browser/browser_thread.h" #include "ui/events/devices/device_data_manager.h"
diff --git a/chrome/browser/ash/system/system_clock.cc b/chrome/browser/ash/system/system_clock.cc index 317a128..9cb955c 100644 --- a/chrome/browser/ash/system/system_clock.cc +++ b/chrome/browser/ash/system/system_clock.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "chrome/browser/ash/ownership/owner_settings_service_ash.h" #include "chrome/browser/ash/ownership/owner_settings_service_ash_factory.h"
diff --git a/chrome/browser/ash/system/timezone_resolver_manager.cc b/chrome/browser/ash/system/timezone_resolver_manager.cc index c46f03a..317a7870 100644 --- a/chrome/browser/ash/system/timezone_resolver_manager.cc +++ b/chrome/browser/ash/system/timezone_resolver_manager.cc
@@ -5,9 +5,9 @@ #include "chrome/browser/ash/system/timezone_resolver_manager.h" #include "ash/constants/ash_switches.h" -#include "base/bind.h" #include "base/check.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/notreached.h" #include "chrome/browser/ash/preferences.h" #include "chrome/browser/ash/system/input_device_settings.h"
diff --git a/chrome/browser/ash/system/tray_accessibility_browsertest.cc b/chrome/browser/ash/system/tray_accessibility_browsertest.cc index f82ce5c..ef02ca20 100644 --- a/chrome/browser/ash/system/tray_accessibility_browsertest.cc +++ b/chrome/browser/ash/system/tray_accessibility_browsertest.cc
@@ -6,7 +6,7 @@ #include "ash/constants/ash_switches.h" #include "ash/public/cpp/ash_view_ids.h" #include "ash/public/cpp/system_tray_test_api.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/run_loop.h" #include "base/test/scoped_feature_list.h" #include "build/build_config.h"
diff --git a/chrome/browser/ash/system/user_removal_manager.cc b/chrome/browser/ash/system/user_removal_manager.cc index b5c1eec9..883ef8d 100644 --- a/chrome/browser/ash/system/user_removal_manager.cc +++ b/chrome/browser/ash/system/user_removal_manager.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/logging.h" #include "base/no_destructor.h"
diff --git a/chrome/browser/ash/system/user_removal_manager.h b/chrome/browser/ash/system/user_removal_manager.h index b51fc3f5..7546d18 100644 --- a/chrome/browser/ash/system/user_removal_manager.h +++ b/chrome/browser/ash/system/user_removal_manager.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_ASH_SYSTEM_USER_REMOVAL_MANAGER_H_ #define CHROME_BROWSER_ASH_SYSTEM_USER_REMOVAL_MANAGER_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" // This file contains a collection of functions that are used to support // removing users from the device.
diff --git a/chrome/browser/ash/system/user_removal_manager_unittest.cc b/chrome/browser/ash/system/user_removal_manager_unittest.cc index b7ec709..6732047 100644 --- a/chrome/browser/ash/system/user_removal_manager_unittest.cc +++ b/chrome/browser/ash/system/user_removal_manager_unittest.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/test/test_mock_time_task_runner.h" #include "chrome/browser/ash/login/users/fake_chrome_user_manager.h"
diff --git a/chrome/browser/ash/system_extensions/system_extensions_internals_page_handler.cc b/chrome/browser/ash/system_extensions/system_extensions_internals_page_handler.cc index c569b57..2a3adea 100644 --- a/chrome/browser/ash/system_extensions/system_extensions_internals_page_handler.cc +++ b/chrome/browser/ash/system_extensions/system_extensions_internals_page_handler.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ash/system_extensions/system_extensions_internals_page_handler.h" -#include "base/callback_helpers.h" #include "base/debug/stack_trace.h" +#include "base/functional/callback_helpers.h" #include "base/system/sys_info.h" #include "chrome/browser/ash/system_extensions/system_extensions_profile_utils.h"
diff --git a/chrome/browser/ash/system_extensions/system_extensions_sandboxed_unpacker.cc b/chrome/browser/ash/system_extensions/system_extensions_sandboxed_unpacker.cc index 824ee84a1..559203d 100644 --- a/chrome/browser/ash/system_extensions/system_extensions_sandboxed_unpacker.cc +++ b/chrome/browser/ash/system_extensions/system_extensions_sandboxed_unpacker.cc
@@ -5,10 +5,10 @@ #include "chrome/browser/ash/system_extensions/system_extensions_sandboxed_unpacker.h" #include "ash/constants/ash_features.h" -#include "base/callback.h" #include "base/feature_list.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/no_destructor.h" #include "base/strings/strcat.h"
diff --git a/chrome/browser/ash/system_extensions/system_extensions_sandboxed_unpacker.h b/chrome/browser/ash/system_extensions/system_extensions_sandboxed_unpacker.h index ecf6bbf..3b336f9 100644 --- a/chrome/browser/ash/system_extensions/system_extensions_sandboxed_unpacker.h +++ b/chrome/browser/ash/system_extensions/system_extensions_sandboxed_unpacker.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_ASH_SYSTEM_EXTENSIONS_SYSTEM_EXTENSIONS_SANDBOXED_UNPACKER_H_ #define CHROME_BROWSER_ASH_SYSTEM_EXTENSIONS_SYSTEM_EXTENSIONS_SANDBOXED_UNPACKER_H_ -#include "base/callback_forward.h" #include "base/files/file_path.h" +#include "base/functional/callback_forward.h" #include "base/task/thread_pool.h" #include "base/threading/sequence_bound.h" #include "chrome/browser/ash/system_extensions/system_extensions_install_status.h"
diff --git a/chrome/browser/ash/system_extensions/system_extensions_service_worker_manager.h b/chrome/browser/ash/system_extensions/system_extensions_service_worker_manager.h index 0b41f0d3..e2fb451 100644 --- a/chrome/browser/ash/system_extensions/system_extensions_service_worker_manager.h +++ b/chrome/browser/ash/system_extensions/system_extensions_service_worker_manager.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_ASH_SYSTEM_EXTENSIONS_SYSTEM_EXTENSIONS_SERVICE_WORKER_MANAGER_H_ #define CHROME_BROWSER_ASH_SYSTEM_EXTENSIONS_SYSTEM_EXTENSIONS_SERVICE_WORKER_MANAGER_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ref.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.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 cf3b703..cfe4c61 100644 --- a/chrome/browser/ash/system_logs/command_line_log_source.cc +++ b/chrome/browser/ash/system_logs/command_line_log_source.cc
@@ -10,9 +10,9 @@ #include <string> #include <vector> -#include "base/bind.h" #include "base/command_line.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/process/launch.h" #include "base/system/sys_info.h"
diff --git a/chrome/browser/ash/system_logs/connected_input_devices_log_source_unittest.cc b/chrome/browser/ash/system_logs/connected_input_devices_log_source_unittest.cc index 511d657..6ad4215 100644 --- a/chrome/browser/ash/system_logs/connected_input_devices_log_source_unittest.cc +++ b/chrome/browser/ash/system_logs/connected_input_devices_log_source_unittest.cc
@@ -10,7 +10,7 @@ #include "chrome/browser/ash/system_logs/connected_input_devices_log_source.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h" #include "content/public/test/browser_task_environment.h"
diff --git a/chrome/browser/ash/system_logs/crosapi_system_log_source.cc b/chrome/browser/ash/system_logs/crosapi_system_log_source.cc index 75caeda5..b953866 100644 --- a/chrome/browser/ash/system_logs/crosapi_system_log_source.cc +++ b/chrome/browser/ash/system_logs/crosapi_system_log_source.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ash/system_logs/crosapi_system_log_source.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/crosapi/browser_manager.h" namespace system_logs {
diff --git a/chrome/browser/ash/system_logs/crosapi_system_log_source_unittest.cc b/chrome/browser/ash/system_logs/crosapi_system_log_source_unittest.cc index 0401040..f8ffbce 100644 --- a/chrome/browser/ash/system_logs/crosapi_system_log_source_unittest.cc +++ b/chrome/browser/ash/system_logs/crosapi_system_log_source_unittest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ash/system_logs/crosapi_system_log_source.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "chrome/browser/ash/crosapi/fake_browser_manager.h" #include "content/public/test/browser_task_environment.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 197d5e2..b20f6f46 100644 --- a/chrome/browser/ash/system_logs/debug_daemon_log_source.cc +++ b/chrome/browser/ash/system_logs/debug_daemon_log_source.cc
@@ -8,11 +8,11 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/contains.h" #include "base/files/file_enumerator.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/memory/weak_ptr.h" #include "base/metrics/histogram_functions.h"
diff --git a/chrome/browser/ash/system_logs/debug_log_writer.cc b/chrome/browser/ash/system_logs/debug_log_writer.cc index 217488f6..86c5773 100644 --- a/chrome/browser/ash/system_logs/debug_log_writer.cc +++ b/chrome/browser/ash/system_logs/debug_log_writer.cc
@@ -7,12 +7,12 @@ #include <stdint.h> #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/files/file.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/process/kill.h" #include "base/process/launch.h" #include "base/task/lazy_thread_pool_task_runner.h"
diff --git a/chrome/browser/ash/system_logs/debug_log_writer.h b/chrome/browser/ash/system_logs/debug_log_writer.h index 281bc85a..be0dc26 100644 --- a/chrome/browser/ash/system_logs/debug_log_writer.h +++ b/chrome/browser/ash/system_logs/debug_log_writer.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_ASH_SYSTEM_LOGS_DEBUG_LOG_WRITER_H_ #define CHROME_BROWSER_ASH_SYSTEM_LOGS_DEBUG_LOG_WRITER_H_ -#include "base/callback_forward.h" #include "base/files/file_path.h" +#include "base/functional/callback_forward.h" #include "third_party/abseil-cpp/absl/types/optional.h" namespace ash {
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 4640a45..17531e5 100644 --- a/chrome/browser/ash/system_logs/iwlwifi_dump_log_source.cc +++ b/chrome/browser/ash/system_logs/iwlwifi_dump_log_source.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ash/system_logs/iwlwifi_dump_log_source.h" -#include "base/bind.h" #include "base/files/file_util.h" +#include "base/functional/bind.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/network_health_source.cc b/chrome/browser/ash/system_logs/network_health_source.cc index 60364e99..804f2667 100644 --- a/chrome/browser/ash/system_logs/network_health_source.cc +++ b/chrome/browser/ash/system_logs/network_health_source.cc
@@ -7,7 +7,7 @@ #include <sstream> #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "chrome/browser/ash/net/network_health/network_health_manager.h"
diff --git a/chrome/browser/ash/system_logs/reven_log_source.cc b/chrome/browser/ash/system_logs/reven_log_source.cc index d91aeac..44e1e832 100644 --- a/chrome/browser/ash/system_logs/reven_log_source.cc +++ b/chrome/browser/ash/system_logs/reven_log_source.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ash/system_logs/reven_log_source.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/strcat.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_piece.h"
diff --git a/chrome/browser/ash/system_logs/shill_log_source.cc b/chrome/browser/ash/system_logs/shill_log_source.cc index baacad95..6537b55b 100644 --- a/chrome/browser/ash/system_logs/shill_log_source.cc +++ b/chrome/browser/ash/system_logs/shill_log_source.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ash/system_logs/shill_log_source.h" -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/json/json_writer.h" #include "base/logging.h" #include "base/strings/string_util.h"
diff --git a/chrome/browser/ash/system_logs/shill_log_source_unittest.cc b/chrome/browser/ash/system_logs/shill_log_source_unittest.cc index e3b02d384..ed5a2f7 100644 --- a/chrome/browser/ash/system_logs/shill_log_source_unittest.cc +++ b/chrome/browser/ash/system_logs/shill_log_source_unittest.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "chromeos/ash/components/dbus/shill/shill_clients.h" #include "content/public/test/browser_task_environment.h"
diff --git a/chrome/browser/ash/system_logs/single_debug_daemon_log_source.cc b/chrome/browser/ash/system_logs/single_debug_daemon_log_source.cc index 533851b..aa77ab5 100644 --- a/chrome/browser/ash/system_logs/single_debug_daemon_log_source.cc +++ b/chrome/browser/ash/system_logs/single_debug_daemon_log_source.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "chromeos/ash/components/dbus/debug_daemon/debug_daemon_client.h" #include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/ash/system_logs/single_debug_daemon_log_source_unittest.cc b/chrome/browser/ash/system_logs/single_debug_daemon_log_source_unittest.cc index 4dfc2c1..3de769e 100644 --- a/chrome/browser/ash/system_logs/single_debug_daemon_log_source_unittest.cc +++ b/chrome/browser/ash/system_logs/single_debug_daemon_log_source_unittest.cc
@@ -7,7 +7,7 @@ #include <memory> #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "chromeos/ash/components/dbus/debug_daemon/debug_daemon_client.h" #include "content/public/test/browser_task_environment.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 a6eaace..c1fb7bda 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
@@ -4,9 +4,9 @@ #include "chrome/browser/ash/system_logs/single_log_file_log_source.h" -#include "base/bind.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/process/process_info.h" #include "base/strings/string_split.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/ash/system_logs/single_log_file_log_source_unittest.cc b/chrome/browser/ash/system_logs/single_log_file_log_source_unittest.cc index 894829f3..209e9f18 100644 --- a/chrome/browser/ash/system_logs/single_log_file_log_source_unittest.cc +++ b/chrome/browser/ash/system_logs/single_log_file_log_source_unittest.cc
@@ -7,10 +7,10 @@ #include <memory> #include <string> -#include "base/bind.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/strings/string_split.h" #include "base/time/time.h"
diff --git a/chrome/browser/ash/system_logs/system_logs_writer.h b/chrome/browser/ash/system_logs/system_logs_writer.h index 3363aea..05b6c2c0b 100644 --- a/chrome/browser/ash/system_logs/system_logs_writer.h +++ b/chrome/browser/ash/system_logs/system_logs_writer.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_ASH_SYSTEM_LOGS_SYSTEM_LOGS_WRITER_H_ #define CHROME_BROWSER_ASH_SYSTEM_LOGS_SYSTEM_LOGS_WRITER_H_ -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "third_party/abseil-cpp/absl/types/optional.h" // Helper function for writing system logs used in Feedback reports. Currently
diff --git a/chrome/browser/ash/system_logs/touch_log_source.cc b/chrome/browser/ash/system_logs/touch_log_source.cc index 4e039a9..e238fcf3 100644 --- a/chrome/browser/ash/system_logs/touch_log_source.cc +++ b/chrome/browser/ash/system_logs/touch_log_source.cc
@@ -6,13 +6,13 @@ #include <stddef.h> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/check_op.h" #include "base/command_line.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/process/launch.h" #include "base/strings/string_util.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/ash/system_logs/traffic_counters_log_source.cc b/chrome/browser/ash/system_logs/traffic_counters_log_source.cc index 0fddd16..52a8e5f 100644 --- a/chrome/browser/ash/system_logs/traffic_counters_log_source.cc +++ b/chrome/browser/ash/system_logs/traffic_counters_log_source.cc
@@ -9,7 +9,7 @@ #include <utility> #include "ash/public/cpp/network_config_service.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/json/json_writer.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h"
diff --git a/chrome/browser/ash/system_token_cert_db_initializer.cc b/chrome/browser/ash/system_token_cert_db_initializer.cc index fe7f087..fb6f7cb 100644 --- a/chrome/browser/ash/system_token_cert_db_initializer.cc +++ b/chrome/browser/ash/system_token_cert_db_initializer.cc
@@ -9,9 +9,9 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/logging.h" #include "base/sequence_checker.h"
diff --git a/chrome/browser/ash/system_token_cert_db_initializer_unittest.cc b/chrome/browser/ash/system_token_cert_db_initializer_unittest.cc index 731b8a0..6a19a402 100644 --- a/chrome/browser/ash/system_token_cert_db_initializer_unittest.cc +++ b/chrome/browser/ash/system_token_cert_db_initializer_unittest.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/test/task_environment.h" #include "base/time/time.h"
diff --git a/chrome/browser/ash/system_web_apps/system_web_app_background_task.cc b/chrome/browser/ash/system_web_apps/system_web_app_background_task.cc index a0f927f7..24297c5 100644 --- a/chrome/browser/ash/system_web_apps/system_web_app_background_task.cc +++ b/chrome/browser/ash/system_web_apps/system_web_app_background_task.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ash/system_web_apps/system_web_app_background_task.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/weak_ptr.h" #include "base/metrics/histogram_functions.h"
diff --git a/chrome/browser/ash/system_web_apps/system_web_app_manager_browsertest.cc b/chrome/browser/ash/system_web_apps/system_web_app_manager_browsertest.cc index bf2dd84..319bfa9 100644 --- a/chrome/browser/ash/system_web_apps/system_web_app_manager_browsertest.cc +++ b/chrome/browser/ash/system_web_apps/system_web_app_manager_browsertest.cc
@@ -12,9 +12,9 @@ #include "ash/public/cpp/shelf_item_delegate.h" #include "ash/public/cpp/shelf_model.h" #include "ash/webui/system_apps/public/system_web_app_type.h" -#include "base/bind.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/path_service.h" #include "base/run_loop.h" #include "base/strings/strcat.h"
diff --git a/chrome/browser/ash/system_web_apps/test_support/test_system_web_app_installation.cc b/chrome/browser/ash/system_web_apps/test_support/test_system_web_app_installation.cc index e393bfa..1c549f9 100644 --- a/chrome/browser/ash/system_web_apps/test_support/test_system_web_app_installation.cc +++ b/chrome/browser/ash/system_web_apps/test_support/test_system_web_app_installation.cc
@@ -7,8 +7,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/debug/stack_trace.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/strings/utf_string_conversions.h" #include "base/test/bind.h"
diff --git a/chrome/browser/ash/telemetry_extension/diagnostics_service_ash.cc b/chrome/browser/ash/telemetry_extension/diagnostics_service_ash.cc index d94872c..aff57c66 100644 --- a/chrome/browser/ash/telemetry_extension/diagnostics_service_ash.cc +++ b/chrome/browser/ash/telemetry_extension/diagnostics_service_ash.cc
@@ -8,7 +8,6 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/functional/bind.h" #include "chrome/browser/ash/telemetry_extension/diagnostics_service_converters.h" #include "chromeos/ash/services/cros_healthd/public/cpp/service_connection.h"
diff --git a/chrome/browser/ash/telemetry_extension/probe_service_ash.cc b/chrome/browser/ash/telemetry_extension/probe_service_ash.cc index b428245..b6351f5 100644 --- a/chrome/browser/ash/telemetry_extension/probe_service_ash.cc +++ b/chrome/browser/ash/telemetry_extension/probe_service_ash.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/telemetry_extension/probe_service_converters.h" #include "chromeos/ash/components/dbus/debug_daemon/debug_daemon_client.h" #include "chromeos/ash/services/cros_healthd/public/cpp/service_connection.h"
diff --git a/chrome/browser/ash/telemetry_extension/probe_service_ash_unittest.cc b/chrome/browser/ash/telemetry_extension/probe_service_ash_unittest.cc index 049eabad..4c6d979b 100644 --- a/chrome/browser/ash/telemetry_extension/probe_service_ash_unittest.cc +++ b/chrome/browser/ash/telemetry_extension/probe_service_ash_unittest.cc
@@ -7,7 +7,7 @@ #include <cstdint> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/test/bind.h" #include "base/test/task_environment.h" #include "chromeos/ash/components/dbus/debug_daemon/debug_daemon_client.h"
diff --git a/chrome/browser/ash/tether/tether_service.cc b/chrome/browser/ash/tether/tether_service.cc index 283bdfb..f069cf9 100644 --- a/chrome/browser/ash/tether/tether_service.cc +++ b/chrome/browser/ash/tether/tether_service.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ash/tether/tether_service.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "base/task/single_thread_task_runner.h" #include "chrome/browser/ash/profiles/profile_helper.h"
diff --git a/chrome/browser/ash/tether/tether_service_unittest.cc b/chrome/browser/ash/tether/tether_service_unittest.cc index 94b41a6..14895ce 100644 --- a/chrome/browser/ash/tether/tether_service_unittest.cc +++ b/chrome/browser/ash/tether/tether_service_unittest.cc
@@ -7,8 +7,8 @@ #include <memory> #include "ash/constants/ash_features.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/run_loop.h" #include "base/test/metrics/histogram_tester.h"
diff --git a/chrome/browser/ash/throttle_observer.h b/chrome/browser/ash/throttle_observer.h index b5fc7e44..4d108d05 100644 --- a/chrome/browser/ash/throttle_observer.h +++ b/chrome/browser/ash/throttle_observer.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/observer_list_types.h" namespace content {
diff --git a/chrome/browser/ash/throttle_observer_unittest.cc b/chrome/browser/ash/throttle_observer_unittest.cc index f2a42f0..9ce6c16 100644 --- a/chrome/browser/ash/throttle_observer_unittest.cc +++ b/chrome/browser/ash/throttle_observer_unittest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ash/throttle_observer.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/weak_ptr.h" #include "base/template_util.h" #include "base/test/task_environment.h"
diff --git a/chrome/browser/ash/throttle_service.cc b/chrome/browser/ash/throttle_service.cc index 3568cd4..c89e0d4 100644 --- a/chrome/browser/ash/throttle_service.cc +++ b/chrome/browser/ash/throttle_service.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" namespace ash {
diff --git a/chrome/browser/ash/tpm_firmware_update.cc b/chrome/browser/ash/tpm_firmware_update.cc index bfb1438b..0f93c68 100644 --- a/chrome/browser/ash/tpm_firmware_update.cc +++ b/chrome/browser/ash/tpm_firmware_update.cc
@@ -7,13 +7,13 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/feature_list.h" #include "base/files/file_path.h" #include "base/files/file_path_watcher.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/weak_ptr.h" #include "base/path_service.h" #include "base/task/sequenced_task_runner.h"
diff --git a/chrome/browser/ash/tpm_firmware_update.h b/chrome/browser/ash/tpm_firmware_update.h index c1b37d9..f2350ea 100644 --- a/chrome/browser/ash/tpm_firmware_update.h +++ b/chrome/browser/ash/tpm_firmware_update.h
@@ -8,7 +8,7 @@ #include <memory> #include <set> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/time/time.h" namespace base {
diff --git a/chrome/browser/ash/tpm_firmware_update_notification.cc b/chrome/browser/ash/tpm_firmware_update_notification.cc index 8d97d94..8b1b7d8 100644 --- a/chrome/browser/ash/tpm_firmware_update_notification.cc +++ b/chrome/browser/ash/tpm_firmware_update_notification.cc
@@ -8,7 +8,7 @@ #include "ash/constants/notifier_catalogs.h" #include "ash/public/cpp/notification_utils.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/scoped_refptr.h" #include "chrome/browser/ash/tpm_firmware_update.h" #include "chrome/browser/notifications/notification_display_service.h"
diff --git a/chrome/browser/ash/tpm_firmware_update_unittest.cc b/chrome/browser/ash/tpm_firmware_update_unittest.cc index 41b3fe3f..381d790a 100644 --- a/chrome/browser/ash/tpm_firmware_update_unittest.cc +++ b/chrome/browser/ash/tpm_firmware_update_unittest.cc
@@ -6,11 +6,11 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/files/file_util.h" #include "base/files/important_file_writer.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/path_service.h" #include "base/test/scoped_feature_list.h" #include "base/test/scoped_path_override.h"
diff --git a/chrome/browser/ash/u2f_notification.cc b/chrome/browser/ash/u2f_notification.cc index 322bdce..bc43ed5 100644 --- a/chrome/browser/ash/u2f_notification.cc +++ b/chrome/browser/ash/u2f_notification.cc
@@ -9,10 +9,10 @@ #include "ash/constants/notifier_catalogs.h" #include "ash/public/cpp/notification_utils.h" -#include "base/bind.h" #include "base/containers/contains.h" #include "base/files/file_enumerator.h" #include "base/files/file_path.h" +#include "base/functional/bind.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/usb/cros_usb_detector.cc b/chrome/browser/ash/usb/cros_usb_detector.cc index 5d0530a..7a8980a 100644 --- a/chrome/browser/ash/usb/cros_usb_detector.cc +++ b/chrome/browser/ash/usb/cros_usb_detector.cc
@@ -14,8 +14,8 @@ #include "ash/constants/ash_pref_names.h" #include "ash/constants/notifier_catalogs.h" #include "ash/public/cpp/notification_utils.h" -#include "base/callback_helpers.h" #include "base/files/file_util.h" +#include "base/functional/callback_helpers.h" #include "base/numerics/safe_conversions.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/ash/arc/arc_util.h"
diff --git a/chrome/browser/ash/wallpaper/wallpaper_enumerator.cc b/chrome/browser/ash/wallpaper/wallpaper_enumerator.cc index 3ad8385..3edd711606 100644 --- a/chrome/browser/ash/wallpaper/wallpaper_enumerator.cc +++ b/chrome/browser/ash/wallpaper/wallpaper_enumerator.cc
@@ -7,9 +7,9 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/files/file_enumerator.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "chrome/browser/ash/file_manager/path_util.h"
diff --git a/chrome/browser/ash/wallpaper/wallpaper_enumerator.h b/chrome/browser/ash/wallpaper/wallpaper_enumerator.h index 1b6f72d..516c698 100644 --- a/chrome/browser/ash/wallpaper/wallpaper_enumerator.h +++ b/chrome/browser/ash/wallpaper/wallpaper_enumerator.h
@@ -7,8 +7,8 @@ #include <vector> -#include "base/callback_forward.h" #include "base/files/file_path.h" +#include "base/functional/callback_forward.h" class Profile;
diff --git a/chrome/browser/ash/wallpaper_handlers/mock_wallpaper_handlers.cc b/chrome/browser/ash/wallpaper_handlers/mock_wallpaper_handlers.cc index 88cc9af..2ed53e0f 100644 --- a/chrome/browser/ash/wallpaper_handlers/mock_wallpaper_handlers.cc +++ b/chrome/browser/ash/wallpaper_handlers/mock_wallpaper_handlers.cc
@@ -7,7 +7,7 @@ #include <vector> #include "ash/webui/personalization_app/mojom/personalization_app.mojom.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/task/sequenced_task_runner.h" #include "chrome/browser/ash/wallpaper_handlers/wallpaper_handlers.h" #include "testing/gmock/include/gmock/gmock.h"
diff --git a/chrome/browser/ash/wallpaper_handlers/mock_wallpaper_handlers.h b/chrome/browser/ash/wallpaper_handlers/mock_wallpaper_handlers.h index 46df1df..40c5650 100644 --- a/chrome/browser/ash/wallpaper_handlers/mock_wallpaper_handlers.h +++ b/chrome/browser/ash/wallpaper_handlers/mock_wallpaper_handlers.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_ASH_WALLPAPER_HANDLERS_MOCK_WALLPAPER_HANDLERS_H_ #define CHROME_BROWSER_ASH_WALLPAPER_HANDLERS_MOCK_WALLPAPER_HANDLERS_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "chrome/browser/ash/wallpaper_handlers/wallpaper_handlers.h" #include "testing/gmock/include/gmock/gmock.h"
diff --git a/chrome/browser/ash/wallpaper_handlers/wallpaper_handlers.cc b/chrome/browser/ash/wallpaper_handlers/wallpaper_handlers.cc index 2c237a3c..009c876 100644 --- a/chrome/browser/ash/wallpaper_handlers/wallpaper_handlers.cc +++ b/chrome/browser/ash/wallpaper_handlers/wallpaper_handlers.cc
@@ -14,10 +14,10 @@ #include "ash/wallpaper/wallpaper_utils/wallpaper_language.h" #include "ash/webui/personalization_app/mojom/personalization_app.mojom.h" #include "ash/webui/personalization_app/proto/backdrop_wallpaper.pb.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/i18n/time_formatting.h" #include "base/numerics/safe_conversions.h" #include "base/strings/strcat.h"
diff --git a/chrome/browser/ash/wallpaper_handlers/wallpaper_handlers.h b/chrome/browser/ash/wallpaper_handlers/wallpaper_handlers.h index 3f2ede5e..ba2d1a47 100644 --- a/chrome/browser/ash/wallpaper_handlers/wallpaper_handlers.h +++ b/chrome/browser/ash/wallpaper_handlers/wallpaper_handlers.h
@@ -10,7 +10,7 @@ #include <vector> #include "ash/webui/personalization_app/mojom/personalization_app.mojom-forward.h" -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/scoped_observation.h" #include "base/values.h" #include "components/signin/public/identity_manager/identity_manager.h"
diff --git a/chrome/browser/ash/web_applications/camera_app/chrome_camera_app_ui_delegate.h b/chrome/browser/ash/web_applications/camera_app/chrome_camera_app_ui_delegate.h index 2335f55..7d539dc 100644 --- a/chrome/browser/ash/web_applications/camera_app/chrome_camera_app_ui_delegate.h +++ b/chrome/browser/ash/web_applications/camera_app/chrome_camera_app_ui_delegate.h
@@ -8,8 +8,8 @@ #include <memory> #include "ash/webui/camera_app_ui/camera_app_ui_delegate.h" -#include "base/callback.h" #include "base/files/file_path_watcher.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h" #include "base/timer/timer.h"
diff --git a/chrome/browser/ash/web_applications/help_app/help_app_discover_tab_notification.h b/chrome/browser/ash/web_applications/help_app/help_app_discover_tab_notification.h index 644dd938..f87bd753 100644 --- a/chrome/browser/ash/web_applications/help_app/help_app_discover_tab_notification.h +++ b/chrome/browser/ash/web_applications/help_app/help_app_discover_tab_notification.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/chrome/browser/ash/web_applications/help_app/help_app_untrusted_ui_config.cc b/chrome/browser/ash/web_applications/help_app/help_app_untrusted_ui_config.cc index 86d43d9..04701cb3 100644 --- a/chrome/browser/ash/web_applications/help_app/help_app_untrusted_ui_config.cc +++ b/chrome/browser/ash/web_applications/help_app/help_app_untrusted_ui_config.cc
@@ -13,10 +13,10 @@ #include "ash/shell.h" #include "ash/webui/help_app_ui/help_app_untrusted_ui.h" #include "ash/webui/help_app_ui/url_constants.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/system/sys_info.h" #include "chrome/browser/ash/accessibility/accessibility_manager.h" #include "chrome/browser/ash/arc/arc_util.h"
diff --git a/chrome/browser/ash/web_applications/media_app/chrome_media_app_ui_delegate.cc b/chrome/browser/ash/web_applications/media_app/chrome_media_app_ui_delegate.cc index 9f1bb86e..17cb6ef 100644 --- a/chrome/browser/ash/web_applications/media_app/chrome_media_app_ui_delegate.cc +++ b/chrome/browser/ash/web_applications/media_app/chrome_media_app_ui_delegate.cc
@@ -9,8 +9,8 @@ #include "ash/constants/ash_features.h" #include "ash/webui/media_app_ui/file_system_access_helpers.h" #include "ash/webui/media_app_ui/url_constants.h" -#include "base/bind.h" #include "base/containers/flat_map.h" +#include "base/functional/bind.h" #include "base/notreached.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/web_applications/media_app/chrome_media_app_ui_delegate.h b/chrome/browser/ash/web_applications/media_app/chrome_media_app_ui_delegate.h index b3e6c3c6..4a4d6f70 100644 --- a/chrome/browser/ash/web_applications/media_app/chrome_media_app_ui_delegate.h +++ b/chrome/browser/ash/web_applications/media_app/chrome_media_app_ui_delegate.h
@@ -6,7 +6,7 @@ #define CHROME_BROWSER_ASH_WEB_APPLICATIONS_MEDIA_APP_CHROME_MEDIA_APP_UI_DELEGATE_H_ #include "ash/webui/media_app_ui/media_app_ui_delegate.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "mojo/public/cpp/bindings/pending_remote.h"
diff --git a/chrome/browser/ash/web_applications/personalization_app/personalization_app_ambient_provider_impl.cc b/chrome/browser/ash/web_applications/personalization_app/personalization_app_ambient_provider_impl.cc index 803c94b8..2cc929dd2a 100644 --- a/chrome/browser/ash/web_applications/personalization_app/personalization_app_ambient_provider_impl.cc +++ b/chrome/browser/ash/web_applications/personalization_app/personalization_app_ambient_provider_impl.cc
@@ -22,9 +22,9 @@ #include "ash/webui/personalization_app/mojom/personalization_app.mojom.h" #include "ash/webui/personalization_app/mojom/personalization_app_mojom_traits.h" #include "base/barrier_closure.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/check.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/memory/ref_counted_memory.h" #include "base/notreached.h"
diff --git a/chrome/browser/ash/web_applications/personalization_app/personalization_app_ambient_provider_impl_unittest.cc b/chrome/browser/ash/web_applications/personalization_app/personalization_app_ambient_provider_impl_unittest.cc index 7b76cd7c..4acdc06 100644 --- a/chrome/browser/ash/web_applications/personalization_app/personalization_app_ambient_provider_impl_unittest.cc +++ b/chrome/browser/ash/web_applications/personalization_app/personalization_app_ambient_provider_impl_unittest.cc
@@ -15,7 +15,7 @@ #include "ash/shell.h" #include "ash/test/ash_test_base.h" #include "ash/webui/personalization_app/mojom/personalization_app.mojom.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/ranges/algorithm.h" #include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h"
diff --git a/chrome/browser/ash/web_applications/personalization_app/personalization_app_integration_browsertest.cc b/chrome/browser/ash/web_applications/personalization_app/personalization_app_integration_browsertest.cc index 2ce5a661..6895b3b 100644 --- a/chrome/browser/ash/web_applications/personalization_app/personalization_app_integration_browsertest.cc +++ b/chrome/browser/ash/web_applications/personalization_app/personalization_app_integration_browsertest.cc
@@ -9,9 +9,9 @@ #include "ash/public/cpp/window_backdrop.h" #include "ash/shell.h" #include "ash/webui/personalization_app/personalization_app_url_constants.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/path_service.h" #include "base/run_loop.h"
diff --git a/chrome/browser/ash/web_applications/personalization_app/personalization_app_manager.cc b/chrome/browser/ash/web_applications/personalization_app/personalization_app_manager.cc index 5119e6e..aa7aa84 100644 --- a/chrome/browser/ash/web_applications/personalization_app/personalization_app_manager.cc +++ b/chrome/browser/ash/web_applications/personalization_app/personalization_app_manager.cc
@@ -7,9 +7,9 @@ #include <memory> #include "ash/webui/personalization_app/search/search_handler.h" -#include "base/bind.h" #include "base/containers/flat_map.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/time/time.h"
diff --git a/chrome/browser/ash/web_applications/personalization_app/personalization_app_user_provider_impl.cc b/chrome/browser/ash/web_applications/personalization_app/personalization_app_user_provider_impl.cc index 5c9b47a2..747bbfd 100644 --- a/chrome/browser/ash/web_applications/personalization_app/personalization_app_user_provider_impl.cc +++ b/chrome/browser/ash/web_applications/personalization_app/personalization_app_user_provider_impl.cc
@@ -9,8 +9,8 @@ #include "ash/webui/personalization_app/mojom/personalization_app.mojom-forward.h" #include "ash/webui/personalization_app/mojom/personalization_app.mojom.h" #include "ash/webui/personalization_app/mojom/personalization_app_mojom_traits.h" -#include "base/bind.h" #include "base/containers/span.h" +#include "base/functional/bind.h" #include "base/memory/scoped_refptr.h" #include "base/strings/utf_string_conversions.h" #include "base/task/sequenced_task_runner.h"
diff --git a/chrome/browser/ash/web_applications/personalization_app/personalization_app_user_provider_impl_unittest.cc b/chrome/browser/ash/web_applications/personalization_app/personalization_app_user_provider_impl_unittest.cc index 3a117b9..105287d3 100644 --- a/chrome/browser/ash/web_applications/personalization_app/personalization_app_user_provider_impl_unittest.cc +++ b/chrome/browser/ash/web_applications/personalization_app/personalization_app_user_provider_impl_unittest.cc
@@ -8,9 +8,9 @@ #include "ash/public/cpp/default_user_image.h" #include "ash/webui/personalization_app/mojom/personalization_app.mojom.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/span.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ref_counted_memory.h" #include "base/strings/utf_string_conversions.h" #include "base/test/bind.h"
diff --git a/chrome/browser/ash/web_applications/personalization_app/personalization_app_wallpaper_provider_impl.cc b/chrome/browser/ash/web_applications/personalization_app/personalization_app_wallpaper_provider_impl.cc index f6fa25f..2c0ce6c9 100644 --- a/chrome/browser/ash/web_applications/personalization_app/personalization_app_wallpaper_provider_impl.cc +++ b/chrome/browser/ash/web_applications/personalization_app/personalization_app_wallpaper_provider_impl.cc
@@ -26,10 +26,10 @@ #include "ash/webui/personalization_app/mojom/personalization_app_mojom_traits.h" #include "ash/webui/personalization_app/proto/backdrop_wallpaper.pb.h" #include "base/base64.h" -#include "base/bind.h" #include "base/debug/crash_logging.h" #include "base/debug/dump_without_crashing.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted_memory.h" #include "base/notreached.h" #include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/ash/web_applications/personalization_app/personalization_app_wallpaper_provider_impl_unittest.cc b/chrome/browser/ash/web_applications/personalization_app/personalization_app_wallpaper_provider_impl_unittest.cc index 826c07a7..8e8288e3 100644 --- a/chrome/browser/ash/web_applications/personalization_app/personalization_app_wallpaper_provider_impl_unittest.cc +++ b/chrome/browser/ash/web_applications/personalization_app/personalization_app_wallpaper_provider_impl_unittest.cc
@@ -17,7 +17,7 @@ #include "ash/wallpaper/wallpaper_pref_manager.h" #include "ash/webui/personalization_app/mojom/personalization_app.mojom-forward.h" #include "ash/webui/personalization_app/mojom/personalization_app.mojom.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/json/json_reader.h" #include "base/memory/ref_counted_memory.h" #include "base/memory/scoped_refptr.h"
diff --git a/chrome/browser/ash/wilco_dtc_supportd/fake_wilco_dtc_supportd_client.cc b/chrome/browser/ash/wilco_dtc_supportd/fake_wilco_dtc_supportd_client.cc index e4fa875..64c3d6c 100644 --- a/chrome/browser/ash/wilco_dtc_supportd/fake_wilco_dtc_supportd_client.cc +++ b/chrome/browser/ash/wilco_dtc_supportd/fake_wilco_dtc_supportd_client.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/single_thread_task_runner.h" namespace ash {
diff --git a/chrome/browser/ash/wilco_dtc_supportd/testing_wilco_dtc_supportd_bridge_wrapper.cc b/chrome/browser/ash/wilco_dtc_supportd/testing_wilco_dtc_supportd_bridge_wrapper.cc index 4da7038..b9af688a 100644 --- a/chrome/browser/ash/wilco_dtc_supportd/testing_wilco_dtc_supportd_bridge_wrapper.cc +++ b/chrome/browser/ash/wilco_dtc_supportd/testing_wilco_dtc_supportd_bridge_wrapper.cc
@@ -8,9 +8,9 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/check.h" #include "base/files/scoped_file.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/posix/eintr_wrapper.h" #include "base/run_loop.h"
diff --git a/chrome/browser/ash/wilco_dtc_supportd/testing_wilco_dtc_supportd_bridge_wrapper.h b/chrome/browser/ash/wilco_dtc_supportd/testing_wilco_dtc_supportd_bridge_wrapper.h index a871b7a1..7204cf44 100644 --- a/chrome/browser/ash/wilco_dtc_supportd/testing_wilco_dtc_supportd_bridge_wrapper.h +++ b/chrome/browser/ash/wilco_dtc_supportd/testing_wilco_dtc_supportd_bridge_wrapper.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/services/wilco_dtc_supportd/public/mojom/wilco_dtc_supportd.mojom.h" #include "mojo/public/cpp/bindings/pending_receiver.h" #include "mojo/public/cpp/bindings/pending_remote.h"
diff --git a/chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_bridge.cc b/chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_bridge.cc index afaf4a7..3604ae0 100644 --- a/chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_bridge.cc +++ b/chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_bridge.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/memory/shared_memory_mapping.h"
diff --git a/chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_bridge_unittest.cc b/chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_bridge_unittest.cc index f229a9e..3b55f7c 100644 --- a/chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_bridge_unittest.cc +++ b/chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_bridge_unittest.cc
@@ -6,8 +6,8 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/posix/eintr_wrapper.h" #include "base/test/task_environment.h" #include "chrome/browser/ash/wilco_dtc_supportd/fake_wilco_dtc_supportd_client.h"
diff --git a/chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_client.cc b/chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_client.cc index f0bba4c9..a62d618 100644 --- a/chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_client.cc +++ b/chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_client.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ash/wilco_dtc_supportd/fake_wilco_dtc_supportd_client.h" #include "chrome/common/chrome_features.h"
diff --git a/chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_manager.cc b/chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_manager.cc index b2aee48..9479212 100644 --- a/chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_manager.cc +++ b/chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_manager.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/strings/string_util.h" #include "chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_bridge.h"
diff --git a/chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_manager.h b/chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_manager.h index e1f0d0b..f13bb1bf0 100644 --- a/chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_manager.h +++ b/chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_manager.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ash/settings/cros_settings.h" #include "components/session_manager/core/session_manager_observer.h"
diff --git a/chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_messaging.cc b/chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_messaging.cc index e2f69b2..7798a8b7 100644 --- a/chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_messaging.cc +++ b/chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_messaging.cc
@@ -8,8 +8,8 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/memory/shared_memory_mapping.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_messaging.h b/chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_messaging.h index 1713d34..8b802356 100644 --- a/chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_messaging.h +++ b/chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_messaging.h
@@ -9,7 +9,7 @@ #include <memory> #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "content/public/browser/browser_context.h" namespace extensions {
diff --git a/chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_messaging_unittest.cc b/chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_messaging_unittest.cc index d86775ce..eeeccba 100644 --- a/chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_messaging_unittest.cc +++ b/chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_messaging_unittest.cc
@@ -6,9 +6,9 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/check.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/shared_memory_mapping.h" #include "base/run_loop.h" #include "base/strings/string_piece.h"
diff --git a/chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_web_request_service.cc b/chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_web_request_service.cc index 5bc64f4..fb8b522c6 100644 --- a/chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_web_request_service.cc +++ b/chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_web_request_service.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "chrome/browser/ash/wilco_dtc_supportd/mojo_utils.h" #include "chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_network_context.h"
diff --git a/chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_web_request_service_browsertest.cc b/chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_web_request_service_browsertest.cc index 391d415a..c3b1ee8 100644 --- a/chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_web_request_service_browsertest.cc +++ b/chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_web_request_service_browsertest.cc
@@ -7,7 +7,7 @@ #include <map> #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted.h" #include "base/run_loop.h" #include "chrome/browser/ash/wilco_dtc_supportd/mojo_utils.h"
diff --git a/chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_web_request_service_unittest.cc b/chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_web_request_service_unittest.cc index 6b7d496d..e3b0286 100644 --- a/chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_web_request_service_unittest.cc +++ b/chrome/browser/ash/wilco_dtc_supportd/wilco_dtc_supportd_web_request_service_unittest.cc
@@ -7,8 +7,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/memory/shared_memory_mapping.h" #include "base/run_loop.h" #include "base/strings/string_piece.h"
diff --git a/chrome/browser/autocomplete/autocomplete_browsertest.cc b/chrome/browser/autocomplete/autocomplete_browsertest.cc index dc1ea4d..0e6276c 100644 --- a/chrome/browser/autocomplete/autocomplete_browsertest.cc +++ b/chrome/browser/autocomplete/autocomplete_browsertest.cc
@@ -4,9 +4,9 @@ #include <stddef.h> -#include "base/bind.h" #include "base/command_line.h" #include "base/format_macros.h" +#include "base/functional/bind.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/trace_event/memory_dump_manager.h"
diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc index 282ad753..5f67835 100644 --- a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc +++ b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
@@ -8,7 +8,7 @@ #include <algorithm> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/autocomplete/search_provider_unittest.cc b/chrome/browser/autocomplete/search_provider_unittest.cc index a0e53d3a3..0ec9b2b2 100644 --- a/chrome/browser/autocomplete/search_provider_unittest.cc +++ b/chrome/browser/autocomplete/search_provider_unittest.cc
@@ -7,8 +7,8 @@ #include <memory> #include <string> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/metrics/field_trial.h" #include "base/run_loop.h"
diff --git a/chrome/browser/autocomplete/shortcuts_provider_extension_unittest.cc b/chrome/browser/autocomplete/shortcuts_provider_extension_unittest.cc index e6ae14d1..b111980 100644 --- a/chrome/browser/autocomplete/shortcuts_provider_extension_unittest.cc +++ b/chrome/browser/autocomplete/shortcuts_provider_extension_unittest.cc
@@ -6,7 +6,7 @@ #include <string> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/autofill/accessory_controller.h b/chrome/browser/autofill/accessory_controller.h index 80ccf961..f7c89584 100644 --- a/chrome/browser/autofill/accessory_controller.h +++ b/chrome/browser/autofill/accessory_controller.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_AUTOFILL_ACCESSORY_CONTROLLER_H_ #define CHROME_BROWSER_AUTOFILL_ACCESSORY_CONTROLLER_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/types/strong_alias.h" #include "components/autofill/core/browser/ui/accessory_sheet_data.h" #include "components/autofill/core/common/unique_ids.h"
diff --git a/chrome/browser/autofill/android/personal_data_manager_android.cc b/chrome/browser/autofill/android/personal_data_manager_android.cc index 11d7907..cba6b293 100644 --- a/chrome/browser/autofill/android/personal_data_manager_android.cc +++ b/chrome/browser/autofill/android/personal_data_manager_android.cc
@@ -12,9 +12,9 @@ #include "base/android/jni_array.h" #include "base/android/jni_string.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/format_macros.h" +#include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "base/time/time.h" #include "chrome/browser/android/resource_mapper.h"
diff --git a/chrome/browser/autofill/android/save_update_address_profile_message_controller.h b/chrome/browser/autofill/android/save_update_address_profile_message_controller.h index da15ad0..f3754d32 100644 --- a/chrome/browser/autofill/android/save_update_address_profile_message_controller.h +++ b/chrome/browser/autofill/android/save_update_address_profile_message_controller.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "components/autofill/core/browser/autofill_client.h" #include "components/autofill/core/browser/data_model/autofill_profile.h"
diff --git a/chrome/browser/autofill/android/save_update_address_profile_prompt_controller.h b/chrome/browser/autofill/android/save_update_address_profile_prompt_controller.h index 2a5138c..69911f1 100644 --- a/chrome/browser/autofill/android/save_update_address_profile_prompt_controller.h +++ b/chrome/browser/autofill/android/save_update_address_profile_prompt_controller.h
@@ -9,7 +9,7 @@ #include <jni.h> #include "base/android/scoped_java_ref.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/autofill/android/save_update_address_profile_prompt_view.h" #include "components/autofill/core/browser/autofill_client.h" #include "components/autofill/core/browser/data_model/autofill_profile.h"
diff --git a/chrome/browser/autofill/autofill_credit_card_filling_infobar_delegate_mobile_unittest.cc b/chrome/browser/autofill/autofill_credit_card_filling_infobar_delegate_mobile_unittest.cc index db97f1b..2ffc274 100644 --- a/chrome/browser/autofill/autofill_credit_card_filling_infobar_delegate_mobile_unittest.cc +++ b/chrome/browser/autofill/autofill_credit_card_filling_infobar_delegate_mobile_unittest.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/test/metrics/histogram_tester.h" #include "chrome/test/base/chrome_render_view_host_test_harness.h" #include "components/autofill/core/browser/autofill_test_utils.h"
diff --git a/chrome/browser/autofill/autofill_image_fetcher_impl_unittest.cc b/chrome/browser/autofill/autofill_image_fetcher_impl_unittest.cc index 8c0fa5c..85b53a5 100644 --- a/chrome/browser/autofill/autofill_image_fetcher_impl_unittest.cc +++ b/chrome/browser/autofill/autofill_image_fetcher_impl_unittest.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/autofill/autofill_image_fetcher_impl.h" -#include "base/callback_helpers.h" #include "base/containers/contains.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h"
diff --git a/chrome/browser/autofill/autofill_interactive_uitest.cc b/chrome/browser/autofill/autofill_interactive_uitest.cc index cb8d4dc3..a9e8d3b 100644 --- a/chrome/browser/autofill/autofill_interactive_uitest.cc +++ b/chrome/browser/autofill/autofill_interactive_uitest.cc
@@ -9,9 +9,9 @@ #include <utility> #include "base/base_switches.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted.h" #include "base/metrics/field_trial.h" #include "base/rand_util.h"
diff --git a/chrome/browser/autofill/autofill_save_card_infobar_delegate_mobile_unittest.cc b/chrome/browser/autofill/autofill_save_card_infobar_delegate_mobile_unittest.cc index 5b33d73..1833dba9 100644 --- a/chrome/browser/autofill/autofill_save_card_infobar_delegate_mobile_unittest.cc +++ b/chrome/browser/autofill/autofill_save_card_infobar_delegate_mobile_unittest.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/json/json_reader.h" #include "base/test/metrics/histogram_tester.h" #include "chrome/browser/autofill/personal_data_manager_factory.h"
diff --git a/chrome/browser/autofill/autofill_server_browsertest.cc b/chrome/browser/autofill/autofill_server_browsertest.cc index a07727b9..2cc62d16 100644 --- a/chrome/browser/autofill/autofill_server_browsertest.cc +++ b/chrome/browser/autofill/autofill_server_browsertest.cc
@@ -4,8 +4,8 @@ #include "base/base64url.h" #include "base/base_switches.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/autofill/autofill_uitest.cc b/chrome/browser/autofill/autofill_uitest.cc index 763aab6..9f833025 100644 --- a/chrome/browser/autofill/autofill_uitest.cc +++ b/chrome/browser/autofill/autofill_uitest.cc
@@ -4,7 +4,7 @@ #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "chrome/browser/autofill/autofill_uitest.h" #include "chrome/browser/autofill/autofill_uitest_util.h"
diff --git a/chrome/browser/autofill/captured_sites_test_utils.cc b/chrome/browser/autofill/captured_sites_test_utils.cc index ff93fa34..0fe5cb0 100644 --- a/chrome/browser/autofill/captured_sites_test_utils.cc +++ b/chrome/browser/autofill/captured_sites_test_utils.cc
@@ -10,8 +10,8 @@ #include <vector> #include "base/base_switches.h" -#include "base/bind.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/guid.h" #include "base/json/json_reader.h" #include "base/json/json_string_value_serializer.h"
diff --git a/chrome/browser/autofill/content_autofill_driver_browsertest.cc b/chrome/browser/autofill/content_autofill_driver_browsertest.cc index 108c444..a6d4256a 100644 --- a/chrome/browser/autofill/content_autofill_driver_browsertest.cc +++ b/chrome/browser/autofill/content_autofill_driver_browsertest.cc
@@ -4,7 +4,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted.h" #include "base/test/scoped_feature_list.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/autofill/form_structure_browsertest.cc b/chrome/browser/autofill/form_structure_browsertest.cc index 3a39fd8..8085519 100644 --- a/chrome/browser/autofill/form_structure_browsertest.cc +++ b/chrome/browser/autofill/form_structure_browsertest.cc
@@ -5,12 +5,12 @@ #include <algorithm> #include <vector> -#include "base/bind.h" #include "base/command_line.h" #include "base/containers/contains.h" #include "base/feature_list.h" #include "base/files/file_enumerator.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/no_destructor.h" #include "base/path_service.h" #include "base/strings/string_util.h"
diff --git a/chrome/browser/autofill/manual_filling_controller_impl.cc b/chrome/browser/autofill/manual_filling_controller_impl.cc index 6458737..a909f3b 100644 --- a/chrome/browser/autofill/manual_filling_controller_impl.cc +++ b/chrome/browser/autofill/manual_filling_controller_impl.cc
@@ -7,9 +7,9 @@ #include <numeric> #include <utility> -#include "base/callback.h" #include "base/containers/fixed_flat_set.h" #include "base/feature_list.h" +#include "base/functional/callback.h" #include "base/memory/ptr_util.h" #include "base/metrics/histogram_macros.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/autofill/manual_filling_controller_impl.h b/chrome/browser/autofill/manual_filling_controller_impl.h index f6c5c24c..351e9e8 100644 --- a/chrome/browser/autofill/manual_filling_controller_impl.h +++ b/chrome/browser/autofill/manual_filling_controller_impl.h
@@ -7,8 +7,8 @@ #include <memory> -#include "base/callback_forward.h" #include "base/containers/flat_set.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "base/trace_event/memory_dump_provider.h" #include "chrome/browser/autofill/accessory_controller.h"
diff --git a/chrome/browser/autofill/manual_filling_controller_impl_unittest.cc b/chrome/browser/autofill/manual_filling_controller_impl_unittest.cc index fc1e1a9..22f1fa7 100644 --- a/chrome/browser/autofill/manual_filling_controller_impl_unittest.cc +++ b/chrome/browser/autofill/manual_filling_controller_impl_unittest.cc
@@ -9,8 +9,8 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/background/background_application_list_model.cc b/chrome/browser/background/background_application_list_model.cc index 8165853..ffd5c44 100644 --- a/chrome/browser/background/background_application_list_model.cc +++ b/chrome/browser/background/background_application_list_model.cc
@@ -8,7 +8,7 @@ #include <set> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/observer_list.h" #include "base/one_shot_event.h"
diff --git a/chrome/browser/background/background_contents_service.cc b/chrome/browser/background/background_contents_service.cc index 957dd05b..dd1fd0a2 100644 --- a/chrome/browser/background/background_contents_service.cc +++ b/chrome/browser/background/background_contents_service.cc
@@ -6,9 +6,9 @@ #include <utility> -#include "base/bind.h" #include "base/command_line.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/metrics/histogram_macros.h"
diff --git a/chrome/browser/background/background_contents_service_unittest.cc b/chrome/browser/background/background_contents_service_unittest.cc index e603ffe..033f2659 100644 --- a/chrome/browser/background/background_contents_service_unittest.cc +++ b/chrome/browser/background/background_contents_service_unittest.cc
@@ -7,8 +7,8 @@ #include <memory> #include <string> -#include "base/callback.h" #include "base/command_line.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "build/build_config.h"
diff --git a/chrome/browser/background/background_mode_manager.cc b/chrome/browser/background/background_mode_manager.cc index cb072f17..f740027e 100644 --- a/chrome/browser/background/background_mode_manager.cc +++ b/chrome/browser/background/background_mode_manager.cc
@@ -13,11 +13,11 @@ #include <vector> #include "base/base_paths.h" -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/logging.h" #include "base/metrics/histogram_macros.h"
diff --git a/chrome/browser/background/background_mode_manager.h b/chrome/browser/background/background_mode_manager.h index d9b02b89..0f757d8 100644 --- a/chrome/browser/background/background_mode_manager.h +++ b/chrome/browser/background/background_mode_manager.h
@@ -10,7 +10,7 @@ #include <set> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/background/background_mode_manager_unittest.cc b/chrome/browser/background/background_mode_manager_unittest.cc index fa6d90e..eb9cc19 100644 --- a/chrome/browser/background/background_mode_manager_unittest.cc +++ b/chrome/browser/background/background_mode_manager_unittest.cc
@@ -10,8 +10,8 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/ranges/algorithm.h" #include "base/run_loop.h"
diff --git a/chrome/browser/background/background_mode_manager_win.cc b/chrome/browser/background/background_mode_manager_win.cc index e01939d..63e247e 100644 --- a/chrome/browser/background/background_mode_manager_win.cc +++ b/chrome/browser/background/background_mode_manager_win.cc
@@ -3,9 +3,9 @@ // found in the LICENSE file. #include "base/base_paths.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/background_fetch/background_fetch_browsertest.cc b/chrome/browser/background_fetch/background_fetch_browsertest.cc index a5f2bffd..b466ecc 100644 --- a/chrome/browser/background_fetch/background_fetch_browsertest.cc +++ b/chrome/browser/background_fetch/background_fetch_browsertest.cc
@@ -4,9 +4,9 @@ #include <memory> -#include "base/bind.h" -#include "base/callback.h" #include "base/check_op.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/strings/string_util.h"
diff --git a/chrome/browser/background_fetch/background_fetch_delegate_impl.cc b/chrome/browser/background_fetch/background_fetch_delegate_impl.cc index 2c3fe23..ebe03bc 100644 --- a/chrome/browser/background_fetch/background_fetch_delegate_impl.cc +++ b/chrome/browser/background_fetch/background_fetch_delegate_impl.cc
@@ -6,10 +6,10 @@ #include <utility> -#include "base/bind.h" #include "base/check_op.h" #include "base/containers/contains.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/notreached.h" #include "base/strings/string_util.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/badging/badge_manager_factory.cc b/chrome/browser/badging/badge_manager_factory.cc index ceaf7a31..265f639 100644 --- a/chrome/browser/badging/badge_manager_factory.cc +++ b/chrome/browser/badging/badge_manager_factory.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/memory/singleton.h" #include "chrome/browser/badging/badge_manager.h"
diff --git a/chrome/browser/badging/badge_manager_unittest.cc b/chrome/browser/badging/badge_manager_unittest.cc index becc3aa..14d0e4dd 100644 --- a/chrome/browser/badging/badge_manager_unittest.cc +++ b/chrome/browser/badging/badge_manager_unittest.cc
@@ -8,7 +8,7 @@ #include <utility> #include <vector> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/test/bind.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/badging/test_badge_manager_delegate.h b/chrome/browser/badging/test_badge_manager_delegate.h index 9dd9307..ef51aba 100644 --- a/chrome/browser/badging/test_badge_manager_delegate.h +++ b/chrome/browser/badging/test_badge_manager_delegate.h
@@ -7,7 +7,7 @@ #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/badging/badge_manager.h" #include "chrome/browser/badging/badge_manager_delegate.h" #include "chrome/browser/web_applications/web_app_id.h"
diff --git a/chrome/browser/banners/app_banner_manager_browsertest.cc b/chrome/browser/banners/app_banner_manager_browsertest.cc index 857ec76..e61e278 100644 --- a/chrome/browser/banners/app_banner_manager_browsertest.cc +++ b/chrome/browser/banners/app_banner_manager_browsertest.cc
@@ -8,9 +8,9 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/banners/app_banner_manager_desktop.cc b/chrome/browser/banners/app_banner_manager_desktop.cc index b8a89dc..df6659b 100644 --- a/chrome/browser/banners/app_banner_manager_desktop.cc +++ b/chrome/browser/banners/app_banner_manager_desktop.cc
@@ -6,9 +6,9 @@ #include <string> -#include "base/bind.h" #include "base/command_line.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h"
diff --git a/chrome/browser/banners/app_banner_manager_desktop_browsertest.cc b/chrome/browser/banners/app_banner_manager_desktop_browsertest.cc index 6818e58..2e0949c2 100644 --- a/chrome/browser/banners/app_banner_manager_desktop_browsertest.cc +++ b/chrome/browser/banners/app_banner_manager_desktop_browsertest.cc
@@ -6,7 +6,7 @@ #include <string> #include <utility> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/run_loop.h" #include "base/strings/strcat.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/battery/battery_metrics.cc b/chrome/browser/battery/battery_metrics.cc index a46299e..75df8f31 100644 --- a/chrome/browser/battery/battery_metrics.cc +++ b/chrome/browser/battery/battery_metrics.cc
@@ -7,8 +7,8 @@ #include <cmath> #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/metrics/histogram_macros.h" #include "base/no_destructor.h" #include "build/build_config.h"
diff --git a/chrome/browser/battery/battery_metrics.h b/chrome/browser/battery/battery_metrics.h index 317c6b28..a0f7df0 100644 --- a/chrome/browser/battery/battery_metrics.h +++ b/chrome/browser/battery/battery_metrics.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_BATTERY_BATTERY_METRICS_H_ #define CHROME_BROWSER_BATTERY_BATTERY_METRICS_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h" #include "build/build_config.h"
diff --git a/chrome/browser/battery/battery_metrics_browsertest.cc b/chrome/browser/battery/battery_metrics_browsertest.cc index 619ab6e..fb071ef5 100644 --- a/chrome/browser/battery/battery_metrics_browsertest.cc +++ b/chrome/browser/battery/battery_metrics_browsertest.cc
@@ -4,8 +4,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/test/metrics/histogram_tester.h" #include "base/threading/thread_task_runner_handle.h"
diff --git a/chrome/browser/bitmap_fetcher/bitmap_fetcher.cc b/chrome/browser/bitmap_fetcher/bitmap_fetcher.cc index 735048c..84904917 100644 --- a/chrome/browser/bitmap_fetcher/bitmap_fetcher.cc +++ b/chrome/browser/bitmap_fetcher/bitmap_fetcher.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/bitmap_fetcher/bitmap_fetcher.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/sequenced_task_runner.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/bitmap_fetcher/bitmap_fetcher_browsertest.cc b/chrome/browser/bitmap_fetcher/bitmap_fetcher_browsertest.cc index dac11d3..a69e8815 100644 --- a/chrome/browser/bitmap_fetcher/bitmap_fetcher_browsertest.cc +++ b/chrome/browser/bitmap_fetcher/bitmap_fetcher_browsertest.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/bitmap_fetcher/bitmap_fetcher.h" -#include "base/bind.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h"
diff --git a/chrome/browser/bitmap_fetcher/bitmap_fetcher_service.h b/chrome/browser/bitmap_fetcher/bitmap_fetcher_service.h index dd25222..852d3ad5 100644 --- a/chrome/browser/bitmap_fetcher/bitmap_fetcher_service.h +++ b/chrome/browser/bitmap_fetcher/bitmap_fetcher_service.h
@@ -7,8 +7,8 @@ #include <memory> #include <vector> -#include "base/callback_forward.h" #include "base/containers/lru_cache.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/bitmap_fetcher/bitmap_fetcher_delegate.h" #include "components/keyed_service/core/keyed_service.h"
diff --git a/chrome/browser/bluetooth/web_bluetooth_browsertest.cc b/chrome/browser/bluetooth/web_bluetooth_browsertest.cc index 9ee5fb82..44deccd 100644 --- a/chrome/browser/bluetooth/web_bluetooth_browsertest.cc +++ b/chrome/browser/bluetooth/web_bluetooth_browsertest.cc
@@ -5,8 +5,8 @@ // This file contains browsertests for Web Bluetooth that depend on behavior // defined in chrome/, not just in content/. -#include "base/callback.h" #include "base/command_line.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/metrics/field_trial.h" #include "base/run_loop.h"
diff --git a/chrome/browser/bookmarks/android/bookmark_bridge.cc b/chrome/browser/bookmarks/android/bookmark_bridge.cc index 29af423..f18859c 100644 --- a/chrome/browser/bookmarks/android/bookmark_bridge.cc +++ b/chrome/browser/bookmarks/android/bookmark_bridge.cc
@@ -16,10 +16,10 @@ #include "base/android/jni_array.h" #include "base/android/jni_string.h" -#include "base/bind.h" #include "base/containers/adapters.h" #include "base/containers/stack.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/guid.h" #include "base/i18n/string_compare.h" #include "base/memory/raw_ptr.h"
diff --git a/chrome/browser/bookmarks/bookmark_html_writer.cc b/chrome/browser/bookmarks/bookmark_html_writer.cc index ec8daad..32c35cda 100644 --- a/chrome/browser/bookmarks/bookmark_html_writer.cc +++ b/chrome/browser/bookmarks/bookmark_html_writer.cc
@@ -13,10 +13,10 @@ #include <string> #include "base/base64.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/files/file.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/logging.h" #include "base/memory/raw_ptr.h"
diff --git a/chrome/browser/bookmarks/managed_bookmark_service_factory.cc b/chrome/browser/bookmarks/managed_bookmark_service_factory.cc index 1437c41..9b5061cc 100644 --- a/chrome/browser/bookmarks/managed_bookmark_service_factory.cc +++ b/chrome/browser/bookmarks/managed_bookmark_service_factory.cc
@@ -6,7 +6,7 @@ #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/singleton.h" #include "build/chromeos_buildflags.h" #include "chrome/browser/policy/profile_policy_connector.h"
diff --git a/chrome/browser/browser_about_handler.cc b/chrome/browser/browser_about_handler.cc index 2ffda81..370d6ab 100644 --- a/chrome/browser/browser_about_handler.cc +++ b/chrome/browser/browser_about_handler.cc
@@ -6,8 +6,8 @@ #include <string> -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/strings/string_util.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/browser_process.h b/chrome/browser/browser_process.h index a640eeb..fa947279 100644 --- a/chrome/browser/browser_process.h +++ b/chrome/browser/browser_process.h
@@ -15,7 +15,7 @@ #include <memory> #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/scoped_refptr.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc index 30f7940..edb0a84 100644 --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc
@@ -13,12 +13,12 @@ #include <vector> #include "base/atomic_ref_count.h" -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/debug/leak_annotations.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/memory/ptr_util.h" #include "base/metrics/histogram_macros.h"
diff --git a/chrome/browser/browser_process_platform_part_ash.cc b/chrome/browser/browser_process_platform_part_ash.cc index e98a2eb4..f3040f0 100644 --- a/chrome/browser/browser_process_platform_part_ash.cc +++ b/chrome/browser/browser_process_platform_part_ash.cc
@@ -9,8 +9,8 @@ #include "ash/components/arc/enterprise/arc_data_snapshotd_manager.h" #include "ash/components/arc/enterprise/snapshot_hours_policy_service.h" -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/memory/singleton.h" #include "base/time/default_clock.h" #include "base/time/default_tick_clock.h"
diff --git a/chrome/browser/browser_switcher/alternative_browser_driver.h b/chrome/browser/browser_switcher/alternative_browser_driver.h index 79dcde8..8084cfc 100644 --- a/chrome/browser/browser_switcher/alternative_browser_driver.h +++ b/chrome/browser/browser_switcher/alternative_browser_driver.h
@@ -7,9 +7,9 @@ #include <string> -#include "base/callback.h" #include "base/command_line.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/strings/string_piece_forward.h" #include "build/build_config.h"
diff --git a/chrome/browser/browser_switcher/browser_switcher_browsertest.cc b/chrome/browser/browser_switcher/browser_switcher_browsertest.cc index 8b96464..7f2435f 100644 --- a/chrome/browser/browser_switcher/browser_switcher_browsertest.cc +++ b/chrome/browser/browser_switcher/browser_switcher_browsertest.cc
@@ -6,13 +6,13 @@ #include <string.h> -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" #include "base/containers/contains.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/browser_switcher/browser_switcher_navigation_throttle.cc b/chrome/browser/browser_switcher/browser_switcher_navigation_throttle.cc index e9f1ee5..f7ceaae 100644 --- a/chrome/browser/browser_switcher/browser_switcher_navigation_throttle.cc +++ b/chrome/browser/browser_switcher/browser_switcher_navigation_throttle.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/task/single_thread_task_runner.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_navigation_throttle_unittest.cc b/chrome/browser/browser_switcher/browser_switcher_navigation_throttle_unittest.cc index 7ce1d9d..ce7a16dc 100644 --- a/chrome/browser/browser_switcher/browser_switcher_navigation_throttle_unittest.cc +++ b/chrome/browser/browser_switcher/browser_switcher_navigation_throttle_unittest.cc
@@ -7,8 +7,8 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/browser_switcher/browser_switcher_prefs.h" #include "chrome/browser/browser_switcher/browser_switcher_service.h"
diff --git a/chrome/browser/browser_switcher/browser_switcher_policy_migrator.cc b/chrome/browser/browser_switcher/browser_switcher_policy_migrator.cc index 6bc004b..c861971d 100644 --- a/chrome/browser/browser_switcher/browser_switcher_policy_migrator.cc +++ b/chrome/browser/browser_switcher/browser_switcher_policy_migrator.cc
@@ -7,7 +7,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "components/policy/core/common/policy_bundle.h" #include "components/policy/core/common/policy_map.h"
diff --git a/chrome/browser/browser_switcher/browser_switcher_prefs.cc b/chrome/browser/browser_switcher/browser_switcher_prefs.cc index 5d47e3a8..a1f4f4cf 100644 --- a/chrome/browser/browser_switcher/browser_switcher_prefs.cc +++ b/chrome/browser/browser_switcher/browser_switcher_prefs.cc
@@ -4,9 +4,9 @@ #include "chrome/browser/browser_switcher/browser_switcher_prefs.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/metrics/histogram_macros.h" #include "base/strings/strcat.h"
diff --git a/chrome/browser/browser_switcher/browser_switcher_prefs.h b/chrome/browser/browser_switcher/browser_switcher_prefs.h index 498be61..fcf3311 100644 --- a/chrome/browser/browser_switcher/browser_switcher_prefs.h +++ b/chrome/browser/browser_switcher/browser_switcher_prefs.h
@@ -9,9 +9,9 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/callback_list.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/raw_ref.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/browser_switcher/browser_switcher_service.cc b/chrome/browser/browser_switcher/browser_switcher_service.cc index 50925af5..c6a95bb5 100644 --- a/chrome/browser/browser_switcher/browser_switcher_service.cc +++ b/chrome/browser/browser_switcher/browser_switcher_service.cc
@@ -7,7 +7,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "base/ranges/algorithm.h" #include "base/syslog_logging.h"
diff --git a/chrome/browser/browser_switcher/browser_switcher_service.h b/chrome/browser/browser_switcher/browser_switcher_service.h index 20d4501..394e807 100644 --- a/chrome/browser/browser_switcher/browser_switcher_service.h +++ b/chrome/browser/browser_switcher/browser_switcher_service.h
@@ -8,8 +8,8 @@ #include <memory> #include <string> -#include "base/callback.h" #include "base/callback_list.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h"
diff --git a/chrome/browser/browser_switcher/browser_switcher_service_browsertest.cc b/chrome/browser/browser_switcher/browser_switcher_service_browsertest.cc index dffaa92..7f74bea0 100644 --- a/chrome/browser/browser_switcher/browser_switcher_service_browsertest.cc +++ b/chrome/browser/browser_switcher/browser_switcher_service_browsertest.cc
@@ -6,9 +6,9 @@ #include <string.h> -#include "base/bind.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h" #include "base/test/scoped_feature_list.h"
diff --git a/chrome/browser/browser_switcher/browser_switcher_service_win.cc b/chrome/browser/browser_switcher/browser_switcher_service_win.cc index b81ac48..f309551 100644 --- a/chrome/browser/browser_switcher/browser_switcher_service_win.cc +++ b/chrome/browser/browser_switcher/browser_switcher_service_win.cc
@@ -9,9 +9,9 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/files/file.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "base/no_destructor.h" #include "base/path_service.h"
diff --git a/chrome/browser/browser_switcher/browser_switcher_sitelist.cc b/chrome/browser/browser_switcher/browser_switcher_sitelist.cc index 040408ea..de7cb54 100644 --- a/chrome/browser/browser_switcher/browser_switcher_sitelist.cc +++ b/chrome/browser/browser_switcher/browser_switcher_sitelist.cc
@@ -11,7 +11,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "base/ranges/algorithm.h" #include "base/strings/strcat.h"
diff --git a/chrome/browser/browser_switcher/ieem_sitelist_parser.cc b/chrome/browser/browser_switcher/ieem_sitelist_parser.cc index 0b8e2bd..a8cbc16 100644 --- a/chrome/browser/browser_switcher/ieem_sitelist_parser.cc +++ b/chrome/browser/browser_switcher/ieem_sitelist_parser.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/browser_switcher/ieem_sitelist_parser.h" -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/strings/string_util.h" #include "chrome/browser/browser_switcher/browser_switcher_features.h" #include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/browser_switcher/ieem_sitelist_parser.h b/chrome/browser/browser_switcher/ieem_sitelist_parser.h index c82fc7f..ffcbeb7 100644 --- a/chrome/browser/browser_switcher/ieem_sitelist_parser.h +++ b/chrome/browser/browser_switcher/ieem_sitelist_parser.h
@@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/browser_switcher/browser_switcher_prefs.h" #include "third_party/abseil-cpp/absl/types/optional.h" #include "url/gurl.h"
diff --git a/chrome/browser/browser_switcher/ieem_sitelist_parser_unittest.cc b/chrome/browser/browser_switcher/ieem_sitelist_parser_unittest.cc index b18c0be..beb99c2 100644 --- a/chrome/browser/browser_switcher/ieem_sitelist_parser_unittest.cc +++ b/chrome/browser/browser_switcher/ieem_sitelist_parser_unittest.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/browser_switcher/ieem_sitelist_parser.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/scoped_refptr.h" #include "base/run_loop.h" #include "base/test/scoped_feature_list.h"
diff --git a/chrome/browser/browsing_data/access_context_audit_database_unittest.cc b/chrome/browser/browsing_data/access_context_audit_database_unittest.cc index 0a2ddff..e5f967bc 100644 --- a/chrome/browser/browsing_data/access_context_audit_database_unittest.cc +++ b/chrome/browser/browsing_data/access_context_audit_database_unittest.cc
@@ -4,10 +4,10 @@ #include "chrome/browser/browsing_data/access_context_audit_database.h" -#include "base/callback_helpers.h" #include "base/containers/contains.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/callback_helpers.h" #include "base/ranges/algorithm.h" #include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h"
diff --git a/chrome/browser/browsing_data/access_context_audit_service_unittest.cc b/chrome/browser/browsing_data/access_context_audit_service_unittest.cc index 5fb3e6c..2b3a486 100644 --- a/chrome/browser/browsing_data/access_context_audit_service_unittest.cc +++ b/chrome/browser/browsing_data/access_context_audit_service_unittest.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/browsing_data/access_context_audit_service.h" -#include "base/callback_helpers.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/callback_helpers.h" #include "base/i18n/time_formatting.h" #include "base/ranges/algorithm.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/browsing_data/browsing_data_history_observer_service.cc b/chrome/browser/browsing_data/browsing_data_history_observer_service.cc index 1b849bd..f3bb4028 100644 --- a/chrome/browser/browsing_data/browsing_data_history_observer_service.cc +++ b/chrome/browser/browsing_data/browsing_data_history_observer_service.cc
@@ -6,7 +6,7 @@ #include <tuple> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "build/build_config.h" #include "chrome/browser/browsing_data/navigation_entry_remover.h" #include "chrome/browser/history/history_service_factory.h"
diff --git a/chrome/browser/browsing_data/browsing_data_quota_helper.h b/chrome/browser/browsing_data/browsing_data_quota_helper.h index 5c004f10..c56391de 100644 --- a/chrome/browser/browsing_data/browsing_data_quota_helper.h +++ b/chrome/browser/browsing_data/browsing_data_quota_helper.h
@@ -10,7 +10,7 @@ #include <list> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "base/task/sequenced_task_runner_helpers.h" #include "third_party/blink/public/mojom/quota/quota_types.mojom.h"
diff --git a/chrome/browser/browsing_data/browsing_data_quota_helper_impl.cc b/chrome/browser/browsing_data/browsing_data_quota_helper_impl.cc index 17d69b7..7aa59a86 100644 --- a/chrome/browser/browsing_data/browsing_data_quota_helper_impl.cc +++ b/chrome/browser/browsing_data/browsing_data_quota_helper_impl.cc
@@ -8,8 +8,8 @@ #include <set> #include "base/barrier_closure.h" -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/notreached.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/url_constants.h"
diff --git a/chrome/browser/browsing_data/browsing_data_quota_helper_impl.h b/chrome/browser/browsing_data/browsing_data_quota_helper_impl.h index 613d438..429e60a9 100644 --- a/chrome/browser/browsing_data/browsing_data_quota_helper_impl.h +++ b/chrome/browser/browsing_data/browsing_data_quota_helper_impl.h
@@ -12,7 +12,7 @@ #include <string> #include <utility> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/browsing_data/browsing_data_quota_helper_unittest.cc b/chrome/browser/browsing_data/browsing_data_quota_helper_unittest.cc index 47a5c46..e6a8f76 100644 --- a/chrome/browser/browsing_data/browsing_data_quota_helper_unittest.cc +++ b/chrome/browser/browsing_data/browsing_data_quota_helper_unittest.cc
@@ -5,10 +5,10 @@ #include <stddef.h> #include <stdint.h> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/span.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "base/test/test_future.h"
diff --git a/chrome/browser/browsing_data/browsing_data_remover_browsertest.cc b/chrome/browser/browsing_data/browsing_data_remover_browsertest.cc index ccd018c..82d0d82 100644 --- a/chrome/browser/browsing_data/browsing_data_remover_browsertest.cc +++ b/chrome/browser/browsing_data/browsing_data_remover_browsertest.cc
@@ -6,9 +6,9 @@ #include <memory> #include <string> -#include "base/bind.h" -#include "base/callback.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/path_service.h" #include "base/run_loop.h" #include "base/task/sequenced_task_runner.h"
diff --git a/chrome/browser/browsing_data/browsing_data_remover_browsertest_base.cc b/chrome/browser/browsing_data/browsing_data_remover_browsertest_base.cc index 4502332..0a318c7a 100644 --- a/chrome/browser/browsing_data/browsing_data_remover_browsertest_base.cc +++ b/chrome/browser/browsing_data/browsing_data_remover_browsertest_base.cc
@@ -8,10 +8,10 @@ #include <utility> #include <vector> -#include "base/callback.h" #include "base/files/file_enumerator.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/path_service.h" #include "base/ranges/algorithm.h"
diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc index d342738..780b513 100644 --- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc +++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
@@ -12,10 +12,10 @@ #include <vector> #include "base/barrier_closure.h" -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h" #include "base/metrics/user_metrics.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 ce198e3..0d69173 100644 --- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h +++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h
@@ -7,8 +7,8 @@ #include <memory> -#include "base/callback_forward.h" #include "base/cancelable_callback.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/synchronization/waitable_event_watcher.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 a2e57e1..a78d1154 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
@@ -11,10 +11,10 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/containers/contains.h" #include "base/containers/flat_set.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/guid.h" #include "base/json/values_util.h" #include "base/memory/ptr_util.h"
diff --git a/chrome/browser/browsing_data/cookies_tree_model.cc b/chrome/browser/browsing_data/cookies_tree_model.cc index 90c46db5..060aa76f 100644 --- a/chrome/browser/browsing_data/cookies_tree_model.cc +++ b/chrome/browser/browsing_data/cookies_tree_model.cc
@@ -13,8 +13,8 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/memory/scoped_refptr.h" #include "base/observer_list.h"
diff --git a/chrome/browser/browsing_data/counters/autofill_counter_browsertest.cc b/chrome/browser/browsing_data/counters/autofill_counter_browsertest.cc index 6c33b0e..65afd10 100644 --- a/chrome/browser/browsing_data/counters/autofill_counter_browsertest.cc +++ b/chrome/browser/browsing_data/counters/autofill_counter_browsertest.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/guid.h" #include "base/run_loop.h" #include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/browsing_data/counters/bookmark_counter_unittest.cc b/chrome/browser/browsing_data/counters/bookmark_counter_unittest.cc index fd2134e..b1c8c351 100644 --- a/chrome/browser/browsing_data/counters/bookmark_counter_unittest.cc +++ b/chrome/browser/browsing_data/counters/bookmark_counter_unittest.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/browsing_data/counters/browsing_data_counter_factory.cc b/chrome/browser/browsing_data/counters/browsing_data_counter_factory.cc index a041681..e3d2126 100644 --- a/chrome/browser/browsing_data/counters/browsing_data_counter_factory.cc +++ b/chrome/browser/browsing_data/counters/browsing_data_counter_factory.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/browsing_data/counters/browsing_data_counter_factory.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h" #include "chrome/browser/browsing_data/counters/browsing_data_counter_utils.h"
diff --git a/chrome/browser/browsing_data/counters/cache_counter.cc b/chrome/browser/browsing_data/counters/cache_counter.cc index f4d5fea..b3cfa256 100644 --- a/chrome/browser/browsing_data/counters/cache_counter.cc +++ b/chrome/browser/browsing_data/counters/cache_counter.cc
@@ -3,7 +3,7 @@ // found in the LICENSE file. #include "chrome/browser/browsing_data/counters/cache_counter.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/profiles/profile.h" #include "components/browsing_data/content/conditional_cache_counting_helper.h" #include "components/browsing_data/core/pref_names.h"
diff --git a/chrome/browser/browsing_data/counters/cache_counter_browsertest.cc b/chrome/browser/browsing_data/counters/cache_counter_browsertest.cc index d3b486d..e473efd 100644 --- a/chrome/browser/browsing_data/counters/cache_counter_browsertest.cc +++ b/chrome/browser/browsing_data/counters/cache_counter_browsertest.cc
@@ -12,7 +12,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "build/build_config.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/browsing_data/counters/conditional_cache_counting_helper_browsertest.cc b/chrome/browser/browsing_data/counters/conditional_cache_counting_helper_browsertest.cc index f27c2c68..2c6f0bc 100644 --- a/chrome/browser/browsing_data/counters/conditional_cache_counting_helper_browsertest.cc +++ b/chrome/browser/browsing_data/counters/conditional_cache_counting_helper_browsertest.cc
@@ -7,7 +7,7 @@ #include <set> #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/strings/strcat.h" #include "build/build_config.h"
diff --git a/chrome/browser/browsing_data/counters/downloads_counter_browsertest.cc b/chrome/browser/browsing_data/counters/downloads_counter_browsertest.cc index 005ab380..4696932c 100644 --- a/chrome/browser/browsing_data/counters/downloads_counter_browsertest.cc +++ b/chrome/browser/browsing_data/counters/downloads_counter_browsertest.cc
@@ -7,8 +7,8 @@ #include <memory> #include <set> -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/guid.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h"
diff --git a/chrome/browser/browsing_data/counters/history_counter_browsertest.cc b/chrome/browser/browsing_data/counters/history_counter_browsertest.cc index 1917d8a..1b2896f 100644 --- a/chrome/browser/browsing_data/counters/history_counter_browsertest.cc +++ b/chrome/browser/browsing_data/counters/history_counter_browsertest.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/time/time.h"
diff --git a/chrome/browser/browsing_data/counters/hosted_apps_counter_unittest.cc b/chrome/browser/browsing_data/counters/hosted_apps_counter_unittest.cc index b712814..e4a3cdf9 100644 --- a/chrome/browser/browsing_data/counters/hosted_apps_counter_unittest.cc +++ b/chrome/browser/browsing_data/counters/hosted_apps_counter_unittest.cc
@@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/guid.h" #include "base/memory/raw_ptr.h" #include "base/values.h"
diff --git a/chrome/browser/browsing_data/counters/passwords_counter_browsertest.cc b/chrome/browser/browsing_data/counters/passwords_counter_browsertest.cc index 64b12e6..e685234 100644 --- a/chrome/browser/browsing_data/counters/passwords_counter_browsertest.cc +++ b/chrome/browser/browsing_data/counters/passwords_counter_browsertest.cc
@@ -4,7 +4,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/browsing_data/counters/site_data_counter.cc b/chrome/browser/browsing_data/counters/site_data_counter.cc index 2c782e3..d404749 100644 --- a/chrome/browser/browsing_data/counters/site_data_counter.cc +++ b/chrome/browser/browsing_data/counters/site_data_counter.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/browsing_data/counters/site_data_counter.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/browsing_data/counters/browsing_data_counter_utils.h" #include "chrome/browser/browsing_data/counters/site_data_counting_helper.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/browsing_data/counters/site_data_counting_helper.cc b/chrome/browser/browsing_data/counters/site_data_counting_helper.cc index 2f77714..22021e16 100644 --- a/chrome/browser/browsing_data/counters/site_data_counting_helper.cc +++ b/chrome/browser/browsing_data/counters/site_data_counting_helper.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/browsing_data/counters/site_data_counting_helper.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/single_thread_task_runner.h" #include "build/build_config.h" #include "chrome/browser/content_settings/host_content_settings_map_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 0a3d246e..c252e43 100644 --- a/chrome/browser/browsing_data/counters/site_data_counting_helper.h +++ b/chrome/browser/browsing_data/counters/site_data_counting_helper.h
@@ -10,7 +10,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/time/time.h" #include "components/content_settings/core/common/content_settings_types.h"
diff --git a/chrome/browser/browsing_data/counters/site_settings_counter_unittest.cc b/chrome/browser/browsing_data/counters/site_settings_counter_unittest.cc index 950ebfc..2df340a6 100644 --- a/chrome/browser/browsing_data/counters/site_settings_counter_unittest.cc +++ b/chrome/browser/browsing_data/counters/site_settings_counter_unittest.cc
@@ -8,8 +8,8 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/containers/flat_set.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/test/simple_test_clock.h" #include "build/build_config.h"
diff --git a/chrome/browser/browsing_data/counters/sync_aware_counter_browsertest.cc b/chrome/browser/browsing_data/counters/sync_aware_counter_browsertest.cc index 5dffb10..73d77420d 100644 --- a/chrome/browser/browsing_data/counters/sync_aware_counter_browsertest.cc +++ b/chrome/browser/browsing_data/counters/sync_aware_counter_browsertest.cc
@@ -4,7 +4,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/threading/platform_thread.h" #include "chrome/browser/history/history_service_factory.h"
diff --git a/chrome/browser/browsing_data/incognito_browsing_data_browsertest.cc b/chrome/browser/browsing_data/incognito_browsing_data_browsertest.cc index d984e78..99405ef 100644 --- a/chrome/browser/browsing_data/incognito_browsing_data_browsertest.cc +++ b/chrome/browser/browsing_data/incognito_browsing_data_browsertest.cc
@@ -6,8 +6,8 @@ #include <memory> #include <string> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/path_service.h" #include "base/run_loop.h" #include "base/test/bind.h"
diff --git a/chrome/browser/browsing_data/local_data_container.cc b/chrome/browser/browsing_data/local_data_container.cc index 9d61fca..427f14c 100644 --- a/chrome/browser/browsing_data/local_data_container.cc +++ b/chrome/browser/browsing_data/local_data_container.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/browsing_data/cookies_tree_model.h" #include "content/public/browser/storage_usage_info.h" #include "net/cookies/canonical_cookie.h"
diff --git a/chrome/browser/browsing_data/navigation_entry_remover.cc b/chrome/browser/browsing_data/navigation_entry_remover.cc index cbc338d..30df442 100644 --- a/chrome/browser/browsing_data/navigation_entry_remover.cc +++ b/chrome/browser/browsing_data/navigation_entry_remover.cc
@@ -6,7 +6,7 @@ #include <functional> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "build/build_config.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/browsing_data/site_data_size_collector.cc b/chrome/browser/browsing_data/site_data_size_collector.cc index 590c573..0f5311c7 100644 --- a/chrome/browser/browsing_data/site_data_size_collector.cc +++ b/chrome/browser/browsing_data/site_data_size_collector.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/task/thread_pool.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/pref_names.h"
diff --git a/chrome/browser/browsing_data/site_data_size_collector_unittest.cc b/chrome/browser/browsing_data/site_data_size_collector_unittest.cc index ff263d8..a83b832 100644 --- a/chrome/browser/browsing_data/site_data_size_collector_unittest.cc +++ b/chrome/browser/browsing_data/site_data_size_collector_unittest.cc
@@ -6,10 +6,10 @@ #include <memory> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "chrome/browser/browsing_data/mock_browsing_data_quota_helper.h" #include "chrome/common/chrome_constants.h"
diff --git a/chrome/browser/browsing_data/third_party_data_remover.h b/chrome/browser/browsing_data/third_party_data_remover.h index 34778e3..a569184 100644 --- a/chrome/browser/browsing_data/third_party_data_remover.h +++ b/chrome/browser/browsing_data/third_party_data_remover.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_BROWSING_DATA_THIRD_PARTY_DATA_REMOVER_H_ #define CHROME_BROWSER_BROWSING_DATA_THIRD_PARTY_DATA_REMOVER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "content/public/browser/browser_context.h" // This function clears cookies available in cross-site contexts (i.e.
diff --git a/chrome/browser/browsing_data/third_party_data_remover_browsertest.cc b/chrome/browser/browsing_data/third_party_data_remover_browsertest.cc index 1ef26fe..4534c30 100644 --- a/chrome/browser/browsing_data/third_party_data_remover_browsertest.cc +++ b/chrome/browser/browsing_data/third_party_data_remover_browsertest.cc
@@ -7,7 +7,7 @@ #include <memory> #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/path_service.h" #include "base/run_loop.h" #include "base/test/bind.h"
diff --git a/chrome/browser/captive_portal/captive_portal_browsertest.cc b/chrome/browser/captive_portal/captive_portal_browsertest.cc index 6f97ccba..9c0536c 100644 --- a/chrome/browser/captive_portal/captive_portal_browsertest.cc +++ b/chrome/browser/captive_portal/captive_portal_browsertest.cc
@@ -13,11 +13,11 @@ #include <vector> #include "base/base_switches.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/compiler_specific.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/path_service.h" #include "base/ranges/algorithm.h"
diff --git a/chrome/browser/cart/cart_db.h b/chrome/browser/cart/cart_db.h index 8721c47..40b162fc 100644 --- a/chrome/browser/cart/cart_db.h +++ b/chrome/browser/cart/cart_db.h
@@ -7,7 +7,7 @@ #include <vector> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/cart/cart_discount_link_fetcher.h b/chrome/browser/cart/cart_discount_link_fetcher.h index 631b49c..9fc1bf0 100644 --- a/chrome/browser/cart/cart_discount_link_fetcher.h +++ b/chrome/browser/cart/cart_discount_link_fetcher.h
@@ -4,7 +4,7 @@ #ifndef CHROME_BROWSER_CART_CART_DISCOUNT_LINK_FETCHER_H_ #define CHROME_BROWSER_CART_CART_DISCOUNT_LINK_FETCHER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "components/commerce/core/proto/cart_db_content.pb.h" #include "components/endpoint_fetcher/endpoint_fetcher.h"
diff --git a/chrome/browser/cart/cart_service.h b/chrome/browser/cart/cart_service.h index 023c4f0f..848d830 100644 --- a/chrome/browser/cart/cart_service.h +++ b/chrome/browser/cart/cart_service.h
@@ -4,7 +4,7 @@ #ifndef CHROME_BROWSER_CART_CART_SERVICE_H_ #define CHROME_BROWSER_CART_CART_SERVICE_H_ -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/certificate_manager_model.cc b/chrome/browser/certificate_manager_model.cc index 422e7fc3..a8c875a 100644 --- a/chrome/browser/certificate_manager_model.cc +++ b/chrome/browser/certificate_manager_model.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/i18n/time_formatting.h" #include "base/logging.h" #include "base/memory/raw_ptr.h"
diff --git a/chrome/browser/certificate_manager_model.h b/chrome/browser/certificate_manager_model.h index 4809e25..46a1aa7e 100644 --- a/chrome/browser/certificate_manager_model.h +++ b/chrome/browser/certificate_manager_model.h
@@ -9,7 +9,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/certificate_provider/certificate_provider_service.cc b/chrome/browser/certificate_provider/certificate_provider_service.cc index a298162..0906c365 100644 --- a/chrome/browser/certificate_provider/certificate_provider_service.cc +++ b/chrome/browser/certificate_provider/certificate_provider_service.cc
@@ -10,9 +10,9 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/logging.h" #include "base/memory/ptr_util.h"
diff --git a/chrome/browser/certificate_provider/certificate_provider_service.h b/chrome/browser/certificate_provider/certificate_provider_service.h index 93f2511..3f81438 100644 --- a/chrome/browser/certificate_provider/certificate_provider_service.h +++ b/chrome/browser/certificate_provider/certificate_provider_service.h
@@ -12,8 +12,8 @@ #include <string> #include <vector> -#include "base/callback_forward.h" #include "base/containers/span.h" +#include "base/functional/callback_forward.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h"
diff --git a/chrome/browser/certificate_provider/certificate_provider_service_unittest.cc b/chrome/browser/certificate_provider/certificate_provider_service_unittest.cc index f0a6d400..3fb8924a 100644 --- a/chrome/browser/certificate_provider/certificate_provider_service_unittest.cc +++ b/chrome/browser/certificate_provider/certificate_provider_service_unittest.cc
@@ -9,8 +9,8 @@ #include <utility> #include "base/base64.h" -#include "base/bind.h" #include "base/containers/span.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/strings/string_piece.h"
diff --git a/chrome/browser/certificate_provider/certificate_requests.cc b/chrome/browser/certificate_provider/certificate_requests.cc index d05e764..aaf0d86 100644 --- a/chrome/browser/certificate_provider/certificate_requests.cc +++ b/chrome/browser/certificate_provider/certificate_requests.cc
@@ -8,8 +8,8 @@ #include <set> #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/logging.h" #include "base/time/time.h"
diff --git a/chrome/browser/certificate_provider/certificate_requests.h b/chrome/browser/certificate_provider/certificate_requests.h index b206ec01..ce29482 100644 --- a/chrome/browser/certificate_provider/certificate_requests.h +++ b/chrome/browser/certificate_provider/certificate_requests.h
@@ -10,7 +10,7 @@ #include <string> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "net/ssl/client_cert_identity.h" namespace chromeos {
diff --git a/chrome/browser/certificate_provider/pin_dialog_manager.cc b/chrome/browser/certificate_provider/pin_dialog_manager.cc index 1fabb08f..3e968d5 100644 --- a/chrome/browser/certificate_provider/pin_dialog_manager.cc +++ b/chrome/browser/certificate_provider/pin_dialog_manager.cc
@@ -4,9 +4,9 @@ #include "chrome/browser/certificate_provider/pin_dialog_manager.h" -#include "base/bind.h" #include "base/containers/contains.h" #include "base/containers/cxx20_erase.h" +#include "base/functional/bind.h" #include "base/logging.h" namespace chromeos {
diff --git a/chrome/browser/certificate_provider/pin_dialog_manager.h b/chrome/browser/certificate_provider/pin_dialog_manager.h index 0aa1073d..3502d41 100644 --- a/chrome/browser/certificate_provider/pin_dialog_manager.h +++ b/chrome/browser/certificate_provider/pin_dialog_manager.h
@@ -11,7 +11,7 @@ #include <utility> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h" #include "chrome/browser/certificate_provider/security_token_pin_dialog_host.h"
diff --git a/chrome/browser/certificate_provider/security_token_pin_dialog_host.h b/chrome/browser/certificate_provider/security_token_pin_dialog_host.h index 9b179ec6..6ffa4c62 100644 --- a/chrome/browser/certificate_provider/security_token_pin_dialog_host.h +++ b/chrome/browser/certificate_provider/security_token_pin_dialog_host.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "chromeos/components/security_token_pin/constants.h" #include "components/account_id/account_id.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/chrome/browser/certificate_provider/security_token_pin_dialog_host_popup_impl.cc b/chrome/browser/certificate_provider/security_token_pin_dialog_host_popup_impl.cc index 32a159c..62660e96 100644 --- a/chrome/browser/certificate_provider/security_token_pin_dialog_host_popup_impl.cc +++ b/chrome/browser/certificate_provider/security_token_pin_dialog_host_popup_impl.cc
@@ -7,8 +7,8 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "build/chromeos_buildflags.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/ui/browser.h"
diff --git a/chrome/browser/certificate_provider/security_token_pin_dialog_host_popup_impl.h b/chrome/browser/certificate_provider/security_token_pin_dialog_host_popup_impl.h index 20fc8908..048154d 100644 --- a/chrome/browser/certificate_provider/security_token_pin_dialog_host_popup_impl.h +++ b/chrome/browser/certificate_provider/security_token_pin_dialog_host_popup_impl.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/certificate_provider/security_token_pin_dialog_host.h"
diff --git a/chrome/browser/certificate_provider/sign_requests.h b/chrome/browser/certificate_provider/sign_requests.h index 5f92e8c..7470b71 100644 --- a/chrome/browser/certificate_provider/sign_requests.h +++ b/chrome/browser/certificate_provider/sign_requests.h
@@ -10,7 +10,7 @@ #include <utility> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "components/account_id/account_id.h" #include "net/cert/x509_certificate.h"
diff --git a/chrome/browser/certificate_provider/test_certificate_provider_extension.h b/chrome/browser/certificate_provider/test_certificate_provider_extension.h index baf2fcb..698c5b8 100644 --- a/chrome/browser/certificate_provider/test_certificate_provider_extension.h +++ b/chrome/browser/certificate_provider/test_certificate_provider_extension.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/values.h"
diff --git a/chrome/browser/chrome_back_forward_cache_browsertest.cc b/chrome/browser/chrome_back_forward_cache_browsertest.cc index 62f52f1..c7836fd 100644 --- a/chrome/browser/chrome_back_forward_cache_browsertest.cc +++ b/chrome/browser/chrome_back_forward_cache_browsertest.cc
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/callback.h" #include "base/command_line.h" +#include "base/functional/callback.h" #include "base/test/bind.h" #include "base/test/mock_callback.h" #include "base/test/scoped_feature_list.h"
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc index 2893df3..f888bef 100644 --- a/chrome/browser/chrome_browser_main.cc +++ b/chrome/browser/chrome_browser_main.cc
@@ -17,7 +17,6 @@ #include "ash/constants/ash_features.h" #include "base/at_exit.h" #include "base/base_switches.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/debug/crash_logging.h" #include "base/debug/debugger.h" @@ -25,6 +24,7 @@ #include "base/feature_list.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h"
diff --git a/chrome/browser/chrome_browser_main_android.cc b/chrome/browser/chrome_browser_main_android.cc index fdd5c16..6873de6e 100644 --- a/chrome/browser/chrome_browser_main_android.cc +++ b/chrome/browser/chrome_browser_main_android.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/path_service.h" #include "base/task/current_thread.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/chrome_browser_main_extra_parts_ozone.cc b/chrome/browser/chrome_browser_main_extra_parts_ozone.cc index b46245a5..963a7284 100644 --- a/chrome/browser/chrome_browser_main_extra_parts_ozone.cc +++ b/chrome/browser/chrome_browser_main_extra_parts_ozone.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/chrome_browser_main_extra_parts_ozone.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "chrome/browser/lifetime/application_lifetime_desktop.h" #include "content/public/browser/browser_task_traits.h"
diff --git a/chrome/browser/chrome_browser_main_linux.cc b/chrome/browser/chrome_browser_main_linux.cc index 62bef8bf..c5a8c21 100644 --- a/chrome/browser/chrome_browser_main_linux.cc +++ b/chrome/browser/chrome_browser_main_linux.cc
@@ -8,9 +8,9 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/feature_list.h" #include "base/files/file_path.h" +#include "base/functional/bind.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/chrome_browser_main_mac.mm b/chrome/browser/chrome_browser_main_mac.mm index 77aaa6d..e402a0a 100644 --- a/chrome/browser/chrome_browser_main_mac.mm +++ b/chrome/browser/chrome_browser_main_mac.mm
@@ -6,9 +6,9 @@ #import <Cocoa/Cocoa.h> -#include "base/bind.h" #include "base/command_line.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/mac/bundle_locations.h" #import "base/mac/foundation_util.h" #include "base/mac/mac_util.h"
diff --git a/chrome/browser/chrome_browser_main_posix.cc b/chrome/browser/chrome_browser_main_posix.cc index 9e667d1..2b3a40f 100644 --- a/chrome/browser/chrome_browser_main_posix.cc +++ b/chrome/browser/chrome_browser_main_posix.cc
@@ -13,8 +13,8 @@ #include <string> -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/notreached.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/chrome_browser_main_win.cc b/chrome/browser/chrome_browser_main_win.cc index 10a1c5a..01fb3da 100644 --- a/chrome/browser/chrome_browser_main_win.cc +++ b/chrome/browser/chrome_browser_main_win.cc
@@ -17,8 +17,6 @@ #include <vector> #include "base/base_switches.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/dcheck_is_on.h" #include "base/enterprise_util.h" @@ -27,6 +25,8 @@ #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/important_file_writer_cleaner.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/i18n/rtl.h" #include "base/location.h" #include "base/metrics/histogram_macros.h"
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc index 4d407d0..32b57f5 100644 --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc
@@ -13,11 +13,11 @@ #include <vector> #include "base/base_switches.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" #include "base/dcheck_is_on.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/i18n/base_i18n_switches.h" #include "base/i18n/character_encoding.h" #include "base/memory/raw_ptr.h"
diff --git a/chrome/browser/chrome_content_browser_client.h b/chrome/browser/chrome_content_browser_client.h index 0a0762cd..f686708 100644 --- a/chrome/browser/chrome_content_browser_client.h +++ b/chrome/browser/chrome_content_browser_client.h
@@ -12,8 +12,8 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/containers/flat_map.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "base/strings/string_piece_forward.h"
diff --git a/chrome/browser/chrome_content_browser_client_browsertest.cc b/chrome/browser/chrome_content_browser_client_browsertest.cc index 3e98c58..0708ec12 100644 --- a/chrome/browser/chrome_content_browser_client_browsertest.cc +++ b/chrome/browser/chrome_content_browser_client_browsertest.cc
@@ -7,8 +7,8 @@ #include <memory> #include <vector> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/chrome_content_browser_client_receiver_bindings.cc b/chrome/browser/chrome_content_browser_client_receiver_bindings.cc index 458afe294..e28f30f 100644 --- a/chrome/browser/chrome_content_browser_client_receiver_bindings.cc +++ b/chrome/browser/chrome_content_browser_client_receiver_bindings.cc
@@ -6,7 +6,7 @@ #include "chrome/browser/chrome_content_browser_client.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/chrome_content_browser_client_unittest.cc b/chrome/browser/chrome_content_browser_client_unittest.cc index 6737845..4b195a335e 100644 --- a/chrome/browser/chrome_content_browser_client_unittest.cc +++ b/chrome/browser/chrome_content_browser_client_unittest.cc
@@ -9,9 +9,9 @@ #include <memory> #include "ash/webui/camera_app_ui/url_constants.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/metrics/field_trial.h" #include "base/run_loop.h"
diff --git a/chrome/browser/chrome_process_singleton.h b/chrome/browser/chrome_process_singleton.h index 3958990..ae42df1 100644 --- a/chrome/browser/chrome_process_singleton.h +++ b/chrome/browser/chrome_process_singleton.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_CHROME_PROCESS_SINGLETON_H_ #define CHROME_BROWSER_CHROME_PROCESS_SINGLETON_H_ -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "chrome/browser/process_singleton.h" #include "chrome/browser/process_singleton_modal_dialog_lock.h" #include "chrome/browser/process_singleton_startup_lock.h"
diff --git a/chrome/browser/chrome_process_singleton_win_unittest.cc b/chrome/browser/chrome_process_singleton_win_unittest.cc index 4cadcfc..9d48471 100644 --- a/chrome/browser/chrome_process_singleton_win_unittest.cc +++ b/chrome/browser/chrome_process_singleton_win_unittest.cc
@@ -4,12 +4,12 @@ #include "chrome/browser/chrome_process_singleton.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" #include "base/compiler_specific.h" #include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "build/build_config.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/chrome_security_exploit_browsertest.cc b/chrome/browser/chrome_security_exploit_browsertest.cc index dc63473c..f914cab 100644 --- a/chrome/browser/chrome_security_exploit_browsertest.cc +++ b/chrome/browser/chrome_security_exploit_browsertest.cc
@@ -4,10 +4,10 @@ #include <tuple> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/chrome_service_worker_browsertest.cc b/chrome/browser/chrome_service_worker_browsertest.cc index 9ce95c6d..1a2198f6 100644 --- a/chrome/browser/chrome_service_worker_browsertest.cc +++ b/chrome/browser/chrome_service_worker_browsertest.cc
@@ -5,10 +5,10 @@ // This file tests that Service Workers (a Content feature) work in the Chromium // embedder. -#include "base/bind.h" #include "base/command_line.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/numerics/safe_conversions.h" #include "base/path_service.h" #include "base/run_loop.h"
diff --git a/chrome/browser/chrome_worker_browsertest.cc b/chrome/browser/chrome_worker_browsertest.cc index af84e33..4dd1b497 100644 --- a/chrome/browser/chrome_worker_browsertest.cc +++ b/chrome/browser/chrome_worker_browsertest.cc
@@ -5,10 +5,10 @@ // This file tests that Web Workers (a Content feature) work in the Chromium // embedder. -#include "base/bind.h" -#include "base/callback.h" #include "base/containers/contains.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/run_loop.h" #include "base/strings/strcat.h" #include "base/test/bind.h"
diff --git a/chrome/browser/chromeos/app_mode/app_session.cc b/chrome/browser/chromeos/app_mode/app_session.cc index 6d78971..59d94131 100644 --- a/chrome/browser/chromeos/app_mode/app_session.cc +++ b/chrome/browser/chromeos/app_mode/app_session.cc
@@ -7,7 +7,7 @@ #include <errno.h> #include <signal.h> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/lazy_instance.h" #include "base/location.h" #include "base/memory/raw_ptr.h"
diff --git a/chrome/browser/chromeos/app_mode/app_session.h b/chrome/browser/chromeos/app_mode/app_session.h index 5b8a2acb..767cb56 100644 --- a/chrome/browser/chromeos/app_mode/app_session.h +++ b/chrome/browser/chromeos/app_mode/app_session.h
@@ -8,8 +8,8 @@ #include <memory> #include <string> -#include "base/callback.h" -#include "base/callback_forward.h" +#include "base/functional/callback.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/time/time.h" #include "chrome/browser/chromeos/app_mode/app_session_browser_window_handler.h"
diff --git a/chrome/browser/chromeos/app_mode/app_session_browser_window_handler.h b/chrome/browser/chromeos/app_mode/app_session_browser_window_handler.h index a651119..95ed16c 100644 --- a/chrome/browser/chromeos/app_mode/app_session_browser_window_handler.h +++ b/chrome/browser/chromeos/app_mode/app_session_browser_window_handler.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_CHROMEOS_APP_MODE_APP_SESSION_BROWSER_WINDOW_HANDLER_H_ #define CHROME_BROWSER_CHROMEOS_APP_MODE_APP_SESSION_BROWSER_WINDOW_HANDLER_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/chromeos/app_mode/app_session_policies.h"
diff --git a/chrome/browser/chromeos/app_mode/app_session_metrics_service.cc b/chrome/browser/chromeos/app_mode/app_session_metrics_service.cc index 52f20a4..68a0fb04 100644 --- a/chrome/browser/chromeos/app_mode/app_session_metrics_service.cc +++ b/chrome/browser/chromeos/app_mode/app_session_metrics_service.cc
@@ -7,10 +7,10 @@ #include <string> #include <vector> -#include "base/callback_helpers.h" #include "base/check.h" #include "base/files/file_enumerator.h" #include "base/files/file_util.h" +#include "base/functional/callback_helpers.h" #include "base/json/values_util.h" #include "base/memory/ptr_util.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/chromeos/app_mode/chrome_kiosk_app_installer.h b/chrome/browser/chromeos/app_mode/chrome_kiosk_app_installer.h index f9ed19d..b379025 100644 --- a/chrome/browser/chromeos/app_mode/chrome_kiosk_app_installer.h +++ b/chrome/browser/chromeos/app_mode/chrome_kiosk_app_installer.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/scoped_observation.h" #include "base/time/time.h"
diff --git a/chrome/browser/chromeos/app_mode/chrome_kiosk_app_launcher.cc b/chrome/browser/chromeos/app_mode/chrome_kiosk_app_launcher.cc index e0727b90..d60dd55 100644 --- a/chrome/browser/chromeos/app_mode/chrome_kiosk_app_launcher.cc +++ b/chrome/browser/chromeos/app_mode/chrome_kiosk_app_launcher.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/chromeos/app_mode/chrome_kiosk_app_launcher.h" -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "base/syslog_logging.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/chromeos/app_mode/chrome_kiosk_app_launcher.h b/chrome/browser/chromeos/app_mode/chrome_kiosk_app_launcher.h index dea9c040..540458c 100644 --- a/chrome/browser/chromeos/app_mode/chrome_kiosk_app_launcher.h +++ b/chrome/browser/chromeos/app_mode/chrome_kiosk_app_launcher.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_CHROMEOS_APP_MODE_CHROME_KIOSK_APP_LAUNCHER_H_ #define CHROME_BROWSER_CHROMEOS_APP_MODE_CHROME_KIOSK_APP_LAUNCHER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/scoped_observation.h" #include "chrome/browser/chromeos/app_mode/kiosk_app_service_launcher.h"
diff --git a/chrome/browser/chromeos/app_mode/chrome_kiosk_external_loader_broker.h b/chrome/browser/chromeos/app_mode/chrome_kiosk_external_loader_broker.h index 77daaaf..e35e6bd 100644 --- a/chrome/browser/chromeos/app_mode/chrome_kiosk_external_loader_broker.h +++ b/chrome/browser/chromeos/app_mode/chrome_kiosk_external_loader_broker.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/values.h" #include "chrome/browser/chromeos/app_mode/chrome_kiosk_app_installer.h" #include "chromeos/crosapi/mojom/chrome_app_kiosk_service.mojom.h"
diff --git a/chrome/browser/chromeos/app_mode/kiosk_app_external_loader.cc b/chrome/browser/chromeos/app_mode/kiosk_app_external_loader.cc index 1e2546e..20ccd6bd 100644 --- a/chrome/browser/chromeos/app_mode/kiosk_app_external_loader.cc +++ b/chrome/browser/chromeos/app_mode/kiosk_app_external_loader.cc
@@ -7,8 +7,8 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/values.h" #include "chrome/browser/chromeos/app_mode/chrome_kiosk_external_loader_broker.h"
diff --git a/chrome/browser/chromeos/app_mode/kiosk_app_external_loader.h b/chrome/browser/chromeos/app_mode/kiosk_app_external_loader.h index 39378b1..ea42c55bb 100644 --- a/chrome/browser/chromeos/app_mode/kiosk_app_external_loader.h +++ b/chrome/browser/chromeos/app_mode/kiosk_app_external_loader.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_CHROMEOS_APP_MODE_KIOSK_APP_EXTERNAL_LOADER_H_ #define CHROME_BROWSER_CHROMEOS_APP_MODE_KIOSK_APP_EXTERNAL_LOADER_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "base/values.h" #include "chrome/browser/chromeos/app_mode/chrome_kiosk_external_loader_broker.h"
diff --git a/chrome/browser/chromeos/app_mode/kiosk_app_service_launcher.cc b/chrome/browser/chromeos/app_mode/kiosk_app_service_launcher.cc index 0a24c1b..a69ec9c 100644 --- a/chrome/browser/chromeos/app_mode/kiosk_app_service_launcher.cc +++ b/chrome/browser/chromeos/app_mode/kiosk_app_service_launcher.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "base/syslog_logging.h" #include "base/types/cxx23_to_underlying.h"
diff --git a/chrome/browser/chromeos/app_mode/kiosk_app_service_launcher.h b/chrome/browser/chromeos/app_mode/kiosk_app_service_launcher.h index 6d45e9d8..1e19627 100644 --- a/chrome/browser/chromeos/app_mode/kiosk_app_service_launcher.h +++ b/chrome/browser/chromeos/app_mode/kiosk_app_service_launcher.h
@@ -6,7 +6,7 @@ #define CHROME_BROWSER_CHROMEOS_APP_MODE_KIOSK_APP_SERVICE_LAUNCHER_H_ #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/scoped_observation.h"
diff --git a/chrome/browser/chromeos/app_mode/kiosk_session_plugin_handler.cc b/chrome/browser/chromeos/app_mode/kiosk_session_plugin_handler.cc index 73657dc4..bbe1510f 100644 --- a/chrome/browser/chromeos/app_mode/kiosk_session_plugin_handler.cc +++ b/chrome/browser/chromeos/app_mode/kiosk_session_plugin_handler.cc
@@ -6,7 +6,7 @@ #include <algorithm> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/single_thread_task_runner.h" #include "base/time/time.h" #include "base/timer/timer.h"
diff --git a/chrome/browser/chromeos/app_mode/startup_app_launcher_update_checker.cc b/chrome/browser/chromeos/app_mode/startup_app_launcher_update_checker.cc index 8c05d0c0..0d092c24d 100644 --- a/chrome/browser/chromeos/app_mode/startup_app_launcher_update_checker.cc +++ b/chrome/browser/chromeos/app_mode/startup_app_launcher_update_checker.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/syslog_logging.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/extension_service.h"
diff --git a/chrome/browser/chromeos/app_mode/startup_app_launcher_update_checker.h b/chrome/browser/chromeos/app_mode/startup_app_launcher_update_checker.h index 30971bdf..4a9714c 100644 --- a/chrome/browser/chromeos/app_mode/startup_app_launcher_update_checker.h +++ b/chrome/browser/chromeos/app_mode/startup_app_launcher_update_checker.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_CHROMEOS_APP_MODE_STARTUP_APP_LAUNCHER_UPDATE_CHECKER_H_ #define CHROME_BROWSER_CHROMEOS_APP_MODE_STARTUP_APP_LAUNCHER_UPDATE_CHECKER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "content/public/browser/notification_observer.h"
diff --git a/chrome/browser/chromeos/app_mode/web_kiosk_browser_controller_base.h b/chrome/browser/chromeos/app_mode/web_kiosk_browser_controller_base.h index 35b136d..3a8ff0d 100644 --- a/chrome/browser/chromeos/app_mode/web_kiosk_browser_controller_base.h +++ b/chrome/browser/chromeos/app_mode/web_kiosk_browser_controller_base.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "build/chromeos_buildflags.h" #include "chrome/browser/ui/web_applications/app_browser_controller.h" #include "chrome/browser/web_applications/web_app_id.h"
diff --git a/chrome/browser/chromeos/arc/arc_external_protocol_dialog.cc b/chrome/browser/chromeos/arc/arc_external_protocol_dialog.cc index 1d954dbe..4875acd 100644 --- a/chrome/browser/chromeos/arc/arc_external_protocol_dialog.cc +++ b/chrome/browser/chromeos/arc/arc_external_protocol_dialog.cc
@@ -6,7 +6,7 @@ #include <map> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted.h" #include "base/metrics/histogram_functions.h" #include "base/ranges/algorithm.h"
diff --git a/chrome/browser/chromeos/arc/start_smart_selection_action_menu.cc b/chrome/browser/chromeos/arc/start_smart_selection_action_menu.cc index af5cc46..adb0f846 100644 --- a/chrome/browser/chromeos/arc/start_smart_selection_action_menu.cc +++ b/chrome/browser/chromeos/arc/start_smart_selection_action_menu.cc
@@ -8,7 +8,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/user_metrics.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/chromeos/extensions/contact_center_insights/contact_center_insights_extension_manager.cc b/chrome/browser/chromeos/extensions/contact_center_insights/contact_center_insights_extension_manager.cc index 9263abd..f6f852f 100644 --- a/chrome/browser/chromeos/extensions/contact_center_insights/contact_center_insights_extension_manager.cc +++ b/chrome/browser/chromeos/extensions/contact_center_insights/contact_center_insights_extension_manager.cc
@@ -6,9 +6,9 @@ #include <memory> -#include "base/bind.h" -#include "base/callback_forward.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback_forward.h" #include "base/no_destructor.h" #include "chrome/browser/enterprise/util/affiliation.h" #include "chrome/browser/extensions/component_loader.h"
diff --git a/chrome/browser/chromeos/extensions/desk_api/desk_api_extension_manager.cc b/chrome/browser/chromeos/extensions/desk_api/desk_api_extension_manager.cc index f1f4eb0..86e759e 100644 --- a/chrome/browser/chromeos/extensions/desk_api/desk_api_extension_manager.cc +++ b/chrome/browser/chromeos/extensions/desk_api/desk_api_extension_manager.cc
@@ -6,9 +6,9 @@ #include <memory> -#include "base/bind.h" -#include "base/callback_forward.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback_forward.h" #include "base/no_destructor.h" #include "base/strings/string_util.h" #include "chrome/browser/enterprise/util/affiliation.h"
diff --git a/chrome/browser/chromeos/extensions/echo_private/echo_private_api.cc b/chrome/browser/chromeos/extensions/echo_private/echo_private_api.cc index cbe058e..5f84327 100644 --- a/chrome/browser/chromeos/extensions/echo_private/echo_private_api.cc +++ b/chrome/browser/chromeos/extensions/echo_private/echo_private_api.cc
@@ -8,8 +8,8 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/strings/utf_string_conversions.h" #include "base/time/time.h"
diff --git a/chrome/browser/chromeos/extensions/echo_private/echo_private_apitest.cc b/chrome/browser/chromeos/extensions/echo_private/echo_private_apitest.cc index fcc06769..da5bf70 100644 --- a/chrome/browser/chromeos/extensions/echo_private/echo_private_apitest.cc +++ b/chrome/browser/chromeos/extensions/echo_private/echo_private_apitest.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/chromeos/extensions/echo_private/echo_private_api.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/strings/stringprintf.h" #include "base/task/single_thread_task_runner.h" #include "chrome/browser/ash/notifications/echo_dialog_view.h"
diff --git a/chrome/browser/chromeos/extensions/file_system_provider/file_system_provider_api.cc b/chrome/browser/chromeos/extensions/file_system_provider/file_system_provider_api.cc index 2a3b9d7e..0b3fb6c3 100644 --- a/chrome/browser/chromeos/extensions/file_system_provider/file_system_provider_api.cc +++ b/chrome/browser/chromeos/extensions/file_system_provider/file_system_provider_api.cc
@@ -9,8 +9,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/files/file.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/trace_event/trace_event.h" #include "base/values.h"
diff --git a/chrome/browser/chromeos/extensions/file_system_provider/file_system_provider_apitest.cc b/chrome/browser/chromeos/extensions/file_system_provider/file_system_provider_apitest.cc index 6217198d..2831d28 100644 --- a/chrome/browser/chromeos/extensions/file_system_provider/file_system_provider_apitest.cc +++ b/chrome/browser/chromeos/extensions/file_system_provider/file_system_provider_apitest.cc
@@ -5,8 +5,8 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/files/file.h" +#include "base/functional/bind.h" #include "base/task/single_thread_task_runner.h" #include "base/time/time.h" #include "chrome/browser/ash/file_system_provider/observer.h"
diff --git a/chrome/browser/chromeos/extensions/info_private_api.cc b/chrome/browser/chromeos/extensions/info_private_api.cc index be591455..7dc536e 100644 --- a/chrome/browser/chromeos/extensions/info_private_api.cc +++ b/chrome/browser/chromeos/extensions/info_private_api.cc
@@ -8,8 +8,8 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/values.h" #include "build/chromeos_buildflags.h" #include "extensions/browser/extension_function.h"
diff --git a/chrome/browser/chromeos/extensions/login_screen/login/cleanup/cleanup_handler.h b/chrome/browser/chromeos/extensions/login_screen/login/cleanup/cleanup_handler.h index fd21c9a..7a2c349 100644 --- a/chrome/browser/chromeos/extensions/login_screen/login/cleanup/cleanup_handler.h +++ b/chrome/browser/chromeos/extensions/login_screen/login/cleanup/cleanup_handler.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_CHROMEOS_EXTENSIONS_LOGIN_SCREEN_LOGIN_CLEANUP_CLEANUP_HANDLER_H_ #define CHROME_BROWSER_CHROMEOS_EXTENSIONS_LOGIN_SCREEN_LOGIN_CLEANUP_CLEANUP_HANDLER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "third_party/abseil-cpp/absl/types/optional.h" namespace chromeos {
diff --git a/chrome/browser/chromeos/extensions/login_screen/login/cleanup/cleanup_manager.cc b/chrome/browser/chromeos/extensions/login_screen/login/cleanup/cleanup_manager.cc index a550f5d..f3ad15e 100644 --- a/chrome/browser/chromeos/extensions/login_screen/login/cleanup/cleanup_manager.cc +++ b/chrome/browser/chromeos/extensions/login_screen/login/cleanup/cleanup_manager.cc
@@ -7,7 +7,7 @@ #include <utility> #include "base/barrier_closure.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "base/no_destructor.h" #include "base/strings/string_util.h"
diff --git a/chrome/browser/chromeos/extensions/login_screen/login/cleanup/cleanup_manager.h b/chrome/browser/chromeos/extensions/login_screen/login/cleanup/cleanup_manager.h index e79559e0..5668b1a3 100644 --- a/chrome/browser/chromeos/extensions/login_screen/login/cleanup/cleanup_manager.h +++ b/chrome/browser/chromeos/extensions/login_screen/login/cleanup/cleanup_manager.h
@@ -10,8 +10,8 @@ #include <string> #include <vector> -#include "base/callback.h" -#include "base/callback_forward.h" +#include "base/functional/callback.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h" #include "chrome/browser/chromeos/extensions/login_screen/login/cleanup/cleanup_handler.h"
diff --git a/chrome/browser/chromeos/extensions/login_screen/login/cleanup/cleanup_manager_lacros.h b/chrome/browser/chromeos/extensions/login_screen/login/cleanup/cleanup_manager_lacros.h index 3733f3b..c135eaa 100644 --- a/chrome/browser/chromeos/extensions/login_screen/login/cleanup/cleanup_manager_lacros.h +++ b/chrome/browser/chromeos/extensions/login_screen/login/cleanup/cleanup_manager_lacros.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_CHROMEOS_EXTENSIONS_LOGIN_SCREEN_LOGIN_CLEANUP_CLEANUP_MANAGER_LACROS_H_ #define CHROME_BROWSER_CHROMEOS_EXTENSIONS_LOGIN_SCREEN_LOGIN_CLEANUP_CLEANUP_MANAGER_LACROS_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/chromeos/extensions/login_screen/login/cleanup/cleanup_manager.h" #include "chromeos/crosapi/mojom/login.mojom.h" #include "components/keyed_service/core/keyed_service.h"
diff --git a/chrome/browser/chromeos/extensions/login_screen/login/cleanup/cleanup_manager_lacros_unittest.cc b/chrome/browser/chromeos/extensions/login_screen/login/cleanup/cleanup_manager_lacros_unittest.cc index 498ca90..59c72fd9 100644 --- a/chrome/browser/chromeos/extensions/login_screen/login/cleanup/cleanup_manager_lacros_unittest.cc +++ b/chrome/browser/chromeos/extensions/login_screen/login/cleanup/cleanup_manager_lacros_unittest.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/test/bind.h" #include "chrome/browser/chromeos/extensions/login_screen/login/cleanup/mock_cleanup_handler.h"
diff --git a/chrome/browser/chromeos/extensions/login_screen/login/cleanup/cleanup_manager_unittest.cc b/chrome/browser/chromeos/extensions/login_screen/login/cleanup/cleanup_manager_unittest.cc index d2e68c2..853a61ca 100644 --- a/chrome/browser/chromeos/extensions/login_screen/login/cleanup/cleanup_manager_unittest.cc +++ b/chrome/browser/chromeos/extensions/login_screen/login/cleanup/cleanup_manager_unittest.cc
@@ -7,8 +7,8 @@ #include <utility> #include "base/barrier_closure.h" -#include "base/callback_forward.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_forward.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h"
diff --git a/chrome/browser/chromeos/extensions/login_screen/login/cleanup/extension_cleanup_handler.h b/chrome/browser/chromeos/extensions/login_screen/login/cleanup/extension_cleanup_handler.h index 6ed7b97..f4a40547 100644 --- a/chrome/browser/chromeos/extensions/login_screen/login/cleanup/extension_cleanup_handler.h +++ b/chrome/browser/chromeos/extensions/login_screen/login/cleanup/extension_cleanup_handler.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_CHROMEOS_EXTENSIONS_LOGIN_SCREEN_LOGIN_CLEANUP_EXTENSION_CLEANUP_HANDLER_H_ #define CHROME_BROWSER_CHROMEOS_EXTENSIONS_LOGIN_SCREEN_LOGIN_CLEANUP_EXTENSION_CLEANUP_HANDLER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/chromeos/extensions/login_screen/login/cleanup/cleanup_handler.h" #include "chrome/browser/extensions/extension_service.h"
diff --git a/chrome/browser/chromeos/extensions/login_screen/login/cleanup/lacros_cleanup_handler.cc b/chrome/browser/chromeos/extensions/login_screen/login/cleanup/lacros_cleanup_handler.cc index fcf6137..5f7a40c5 100644 --- a/chrome/browser/chromeos/extensions/login_screen/login/cleanup/lacros_cleanup_handler.cc +++ b/chrome/browser/chromeos/extensions/login_screen/login/cleanup/lacros_cleanup_handler.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/string_util.h" #include "chrome/browser/ash/crosapi/crosapi_ash.h" #include "chrome/browser/ash/crosapi/crosapi_manager.h"
diff --git a/chrome/browser/chromeos/extensions/login_screen/login/cleanup/lacros_cleanup_handler.h b/chrome/browser/chromeos/extensions/login_screen/login/cleanup/lacros_cleanup_handler.h index 1a1d0380..ff2835d 100644 --- a/chrome/browser/chromeos/extensions/login_screen/login/cleanup/lacros_cleanup_handler.h +++ b/chrome/browser/chromeos/extensions/login_screen/login/cleanup/lacros_cleanup_handler.h
@@ -11,7 +11,7 @@ #include <set> #include "base/barrier_closure.h" -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "chromeos/crosapi/mojom/login.mojom.h" #include "mojo/public/cpp/bindings/remote_set.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/chrome/browser/chromeos/extensions/login_screen/login/cleanup/lacros_cleanup_handler_unittest.cc b/chrome/browser/chromeos/extensions/login_screen/login/cleanup/lacros_cleanup_handler_unittest.cc index ca7a394..2d744ca 100644 --- a/chrome/browser/chromeos/extensions/login_screen/login/cleanup/lacros_cleanup_handler_unittest.cc +++ b/chrome/browser/chromeos/extensions/login_screen/login/cleanup/lacros_cleanup_handler_unittest.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/test/bind.h" #include "base/test/test_future.h"
diff --git a/chrome/browser/chromeos/extensions/login_screen/login/cleanup/print_jobs_cleanup_handler.cc b/chrome/browser/chromeos/extensions/login_screen/login/cleanup/print_jobs_cleanup_handler.cc index 2a49038..c9b3590 100644 --- a/chrome/browser/chromeos/extensions/login_screen/login/cleanup/print_jobs_cleanup_handler.cc +++ b/chrome/browser/chromeos/extensions/login_screen/login/cleanup/print_jobs_cleanup_handler.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/printing/print_management/printing_manager.h" #include "chrome/browser/ash/printing/print_management/printing_manager_factory.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/chromeos/extensions/login_screen/login/cleanup/print_jobs_cleanup_handler_unittest.cc b/chrome/browser/chromeos/extensions/login_screen/login/cleanup/print_jobs_cleanup_handler_unittest.cc index bec959b..39f691b 100644 --- a/chrome/browser/chromeos/extensions/login_screen/login/cleanup/print_jobs_cleanup_handler_unittest.cc +++ b/chrome/browser/chromeos/extensions/login_screen/login/cleanup/print_jobs_cleanup_handler_unittest.cc
@@ -7,8 +7,8 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/test/bind.h" #include "chrome/browser/ash/login/users/fake_chrome_user_manager.h" #include "chrome/browser/ash/printing/history/print_job_history_service.h"
diff --git a/chrome/browser/chromeos/extensions/login_screen/login/login_api.cc b/chrome/browser/chromeos/extensions/login_screen/login/login_api.cc index e3993ec0..eb7f861 100644 --- a/chrome/browser/chromeos/extensions/login_screen/login/login_api.cc +++ b/chrome/browser/chromeos/extensions/login_screen/login/login_api.cc
@@ -8,7 +8,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/values.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/chromeos/extensions/login_screen/login/login_api_ash_unittest.cc b/chrome/browser/chromeos/extensions/login_screen/login/login_api_ash_unittest.cc index 36e8e09..274333e9 100644 --- a/chrome/browser/chromeos/extensions/login_screen/login/login_api_ash_unittest.cc +++ b/chrome/browser/chromeos/extensions/login_screen/login/login_api_ash_unittest.cc
@@ -9,8 +9,8 @@ #include <string> #include <utility> -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/scoped_refptr.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/chromeos/extensions/login_screen/login/login_api_lock_handler.cc b/chrome/browser/chromeos/extensions/login_screen/login/login_api_lock_handler.cc index 43fe631..9a42f3d 100644 --- a/chrome/browser/chromeos/extensions/login_screen/login/login_api_lock_handler.cc +++ b/chrome/browser/chromeos/extensions/login_screen/login/login_api_lock_handler.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/no_destructor.h" #include "chrome/browser/ash/login/lock/screen_locker.h" #include "chrome/browser/ui/ash/session_controller_client_impl.h"
diff --git a/chrome/browser/chromeos/extensions/login_screen/login/login_api_lock_handler.h b/chrome/browser/chromeos/extensions/login_screen/login/login_api_lock_handler.h index 7a27c20..98e24fe 100644 --- a/chrome/browser/chromeos/extensions/login_screen/login/login_api_lock_handler.h +++ b/chrome/browser/chromeos/extensions/login_screen/login/login_api_lock_handler.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_CHROMEOS_EXTENSIONS_LOGIN_SCREEN_LOGIN_LOGIN_API_LOCK_HANDLER_H_ #define CHROME_BROWSER_CHROMEOS_EXTENSIONS_LOGIN_SCREEN_LOGIN_LOGIN_API_LOCK_HANDLER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" namespace ash {
diff --git a/chrome/browser/chromeos/extensions/login_screen/login/shared_session_handler.cc b/chrome/browser/chromeos/extensions/login_screen/login/shared_session_handler.cc index 046902c..d183fcb 100644 --- a/chrome/browser/chromeos/extensions/login_screen/login/shared_session_handler.cc +++ b/chrome/browser/chromeos/extensions/login_screen/login/shared_session_handler.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/no_destructor.h" #include "base/strings/string_number_conversions.h" #include "chrome/browser/ash/login/existing_user_controller.h"
diff --git a/chrome/browser/chromeos/extensions/login_screen/login/shared_session_handler.h b/chrome/browser/chromeos/extensions/login_screen/login/shared_session_handler.h index 3ee1536..9a39c237 100644 --- a/chrome/browser/chromeos/extensions/login_screen/login/shared_session_handler.h +++ b/chrome/browser/chromeos/extensions/login_screen/login/shared_session_handler.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/no_destructor.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/chrome/browser/chromeos/extensions/login_screen/login_state/login_state_api.cc b/chrome/browser/chromeos/extensions/login_screen/login_state/login_state_api.cc index 55d4f33..431e5b7 100644 --- a/chrome/browser/chromeos/extensions/login_screen/login_state/login_state_api.cc +++ b/chrome/browser/chromeos/extensions/login_screen/login_state/login_state_api.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/chromeos/extensions/login_screen/login_state/login_state_api.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "build/chromeos_buildflags.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/extensions/api/login_state.h"
diff --git a/chrome/browser/chromeos/extensions/printing_metrics/printing_metrics_apitest.cc b/chrome/browser/chromeos/extensions/printing_metrics/printing_metrics_apitest.cc index f8498456a..7a194d3 100644 --- a/chrome/browser/chromeos/extensions/printing_metrics/printing_metrics_apitest.cc +++ b/chrome/browser/chromeos/extensions/printing_metrics/printing_metrics_apitest.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 "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/chromeos/extensions/printing_metrics/printing_metrics_api.h" #include "chrome/browser/extensions/extension_apitest.h"
diff --git a/chrome/browser/chromeos/extensions/telemetry/api/api_guard_delegate.cc b/chrome/browser/chromeos/extensions/telemetry/api/api_guard_delegate.cc index 8ff8d6db..77e0c31 100644 --- a/chrome/browser/chromeos/extensions/telemetry/api/api_guard_delegate.cc +++ b/chrome/browser/chromeos/extensions/telemetry/api/api_guard_delegate.cc
@@ -6,9 +6,9 @@ #include <string> -#include "base/bind.h" -#include "base/callback.h" #include "base/containers/flat_set.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/ptr_util.h" #include "base/values.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/chromeos/extensions/telemetry/api/api_guard_delegate.h b/chrome/browser/chromeos/extensions/telemetry/api/api_guard_delegate.h index 3ced29c..2c503fb 100644 --- a/chrome/browser/chromeos/extensions/telemetry/api/api_guard_delegate.h +++ b/chrome/browser/chromeos/extensions/telemetry/api/api_guard_delegate.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" namespace content { class BrowserContext;
diff --git a/chrome/browser/chromeos/extensions/telemetry/api/base_telemetry_extension_api_guard_function.cc b/chrome/browser/chromeos/extensions/telemetry/api/base_telemetry_extension_api_guard_function.cc index b4f7fd0..c8d8d27 100644 --- a/chrome/browser/chromeos/extensions/telemetry/api/base_telemetry_extension_api_guard_function.cc +++ b/chrome/browser/chromeos/extensions/telemetry/api/base_telemetry_extension_api_guard_function.cc
@@ -7,7 +7,7 @@ #include <memory> #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/stringprintf.h" #include "chrome/browser/chromeos/extensions/telemetry/api/api_guard_delegate.h"
diff --git a/chrome/browser/chromeos/extensions/telemetry/api/diagnostics_api.cc b/chrome/browser/chromeos/extensions/telemetry/api/diagnostics_api.cc index 7322621..760e858 100644 --- a/chrome/browser/chromeos/extensions/telemetry/api/diagnostics_api.cc +++ b/chrome/browser/chromeos/extensions/telemetry/api/diagnostics_api.cc
@@ -9,7 +9,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/values.h" #include "build/chromeos_buildflags.h" #include "chrome/browser/chromeos/extensions/telemetry/api/diagnostics_api_converters.h"
diff --git a/chrome/browser/chromeos/extensions/telemetry/api/fake_api_guard_delegate.cc b/chrome/browser/chromeos/extensions/telemetry/api/fake_api_guard_delegate.cc index ce4f9e25..b734566 100644 --- a/chrome/browser/chromeos/extensions/telemetry/api/fake_api_guard_delegate.cc +++ b/chrome/browser/chromeos/extensions/telemetry/api/fake_api_guard_delegate.cc
@@ -8,7 +8,7 @@ #include <string> #include <utility> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/memory/ptr_util.h" #include "base/task/sequenced_task_runner.h"
diff --git a/chrome/browser/chromeos/extensions/telemetry/api/fake_diagnostics_service.cc b/chrome/browser/chromeos/extensions/telemetry/api/fake_diagnostics_service.cc index 3706d6bf..e150d64 100644 --- a/chrome/browser/chromeos/extensions/telemetry/api/fake_diagnostics_service.cc +++ b/chrome/browser/chromeos/extensions/telemetry/api/fake_diagnostics_service.cc
@@ -8,7 +8,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/task/sequenced_task_runner.h" #include "base/values.h"
diff --git a/chrome/browser/chromeos/extensions/telemetry/api/fake_hardware_info_delegate.cc b/chrome/browser/chromeos/extensions/telemetry/api/fake_hardware_info_delegate.cc index 913c6855..e50952b 100644 --- a/chrome/browser/chromeos/extensions/telemetry/api/fake_hardware_info_delegate.cc +++ b/chrome/browser/chromeos/extensions/telemetry/api/fake_hardware_info_delegate.cc
@@ -8,7 +8,7 @@ #include <string> #include <utility> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/memory/ptr_util.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/chromeos/extensions/telemetry/api/fake_probe_service.cc b/chrome/browser/chromeos/extensions/telemetry/api/fake_probe_service.cc index 7e4d5d4..415abd5 100644 --- a/chrome/browser/chromeos/extensions/telemetry/api/fake_probe_service.cc +++ b/chrome/browser/chromeos/extensions/telemetry/api/fake_probe_service.cc
@@ -8,7 +8,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/task/sequenced_task_runner.h" #include "chromeos/crosapi/mojom/probe_service.mojom.h"
diff --git a/chrome/browser/chromeos/extensions/telemetry/api/hardware_info_delegate.cc b/chrome/browser/chromeos/extensions/telemetry/api/hardware_info_delegate.cc index 0b38c8e..c80c296b2 100644 --- a/chrome/browser/chromeos/extensions/telemetry/api/hardware_info_delegate.cc +++ b/chrome/browser/chromeos/extensions/telemetry/api/hardware_info_delegate.cc
@@ -8,10 +8,10 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/ptr_util.h" #include "base/strings/string_util.h" #include "base/system/sys_info.h"
diff --git a/chrome/browser/chromeos/extensions/telemetry/api/hardware_info_delegate.h b/chrome/browser/chromeos/extensions/telemetry/api/hardware_info_delegate.h index 2f5b940..42c1cd2 100644 --- a/chrome/browser/chromeos/extensions/telemetry/api/hardware_info_delegate.h +++ b/chrome/browser/chromeos/extensions/telemetry/api/hardware_info_delegate.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/chromeos/extensions/telemetry/api/remote_probe_service_strategy.h" #include "chromeos/crosapi/mojom/probe_service.mojom.h"
diff --git a/chrome/browser/chromeos/extensions/telemetry/api/telemetry_extension_capabilities_browser_test.cc b/chrome/browser/chromeos/extensions/telemetry/api/telemetry_extension_capabilities_browser_test.cc index 37c3743..d780bdf 100644 --- a/chrome/browser/chromeos/extensions/telemetry/api/telemetry_extension_capabilities_browser_test.cc +++ b/chrome/browser/chromeos/extensions/telemetry/api/telemetry_extension_capabilities_browser_test.cc
@@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/files/file_path.h" +#include "base/functional/callback_helpers.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/chromeos/extensions/telemetry/api/base_telemetry_extension_browser_test.h"
diff --git a/chrome/browser/chromeos/extensions/vpn_provider/vpn_provider_api.cc b/chrome/browser/chromeos/extensions/vpn_provider/vpn_provider_api.cc index 7f122461..9df5a87 100644 --- a/chrome/browser/chromeos/extensions/vpn_provider/vpn_provider_api.cc +++ b/chrome/browser/chromeos/extensions/vpn_provider/vpn_provider_api.cc
@@ -8,8 +8,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" #include "base/values.h"
diff --git a/chrome/browser/chromeos/extensions/vpn_provider/vpn_service.cc b/chrome/browser/chromeos/extensions/vpn_provider/vpn_service.cc index b35c2e09..a35d1f0 100644 --- a/chrome/browser/chromeos/extensions/vpn_provider/vpn_service.cc +++ b/chrome/browser/chromeos/extensions/vpn_provider/vpn_service.cc
@@ -6,9 +6,9 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "chrome/common/extensions/api/vpn_provider.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/pepper_vpn_provider_resource_host_proxy.h"
diff --git a/chrome/browser/chromeos/extensions/vpn_provider/vpn_service.h b/chrome/browser/chromeos/extensions/vpn_provider/vpn_service.h index 3f12b38..24569d7 100644 --- a/chrome/browser/chromeos/extensions/vpn_provider/vpn_service.h +++ b/chrome/browser/chromeos/extensions/vpn_provider/vpn_service.h
@@ -9,8 +9,8 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/containers/flat_map.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/scoped_observation.h"
diff --git a/chrome/browser/chromeos/extensions/vpn_provider/vpn_service_interface.h b/chrome/browser/chromeos/extensions/vpn_provider/vpn_service_interface.h index 1c6f3a7..19d5ef4 100644 --- a/chrome/browser/chromeos/extensions/vpn_provider/vpn_service_interface.h +++ b/chrome/browser/chromeos/extensions/vpn_provider/vpn_service_interface.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/values.h" #include "components/keyed_service/core/keyed_service.h"
diff --git a/chrome/browser/chromeos/extensions/wallpaper_api.cc b/chrome/browser/chromeos/extensions/wallpaper_api.cc index 338dc14..bf5b06a 100644 --- a/chrome/browser/chromeos/extensions/wallpaper_api.cc +++ b/chrome/browser/chromeos/extensions/wallpaper_api.cc
@@ -9,9 +9,9 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/check_op.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/lazy_instance.h" #include "base/strings/stringprintf.h" #include "base/task/sequenced_task_runner.h"
diff --git a/chrome/browser/chromeos/extensions/wm/wm_desks_private_api.cc b/chrome/browser/chromeos/extensions/wm/wm_desks_private_api.cc index 8d7634c..ead95fe 100644 --- a/chrome/browser/chromeos/extensions/wm/wm_desks_private_api.cc +++ b/chrome/browser/chromeos/extensions/wm/wm_desks_private_api.cc
@@ -6,7 +6,6 @@ #include <memory> -#include "base/bind.h" #include "base/functional/bind.h" #include "base/guid.h" #include "base/json/json_writer.h"
diff --git a/chrome/browser/chromeos/extensions/wm/wm_desks_private_feature.h b/chrome/browser/chromeos/extensions/wm/wm_desks_private_feature.h index 5972673..7dc6825 100644 --- a/chrome/browser/chromeos/extensions/wm/wm_desks_private_feature.h +++ b/chrome/browser/chromeos/extensions/wm/wm_desks_private_feature.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/guid.h" #include "base/values.h" #include "chrome/common/extensions/api/wm_desks_private.h"
diff --git a/chrome/browser/chromeos/launcher_search/search_util.cc b/chrome/browser/chromeos/launcher_search/search_util.cc index 2700044..edd85712 100644 --- a/chrome/browser/chromeos/launcher_search/search_util.cc +++ b/chrome/browser/chromeos/launcher_search/search_util.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/chromeos/launcher_search/search_util.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/strings/string_piece.h" #include "components/bookmarks/browser/bookmark_model.h" #include "components/omnibox/browser/autocomplete_classifier.h"
diff --git a/chrome/browser/chromeos/policy/dlp/clipboard_bubble.cc b/chrome/browser/chromeos/policy/dlp/clipboard_bubble.cc index 29ae859b..d191b91 100644 --- a/chrome/browser/chromeos/policy/dlp/clipboard_bubble.cc +++ b/chrome/browser/chromeos/policy/dlp/clipboard_bubble.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/chromeos/policy/dlp/clipboard_bubble.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "build/chromeos_buildflags.h" #include "chrome/browser/chromeos/policy/dlp/dlp_clipboard_bubble_constants.h" #include "chrome/browser/chromeos/policy/dlp/dlp_policy_constants.h"
diff --git a/chrome/browser/chromeos/policy/dlp/clipboard_bubble.h b/chrome/browser/chromeos/policy/dlp/clipboard_bubble.h index efcd9e4..4e45e5f 100644 --- a/chrome/browser/chromeos/policy/dlp/clipboard_bubble.h +++ b/chrome/browser/chromeos/policy/dlp/clipboard_bubble.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "ui/base/metadata/metadata_header_macros.h" #include "ui/gfx/geometry/size.h"
diff --git a/chrome/browser/chromeos/policy/dlp/data_transfer_dlp_controller.h b/chrome/browser/chromeos/policy/dlp/data_transfer_dlp_controller.h index f7e42b1d..486e9dc0 100644 --- a/chrome/browser/chromeos/policy/dlp/data_transfer_dlp_controller.h +++ b/chrome/browser/chromeos/policy/dlp/data_transfer_dlp_controller.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_CHROMEOS_POLICY_DLP_DATA_TRANSFER_DLP_CONTROLLER_H_ #define CHROME_BROWSER_CHROMEOS_POLICY_DLP_DATA_TRANSFER_DLP_CONTROLLER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h" #include "chrome/browser/chromeos/policy/dlp/dlp_clipboard_notifier.h"
diff --git a/chrome/browser/chromeos/policy/dlp/dlp_clipboard_notifier.cc b/chrome/browser/chromeos/policy/dlp/dlp_clipboard_notifier.cc index d8b4bf89..0a475f9 100644 --- a/chrome/browser/chromeos/policy/dlp/dlp_clipboard_notifier.cc +++ b/chrome/browser/chromeos/policy/dlp/dlp_clipboard_notifier.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/notreached.h" #include "chrome/browser/chromeos/policy/dlp/clipboard_bubble.h" #include "chrome/browser/chromeos/policy/dlp/dlp_clipboard_bubble_constants.h"
diff --git a/chrome/browser/chromeos/policy/dlp/dlp_content_manager.cc b/chrome/browser/chromeos/policy/dlp/dlp_content_manager.cc index ebb34ef..f0d6c65 100644 --- a/chrome/browser/chromeos/policy/dlp/dlp_content_manager.cc +++ b/chrome/browser/chromeos/policy/dlp/dlp_content_manager.cc
@@ -8,12 +8,12 @@ #include <string> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check.h" #include "base/check_op.h" #include "base/containers/contains.h" #include "base/containers/cxx20_erase.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/weak_ptr.h" #include "base/notreached.h" #include "base/ranges/algorithm.h"
diff --git a/chrome/browser/chromeos/policy/dlp/dlp_content_manager.h b/chrome/browser/chromeos/policy/dlp/dlp_content_manager.h index 897551f..502a067 100644 --- a/chrome/browser/chromeos/policy/dlp/dlp_content_manager.h +++ b/chrome/browser/chromeos/policy/dlp/dlp_content_manager.h
@@ -9,8 +9,8 @@ #include <string> #include <utility> -#include "base/callback.h" #include "base/containers/flat_map.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" #include "chrome/browser/chromeos/policy/dlp/dlp_confidential_contents.h"
diff --git a/chrome/browser/chromeos/policy/dlp/dlp_content_manager_browsertest.cc b/chrome/browser/chromeos/policy/dlp/dlp_content_manager_browsertest.cc index 2b91b49..1a9f9fc 100644 --- a/chrome/browser/chromeos/policy/dlp/dlp_content_manager_browsertest.cc +++ b/chrome/browser/chromeos/policy/dlp/dlp_content_manager_browsertest.cc
@@ -6,8 +6,8 @@ #include <functional> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool/thread_pool_instance.h"
diff --git a/chrome/browser/chromeos/policy/dlp/dlp_data_transfer_notifier.cc b/chrome/browser/chromeos/policy/dlp/dlp_data_transfer_notifier.cc index ef8c778..32d4667 100644 --- a/chrome/browser/chromeos/policy/dlp/dlp_data_transfer_notifier.cc +++ b/chrome/browser/chromeos/policy/dlp/dlp_data_transfer_notifier.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/chromeos/policy/dlp/dlp_data_transfer_notifier.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "build/chromeos_buildflags.h" #include "chrome/browser/chromeos/policy/dlp/clipboard_bubble.h" #include "chrome/browser/chromeos/policy/dlp/dlp_clipboard_bubble_constants.h"
diff --git a/chrome/browser/chromeos/policy/dlp/dlp_data_transfer_notifier.h b/chrome/browser/chromeos/policy/dlp/dlp_data_transfer_notifier.h index 398ef3fa..a9abb77 100644 --- a/chrome/browser/chromeos/policy/dlp/dlp_data_transfer_notifier.h +++ b/chrome/browser/chromeos/policy/dlp/dlp_data_transfer_notifier.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_CHROMEOS_POLICY_DLP_DLP_DATA_TRANSFER_NOTIFIER_H_ #define CHROME_BROWSER_CHROMEOS_POLICY_DLP_DLP_DATA_TRANSFER_NOTIFIER_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/timer/timer.h" #include "ui/gfx/geometry/size.h" #include "ui/views/widget/unique_widget_ptr.h"
diff --git a/chrome/browser/chromeos/policy/dlp/dlp_data_transfer_notifier_browsertest.cc b/chrome/browser/chromeos/policy/dlp/dlp_data_transfer_notifier_browsertest.cc index 615d686..1152da6 100644 --- a/chrome/browser/chromeos/policy/dlp/dlp_data_transfer_notifier_browsertest.cc +++ b/chrome/browser/chromeos/policy/dlp/dlp_data_transfer_notifier_browsertest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/chromeos/policy/dlp/dlp_data_transfer_notifier.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "chrome/test/base/in_process_browser_test.h" #include "content/public/test/browser_test.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/chromeos/policy/dlp/dlp_drag_drop_notifier.cc b/chrome/browser/chromeos/policy/dlp/dlp_drag_drop_notifier.cc index 4520490e..223cf8d8 100644 --- a/chrome/browser/chromeos/policy/dlp/dlp_drag_drop_notifier.cc +++ b/chrome/browser/chromeos/policy/dlp/dlp_drag_drop_notifier.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "components/strings/grit/components_strings.h" #include "ui/base/data_transfer_policy/data_transfer_endpoint.h" #include "ui/base/l10n/l10n_util.h"
diff --git a/chrome/browser/chromeos/policy/dlp/dlp_notification_helper.h b/chrome/browser/chromeos/policy/dlp/dlp_notification_helper.h index 030677c..eef8e96 100644 --- a/chrome/browser/chromeos/policy/dlp/dlp_notification_helper.h +++ b/chrome/browser/chromeos/policy/dlp/dlp_notification_helper.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" namespace policy {
diff --git a/chrome/browser/chromeos/policy/dlp/dlp_reporting_manager.cc b/chrome/browser/chromeos/policy/dlp/dlp_reporting_manager.cc index 836bfe01..bd5b17c 100644 --- a/chrome/browser/chromeos/policy/dlp/dlp_reporting_manager.cc +++ b/chrome/browser/chromeos/policy/dlp/dlp_reporting_manager.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/histogram_functions.h" #include "build/chromeos_buildflags.h" #include "chrome/browser/chromeos/policy/dlp/dlp_histogram_helper.h"
diff --git a/chrome/browser/chromeos/policy/dlp/dlp_rules_manager_impl.cc b/chrome/browser/chromeos/policy/dlp/dlp_rules_manager_impl.cc index 79f91023..148153c 100644 --- a/chrome/browser/chromeos/policy/dlp/dlp_rules_manager_impl.cc +++ b/chrome/browser/chromeos/policy/dlp/dlp_rules_manager_impl.cc
@@ -10,10 +10,10 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/containers/contains.h" #include "base/containers/fixed_flat_map.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/values.h" #include "chrome/browser/ash/policy/dlp/dlp_files_controller.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/chromeos/policy/dlp/dlp_scoped_file_access_delegate.h b/chrome/browser/chromeos/policy/dlp/dlp_scoped_file_access_delegate.h index 838333f..500d8120 100644 --- a/chrome/browser/chromeos/policy/dlp/dlp_scoped_file_access_delegate.h +++ b/chrome/browser/chromeos/policy/dlp/dlp_scoped_file_access_delegate.h
@@ -8,9 +8,9 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/files/file_path.h" #include "base/files/scoped_file.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "chromeos/dbus/dlp/dlp_service.pb.h"
diff --git a/chrome/browser/chromeos/policy/dlp/dlp_warn_dialog.h b/chrome/browser/chromeos/policy/dlp/dlp_warn_dialog.h index ba4c3e6..393baee 100644 --- a/chrome/browser/chromeos/policy/dlp/dlp_warn_dialog.h +++ b/chrome/browser/chromeos/policy/dlp/dlp_warn_dialog.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "chrome/browser/ash/policy/dlp/dlp_files_controller.h" #include "chrome/browser/chromeos/policy/dlp/dlp_confidential_contents.h" #include "chrome/browser/chromeos/policy/dlp/dlp_confidential_file.h"
diff --git a/chrome/browser/chromeos/policy/dlp/mock_dlp_warn_notifier.h b/chrome/browser/chromeos/policy/dlp/mock_dlp_warn_notifier.h index 850d60e..a045bc7 100644 --- a/chrome/browser/chromeos/policy/dlp/mock_dlp_warn_notifier.h +++ b/chrome/browser/chromeos/policy/dlp/mock_dlp_warn_notifier.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_CHROMEOS_POLICY_DLP_MOCK_DLP_WARN_NOTIFIER_H_ #define CHROME_BROWSER_CHROMEOS_POLICY_DLP_MOCK_DLP_WARN_NOTIFIER_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/chromeos/policy/dlp/dlp_confidential_contents.h" #include "chrome/browser/chromeos/policy/dlp/dlp_warn_dialog.h"
diff --git a/chrome/browser/chromeos/printing/cups_wrapper.h b/chrome/browser/chromeos/printing/cups_wrapper.h index 1bd524f..97ca2561 100644 --- a/chrome/browser/chromeos/printing/cups_wrapper.h +++ b/chrome/browser/chromeos/printing/cups_wrapper.h
@@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "printing/backend/cups_connection.h" namespace chromeos {
diff --git a/chrome/browser/chromeos/printing/cups_wrapper_impl.cc b/chrome/browser/chromeos/printing/cups_wrapper_impl.cc index f20fdd09..d815615 100644 --- a/chrome/browser/chromeos/printing/cups_wrapper_impl.cc +++ b/chrome/browser/chromeos/printing/cups_wrapper_impl.cc
@@ -7,7 +7,7 @@ #include <cups/cups.h> #include <utility> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/sequence_checker.h" #include "base/task/sequenced_task_runner.h"
diff --git a/chrome/browser/chromeos/printing/test_cups_wrapper.cc b/chrome/browser/chromeos/printing/test_cups_wrapper.cc index cb276a8..f332494 100644 --- a/chrome/browser/chromeos/printing/test_cups_wrapper.cc +++ b/chrome/browser/chromeos/printing/test_cups_wrapper.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/callback.h" +#include "base/functional/callback.h" namespace chromeos {
diff --git a/chrome/browser/chromeos/reporting/device_reporting_settings_lacros.cc b/chrome/browser/chromeos/reporting/device_reporting_settings_lacros.cc index 5b2b856..87e7131 100644 --- a/chrome/browser/chromeos/reporting/device_reporting_settings_lacros.cc +++ b/chrome/browser/chromeos/reporting/device_reporting_settings_lacros.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/ptr_util.h" #include "base/sequence_checker.h" #include "base/strings/string_piece_forward.h"
diff --git a/chrome/browser/chromeos/reporting/device_reporting_settings_lacros.h b/chrome/browser/chromeos/reporting/device_reporting_settings_lacros.h index bcccb97f..e3e6c0fb 100644 --- a/chrome/browser/chromeos/reporting/device_reporting_settings_lacros.h +++ b/chrome/browser/chromeos/reporting/device_reporting_settings_lacros.h
@@ -8,8 +8,8 @@ #include <memory> #include <string> -#include "base/callback_forward.h" #include "base/callback_list.h" +#include "base/functional/callback_forward.h" #include "base/sequence_checker.h" #include "base/thread_annotations.h" #include "chrome/browser/lacros/device_settings_lacros.h"
diff --git a/chrome/browser/chromeos/reporting/metric_reporting_manager_lacros.cc b/chrome/browser/chromeos/reporting/metric_reporting_manager_lacros.cc index f34eaa4..0b9f2a728 100644 --- a/chrome/browser/chromeos/reporting/metric_reporting_manager_lacros.cc +++ b/chrome/browser/chromeos/reporting/metric_reporting_manager_lacros.cc
@@ -7,7 +7,7 @@ #include <memory> #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/sequence_checker.h" #include "base/time/time.h"
diff --git a/chrome/browser/chromeos/reporting/metric_reporting_manager_lacros_unittest.cc b/chrome/browser/chromeos/reporting/metric_reporting_manager_lacros_unittest.cc index 1317f92..7806d41 100644 --- a/chrome/browser/chromeos/reporting/metric_reporting_manager_lacros_unittest.cc +++ b/chrome/browser/chromeos/reporting/metric_reporting_manager_lacros_unittest.cc
@@ -7,7 +7,7 @@ #include <memory> #include <string> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/test/bind.h" #include "base/time/time.h"
diff --git a/chrome/browser/chromeos/tablet_mode/tablet_mode_page_behavior.cc b/chrome/browser/chromeos/tablet_mode/tablet_mode_page_behavior.cc index 3eefb60..ced79d2 100644 --- a/chrome/browser/chromeos/tablet_mode/tablet_mode_page_behavior.cc +++ b/chrome/browser/chromeos/tablet_mode/tablet_mode_page_behavior.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/chromeos/arc/arc_web_contents_data.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_list.h"
diff --git a/chrome/browser/chromeos/tablet_mode/tablet_mode_page_behavior_browsertest.cc b/chrome/browser/chromeos/tablet_mode/tablet_mode_page_behavior_browsertest.cc index bd7f17cc..1872f73a 100644 --- a/chrome/browser/chromeos/tablet_mode/tablet_mode_page_behavior_browsertest.cc +++ b/chrome/browser/chromeos/tablet_mode/tablet_mode_page_behavior_browsertest.cc
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/callback_forward.h" #include "base/command_line.h" +#include "base/functional/callback_forward.h" #include "base/run_loop.h" #include "base/test/scoped_feature_list.h" #include "chrome/browser/browser_features.h"
diff --git a/chrome/browser/client_hints/client_hints_browsertest.cc b/chrome/browser/client_hints/client_hints_browsertest.cc index a6425f3..faf30ed3 100644 --- a/chrome/browser/client_hints/client_hints_browsertest.cc +++ b/chrome/browser/client_hints/client_hints_browsertest.cc
@@ -7,11 +7,11 @@ #include <memory> #include "base/base_switches.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/containers/contains.h" #include "base/containers/fixed_flat_set.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/metrics/field_trial_param_associator.h" #include "base/metrics/field_trial_params.h" #include "base/run_loop.h"
diff --git a/chrome/browser/commerce/android/price_tracking_utils_android.cc b/chrome/browser/commerce/android/price_tracking_utils_android.cc index 93c39e8..4c23b59 100644 --- a/chrome/browser/commerce/android/price_tracking_utils_android.cc +++ b/chrome/browser/commerce/android/price_tracking_utils_android.cc
@@ -5,7 +5,7 @@ #include "base/android/callback_android.h" #include "base/android/jni_android.h" #include "base/android/scoped_java_ref.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/commerce/android/shopping_service_jni/PriceTrackingUtils_jni.h" #include "chrome/browser/commerce/shopping_service_factory.h"
diff --git a/chrome/browser/commerce/coupons/coupon_db.h b/chrome/browser/commerce/coupons/coupon_db.h index ddeca1bf..99b1e7e 100644 --- a/chrome/browser/commerce/coupons/coupon_db.h +++ b/chrome/browser/commerce/coupons/coupon_db.h
@@ -7,7 +7,7 @@ #include <vector> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "url/gurl.h"
diff --git a/chrome/browser/commerce/merchant_viewer/merchant_signal_db.cc b/chrome/browser/commerce/merchant_viewer/merchant_signal_db.cc index de66578..4624b7c 100644 --- a/chrome/browser/commerce/merchant_viewer/merchant_signal_db.cc +++ b/chrome/browser/commerce/merchant_viewer/merchant_signal_db.cc
@@ -8,9 +8,9 @@ #include "base/android/jni_android.h" #include "base/android/jni_array.h" #include "base/android/jni_string.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/fixed_flat_map.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "chrome/browser/commerce/merchant_viewer/android/jni_headers/MerchantTrustSignalsEventStorage_jni.h" #include "chrome/browser/commerce/merchant_viewer/android/jni_headers/MerchantTrustSignalsEvent_jni.h" #include "chrome/browser/persisted_state_db/session_proto_db_factory.h"
diff --git a/chrome/browser/commerce/merchant_viewer/merchant_viewer_data_manager.cc b/chrome/browser/commerce/merchant_viewer/merchant_viewer_data_manager.cc index c556f07..c55585a 100644 --- a/chrome/browser/commerce/merchant_viewer/merchant_viewer_data_manager.cc +++ b/chrome/browser/commerce/merchant_viewer/merchant_viewer_data_manager.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/commerce/merchant_viewer/merchant_viewer_data_manager.h" -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/metrics/field_trial_params.h" #include "base/metrics/histogram_macros.h" #include "base/metrics/histogram_macros_local.h"
diff --git a/chrome/browser/commerce/merchant_viewer/merchant_viewer_data_manager_factory.cc b/chrome/browser/commerce/merchant_viewer/merchant_viewer_data_manager_factory.cc index ced77028..95fb8b8fc 100644 --- a/chrome/browser/commerce/merchant_viewer/merchant_viewer_data_manager_factory.cc +++ b/chrome/browser/commerce/merchant_viewer/merchant_viewer_data_manager_factory.cc
@@ -4,10 +4,10 @@ #include "chrome/browser/commerce/merchant_viewer/merchant_viewer_data_manager_factory.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/fixed_flat_map.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/no_destructor.h" #include "chrome/browser/commerce/merchant_viewer/merchant_signal_db.h" #include "chrome/browser/commerce/merchant_viewer/merchant_viewer_data_manager.h"
diff --git a/chrome/browser/commerce/merchant_viewer/merchant_viewer_data_manager_unittest.cc b/chrome/browser/commerce/merchant_viewer/merchant_viewer_data_manager_unittest.cc index a5409bb..2404cd5 100644 --- a/chrome/browser/commerce/merchant_viewer/merchant_viewer_data_manager_unittest.cc +++ b/chrome/browser/commerce/merchant_viewer/merchant_viewer_data_manager_unittest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/commerce/merchant_viewer/merchant_viewer_data_manager.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/metrics/histogram_macros.h" #include "base/metrics/histogram_macros_local.h"
diff --git a/chrome/browser/commerce/subscriptions/commerce_subscription_db.cc b/chrome/browser/commerce/subscriptions/commerce_subscription_db.cc index 05a6d48..c03987a 100644 --- a/chrome/browser/commerce/subscriptions/commerce_subscription_db.cc +++ b/chrome/browser/commerce/subscriptions/commerce_subscription_db.cc
@@ -8,9 +8,9 @@ #include "base/android/jni_android.h" #include "base/android/jni_array.h" #include "base/android/jni_string.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/fixed_flat_map.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "chrome/browser/commerce/subscriptions/android/jni_headers/CommerceSubscription_jni.h" #include "chrome/browser/commerce/subscriptions/android/jni_headers/CommerceSubscriptionsStorage_jni.h" #include "chrome/browser/persisted_state_db/session_proto_db_factory.h"
diff --git a/chrome/browser/component_updater/app_provisioning_component_installer.cc b/chrome/browser/component_updater/app_provisioning_component_installer.cc index f400d909..4c920a5 100644 --- a/chrome/browser/component_updater/app_provisioning_component_installer.cc +++ b/chrome/browser/component_updater/app_provisioning_component_installer.cc
@@ -12,11 +12,11 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" #include "base/feature_list.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/path_service.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 c1c8903..8903c56 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
@@ -7,11 +7,11 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_forward.h" #include "base/files/file.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_forward.h" #include "base/location.h" #include "base/memory/ref_counted.h" #include "base/task/task_traits.h"
diff --git a/chrome/browser/component_updater/chrome_component_updater_configurator.cc b/chrome/browser/component_updater/chrome_component_updater_configurator.cc index 9ee5dd83..c89a2d5c 100644 --- a/chrome/browser/component_updater/chrome_component_updater_configurator.cc +++ b/chrome/browser/component_updater/chrome_component_updater_configurator.cc
@@ -8,9 +8,9 @@ #include <string> #include <vector> -#include "base/bind.h" -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/path_service.h" #include "base/strings/sys_string_conversions.h"
diff --git a/chrome/browser/component_updater/chrome_origin_trials_component_installer.cc b/chrome/browser/component_updater/chrome_origin_trials_component_installer.cc index db75354..d87a4703 100644 --- a/chrome/browser/component_updater/chrome_origin_trials_component_installer.cc +++ b/chrome/browser/component_updater/chrome_origin_trials_component_installer.cc
@@ -8,7 +8,7 @@ #include <utility> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/browser_process.h" #include "components/embedder_support/origin_trials/component_updater_utils.h"
diff --git a/chrome/browser/component_updater/commerce_heuristics_component_installer.cc b/chrome/browser/component_updater/commerce_heuristics_component_installer.cc index f42a4f72..3883fce 100644 --- a/chrome/browser/component_updater/commerce_heuristics_component_installer.cc +++ b/chrome/browser/component_updater/commerce_heuristics_component_installer.cc
@@ -10,10 +10,10 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/feature_list.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/task/thread_pool.h" #include "components/commerce/core/commerce_heuristics_data.h"
diff --git a/chrome/browser/component_updater/component_patcher_operation_browsertest.cc b/chrome/browser/component_updater/component_patcher_operation_browsertest.cc index 90aa15c..e4c06ba1 100644 --- a/chrome/browser/component_updater/component_patcher_operation_browsertest.cc +++ b/chrome/browser/component_updater/component_patcher_operation_browsertest.cc
@@ -3,12 +3,12 @@ // found in the LICENSE file. #include "base/base_paths.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/files/file.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "base/path_service.h" #include "base/run_loop.h"
diff --git a/chrome/browser/component_updater/crl_set_component_installer.cc b/chrome/browser/component_updater/crl_set_component_installer.cc index d7bc8ba..1e49833 100644 --- a/chrome/browser/component_updater/crl_set_component_installer.cc +++ b/chrome/browser/component_updater/crl_set_component_installer.cc
@@ -8,11 +8,11 @@ #include <string> #include <vector> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/containers/span.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/component_updater/cros_component_installer_chromeos.cc b/chrome/browser/component_updater/cros_component_installer_chromeos.cc index aadf1ded..10e9b2b4 100644 --- a/chrome/browser/component_updater/cros_component_installer_chromeos.cc +++ b/chrome/browser/component_updater/cros_component_installer_chromeos.cc
@@ -7,10 +7,10 @@ #include <map> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/metrics/histogram_macros.h" #include "base/path_service.h" #include "base/ranges/algorithm.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 9c7247a..db36bd6 100644 --- a/chrome/browser/component_updater/cros_component_installer_chromeos_unittest.cc +++ b/chrome/browser/component_updater/cros_component_installer_chromeos_unittest.cc
@@ -6,13 +6,13 @@ #include <utility> #include "ash/constants/ash_paths.h" -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/containers/contains.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/component_updater/cros_component_manager.h b/chrome/browser/component_updater/cros_component_manager.h index 7ffcb5b..4087d8ac 100644 --- a/chrome/browser/component_updater/cros_component_manager.h +++ b/chrome/browser/component_updater/cros_component_manager.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/ref_counted.h" namespace base {
diff --git a/chrome/browser/component_updater/crow_domain_list_component_installer.cc b/chrome/browser/component_updater/crow_domain_list_component_installer.cc index 08f3bd7..64306a6 100644 --- a/chrome/browser/component_updater/crow_domain_list_component_installer.cc +++ b/chrome/browser/component_updater/crow_domain_list_component_installer.cc
@@ -10,10 +10,10 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/path_service.h"
diff --git a/chrome/browser/component_updater/crowd_deny_component_installer.cc b/chrome/browser/component_updater/crowd_deny_component_installer.cc index 05c6256..f319f3d 100644 --- a/chrome/browser/component_updater/crowd_deny_component_installer.cc +++ b/chrome/browser/component_updater/crowd_deny_component_installer.cc
@@ -9,9 +9,9 @@ #include <utility> #include <vector> -#include "base/callback.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/values.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 c97e4852..2d287d0 100644 --- a/chrome/browser/component_updater/desktop_screenshot_editor_component_installer.cc +++ b/chrome/browser/component_updater/desktop_screenshot_editor_component_installer.cc
@@ -9,10 +9,10 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/path_service.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 7830ce6..218a984e9 100644 --- a/chrome/browser/component_updater/desktop_sharing_hub_component_installer.cc +++ b/chrome/browser/component_updater/desktop_sharing_hub_component_installer.cc
@@ -9,10 +9,10 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/path_service.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 b6b23652..c2ceb161 100644 --- a/chrome/browser/component_updater/desktop_sharing_hub_component_remover.cc +++ b/chrome/browser/component_updater/desktop_sharing_hub_component_remover.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/component_updater/desktop_sharing_hub_component_remover.h" -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/task/thread_pool.h" #include "components/component_updater/component_updater_utils.h"
diff --git a/chrome/browser/component_updater/fake_cros_component_manager.cc b/chrome/browser/component_updater/fake_cros_component_manager.cc index 455bffa9..fb207a6c 100644 --- a/chrome/browser/component_updater/fake_cros_component_manager.cc +++ b/chrome/browser/component_updater/fake_cros_component_manager.cc
@@ -6,9 +6,9 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/task/sequenced_task_runner.h"
diff --git a/chrome/browser/component_updater/fake_cros_component_manager.h b/chrome/browser/component_updater/fake_cros_component_manager.h index 536dbed1..0aada41 100644 --- a/chrome/browser/component_updater/fake_cros_component_manager.h +++ b/chrome/browser/component_updater/fake_cros_component_manager.h
@@ -11,8 +11,8 @@ #include <set> #include <string> -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/synchronization/lock.h" #include "chrome/browser/component_updater/cros_component_manager.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 3e4df60..be7455b 100644 --- a/chrome/browser/component_updater/file_type_policies_component_installer.cc +++ b/chrome/browser/component_updater/file_type_policies_component_installer.cc
@@ -9,10 +9,10 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/path_service.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 3db25a0..287ebbd 100644 --- a/chrome/browser/component_updater/first_party_sets_component_installer.cc +++ b/chrome/browser/component_updater/first_party_sets_component_installer.cc
@@ -6,12 +6,12 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/feature_list.h" #include "base/files/file.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/no_destructor.h"
diff --git a/chrome/browser/component_updater/first_party_sets_component_installer.h b/chrome/browser/component_updater/first_party_sets_component_installer.h index a22b841e..778dc41 100644 --- a/chrome/browser/component_updater/first_party_sets_component_installer.h +++ b/chrome/browser/component_updater/first_party_sets_component_installer.h
@@ -11,8 +11,8 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/files/file.h" +#include "base/functional/callback.h" #include "base/gtest_prod_util.h" #include "base/strings/string_piece.h" #include "base/values.h"
diff --git a/chrome/browser/component_updater/first_party_sets_component_installer_unittest.cc b/chrome/browser/component_updater/first_party_sets_component_installer_unittest.cc index 99bd38bb..d044141 100644 --- a/chrome/browser/component_updater/first_party_sets_component_installer_unittest.cc +++ b/chrome/browser/component_updater/first_party_sets_component_installer_unittest.cc
@@ -4,11 +4,11 @@ #include "chrome/browser/component_updater/first_party_sets_component_installer.h" -#include "base/callback_helpers.h" #include "base/check.h" #include "base/files/file.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/callback_helpers.h" #include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/test/task_environment.h"
diff --git a/chrome/browser/component_updater/hyphenation_component_installer.h b/chrome/browser/component_updater/hyphenation_component_installer.h index fb3120e..fdcfdac 100644 --- a/chrome/browser/component_updater/hyphenation_component_installer.h +++ b/chrome/browser/component_updater/hyphenation_component_installer.h
@@ -11,7 +11,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/values.h" #include "components/component_updater/component_installer.h"
diff --git a/chrome/browser/component_updater/intervention_policy_database_component_installer.cc b/chrome/browser/component_updater/intervention_policy_database_component_installer.cc index c773d753..855ff46 100644 --- a/chrome/browser/component_updater/intervention_policy_database_component_installer.cc +++ b/chrome/browser/component_updater/intervention_policy_database_component_installer.cc
@@ -4,11 +4,11 @@ #include "chrome/browser/component_updater/intervention_policy_database_component_installer.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/check.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/values.h" #include "chrome/browser/resource_coordinator/intervention_policy_database.h" #include "components/component_updater/component_updater_paths.h"
diff --git a/chrome/browser/component_updater/media_foundation_widevine_cdm_component_installer.cc b/chrome/browser/component_updater/media_foundation_widevine_cdm_component_installer.cc index 7a1ac96..9d5ebf5f 100644 --- a/chrome/browser/component_updater/media_foundation_widevine_cdm_component_installer.cc +++ b/chrome/browser/component_updater/media_foundation_widevine_cdm_component_installer.cc
@@ -10,10 +10,10 @@ #include <string> #include <vector> -#include "base/callback_helpers.h" #include "base/feature_list.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/metrics/histogram_functions.h" #include "base/native_library.h"
diff --git a/chrome/browser/component_updater/mei_preload_component_installer.cc b/chrome/browser/component_updater/mei_preload_component_installer.cc index 34f7f67b..c287fae 100644 --- a/chrome/browser/component_updater/mei_preload_component_installer.cc +++ b/chrome/browser/component_updater/mei_preload_component_installer.cc
@@ -9,10 +9,10 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/check.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted.h" #include "base/path_service.h" #include "base/task/task_traits.h"
diff --git a/chrome/browser/component_updater/mei_preload_component_installer.h b/chrome/browser/component_updater/mei_preload_component_installer.h index eb99c36..2d4a0e7 100644 --- a/chrome/browser/component_updater/mei_preload_component_installer.h +++ b/chrome/browser/component_updater/mei_preload_component_installer.h
@@ -11,8 +11,8 @@ #include <utility> #include <vector> -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/values.h" #include "components/component_updater/component_installer.h"
diff --git a/chrome/browser/component_updater/pki_metadata_component_installer.cc b/chrome/browser/component_updater/pki_metadata_component_installer.cc index 9e07312..81ef3f49 100644 --- a/chrome/browser/component_updater/pki_metadata_component_installer.cc +++ b/chrome/browser/component_updater/pki_metadata_component_installer.cc
@@ -10,14 +10,14 @@ #include "base/barrier_closure.h" #include "base/base64.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/check.h" #include "base/containers/flat_map.h" #include "base/containers/span.h" #include "base/feature_list.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/no_destructor.h"
diff --git a/chrome/browser/component_updater/pki_metadata_component_installer_browsertest.cc b/chrome/browser/component_updater/pki_metadata_component_installer_browsertest.cc index 032fbad..d440ee21 100644 --- a/chrome/browser/component_updater/pki_metadata_component_installer_browsertest.cc +++ b/chrome/browser/component_updater/pki_metadata_component_installer_browsertest.cc
@@ -5,8 +5,8 @@ #include <memory> #include <utility> -#include "base/callback_forward.h" #include "base/command_line.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/test/scoped_feature_list.h"
diff --git a/chrome/browser/component_updater/pnacl_component_installer.cc b/chrome/browser/component_updater/pnacl_component_installer.cc index 4617b5d..3530b32b1 100644 --- a/chrome/browser/component_updater/pnacl_component_installer.cc +++ b/chrome/browser/component_updater/pnacl_component_installer.cc
@@ -13,10 +13,10 @@ #include "base/atomicops.h" #include "base/base_paths.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/json/json_file_value_serializer.h" #include "base/logging.h" #include "base/memory/ref_counted.h"
diff --git a/chrome/browser/component_updater/real_time_url_checks_allowlist_component_installer.cc b/chrome/browser/component_updater/real_time_url_checks_allowlist_component_installer.cc index 3e049547..94d5f69 100644 --- a/chrome/browser/component_updater/real_time_url_checks_allowlist_component_installer.cc +++ b/chrome/browser/component_updater/real_time_url_checks_allowlist_component_installer.cc
@@ -9,10 +9,10 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "base/metrics/histogram_functions.h" #include "base/path_service.h"
diff --git a/chrome/browser/component_updater/recovery_component_installer.cc b/chrome/browser/component_updater/recovery_component_installer.cc index ce43238..7bf108a 100644 --- a/chrome/browser/component_updater/recovery_component_installer.cc +++ b/chrome/browser/component_updater/recovery_component_installer.cc
@@ -13,10 +13,10 @@ #include <vector> #include "base/base_paths.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/json/json_file_value_serializer.h" #include "base/logging.h" #include "base/memory/raw_ptr.h"
diff --git a/chrome/browser/component_updater/recovery_improved_component_installer.cc b/chrome/browser/component_updater/recovery_improved_component_installer.cc index 18e5dafa..d5da1ea 100644 --- a/chrome/browser/component_updater/recovery_improved_component_installer.cc +++ b/chrome/browser/component_updater/recovery_improved_component_installer.cc
@@ -15,11 +15,11 @@ #include <tuple> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/process/launch.h"
diff --git a/chrome/browser/component_updater/recovery_improved_component_installer_win.cc b/chrome/browser/component_updater/recovery_improved_component_installer_win.cc index ace93dce..0c2c9feb 100644 --- a/chrome/browser/component_updater/recovery_improved_component_installer_win.cc +++ b/chrome/browser/component_updater/recovery_improved_component_installer_win.cc
@@ -11,10 +11,10 @@ #include <tuple> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "base/process/process.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/component_updater/recovery_improved_component_unittest.cc b/chrome/browser/component_updater/recovery_improved_component_unittest.cc index 6d226197..0b861e2c 100644 --- a/chrome/browser/component_updater/recovery_improved_component_unittest.cc +++ b/chrome/browser/component_updater/recovery_improved_component_unittest.cc
@@ -8,12 +8,12 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "base/path_service.h" #include "base/test/scoped_run_loop_timeout.h"
diff --git a/chrome/browser/component_updater/registration.cc b/chrome/browser/component_updater/registration.cc index 2a466125..0f6b30c 100644 --- a/chrome/browser/component_updater/registration.cc +++ b/chrome/browser/component_updater/registration.cc
@@ -4,9 +4,9 @@ #include "chrome/browser/component_updater/registration.h" -#include "base/callback.h" #include "base/feature_list.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/metrics/histogram_functions.h" #include "base/path_service.h" #include "build/branding_buildflags.h"
diff --git a/chrome/browser/component_updater/smart_dim_component_installer.cc b/chrome/browser/component_updater/smart_dim_component_installer.cc index 1c15527..d8f11ce 100644 --- a/chrome/browser/component_updater/smart_dim_component_installer.cc +++ b/chrome/browser/component_updater/smart_dim_component_installer.cc
@@ -8,11 +8,11 @@ #include <tuple> #include "ash/constants/ash_features.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/feature_list.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/metrics/field_trial_params.h"
diff --git a/chrome/browser/component_updater/soda_component_installer.cc b/chrome/browser/component_updater/soda_component_installer.cc index 65598da3..7247e11 100644 --- a/chrome/browser/component_updater/soda_component_installer.cc +++ b/chrome/browser/component_updater/soda_component_installer.cc
@@ -4,9 +4,9 @@ #include "chrome/browser/component_updater/soda_component_installer.h" -#include "base/bind.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/metrics/histogram_functions.h" #include "base/task/task_traits.h"
diff --git a/chrome/browser/component_updater/soda_component_installer_unittest.cc b/chrome/browser/component_updater/soda_component_installer_unittest.cc index 8882ad4..748a10f 100644 --- a/chrome/browser/component_updater/soda_component_installer_unittest.cc +++ b/chrome/browser/component_updater/soda_component_installer_unittest.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/component_updater/soda_component_installer.h" -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/test/task_environment.h"
diff --git a/chrome/browser/component_updater/soda_language_pack_component_installer.cc b/chrome/browser/component_updater/soda_language_pack_component_installer.cc index eb9c44d..99996167 100644 --- a/chrome/browser/component_updater/soda_language_pack_component_installer.cc +++ b/chrome/browser/component_updater/soda_language_pack_component_installer.cc
@@ -9,11 +9,11 @@ #include <string> #include <vector> -#include "base/bind.h" -#include "base/callback.h" #include "base/containers/flat_set.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/notreached.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/component_updater/soda_language_pack_component_installer.h b/chrome/browser/component_updater/soda_language_pack_component_installer.h index 8be3a31..fa6c5e3 100644 --- a/chrome/browser/component_updater/soda_language_pack_component_installer.h +++ b/chrome/browser/component_updater/soda_language_pack_component_installer.h
@@ -8,8 +8,8 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/containers/flat_set.h" +#include "base/functional/callback.h" #include "base/gtest_prod_util.h" #include "base/values.h" #include "chrome/browser/component_updater/soda_component_installer.h"
diff --git a/chrome/browser/component_updater/ssl_error_assistant_component_installer.cc b/chrome/browser/component_updater/ssl_error_assistant_component_installer.cc index a13c982..dd8f358 100644 --- a/chrome/browser/component_updater/ssl_error_assistant_component_installer.cc +++ b/chrome/browser/component_updater/ssl_error_assistant_component_installer.cc
@@ -7,9 +7,9 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/component_updater/subresource_filter_component_installer.cc b/chrome/browser/component_updater/subresource_filter_component_installer.cc index aa3381b..be10d16 100644 --- a/chrome/browser/component_updater/subresource_filter_component_installer.cc +++ b/chrome/browser/component_updater/subresource_filter_component_installer.cc
@@ -6,9 +6,9 @@ #include <utility> -#include "base/callback.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "base/path_service.h" #include "base/strings/string_piece.h"
diff --git a/chrome/browser/component_updater/sw_reporter_installer_win.cc b/chrome/browser/component_updater/sw_reporter_installer_win.cc index 31254d9..6f2b5e1e 100644 --- a/chrome/browser/component_updater/sw_reporter_installer_win.cc +++ b/chrome/browser/component_updater/sw_reporter_installer_win.cc
@@ -14,13 +14,13 @@ #include "base/base64.h" #include "base/base_paths.h" -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/check_op.h" #include "base/command_line.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ref_counted.h" #include "base/metrics/field_trial_params.h" #include "base/metrics/histogram_functions.h"
diff --git a/chrome/browser/component_updater/sw_reporter_installer_win.h b/chrome/browser/component_updater/sw_reporter_installer_win.h index b5fb551d..d7397ea 100644 --- a/chrome/browser/component_updater/sw_reporter_installer_win.h +++ b/chrome/browser/component_updater/sw_reporter_installer_win.h
@@ -10,7 +10,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/values.h" #include "chrome/browser/safe_browsing/chrome_cleaner/sw_reporter_invocation_win.h"
diff --git a/chrome/browser/component_updater/sw_reporter_installer_win_unittest.cc b/chrome/browser/component_updater/sw_reporter_installer_win_unittest.cc index 21a9da5..f324ab1 100644 --- a/chrome/browser/component_updater/sw_reporter_installer_win_unittest.cc +++ b/chrome/browser/component_updater/sw_reporter_installer_win_unittest.cc
@@ -11,10 +11,10 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/command_line.h" #include "base/feature_list.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/json/json_reader.h" #include "base/json/values_util.h" #include "base/metrics/field_trial.h"
diff --git a/chrome/browser/component_updater/third_party_module_list_component_installer_win.cc b/chrome/browser/component_updater/third_party_module_list_component_installer_win.cc index abde7df..30e952a8 100644 --- a/chrome/browser/component_updater/third_party_module_list_component_installer_win.cc +++ b/chrome/browser/component_updater/third_party_module_list_component_installer_win.cc
@@ -7,8 +7,8 @@ #include <iterator> #include <utility> -#include "base/bind.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/ranges/algorithm.h"
diff --git a/chrome/browser/component_updater/trust_token_key_commitments_component_installer.cc b/chrome/browser/component_updater/trust_token_key_commitments_component_installer.cc index ec49116e..b5ed86a 100644 --- a/chrome/browser/component_updater/trust_token_key_commitments_component_installer.cc +++ b/chrome/browser/component_updater/trust_token_key_commitments_component_installer.cc
@@ -7,9 +7,9 @@ #include <memory> #include <string> -#include "base/bind.h" -#include "base/callback.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "components/component_updater/installer_policies/trust_token_key_commitments_component_installer_policy.h" #include "content/public/browser/network_service_instance.h"
diff --git a/chrome/browser/component_updater/vr_assets_component_installer.cc b/chrome/browser/component_updater/vr_assets_component_installer.cc index 6d6c058f..a7bdfd7 100644 --- a/chrome/browser/component_updater/vr_assets_component_installer.cc +++ b/chrome/browser/component_updater/vr_assets_component_installer.cc
@@ -9,9 +9,9 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/path_service.h" #include "base/values.h"
diff --git a/chrome/browser/component_updater/widevine_cdm_component_installer.cc b/chrome/browser/component_updater/widevine_cdm_component_installer.cc index ed2256ab..28c39cb 100644 --- a/chrome/browser/component_updater/widevine_cdm_component_installer.cc +++ b/chrome/browser/component_updater/widevine_cdm_component_installer.cc
@@ -13,10 +13,10 @@ #include <vector> #include "base/base_paths.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/native_library.h"
diff --git a/chrome/browser/component_updater/zxcvbn_data_component_installer.cc b/chrome/browser/component_updater/zxcvbn_data_component_installer.cc index 8ede0b6..5b98102 100644 --- a/chrome/browser/component_updater/zxcvbn_data_component_installer.cc +++ b/chrome/browser/component_updater/zxcvbn_data_component_installer.cc
@@ -11,11 +11,11 @@ #include <string> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/flat_map.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/logging.h" #include "base/memory/scoped_refptr.h"
diff --git a/chrome/browser/consent_auditor/consent_auditor_factory.cc b/chrome/browser/consent_auditor/consent_auditor_factory.cc index daa4c00..7681b63a 100644 --- a/chrome/browser/consent_auditor/consent_auditor_factory.cc +++ b/chrome/browser/consent_auditor/consent_auditor_factory.cc
@@ -7,8 +7,8 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/time/default_clock.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/content_settings/content_settings_browsertest.cc b/chrome/browser/content_settings/content_settings_browsertest.cc index b59f5382..2ecd474e 100644 --- a/chrome/browser/content_settings/content_settings_browsertest.cc +++ b/chrome/browser/content_settings/content_settings_browsertest.cc
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/path_service.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc b/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc index 520fc713..0420002d 100644 --- a/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc +++ b/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc
@@ -7,8 +7,8 @@ #include <memory> #include "base/auto_reset.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/test/simple_test_clock.h"
diff --git a/chrome/browser/content_settings/content_settings_supervised_provider.cc b/chrome/browser/content_settings/content_settings_supervised_provider.cc index e709b56..6cd52e2b 100644 --- a/chrome/browser/content_settings/content_settings_supervised_provider.cc +++ b/chrome/browser/content_settings/content_settings_supervised_provider.cc
@@ -8,7 +8,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/values.h" #include "chrome/browser/supervised_user/supervised_user_constants.h" #include "chrome/browser/supervised_user/supervised_user_settings_service.h"
diff --git a/chrome/browser/content_settings/host_content_settings_map_unittest.cc b/chrome/browser/content_settings/host_content_settings_map_unittest.cc index f8aeafb..1d9e221 100644 --- a/chrome/browser/content_settings/host_content_settings_map_unittest.cc +++ b/chrome/browser/content_settings/host_content_settings_map_unittest.cc
@@ -7,8 +7,8 @@ #include <utility> #include "base/auto_reset.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/memory/ptr_util.h"
diff --git a/chrome/browser/content_settings/sound_content_setting_observer.cc b/chrome/browser/content_settings/sound_content_setting_observer.cc index 1cc1224b..45d2a41b 100644 --- a/chrome/browser/content_settings/sound_content_setting_observer.cc +++ b/chrome/browser/content_settings/sound_content_setting_observer.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/content_settings/sound_content_setting_observer.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "build/build_config.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/crash_recovery_browsertest.cc b/chrome/browser/crash_recovery_browsertest.cc index 245bf551..f6657a0 100644 --- a/chrome/browser/crash_recovery_browsertest.cc +++ b/chrome/browser/crash_recovery_browsertest.cc
@@ -5,9 +5,9 @@ #include <utility> #include "base/base_switches.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/strings/stringprintf.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/creator/android/creator_api_bridge.cc b/chrome/browser/creator/android/creator_api_bridge.cc index 744b614..c48150e 100644 --- a/chrome/browser/creator/android/creator_api_bridge.cc +++ b/chrome/browser/creator/android/creator_api_bridge.cc
@@ -11,8 +11,8 @@ #include "base/android/jni_android.h" #include "base/android/jni_string.h" #include "base/android/scoped_java_ref.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "chrome/browser/creator/android/jni_headers/CreatorApiBridge_jni.h" #include "components/creator/public/creator_api.h" #include "url/android/gurl_android.h"
diff --git a/chrome/browser/custom_handlers/chrome_protocol_handler_registry_delegate.cc b/chrome/browser/custom_handlers/chrome_protocol_handler_registry_delegate.cc index b33b2a96..32bf469 100644 --- a/chrome/browser/custom_handlers/chrome_protocol_handler_registry_delegate.cc +++ b/chrome/browser/custom_handlers/chrome_protocol_handler_registry_delegate.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/threading/thread_task_runner_handle.h" #include "build/build_config.h" #include "chrome/browser/profiles/profile_io_data.h"
diff --git a/chrome/browser/data_saver/data_saver_browsertest.cc b/chrome/browser/data_saver/data_saver_browsertest.cc index aa1db89..36fb409 100644 --- a/chrome/browser/data_saver/data_saver_browsertest.cc +++ b/chrome/browser/data_saver/data_saver_browsertest.cc
@@ -6,8 +6,8 @@ #include <string> #include "base/barrier_closure.h" -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/test/metrics/histogram_tester.h" #include "build/build_config.h"
diff --git a/chrome/browser/dbus_memory_pressure_evaluator_linux.cc b/chrome/browser/dbus_memory_pressure_evaluator_linux.cc index 973240c..456cd0e 100644 --- a/chrome/browser/dbus_memory_pressure_evaluator_linux.cc +++ b/chrome/browser/dbus_memory_pressure_evaluator_linux.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/memory_pressure_listener.h" #include "base/memory/scoped_refptr.h"
diff --git a/chrome/browser/dbus_memory_pressure_evaluator_linux.h b/chrome/browser/dbus_memory_pressure_evaluator_linux.h index ea17ea8f..d213e240 100644 --- a/chrome/browser/dbus_memory_pressure_evaluator_linux.h +++ b/chrome/browser/dbus_memory_pressure_evaluator_linux.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/memory_pressure_listener.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h"
diff --git a/chrome/browser/dbus_memory_pressure_evaluator_linux_unittest.cc b/chrome/browser/dbus_memory_pressure_evaluator_linux_unittest.cc index 7551885..2a1feb0 100644 --- a/chrome/browser/dbus_memory_pressure_evaluator_linux_unittest.cc +++ b/chrome/browser/dbus_memory_pressure_evaluator_linux_unittest.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/memory/memory_pressure_listener.h" #include "base/memory/memory_pressure_monitor.h" #include "base/memory/ptr_util.h"
diff --git a/chrome/browser/device_api/managed_configuration_api.cc b/chrome/browser/device_api/managed_configuration_api.cc index 72d709119..8e61398c 100644 --- a/chrome/browser/device_api/managed_configuration_api.cc +++ b/chrome/browser/device_api/managed_configuration_api.cc
@@ -7,9 +7,9 @@ #include <memory> #include <tuple> -#include "base/bind.h" -#include "base/callback.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/json/json_string_value_serializer.h" #include "base/task/thread_pool.h" #include "base/values.h"
diff --git a/chrome/browser/device_identity/device_identity_provider.cc b/chrome/browser/device_identity/device_identity_provider.cc index 848b932..d053800 100644 --- a/chrome/browser/device_identity/device_identity_provider.cc +++ b/chrome/browser/device_identity/device_identity_provider.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/device_identity/device_identity_provider.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "chrome/browser/device_identity/device_oauth2_token_service.h"
diff --git a/chrome/browser/device_identity/device_oauth2_token_service.cc b/chrome/browser/device_identity/device_oauth2_token_service.cc index 3bef5b9f..cbaa42001 100644 --- a/chrome/browser/device_identity/device_oauth2_token_service.cc +++ b/chrome/browser/device_identity/device_oauth2_token_service.cc
@@ -7,8 +7,8 @@ #include <string> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/memory/weak_ptr.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/device_identity/device_oauth2_token_service.h b/chrome/browser/device_identity/device_oauth2_token_service.h index e08f5e7..781ad8b 100644 --- a/chrome/browser/device_identity/device_oauth2_token_service.h +++ b/chrome/browser/device_identity/device_oauth2_token_service.h
@@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "build/chromeos_buildflags.h" #include "chrome/browser/device_identity/device_oauth2_token_store.h"
diff --git a/chrome/browser/device_identity/device_oauth2_token_store.h b/chrome/browser/device_identity/device_oauth2_token_store.h index c669177..59dbe61 100644 --- a/chrome/browser/device_identity/device_oauth2_token_store.h +++ b/chrome/browser/device_identity/device_oauth2_token_store.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "build/chromeos_buildflags.h" #include "google_apis/gaia/core_account_id.h"
diff --git a/chrome/browser/device_identity/device_oauth2_token_store_desktop.cc b/chrome/browser/device_identity/device_oauth2_token_store_desktop.cc index 81ad88d..de2a1be 100644 --- a/chrome/browser/device_identity/device_oauth2_token_store_desktop.cc +++ b/chrome/browser/device_identity/device_oauth2_token_store_desktop.cc
@@ -7,7 +7,7 @@ #include <string> #include "base/base64.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/common/pref_names.h" #include "components/os_crypt/os_crypt.h" #include "components/policy/core/common/policy_pref_names.h"
diff --git a/chrome/browser/device_reauth/android/biometric_authenticator_android.cc b/chrome/browser/device_reauth/android/biometric_authenticator_android.cc index dc0dee6b..62edea5 100644 --- a/chrome/browser/device_reauth/android/biometric_authenticator_android.cc +++ b/chrome/browser/device_reauth/android/biometric_authenticator_android.cc
@@ -7,10 +7,10 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h"
diff --git a/chrome/browser/device_reauth/android/biometric_authenticator_android.h b/chrome/browser/device_reauth/android/biometric_authenticator_android.h index 54d0ba3..df653ca7 100644 --- a/chrome/browser/device_reauth/android/biometric_authenticator_android.h +++ b/chrome/browser/device_reauth/android/biometric_authenticator_android.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_DEVICE_REAUTH_ANDROID_BIOMETRIC_AUTHENTICATOR_ANDROID_H_ #define CHROME_BROWSER_DEVICE_REAUTH_ANDROID_BIOMETRIC_AUTHENTICATOR_ANDROID_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/time/time.h" #include "chrome/browser/device_reauth/android/biometric_authenticator_bridge.h" #include "chrome/browser/device_reauth/chrome_biometric_authenticator_common.h"
diff --git a/chrome/browser/device_reauth/android/biometric_authenticator_android_unittest.cc b/chrome/browser/device_reauth/android/biometric_authenticator_android_unittest.cc index 5b3af62b..06927e0 100644 --- a/chrome/browser/device_reauth/android/biometric_authenticator_android_unittest.cc +++ b/chrome/browser/device_reauth/android/biometric_authenticator_android_unittest.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/metrics/histogram.h" #include "base/test/gmock_callback_support.h"
diff --git a/chrome/browser/device_reauth/android/biometric_authenticator_bridge.h b/chrome/browser/device_reauth/android/biometric_authenticator_bridge.h index c107c124..2949e35 100644 --- a/chrome/browser/device_reauth/android/biometric_authenticator_bridge.h +++ b/chrome/browser/device_reauth/android/biometric_authenticator_bridge.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_DEVICE_REAUTH_ANDROID_BIOMETRIC_AUTHENTICATOR_BRIDGE_H_ #define CHROME_BROWSER_DEVICE_REAUTH_ANDROID_BIOMETRIC_AUTHENTICATOR_BRIDGE_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "components/device_reauth/biometric_authenticator.h" namespace device_reauth {
diff --git a/chrome/browser/device_reauth/android/biometric_authenticator_bridge_impl.cc b/chrome/browser/device_reauth/android/biometric_authenticator_bridge_impl.cc index 02b9365..3de4731 100644 --- a/chrome/browser/device_reauth/android/biometric_authenticator_bridge_impl.cc +++ b/chrome/browser/device_reauth/android/biometric_authenticator_bridge_impl.cc
@@ -5,7 +5,7 @@ #include "chrome/browser/device_reauth/android/biometric_authenticator_bridge_impl.h" #include "base/android/jni_android.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/device_reauth/android/biometric_authenticator_android.h" #include "chrome/browser/device_reauth/android/jni_headers/BiometricAuthenticatorBridge_jni.h" #include "components/device_reauth/biometric_authenticator.h"
diff --git a/chrome/browser/device_reauth/android/biometric_authenticator_bridge_impl.h b/chrome/browser/device_reauth/android/biometric_authenticator_bridge_impl.h index 13f4cb3..c4f7ccf 100644 --- a/chrome/browser/device_reauth/android/biometric_authenticator_bridge_impl.h +++ b/chrome/browser/device_reauth/android/biometric_authenticator_bridge_impl.h
@@ -6,7 +6,7 @@ #define CHROME_BROWSER_DEVICE_REAUTH_ANDROID_BIOMETRIC_AUTHENTICATOR_BRIDGE_IMPL_H_ #include "base/android/scoped_java_ref.h" -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "chrome/browser/device_reauth/android/biometric_authenticator_android.h" class BiometricAuthenticatorBridgeImpl : public BiometricAuthenticatorBridge {
diff --git a/chrome/browser/device_reauth/android/reauthenticator_bridge.cc b/chrome/browser/device_reauth/android/reauthenticator_bridge.cc index f153314..5400f94 100644 --- a/chrome/browser/device_reauth/android/reauthenticator_bridge.cc +++ b/chrome/browser/device_reauth/android/reauthenticator_bridge.cc
@@ -6,8 +6,8 @@ #include <jni.h> #include "base/android/jni_android.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "chrome/browser/device_reauth/android/jni_headers/ReauthenticatorBridge_jni.h" #include "chrome/browser/device_reauth/chrome_biometric_authenticator_factory.h" #include "components/password_manager/core/browser/password_manager_util.h"
diff --git a/chrome/browser/device_reauth/chrome_biometric_authenticator_common.cc b/chrome/browser/device_reauth/chrome_biometric_authenticator_common.cc index b0e80f5..c0e7e49 100644 --- a/chrome/browser/device_reauth/chrome_biometric_authenticator_common.cc +++ b/chrome/browser/device_reauth/chrome_biometric_authenticator_common.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/device_reauth/chrome_biometric_authenticator_common.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/scoped_refptr.h" #include "base/task/sequenced_task_runner.h" #include "base/time/time.h"
diff --git a/chrome/browser/device_reauth/chrome_biometric_authenticator_common_unittest.cc b/chrome/browser/device_reauth/chrome_biometric_authenticator_common_unittest.cc index 49a551e..d8a6693 100644 --- a/chrome/browser/device_reauth/chrome_biometric_authenticator_common_unittest.cc +++ b/chrome/browser/device_reauth/chrome_biometric_authenticator_common_unittest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/device_reauth/chrome_biometric_authenticator_common.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/notreached.h" #include "base/test/task_environment.h"
diff --git a/chrome/browser/device_reauth/mac/biometric_authenticator_mac.h b/chrome/browser/device_reauth/mac/biometric_authenticator_mac.h index dd9e7cae..9422db4 100644 --- a/chrome/browser/device_reauth/mac/biometric_authenticator_mac.h +++ b/chrome/browser/device_reauth/mac/biometric_authenticator_mac.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_DEVICE_REAUTH_MAC_BIOMETRIC_AUTHENTICATOR_MAC_H_ #define CHROME_BROWSER_DEVICE_REAUTH_MAC_BIOMETRIC_AUTHENTICATOR_MAC_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/sequence_checker.h" #include "chrome/browser/device_reauth/chrome_biometric_authenticator_common.h" #include "chrome/browser/device_reauth/chrome_biometric_authenticator_factory.h"
diff --git a/chrome/browser/device_reauth/mac/biometric_authenticator_mac.mm b/chrome/browser/device_reauth/mac/biometric_authenticator_mac.mm index 7c173de..406473a 100644 --- a/chrome/browser/device_reauth/mac/biometric_authenticator_mac.mm +++ b/chrome/browser/device_reauth/mac/biometric_authenticator_mac.mm
@@ -4,7 +4,7 @@ #include "chrome/browser/device_reauth/mac/biometric_authenticator_mac.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "base/notreached.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/device_reauth/mac/biometric_authenticator_mac_unittest.mm b/chrome/browser/device_reauth/mac/biometric_authenticator_mac_unittest.mm index 8a957d4..8417ae81 100644 --- a/chrome/browser/device_reauth/mac/biometric_authenticator_mac_unittest.mm +++ b/chrome/browser/device_reauth/mac/biometric_authenticator_mac_unittest.mm
@@ -6,7 +6,7 @@ #include "chrome/browser/device_reauth/chrome_biometric_authenticator_factory.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/test/mock_callback.h" #include "base/test/task_environment.h"
diff --git a/chrome/browser/device_reauth/win/authenticator_win.h b/chrome/browser/device_reauth/win/authenticator_win.h index aa42505a..2df9841 100644 --- a/chrome/browser/device_reauth/win/authenticator_win.h +++ b/chrome/browser/device_reauth/win/authenticator_win.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/functional/callback_forward.h" // Enum specifying possible states of biometric authentication availability on
diff --git a/chrome/browser/device_reauth/win/biometric_authenticator_win.cc b/chrome/browser/device_reauth/win/biometric_authenticator_win.cc index 55c5175f..a71bf6a 100644 --- a/chrome/browser/device_reauth/win/biometric_authenticator_win.cc +++ b/chrome/browser/device_reauth/win/biometric_authenticator_win.cc
@@ -4,9 +4,8 @@ #include "chrome/browser/device_reauth/win/biometric_authenticator_win.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/metrics/histogram_functions.h" #include "base/notreached.h" #include "base/task/sequenced_task_runner.h"
diff --git a/chrome/browser/device_reauth/win/biometric_authenticator_win_unittest.cc b/chrome/browser/device_reauth/win/biometric_authenticator_win_unittest.cc index d92beaee..2dbb095 100644 --- a/chrome/browser/device_reauth/win/biometric_authenticator_win_unittest.cc +++ b/chrome/browser/device_reauth/win/biometric_authenticator_win_unittest.cc
@@ -10,12 +10,12 @@ #include <string> #include <utility> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" +#include "base/task/sequenced_task_runner.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/mock_callback.h" #include "base/test/task_environment.h" -#include "base/task/sequenced_task_runner.h" #include "chrome/test/base/scoped_testing_local_state.h" #include "chrome/test/base/testing_browser_process.h" #include "components/device_reauth/biometric_authenticator.h"
diff --git a/chrome/browser/devtools/chrome_devtools_manager_delegate.cc b/chrome/browser/devtools/chrome_devtools_manager_delegate.cc index 8a8045f3..2892982 100644 --- a/chrome/browser/devtools/chrome_devtools_manager_delegate.cc +++ b/chrome/browser/devtools/chrome_devtools_manager_delegate.cc
@@ -7,9 +7,9 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/command_line.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/devtools/device/adb/adb_client_socket.cc b/chrome/browser/devtools/device/adb/adb_client_socket.cc index 46d3362..5d12763 100644 --- a/chrome/browser/devtools/device/adb/adb_client_socket.cc +++ b/chrome/browser/devtools/device/adb/adb_client_socket.cc
@@ -9,9 +9,9 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h"
diff --git a/chrome/browser/devtools/device/adb/adb_client_socket.h b/chrome/browser/devtools/device/adb/adb_client_socket.h index 492f505..f329f6f 100644 --- a/chrome/browser/devtools/device/adb/adb_client_socket.h +++ b/chrome/browser/devtools/device/adb/adb_client_socket.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "net/base/io_buffer.h" #include "net/socket/stream_socket.h"
diff --git a/chrome/browser/devtools/device/adb/adb_device_provider.cc b/chrome/browser/devtools/device/adb/adb_device_provider.cc index 99477658..146a271c 100644 --- a/chrome/browser/devtools/device/adb/adb_device_provider.cc +++ b/chrome/browser/devtools/device/adb/adb_device_provider.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/devtools/device/adb/adb_device_provider.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/string_piece.h" #include "base/strings/string_split.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/devtools/device/adb/mock_adb_server.cc b/chrome/browser/devtools/device/adb/mock_adb_server.cc index e52377f..a687b73 100644 --- a/chrome/browser/devtools/device/adb/mock_adb_server.cc +++ b/chrome/browser/devtools/device/adb/mock_adb_server.cc
@@ -7,7 +7,7 @@ #include <stddef.h> #include <stdint.h> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/weak_ptr.h" #include "base/run_loop.h"
diff --git a/chrome/browser/devtools/device/adb/mock_adb_server.h b/chrome/browser/devtools/device/adb/mock_adb_server.h index 87a3c30..1cee9c4e 100644 --- a/chrome/browser/devtools/device/adb/mock_adb_server.h +++ b/chrome/browser/devtools/device/adb/mock_adb_server.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" // Single instance mock ADB server for use in browser tests. Runs on IO thread.
diff --git a/chrome/browser/devtools/device/android_device_info_query.cc b/chrome/browser/devtools/device/android_device_info_query.cc index ede5cd1..f4420ab 100644 --- a/chrome/browser/devtools/device/android_device_info_query.cc +++ b/chrome/browser/devtools/device/android_device_info_query.cc
@@ -4,7 +4,7 @@ #include <stddef.h> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_piece.h" #include "base/strings/string_split.h"
diff --git a/chrome/browser/devtools/device/android_device_manager.cc b/chrome/browser/devtools/device/android_device_manager.cc index 0db0043..1bcd200 100644 --- a/chrome/browser/devtools/device/android_device_manager.cc +++ b/chrome/browser/devtools/device/android_device_manager.cc
@@ -9,7 +9,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/ptr_util.h" #include "base/message_loop/message_pump_type.h"
diff --git a/chrome/browser/devtools/device/android_web_socket.cc b/chrome/browser/devtools/device/android_web_socket.cc index 1ddd1e2..e82d815a 100644 --- a/chrome/browser/devtools/device/android_web_socket.cc +++ b/chrome/browser/devtools/device/android_web_socket.cc
@@ -4,7 +4,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/weak_ptr.h" #include "base/rand_util.h"
diff --git a/chrome/browser/devtools/device/cast_device_provider.cc b/chrome/browser/devtools/device/cast_device_provider.cc index 7294f6bf..3497a07 100644 --- a/chrome/browser/devtools/device/cast_device_provider.cc +++ b/chrome/browser/devtools/device/cast_device_provider.cc
@@ -10,7 +10,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/devtools/device/cast_device_provider_unittest.cc b/chrome/browser/devtools/device/cast_device_provider_unittest.cc index 232a46b..38b17e0 100644 --- a/chrome/browser/devtools/device/cast_device_provider_unittest.cc +++ b/chrome/browser/devtools/device/cast_device_provider_unittest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/devtools/device/cast_device_provider.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/devtools/device/android_device_manager.h" #include "net/base/host_port_pair.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/devtools/device/devtools_android_bridge.cc b/chrome/browser/devtools/device/devtools_android_bridge.cc index 12ec7f44..35454ca 100644 --- a/chrome/browser/devtools/device/devtools_android_bridge.cc +++ b/chrome/browser/devtools/device/devtools_android_bridge.cc
@@ -13,10 +13,10 @@ #include <vector> #include "base/base64.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/json/json_reader.h" #include "base/lazy_instance.h" #include "base/memory/singleton.h"
diff --git a/chrome/browser/devtools/device/devtools_android_bridge.h b/chrome/browser/devtools/device/devtools_android_bridge.h index 4251015..0bba75e5 100644 --- a/chrome/browser/devtools/device/devtools_android_bridge.h +++ b/chrome/browser/devtools/device/devtools_android_bridge.h
@@ -11,8 +11,8 @@ #include <utility> #include <vector> -#include "base/callback.h" #include "base/cancelable_callback.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/devtools/device/android_device_manager.h"
diff --git a/chrome/browser/devtools/device/devtools_android_bridge_browsertest.cc b/chrome/browser/devtools/device/devtools_android_bridge_browsertest.cc index 87af29f..c308ff9 100644 --- a/chrome/browser/devtools/device/devtools_android_bridge_browsertest.cc +++ b/chrome/browser/devtools/device/devtools_android_bridge_browsertest.cc
@@ -4,7 +4,7 @@ #include <array> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/ranges/algorithm.h" #include "base/values.h" #include "chrome/browser/devtools/device/devtools_android_bridge.h"
diff --git a/chrome/browser/devtools/device/devtools_device_discovery.cc b/chrome/browser/devtools/device/devtools_device_discovery.cc index f2ce0a2..33d5449 100644 --- a/chrome/browser/devtools/device/devtools_device_discovery.cc +++ b/chrome/browser/devtools/device/devtools_device_discovery.cc
@@ -6,8 +6,8 @@ #include <map> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/json/json_reader.h" #include "base/memory/ptr_util.h" #include "base/metrics/user_metrics.h"
diff --git a/chrome/browser/devtools/device/devtools_device_discovery.h b/chrome/browser/devtools/device/devtools_device_discovery.h index 3aeaedb..82a1a14 100644 --- a/chrome/browser/devtools/device/devtools_device_discovery.h +++ b/chrome/browser/devtools/device/devtools_device_discovery.h
@@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/values.h"
diff --git a/chrome/browser/devtools/device/port_forwarding_browsertest.cc b/chrome/browser/devtools/device/port_forwarding_browsertest.cc index 324d84a..50faf011 100644 --- a/chrome/browser/devtools/device/port_forwarding_browsertest.cc +++ b/chrome/browser/devtools/device/port_forwarding_browsertest.cc
@@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/strings/string_number_conversions.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/devtools/device/port_forwarding_controller.cc b/chrome/browser/devtools/device/port_forwarding_controller.cc index c14e3cc..58e7e50e 100644 --- a/chrome/browser/devtools/device/port_forwarding_controller.cc +++ b/chrome/browser/devtools/device/port_forwarding_controller.cc
@@ -8,8 +8,8 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/memory/singleton.h"
diff --git a/chrome/browser/devtools/device/tcp_device_provider.cc b/chrome/browser/devtools/device/tcp_device_provider.cc index 2d03f338..a406dc5 100644 --- a/chrome/browser/devtools/device/tcp_device_provider.cc +++ b/chrome/browser/devtools/device/tcp_device_provider.cc
@@ -6,9 +6,9 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/strings/string_number_conversions.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/devtools/device/usb/android_usb_browsertest.cc b/chrome/browser/devtools/device/usb/android_usb_browsertest.cc index 7f58a107..41399dc 100644 --- a/chrome/browser/devtools/device/usb/android_usb_browsertest.cc +++ b/chrome/browser/devtools/device/usb/android_usb_browsertest.cc
@@ -9,10 +9,10 @@ #include <unordered_map> #include <utility> -#include "base/bind.h" #include "base/containers/contains.h" #include "base/containers/queue.h" #include "base/containers/span.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/ptr_util.h" #include "base/memory/ref_counted_memory.h"
diff --git a/chrome/browser/devtools/device/usb/android_usb_device.cc b/chrome/browser/devtools/device/usb/android_usb_device.cc index 36fbace..0e219d8 100644 --- a/chrome/browser/devtools/device/usb/android_usb_device.cc +++ b/chrome/browser/devtools/device/usb/android_usb_device.cc
@@ -9,9 +9,9 @@ #include "base/barrier_closure.h" #include "base/base64.h" -#include "base/bind.h" #include "base/containers/contains.h" #include "base/containers/cxx20_erase.h" +#include "base/functional/bind.h" #include "base/lazy_instance.h" #include "base/memory/ref_counted_memory.h" #include "base/ranges/algorithm.h"
diff --git a/chrome/browser/devtools/device/usb/android_usb_socket.cc b/chrome/browser/devtools/device/usb/android_usb_socket.cc index 9632511..2f6d159ad 100644 --- a/chrome/browser/devtools/device/usb/android_usb_socket.cc +++ b/chrome/browser/devtools/device/usb/android_usb_socket.cc
@@ -6,8 +6,8 @@ #include <stddef.h> -#include "base/callback_helpers.h" #include "base/check_op.h" +#include "base/functional/callback_helpers.h" #include "base/notreached.h" #include "net/base/io_buffer.h" #include "net/base/ip_address.h"
diff --git a/chrome/browser/devtools/device/usb/usb_device_manager_helper.cc b/chrome/browser/devtools/device/usb/usb_device_manager_helper.cc index b291efda..fbd8629 100644 --- a/chrome/browser/devtools/device/usb/usb_device_manager_helper.cc +++ b/chrome/browser/devtools/device/usb/usb_device_manager_helper.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/no_destructor.h" #include "base/strings/utf_string_conversions.h" #include "content/public/browser/browser_task_traits.h"
diff --git a/chrome/browser/devtools/device/usb/usb_device_provider.cc b/chrome/browser/devtools/device/usb/usb_device_provider.cc index ed563dd..32635cd 100644 --- a/chrome/browser/devtools/device/usb/usb_device_provider.cc +++ b/chrome/browser/devtools/device/usb/usb_device_provider.cc
@@ -7,8 +7,8 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/strings/stringprintf.h" #include "chrome/browser/devtools/device/usb/android_rsa.h"
diff --git a/chrome/browser/devtools/devtools_browser_context_manager.cc b/chrome/browser/devtools/devtools_browser_context_manager.cc index 722e2bd..2bc0529 100644 --- a/chrome/browser/devtools/devtools_browser_context_manager.cc +++ b/chrome/browser/devtools/devtools_browser_context_manager.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/devtools/devtools_browser_context_manager.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/no_destructor.h" #include "base/task/single_thread_task_runner.h" #include "chrome/browser/profiles/profile_destroyer.h"
diff --git a/chrome/browser/devtools/devtools_browsertest.cc b/chrome/browser/devtools/devtools_browsertest.cc index e0d75db..daf254d2 100644 --- a/chrome/browser/devtools/devtools_browsertest.cc +++ b/chrome/browser/devtools/devtools_browsertest.cc
@@ -7,12 +7,12 @@ #include <memory> #include <vector> -#include "base/bind.h" #include "base/cancelable_callback.h" #include "base/command_line.h" #include "base/compiler_specific.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/ptr_util.h" #include "base/memory/ref_counted.h"
diff --git a/chrome/browser/devtools/devtools_embedder_message_dispatcher.cc b/chrome/browser/devtools/devtools_embedder_message_dispatcher.cc index 517d555..59ba0e1 100644 --- a/chrome/browser/devtools/devtools_embedder_message_dispatcher.cc +++ b/chrome/browser/devtools/devtools_embedder_message_dispatcher.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/values.h" #include "chrome/browser/devtools/devtools_settings.h"
diff --git a/chrome/browser/devtools/devtools_embedder_message_dispatcher.h b/chrome/browser/devtools/devtools_embedder_message_dispatcher.h index e405e47..422f266 100644 --- a/chrome/browser/devtools/devtools_embedder_message_dispatcher.h +++ b/chrome/browser/devtools/devtools_embedder_message_dispatcher.h
@@ -9,7 +9,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/values.h" #include "ui/gfx/geometry/insets.h" #include "ui/gfx/geometry/rect.h"
diff --git a/chrome/browser/devtools/devtools_eye_dropper.cc b/chrome/browser/devtools/devtools_eye_dropper.cc index ba898b5c..d226aa45 100644 --- a/chrome/browser/devtools/devtools_eye_dropper.cc +++ b/chrome/browser/devtools/devtools_eye_dropper.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/shared_memory_mapping.h" #include "build/build_config.h" #include "cc/paint/skia_paint_canvas.h"
diff --git a/chrome/browser/devtools/devtools_eye_dropper.h b/chrome/browser/devtools/devtools_eye_dropper.h index cd95677..f3e8f61b 100644 --- a/chrome/browser/devtools/devtools_eye_dropper.h +++ b/chrome/browser/devtools/devtools_eye_dropper.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "components/viz/host/client_frame_sink_video_capturer.h" #include "content/public/browser/render_widget_host.h" #include "content/public/browser/web_contents_observer.h"
diff --git a/chrome/browser/devtools/devtools_file_helper.cc b/chrome/browser/devtools/devtools_file_helper.cc index 0125b86d..2ea732a 100644 --- a/chrome/browser/devtools/devtools_file_helper.cc +++ b/chrome/browser/devtools/devtools_file_helper.cc
@@ -7,9 +7,9 @@ #include <set> #include <vector> -#include "base/bind.h" -#include "base/callback.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/hash/md5.h" #include "base/json/values_util.h" #include "base/lazy_instance.h"
diff --git a/chrome/browser/devtools/devtools_file_helper.h b/chrome/browser/devtools/devtools_file_helper.h index 833d419..8d86b79 100644 --- a/chrome/browser/devtools/devtools_file_helper.h +++ b/chrome/browser/devtools/devtools_file_helper.h
@@ -11,7 +11,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/devtools/devtools_file_watcher.h"
diff --git a/chrome/browser/devtools/devtools_file_system_indexer.cc b/chrome/browser/devtools/devtools_file_system_indexer.cc index 02725162..6142232b 100644 --- a/chrome/browser/devtools/devtools_file_system_indexer.cc +++ b/chrome/browser/devtools/devtools_file_system_indexer.cc
@@ -10,11 +10,11 @@ #include <memory> #include <set> -#include "base/bind.h" -#include "base/callback.h" #include "base/check_op.h" #include "base/files/file_enumerator.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/lazy_instance.h" #include "base/ranges/algorithm.h" #include "base/sequence_checker.h"
diff --git a/chrome/browser/devtools/devtools_file_system_indexer.h b/chrome/browser/devtools/devtools_file_system_indexer.h index e9c33f4..6867f33 100644 --- a/chrome/browser/devtools/devtools_file_system_indexer.h +++ b/chrome/browser/devtools/devtools_file_system_indexer.h
@@ -12,8 +12,8 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/files/file.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "base/time/time.h"
diff --git a/chrome/browser/devtools/devtools_file_system_indexer_unittest.cc b/chrome/browser/devtools/devtools_file_system_indexer_unittest.cc index de775d6..2a229cea 100644 --- a/chrome/browser/devtools/devtools_file_system_indexer_unittest.cc +++ b/chrome/browser/devtools/devtools_file_system_indexer_unittest.cc
@@ -4,9 +4,9 @@ #include <set> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/path_service.h" #include "base/run_loop.h" #include "chrome/browser/devtools/devtools_file_system_indexer.h"
diff --git a/chrome/browser/devtools/devtools_file_watcher.cc b/chrome/browser/devtools/devtools_file_watcher.cc index 7d066bd..2a48972 100644 --- a/chrome/browser/devtools/devtools_file_watcher.cc +++ b/chrome/browser/devtools/devtools_file_watcher.cc
@@ -9,11 +9,11 @@ #include <set> #include <unordered_map> -#include "base/bind.h" #include "base/files/file_enumerator.h" #include "base/files/file_path.h" #include "base/files/file_path_watcher.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted.h" #include "base/ranges/algorithm.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/devtools/devtools_file_watcher.h b/chrome/browser/devtools/devtools_file_watcher.h index 68cbe21..c346306f 100644 --- a/chrome/browser/devtools/devtools_file_watcher.h +++ b/chrome/browser/devtools/devtools_file_watcher.h
@@ -7,7 +7,7 @@ #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" namespace base { class FilePath;
diff --git a/chrome/browser/devtools/devtools_file_watcher_unittest.cc b/chrome/browser/devtools/devtools_file_watcher_unittest.cc index 1a50651..9d6895c 100644 --- a/chrome/browser/devtools/devtools_file_watcher_unittest.cc +++ b/chrome/browser/devtools/devtools_file_watcher_unittest.cc
@@ -4,9 +4,9 @@ #include <set> -#include "base/bind.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/task/sequenced_task_runner.h" #include "base/test/task_environment.h"
diff --git a/chrome/browser/devtools/devtools_infobar_delegate.h b/chrome/browser/devtools/devtools_infobar_delegate.h index 8c7c785..8da0578 100644 --- a/chrome/browser/devtools/devtools_infobar_delegate.h +++ b/chrome/browser/devtools/devtools_infobar_delegate.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "components/infobars/core/confirm_infobar_delegate.h" class DevToolsInfoBarDelegate : public ConfirmInfoBarDelegate {
diff --git a/chrome/browser/devtools/devtools_interactive_browsertest.cc b/chrome/browser/devtools/devtools_interactive_browsertest.cc index 0d208c0..8faae4d 100644 --- a/chrome/browser/devtools/devtools_interactive_browsertest.cc +++ b/chrome/browser/devtools/devtools_interactive_browsertest.cc
@@ -4,7 +4,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h" #include "base/test/test_timeouts.h"
diff --git a/chrome/browser/devtools/devtools_targets_ui.cc b/chrome/browser/devtools/devtools_targets_ui.cc index 0538648..68a71508 100644 --- a/chrome/browser/devtools/devtools_targets_ui.cc +++ b/chrome/browser/devtools/devtools_targets_ui.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/devtools/devtools_targets_ui.h b/chrome/browser/devtools/devtools_targets_ui.h index 50f40d0..a5f7109a 100644 --- a/chrome/browser/devtools/devtools_targets_ui.h +++ b/chrome/browser/devtools/devtools_targets_ui.h
@@ -9,7 +9,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/devtools/device/devtools_android_bridge.h" namespace base {
diff --git a/chrome/browser/devtools/devtools_ui_bindings.cc b/chrome/browser/devtools/devtools_ui_bindings.cc index 2351e4f..fffb6f40 100644 --- a/chrome/browser/devtools/devtools_ui_bindings.cc +++ b/chrome/browser/devtools/devtools_ui_bindings.cc
@@ -10,9 +10,9 @@ #include <utility> #include "base/base64.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/guid.h" #include "base/json/json_reader.h" #include "base/json/string_escape.h"
diff --git a/chrome/browser/devtools/devtools_window.cc b/chrome/browser/devtools/devtools_window.cc index 28256f75..92724b2 100644 --- a/chrome/browser/devtools/devtools_window.cc +++ b/chrome/browser/devtools/devtools_window.cc
@@ -9,8 +9,8 @@ #include <utility> #include "base/base64.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/json/json_reader.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h"
diff --git a/chrome/browser/devtools/devtools_window_testing.cc b/chrome/browser/devtools/devtools_window_testing.cc index 064405e6..64dcc2d4 100644 --- a/chrome/browser/devtools/devtools_window_testing.cc +++ b/chrome/browser/devtools/devtools_window_testing.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/devtools/devtools_window_testing.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/lazy_instance.h" #include "base/ranges/algorithm.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/devtools/devtools_window_testing.h b/chrome/browser/devtools/devtools_window_testing.h index e87b7f8..1a784301e 100644 --- a/chrome/browser/devtools/devtools_window_testing.h +++ b/chrome/browser/devtools/devtools_window_testing.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_DEVTOOLS_DEVTOOLS_WINDOW_TESTING_H_ #define CHROME_BROWSER_DEVTOOLS_DEVTOOLS_WINDOW_TESTING_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/devtools/devtools_window.h" #include "ui/gfx/geometry/rect.h"
diff --git a/chrome/browser/devtools/global_confirm_info_bar.cc b/chrome/browser/devtools/global_confirm_info_bar.cc index 437f163..f5c0b9b 100644 --- a/chrome/browser/devtools/global_confirm_info_bar.cc +++ b/chrome/browser/devtools/global_confirm_info_bar.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/task/sequenced_task_runner.h" #include "chrome/browser/infobars/confirm_infobar_creator.h" #include "chrome/browser/ui/browser.h"
diff --git a/chrome/browser/devtools/protocol/browser_handler.cc b/chrome/browser/devtools/protocol/browser_handler.cc index 02ed49a..08e3833 100644 --- a/chrome/browser/devtools/protocol/browser_handler.cc +++ b/chrome/browser/devtools/protocol/browser_handler.cc
@@ -7,7 +7,7 @@ #include <set> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted_memory.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/devtools/chrome_devtools_manager_delegate.h"
diff --git a/chrome/browser/devtools/protocol/cast_handler.cc b/chrome/browser/devtools/protocol/cast_handler.cc index 375bc4d..550fb4a8 100644 --- a/chrome/browser/devtools/protocol/cast_handler.cc +++ b/chrome/browser/devtools/protocol/cast_handler.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/ranges/algorithm.h" #include "chrome/browser/media/router/media_router_feature.h" #include "chrome/browser/ui/media_router/media_router_ui_helper.h"
diff --git a/chrome/browser/devtools/protocol/cast_handler_unittest.cc b/chrome/browser/devtools/protocol/cast_handler_unittest.cc index b0bd35c..1846534 100644 --- a/chrome/browser/devtools/protocol/cast_handler_unittest.cc +++ b/chrome/browser/devtools/protocol/cast_handler_unittest.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/devtools/protocol/cast_handler.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "chrome/browser/media/router/chrome_media_router_factory.h" #include "chrome/test/base/chrome_render_view_host_test_harness.h" #include "components/media_router/browser/media_sinks_observer.h"
diff --git a/chrome/browser/devtools/protocol/devtools_printtopdf_browsertest.cc b/chrome/browser/devtools/protocol/devtools_printtopdf_browsertest.cc index fb97075..04cfcde7 100644 --- a/chrome/browser/devtools/protocol/devtools_printtopdf_browsertest.cc +++ b/chrome/browser/devtools/protocol/devtools_printtopdf_browsertest.cc
@@ -6,8 +6,8 @@ #include <vector> #include "base/base64.h" -#include "base/bind.h" #include "base/containers/span.h" +#include "base/functional/bind.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/test/values_test_util.h"
diff --git a/chrome/browser/devtools/protocol/devtools_protocol_browsertest.cc b/chrome/browser/devtools/protocol/devtools_protocol_browsertest.cc index b128554c..8bbc71b 100644 --- a/chrome/browser/devtools/protocol/devtools_protocol_browsertest.cc +++ b/chrome/browser/devtools/protocol/devtools_protocol_browsertest.cc
@@ -5,9 +5,9 @@ #include <string> #include "base/base64.h" -#include "base/bind.h" #include "base/containers/contains.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/path_service.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h"
diff --git a/chrome/browser/diagnostics/sqlite_diagnostics.cc b/chrome/browser/diagnostics/sqlite_diagnostics.cc index 3c7b34f..156507e7 100644 --- a/chrome/browser/diagnostics/sqlite_diagnostics.cc +++ b/chrome/browser/diagnostics/sqlite_diagnostics.cc
@@ -7,8 +7,8 @@ #include <stdint.h> #include "base/base_paths.h" -#include "base/bind.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/memory/singleton.h"
diff --git a/chrome/browser/dom_distiller/distillable_page_utils_browsertest.cc b/chrome/browser/dom_distiller/distillable_page_utils_browsertest.cc index 3ce995a..6a49ff6 100644 --- a/chrome/browser/dom_distiller/distillable_page_utils_browsertest.cc +++ b/chrome/browser/dom_distiller/distillable_page_utils_browsertest.cc
@@ -5,8 +5,8 @@ #include <cstring> #include <memory> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/dom_distiller/dom_distiller_viewer_source_browsertest.cc b/chrome/browser/dom_distiller/dom_distiller_viewer_source_browsertest.cc index 128bd69c..819abd1 100644 --- a/chrome/browser/dom_distiller/dom_distiller_viewer_source_browsertest.cc +++ b/chrome/browser/dom_distiller/dom_distiller_viewer_source_browsertest.cc
@@ -7,8 +7,8 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/guid.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h"
diff --git a/chrome/browser/domain_reliability/browsertest.cc b/chrome/browser/domain_reliability/browsertest.cc index 16bb3c6..fcde524e 100644 --- a/chrome/browser/domain_reliability/browsertest.cc +++ b/chrome/browser/domain_reliability/browsertest.cc
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/json/json_reader.h" #include "base/run_loop.h" #include "base/test/values_test_util.h"
diff --git a/chrome/browser/downgrade/downgrade_manager.cc b/chrome/browser/downgrade/downgrade_manager.cc index c9f356b4..576b00d 100644 --- a/chrome/browser/downgrade/downgrade_manager.cc +++ b/chrome/browser/downgrade/downgrade_manager.cc
@@ -7,13 +7,13 @@ #include <iterator> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" #include "base/enterprise_util.h" #include "base/files/file_enumerator.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/metrics/histogram_functions.h" #include "base/ranges/algorithm.h"
diff --git a/chrome/browser/downgrade/downgrade_utils.h b/chrome/browser/downgrade/downgrade_utils.h index f21e89e7..a56f618 100644 --- a/chrome/browser/downgrade/downgrade_utils.h +++ b/chrome/browser/downgrade/downgrade_utils.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_DOWNGRADE_DOWNGRADE_UTILS_H_ #define CHROME_BROWSER_DOWNGRADE_DOWNGRADE_UTILS_H_ -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "third_party/abseil-cpp/absl/types/optional.h" namespace downgrade {
diff --git a/chrome/browser/download/android/available_offline_content_provider.cc b/chrome/browser/download/android/available_offline_content_provider.cc index da8881f..bd9e1f8 100644 --- a/chrome/browser/download/android/available_offline_content_provider.cc +++ b/chrome/browser/download/android/available_offline_content_provider.cc
@@ -8,7 +8,7 @@ #include <utility> #include "base/base64.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted_memory.h" #include "base/numerics/safe_conversions.h" #include "base/strings/strcat.h"
diff --git a/chrome/browser/download/android/available_offline_content_provider_unittest.cc b/chrome/browser/download/android/available_offline_content_provider_unittest.cc index 8a93159..e8aaac94c2 100644 --- a/chrome/browser/download/android/available_offline_content_provider_unittest.cc +++ b/chrome/browser/download/android/available_offline_content_provider_unittest.cc
@@ -8,7 +8,7 @@ #include <tuple> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/strings/string_util.h" #include "base/test/bind.h"
diff --git a/chrome/browser/download/android/chrome_duplicate_download_infobar_delegate.cc b/chrome/browser/download/android/chrome_duplicate_download_infobar_delegate.cc index a1e346b..828bc9d 100644 --- a/chrome/browser/download/android/chrome_duplicate_download_infobar_delegate.cc +++ b/chrome/browser/download/android/chrome_duplicate_download_infobar_delegate.cc
@@ -7,7 +7,7 @@ #include <memory> #include "base/android/path_utils.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "chrome/browser/download/android/download_controller.h" #include "chrome/browser/download/android/download_dialog_utils.h"
diff --git a/chrome/browser/download/android/chrome_duplicate_download_infobar_delegate.h b/chrome/browser/download/android/chrome_duplicate_download_infobar_delegate.h index 02ba22d..b1d349e3 100644 --- a/chrome/browser/download/android/chrome_duplicate_download_infobar_delegate.h +++ b/chrome/browser/download/android/chrome_duplicate_download_infobar_delegate.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_DOWNLOAD_ANDROID_CHROME_DUPLICATE_DOWNLOAD_INFOBAR_DELEGATE_H_ #define CHROME_BROWSER_DOWNLOAD_ANDROID_CHROME_DUPLICATE_DOWNLOAD_INFOBAR_DELEGATE_H_ -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/download/android/duplicate_download_infobar_delegate.h" #include "chrome/browser/download/download_target_determiner_delegate.h"
diff --git a/chrome/browser/download/android/download_controller.cc b/chrome/browser/download/android/download_controller.cc index 82ffb34d..daf1511b 100644 --- a/chrome/browser/download/android/download_controller.cc +++ b/chrome/browser/download/android/download_controller.cc
@@ -10,9 +10,9 @@ #include "base/android/jni_android.h" #include "base/android/jni_string.h" -#include "base/bind.h" #include "base/check_op.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/lazy_instance.h" #include "base/memory/raw_ptr.h" #include "base/metrics/field_trial_params.h"
diff --git a/chrome/browser/download/android/download_controller_base.h b/chrome/browser/download/android/download_controller_base.h index 939f3f0..9fb6467ba 100644 --- a/chrome/browser/download/android/download_controller_base.h +++ b/chrome/browser/download/android/download_controller_base.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "components/download/public/common/download_item.h" #include "components/download/public/common/download_start_observer.h" #include "content/public/browser/context_menu_params.h"
diff --git a/chrome/browser/download/android/download_dialog_bridge.h b/chrome/browser/download/android/download_dialog_bridge.h index e9c1c52..9079898 100644 --- a/chrome/browser/download/android/download_dialog_bridge.h +++ b/chrome/browser/download/android/download_dialog_bridge.h
@@ -7,8 +7,8 @@ #include "base/android/jni_android.h" #include "base/android/scoped_java_ref.h" -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "chrome/browser/download/download_dialog_types.h" #include "net/base/network_change_notifier.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/chrome/browser/download/android/download_dialog_utils.cc b/chrome/browser/download/android/download_dialog_utils.cc index 8fa1f6d5..7641d9d 100644 --- a/chrome/browser/download/android/download_dialog_utils.cc +++ b/chrome/browser/download/android/download_dialog_utils.cc
@@ -6,7 +6,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/ranges/algorithm.h" #include "base/strings/utf_string_conversions.h" #include "components/url_formatter/url_formatter.h"
diff --git a/chrome/browser/download/android/download_manager_bridge.h b/chrome/browser/download/android/download_manager_bridge.h index db3da046..ba366556 100644 --- a/chrome/browser/download/android/download_manager_bridge.h +++ b/chrome/browser/download/android/download_manager_bridge.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_DOWNLOAD_ANDROID_DOWNLOAD_MANAGER_BRIDGE_H_ #define CHROME_BROWSER_DOWNLOAD_ANDROID_DOWNLOAD_MANAGER_BRIDGE_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "components/download/public/common/download_item.h" using DownloadItem = download::DownloadItem;
diff --git a/chrome/browser/download/android/download_manager_service.cc b/chrome/browser/download/android/download_manager_service.cc index 8744816..7fa01b3 100644 --- a/chrome/browser/download/android/download_manager_service.cc +++ b/chrome/browser/download/android/download_manager_service.cc
@@ -9,8 +9,8 @@ #include "base/android/callback_android.h" #include "base/android/jni_string.h" #include "base/android/path_utils.h" -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/metrics/field_trial_params.h" #include "base/ranges/algorithm.h"
diff --git a/chrome/browser/download/android/download_manager_service.h b/chrome/browser/download/android/download_manager_service.h index 414b268..debb6bac 100644 --- a/chrome/browser/download/android/download_manager_service.h +++ b/chrome/browser/download/android/download_manager_service.h
@@ -11,7 +11,7 @@ #include <vector> #include "base/android/scoped_java_ref.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/singleton.h" #include "base/scoped_multi_source_observation.h" #include "chrome/browser/download/android/download_open_source.h"
diff --git a/chrome/browser/download/android/download_manager_service_unittest.cc b/chrome/browser/download/android/download_manager_service_unittest.cc index db3a296..4ec455e 100644 --- a/chrome/browser/download/android/download_manager_service_unittest.cc +++ b/chrome/browser/download/android/download_manager_service_unittest.cc
@@ -8,8 +8,8 @@ #include "base/android/jni_android.h" #include "base/android/jni_string.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "chrome/browser/profiles/profile_key_android.h"
diff --git a/chrome/browser/download/android/insecure_download_dialog_bridge.h b/chrome/browser/download/android/insecure_download_dialog_bridge.h index 99a29a56..b84f302 100644 --- a/chrome/browser/download/android/insecure_download_dialog_bridge.h +++ b/chrome/browser/download/android/insecure_download_dialog_bridge.h
@@ -9,7 +9,7 @@ #include "base/android/jni_android.h" #include "base/android/scoped_java_ref.h" -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "chrome/browser/download/android/download_callback_validator.h" #include "components/download/public/common/download_item.h" #include "ui/gfx/native_widget_types.h"
diff --git a/chrome/browser/download/android/insecure_download_infobar_delegate.h b/chrome/browser/download/android/insecure_download_infobar_delegate.h index ed7cbfe..2c85d7d 100644 --- a/chrome/browser/download/android/insecure_download_infobar_delegate.h +++ b/chrome/browser/download/android/insecure_download_infobar_delegate.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_DOWNLOAD_ANDROID_INSECURE_DOWNLOAD_INFOBAR_DELEGATE_H_ #define CHROME_BROWSER_DOWNLOAD_ANDROID_INSECURE_DOWNLOAD_INFOBAR_DELEGATE_H_ -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "components/download/public/common/download_item.h" #include "components/infobars/core/confirm_infobar_delegate.h"
diff --git a/chrome/browser/download/android/intercept_oma_download_navigation_throttle.cc b/chrome/browser/download/android/intercept_oma_download_navigation_throttle.cc index 1a06204..8c2dad5 100644 --- a/chrome/browser/download/android/intercept_oma_download_navigation_throttle.cc +++ b/chrome/browser/download/android/intercept_oma_download_navigation_throttle.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/download/android/intercept_oma_download_navigation_throttle.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "chrome/browser/download/android/download_controller_base.h" #include "components/embedder_support/user_agent_utils.h"
diff --git a/chrome/browser/download/android/mock_download_controller.cc b/chrome/browser/download/android/mock_download_controller.cc index bc00e2d..3a265bd 100644 --- a/chrome/browser/download/android/mock_download_controller.cc +++ b/chrome/browser/download/android/mock_download_controller.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/download/android/mock_download_controller.h b/chrome/browser/download/android/mock_download_controller.h index 1d27070..fde2eea 100644 --- a/chrome/browser/download/android/mock_download_controller.h +++ b/chrome/browser/download/android/mock_download_controller.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_DOWNLOAD_ANDROID_MOCK_DOWNLOAD_CONTROLLER_H_ #define CHROME_BROWSER_DOWNLOAD_ANDROID_MOCK_DOWNLOAD_CONTROLLER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/download/android/download_controller_base.h" namespace chrome {
diff --git a/chrome/browser/download/android/service/download_background_task.cc b/chrome/browser/download/android/service/download_background_task.cc index 147d409..c452d7b 100644 --- a/chrome/browser/download/android/service/download_background_task.cc +++ b/chrome/browser/download/android/service/download_background_task.cc
@@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/android/callback_android.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/android/chrome_jni_headers/DownloadBackgroundTask_jni.h" #include "chrome/browser/download/android/download_manager_service.h" #include "chrome/browser/download/background_download_service_factory.h"
diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrome/browser/download/chrome_download_manager_delegate.cc index 0850f83d..b5fbc11 100644 --- a/chrome/browser/download/chrome_download_manager_delegate.cc +++ b/chrome/browser/download/chrome_download_manager_delegate.cc
@@ -9,11 +9,11 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/memory/weak_ptr.h" #include "base/metrics/field_trial_params.h"
diff --git a/chrome/browser/download/chrome_download_manager_delegate_unittest.cc b/chrome/browser/download/chrome_download_manager_delegate_unittest.cc index 1de11cd..524c7c1 100644 --- a/chrome/browser/download/chrome_download_manager_delegate_unittest.cc +++ b/chrome/browser/download/chrome_download_manager_delegate_unittest.cc
@@ -11,12 +11,12 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/guid.h" #include "base/location.h" #include "base/memory/raw_ptr.h"
diff --git a/chrome/browser/download/deferred_client_wrapper.cc b/chrome/browser/download/deferred_client_wrapper.cc index 0d44a9a..040bb71 100644 --- a/chrome/browser/download/deferred_client_wrapper.cc +++ b/chrome/browser/download/deferred_client_wrapper.cc
@@ -6,7 +6,7 @@ #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "build/build_config.h" #include "chrome/browser/android/startup_bridge.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/download/deferred_client_wrapper.h b/chrome/browser/download/deferred_client_wrapper.h index b729f54..f163261 100644 --- a/chrome/browser/download/deferred_client_wrapper.h +++ b/chrome/browser/download/deferred_client_wrapper.h
@@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "build/build_config.h"
diff --git a/chrome/browser/download/download_browsertest.cc b/chrome/browser/download/download_browsertest.cc index fd3431b..2e80eb0 100644 --- a/chrome/browser/download/download_browsertest.cc +++ b/chrome/browser/download/download_browsertest.cc
@@ -15,14 +15,14 @@ #include <vector> #include "base/base64.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/feature_list.h" #include "base/files/file.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/guid.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h"
diff --git a/chrome/browser/download/download_commands.cc b/chrome/browser/download/download_commands.cc index b652c4ac..4edd9cfc 100644 --- a/chrome/browser/download/download_commands.cc +++ b/chrome/browser/download/download_commands.cc
@@ -7,8 +7,8 @@ #include <stdint.h> #include "base/base64.h" -#include "base/bind.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/download/download_completion_blocker.h b/chrome/browser/download/download_completion_blocker.h index 7849acf..fd97d30 100644 --- a/chrome/browser/download/download_completion_blocker.h +++ b/chrome/browser/download/download_completion_blocker.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_DOWNLOAD_DOWNLOAD_COMPLETION_BLOCKER_H_ #define CHROME_BROWSER_DOWNLOAD_DOWNLOAD_COMPLETION_BLOCKER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/supports_user_data.h" #include "components/download/public/common/download_item.h"
diff --git a/chrome/browser/download/download_core_service_impl.cc b/chrome/browser/download/download_core_service_impl.cc index 53562f26..5e3feb2d 100644 --- a/chrome/browser/download/download_core_service_impl.cc +++ b/chrome/browser/download/download_core_service_impl.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/download/chrome_download_manager_delegate.h"
diff --git a/chrome/browser/download/download_danger_prompt.h b/chrome/browser/download/download_danger_prompt.h index e6565a68..ffacd0f 100644 --- a/chrome/browser/download/download_danger_prompt.h +++ b/chrome/browser/download/download_danger_prompt.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_DOWNLOAD_DOWNLOAD_DANGER_PROMPT_H_ #define CHROME_BROWSER_DOWNLOAD_DOWNLOAD_DANGER_PROMPT_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "components/safe_browsing/core/common/proto/csd.pb.h" namespace content {
diff --git a/chrome/browser/download/download_danger_prompt_browsertest.cc b/chrome/browser/download/download_danger_prompt_browsertest.cc index e592bab3..877a0cb 100644 --- a/chrome/browser/download/download_danger_prompt_browsertest.cc +++ b/chrome/browser/download/download_danger_prompt_browsertest.cc
@@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/bind.h" #include "base/command_line.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "build/build_config.h" #include "chrome/browser/download/download_danger_prompt.h"
diff --git a/chrome/browser/download/download_file_icon_extractor.h b/chrome/browser/download/download_file_icon_extractor.h index d9a8dab..9ab3ffce 100644 --- a/chrome/browser/download/download_file_icon_extractor.h +++ b/chrome/browser/download/download_file_icon_extractor.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "chrome/browser/icon_loader.h" // Helper class for DownloadsGetFileIconFunction. Only used for a single icon
diff --git a/chrome/browser/download/download_file_picker.cc b/chrome/browser/download/download_file_picker.cc index fb92e7ac..7135b3e 100644 --- a/chrome/browser/download/download_file_picker.cc +++ b/chrome/browser/download/download_file_picker.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/download/download_file_picker.h" -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/task/single_thread_task_runner.h" #include "build/chromeos_buildflags.h" #include "chrome/browser/download/download_prefs.h"
diff --git a/chrome/browser/download/download_file_picker.h b/chrome/browser/download/download_file_picker.h index d9b80491..d23946a4 100644 --- a/chrome/browser/download/download_file_picker.h +++ b/chrome/browser/download/download_file_picker.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_DOWNLOAD_DOWNLOAD_FILE_PICKER_H_ #define CHROME_BROWSER_DOWNLOAD_DOWNLOAD_FILE_PICKER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/download/download_confirmation_result.h" #include "components/download/public/common/download_item.h"
diff --git a/chrome/browser/download/download_frame_policy_browsertest.cc b/chrome/browser/download/download_frame_policy_browsertest.cc index 1fd0010..24c67ba 100644 --- a/chrome/browser/download/download_frame_policy_browsertest.cc +++ b/chrome/browser/download/download_frame_policy_browsertest.cc
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/download/download_history.cc b/chrome/browser/download/download_history.cc index 842f973..8ec2a14f 100644 --- a/chrome/browser/download/download_history.cc +++ b/chrome/browser/download/download_history.cc
@@ -32,7 +32,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/metrics/histogram_macros.h" #include "base/observer_list.h"
diff --git a/chrome/browser/download/download_history.h b/chrome/browser/download/download_history.h index 1642799..e931b56 100644 --- a/chrome/browser/download/download_history.h +++ b/chrome/browser/download/download_history.h
@@ -10,7 +10,7 @@ #include <set> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h"
diff --git a/chrome/browser/download/download_history_unittest.cc b/chrome/browser/download/download_history_unittest.cc index 9913bde..b153258 100644 --- a/chrome/browser/download/download_history_unittest.cc +++ b/chrome/browser/download/download_history_unittest.cc
@@ -13,7 +13,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/guid.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/download/download_item_model.cc b/chrome/browser/download/download_item_model.cc index 16e2e1cc..20297a4 100644 --- a/chrome/browser/download/download_item_model.cc +++ b/chrome/browser/download/download_item_model.cc
@@ -6,7 +6,7 @@ #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/i18n/number_formatting.h" #include "base/i18n/rtl.h" #include "base/memory/ptr_util.h"
diff --git a/chrome/browser/download/download_manager_utils.cc b/chrome/browser/download/download_manager_utils.cc index f0069c8..1787bec1 100644 --- a/chrome/browser/download/download_manager_utils.cc +++ b/chrome/browser/download/download_manager_utils.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/no_destructor.h" #include "build/build_config.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/download/download_manager_utils.h b/chrome/browser/download/download_manager_utils.h index d1c629e..9a5b9de 100644 --- a/chrome/browser/download/download_manager_utils.h +++ b/chrome/browser/download/download_manager_utils.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" class Profile; class ProfileKey;
diff --git a/chrome/browser/download/download_offline_content_provider.cc b/chrome/browser/download/download_offline_content_provider.cc index a05a26d..2d4b25b 100644 --- a/chrome/browser/download/download_offline_content_provider.cc +++ b/chrome/browser/download/download_offline_content_provider.cc
@@ -7,9 +7,9 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/strings/utf_string_conversions.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/download/download_offline_content_provider_unittest.cc b/chrome/browser/download/download_offline_content_provider_unittest.cc index 0a1e6dc..dcb4da4 100644 --- a/chrome/browser/download/download_offline_content_provider_unittest.cc +++ b/chrome/browser/download/download_offline_content_provider_unittest.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/guid.h" #include "base/task/single_thread_task_runner.h" #include "base/test/test_simple_task_runner.h"
diff --git a/chrome/browser/download/download_open_prompt.cc b/chrome/browser/download/download_open_prompt.cc index 9836695d..a93f529 100644 --- a/chrome/browser/download/download_open_prompt.cc +++ b/chrome/browser/download/download_open_prompt.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/tab_modal_confirm_dialog.h" #include "chrome/browser/ui/tab_modal_confirm_dialog_delegate.h"
diff --git a/chrome/browser/download/download_open_prompt.h b/chrome/browser/download/download_open_prompt.h index b40b6de..33578a9 100644 --- a/chrome/browser/download/download_open_prompt.h +++ b/chrome/browser/download/download_open_prompt.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/callback_forward.h" #include "base/files/file_path.h" +#include "base/functional/callback_forward.h" namespace content { class WebContents;
diff --git a/chrome/browser/download/download_prefs.cc b/chrome/browser/download/download_prefs.cc index 04d7b8a..35c194b 100644 --- a/chrome/browser/download/download_prefs.cc +++ b/chrome/browser/download/download_prefs.cc
@@ -9,12 +9,12 @@ #include <string> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check.h" #include "base/cxx17_backports.h" #include "base/feature_list.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/no_destructor.h" #include "base/notreached.h" #include "base/path_service.h"
diff --git a/chrome/browser/download/download_query.cc b/chrome/browser/download/download_query.cc index 16f7027e..69872aa0 100644 --- a/chrome/browser/download/download_query.cc +++ b/chrome/browser/download/download_query.cc
@@ -12,10 +12,10 @@ #include <string> #include <vector> -#include "base/bind.h" -#include "base/callback.h" #include "base/check_op.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/i18n/case_conversion.h" #include "base/i18n/string_search.h" #include "base/memory/raw_ref.h"
diff --git a/chrome/browser/download/download_query.h b/chrome/browser/download/download_query.h index e6c9703f..f97971c 100644 --- a/chrome/browser/download/download_query.h +++ b/chrome/browser/download/download_query.h
@@ -11,7 +11,7 @@ #include <string> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "components/download/public/common/download_item.h" namespace base {
diff --git a/chrome/browser/download/download_query_unittest.cc b/chrome/browser/download/download_query_unittest.cc index c005192..2b01392 100644 --- a/chrome/browser/download/download_query_unittest.cc +++ b/chrome/browser/download/download_query_unittest.cc
@@ -12,9 +12,9 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/check.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/time/time.h" #include "base/values.h" #include "build/build_config.h"
diff --git a/chrome/browser/download/download_request_limiter.cc b/chrome/browser/download/download_request_limiter.cc index f15b4420..68e1bf3 100644 --- a/chrome/browser/download/download_request_limiter.cc +++ b/chrome/browser/download/download_request_limiter.cc
@@ -7,8 +7,8 @@ #include <iterator> #include <utility> -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "build/build_config.h" #include "chrome/browser/content_settings/chrome_content_settings_utils.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
diff --git a/chrome/browser/download/download_request_limiter.h b/chrome/browser/download/download_request_limiter.h index 369c8c5..385bb7b 100644 --- a/chrome/browser/download/download_request_limiter.h +++ b/chrome/browser/download/download_request_limiter.h
@@ -12,7 +12,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h"
diff --git a/chrome/browser/download/download_request_limiter_unittest.cc b/chrome/browser/download/download_request_limiter_unittest.cc index e37321f9..78edb70 100644 --- a/chrome/browser/download/download_request_limiter_unittest.cc +++ b/chrome/browser/download/download_request_limiter_unittest.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "build/build_config.h" #include "chrome/browser/chrome_notification_types.h"
diff --git a/chrome/browser/download/download_shelf.cc b/chrome/browser/download/download_shelf.cc index c4723980..8baa15d 100644 --- a/chrome/browser/download/download_shelf.cc +++ b/chrome/browser/download/download_shelf.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/task/single_thread_task_runner.h" #include "base/time/time.h"
diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/browser/download/download_target_determiner.cc index 6e2ece9..bbb859c 100644 --- a/chrome/browser/download/download_target_determiner.cc +++ b/chrome/browser/download/download_target_determiner.cc
@@ -7,8 +7,8 @@ #include <string> #include <vector> -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/rand_util.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/download/download_target_determiner_delegate.h b/chrome/browser/download/download_target_determiner_delegate.h index 14add84..e0a94af 100644 --- a/chrome/browser/download/download_target_determiner_delegate.h +++ b/chrome/browser/download/download_target_determiner_delegate.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "chrome/browser/download/download_confirmation_reason.h" #include "chrome/browser/download/download_confirmation_result.h" #include "components/download/public/common/download_danger_type.h"
diff --git a/chrome/browser/download/download_target_determiner_unittest.cc b/chrome/browser/download/download_target_determiner_unittest.cc index 976fdce5..b0e62516 100644 --- a/chrome/browser/download/download_target_determiner_unittest.cc +++ b/chrome/browser/download/download_target_determiner_unittest.cc
@@ -10,8 +10,8 @@ #include <string> #include <vector> -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/json/values_util.h" #include "base/location.h" #include "base/memory/raw_ptr.h"
diff --git a/chrome/browser/download/download_test_file_activity_observer.cc b/chrome/browser/download/download_test_file_activity_observer.cc index d88cbcad..fd346a2 100644 --- a/chrome/browser/download/download_test_file_activity_observer.cc +++ b/chrome/browser/download/download_test_file_activity_observer.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/task/single_thread_task_runner.h" #include "chrome/browser/download/chrome_download_manager_delegate.h"
diff --git a/chrome/browser/download/download_ui_controller.cc b/chrome/browser/download/download_ui_controller.cc index 247a200..640de492 100644 --- a/chrome/browser/download/download_ui_controller.cc +++ b/chrome/browser/download/download_ui_controller.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/metrics/histogram_macros.h" #include "build/build_config.h"
diff --git a/chrome/browser/download/download_ui_controller_unittest.cc b/chrome/browser/download/download_ui_controller_unittest.cc index 793ba4b..8c0b74c 100644 --- a/chrome/browser/download/download_ui_controller_unittest.cc +++ b/chrome/browser/download/download_ui_controller_unittest.cc
@@ -7,9 +7,9 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/download/notification/download_item_notification.cc b/chrome/browser/download/notification/download_item_notification.cc index 8d3d9be..37aaa9e 100644 --- a/chrome/browser/download/notification/download_item_notification.cc +++ b/chrome/browser/download/notification/download_item_notification.cc
@@ -10,9 +10,9 @@ #include <memory> #include "ash/public/cpp/notification_utils.h" -#include "base/bind.h" #include "base/feature_list.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/i18n/rtl.h" #include "base/metrics/user_metrics.h" #include "base/strings/escape.h"
diff --git a/chrome/browser/download/notification/download_notification_browsertest.cc b/chrome/browser/download/notification/download_notification_browsertest.cc index 81ac5b5b..9e15158 100644 --- a/chrome/browser/download/notification/download_notification_browsertest.cc +++ b/chrome/browser/download/notification/download_notification_browsertest.cc
@@ -7,11 +7,11 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" #include "base/feature_list.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/path_service.h" #include "base/run_loop.h"
diff --git a/chrome/browser/download/save_package_file_picker.cc b/chrome/browser/download/save_package_file_picker.cc index 9192dfa..e27a1ec2 100644 --- a/chrome/browser/download/save_package_file_picker.cc +++ b/chrome/browser/download/save_package_file_picker.cc
@@ -8,9 +8,9 @@ #include <memory> -#include "base/bind.h" #include "base/command_line.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/i18n/file_util_icu.h" #include "base/metrics/histogram_macros.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/download/save_page_browsertest.cc b/chrome/browser/download/save_page_browsertest.cc index fe09b26..ed935e7b 100644 --- a/chrome/browser/download/save_page_browsertest.cc +++ b/chrome/browser/download/save_page_browsertest.cc
@@ -8,12 +8,12 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/path_service.h" #include "base/run_loop.h"
diff --git a/chrome/browser/engagement/important_sites_util_unittest.cc b/chrome/browser/engagement/important_sites_util_unittest.cc index b2e8bd3..249d9b3 100644 --- a/chrome/browser/engagement/important_sites_util_unittest.cc +++ b/chrome/browser/engagement/important_sites_util_unittest.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/metrics/histogram_macros.h" #include "base/metrics/sample_vector.h"
diff --git a/chrome/browser/engagement/site_engagement_service_unittest.cc b/chrome/browser/engagement/site_engagement_service_unittest.cc index 2cffc11..244127b 100644 --- a/chrome/browser/engagement/site_engagement_service_unittest.cc +++ b/chrome/browser/engagement/site_engagement_service_unittest.cc
@@ -9,9 +9,9 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/test/bind.h"
diff --git a/chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc b/chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc index 8f38b0c7..5338335 100644 --- a/chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc +++ b/chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc
@@ -10,9 +10,9 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/feature_list.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.h b/chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.h index 30f1e32..7564266 100644 --- a/chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.h +++ b/chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.h
@@ -9,8 +9,8 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/read_only_shared_memory_region.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/enterprise/connectors/analysis/content_analysis_delegate_unittest.cc b/chrome/browser/enterprise/connectors/analysis/content_analysis_delegate_unittest.cc index d7d1198..724bd39 100644 --- a/chrome/browser/enterprise/connectors/analysis/content_analysis_delegate_unittest.cc +++ b/chrome/browser/enterprise/connectors/analysis/content_analysis_delegate_unittest.cc
@@ -9,10 +9,10 @@ #include <string> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/memory/read_only_shared_memory_region.h" #include "base/memory/scoped_refptr.h"
diff --git a/chrome/browser/enterprise/connectors/analysis/content_analysis_dialog.cc b/chrome/browser/enterprise/connectors/analysis/content_analysis_dialog.cc index 605e265..37d9a2a 100644 --- a/chrome/browser/enterprise/connectors/analysis/content_analysis_dialog.cc +++ b/chrome/browser/enterprise/connectors/analysis/content_analysis_dialog.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/strings/string_number_conversions.h" #include "cc/paint/paint_flags.h"
diff --git a/chrome/browser/enterprise/connectors/analysis/content_analysis_downloads_delegate.h b/chrome/browser/enterprise/connectors/analysis/content_analysis_downloads_delegate.h index 4f21880..2247f4c 100644 --- a/chrome/browser/enterprise/connectors/analysis/content_analysis_downloads_delegate.h +++ b/chrome/browser/enterprise/connectors/analysis/content_analysis_downloads_delegate.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_ENTERPRISE_CONNECTORS_ANALYSIS_CONTENT_ANALYSIS_DOWNLOADS_DELEGATE_H_ #define CHROME_BROWSER_ENTERPRISE_CONNECTORS_ANALYSIS_CONTENT_ANALYSIS_DOWNLOADS_DELEGATE_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/enterprise/connectors/analysis/content_analysis_delegate_base.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 2425d1d..e33718d 100644 --- a/chrome/browser/enterprise/connectors/analysis/fake_content_analysis_delegate.cc +++ b/chrome/browser/enterprise/connectors/analysis/fake_content_analysis_delegate.cc
@@ -4,9 +4,9 @@ #include "chrome/browser/enterprise/connectors/analysis/fake_content_analysis_delegate.h" -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_forward.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_forward.h" #include "base/logging.h" #include "base/test/bind.h" #include "base/time/time.h"
diff --git a/chrome/browser/enterprise/connectors/analysis/fake_content_analysis_delegate.h b/chrome/browser/enterprise/connectors/analysis/fake_content_analysis_delegate.h index e3d397b..8dd3f944 100644 --- a/chrome/browser/enterprise/connectors/analysis/fake_content_analysis_delegate.h +++ b/chrome/browser/enterprise/connectors/analysis/fake_content_analysis_delegate.h
@@ -7,8 +7,8 @@ #include <memory> -#include "base/callback_forward.h" #include "base/files/file_path.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.h" #include "chrome/browser/enterprise/connectors/analysis/fake_files_request_handler.h"
diff --git a/chrome/browser/enterprise/connectors/analysis/fake_files_request_handler.cc b/chrome/browser/enterprise/connectors/analysis/fake_files_request_handler.cc index 455818f5..73b31e6 100644 --- a/chrome/browser/enterprise/connectors/analysis/fake_files_request_handler.cc +++ b/chrome/browser/enterprise/connectors/analysis/fake_files_request_handler.cc
@@ -3,7 +3,7 @@ // found in the LICENSE file. #include "chrome/browser/enterprise/connectors/analysis/fake_files_request_handler.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/weak_ptr.h" namespace enterprise_connectors {
diff --git a/chrome/browser/enterprise/connectors/analysis/fake_files_request_handler.h b/chrome/browser/enterprise/connectors/analysis/fake_files_request_handler.h index b219230..1f1bd632 100644 --- a/chrome/browser/enterprise/connectors/analysis/fake_files_request_handler.h +++ b/chrome/browser/enterprise/connectors/analysis/fake_files_request_handler.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_ENTERPRISE_CONNECTORS_ANALYSIS_FAKE_FILES_REQUEST_HANDLER_H_ #define CHROME_BROWSER_ENTERPRISE_CONNECTORS_ANALYSIS_FAKE_FILES_REQUEST_HANDLER_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/enterprise/connectors/analysis/files_request_handler.h"
diff --git a/chrome/browser/enterprise/connectors/analysis/file_transfer_analysis_delegate.cc b/chrome/browser/enterprise/connectors/analysis/file_transfer_analysis_delegate.cc index 810e2e5..99b73d6 100644 --- a/chrome/browser/enterprise/connectors/analysis/file_transfer_analysis_delegate.cc +++ b/chrome/browser/enterprise/connectors/analysis/file_transfer_analysis_delegate.cc
@@ -7,8 +7,8 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_forward.h" +#include "base/functional/bind.h" +#include "base/functional/callback_forward.h" #include "base/memory/ptr_util.h" #include "base/no_destructor.h" #include "chrome/browser/ash/file_manager/volume_manager.h"
diff --git a/chrome/browser/enterprise/connectors/analysis/file_transfer_analysis_delegate.h b/chrome/browser/enterprise/connectors/analysis/file_transfer_analysis_delegate.h index 6c51d0f..96d9004 100644 --- a/chrome/browser/enterprise/connectors/analysis/file_transfer_analysis_delegate.h +++ b/chrome/browser/enterprise/connectors/analysis/file_transfer_analysis_delegate.h
@@ -7,7 +7,7 @@ #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/enterprise/connectors/analysis/content_analysis_delegate_base.h" #include "chrome/browser/enterprise/connectors/common.h" #include "chrome/browser/safe_browsing/cloud_content_scanning/deep_scanning_utils.h"
diff --git a/chrome/browser/enterprise/connectors/analysis/file_transfer_analysis_delegate_unittest.cc b/chrome/browser/enterprise/connectors/analysis/file_transfer_analysis_delegate_unittest.cc index 730f375..70c60f6 100644 --- a/chrome/browser/enterprise/connectors/analysis/file_transfer_analysis_delegate_unittest.cc +++ b/chrome/browser/enterprise/connectors/analysis/file_transfer_analysis_delegate_unittest.cc
@@ -9,10 +9,10 @@ #include <string> #include <vector> -#include "base/bind.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/path_service.h"
diff --git a/chrome/browser/enterprise/connectors/analysis/files_request_handler.h b/chrome/browser/enterprise/connectors/analysis/files_request_handler.h index 5e3776d..61fc6bf 100644 --- a/chrome/browser/enterprise/connectors/analysis/files_request_handler.h +++ b/chrome/browser/enterprise/connectors/analysis/files_request_handler.h
@@ -7,8 +7,8 @@ #include <memory> -#include "base/callback_forward.h" #include "base/files/file_path.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/enterprise/connectors/analysis/request_handler_base.h" #include "chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.h"
diff --git a/chrome/browser/enterprise/connectors/analysis/files_request_handler_unittest.cc b/chrome/browser/enterprise/connectors/analysis/files_request_handler_unittest.cc index 746472c..12dbb0d 100644 --- a/chrome/browser/enterprise/connectors/analysis/files_request_handler_unittest.cc +++ b/chrome/browser/enterprise/connectors/analysis/files_request_handler_unittest.cc
@@ -9,12 +9,12 @@ #include <string> #include <vector> -#include "base/bind.h" #include "base/check_op.h" #include "base/containers/contains.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/path_service.h"
diff --git a/chrome/browser/enterprise/connectors/analysis/local_binary_upload_service.h b/chrome/browser/enterprise/connectors/analysis/local_binary_upload_service.h index 7c5fa58..45bd03a 100644 --- a/chrome/browser/enterprise/connectors/analysis/local_binary_upload_service.h +++ b/chrome/browser/enterprise/connectors/analysis/local_binary_upload_service.h
@@ -9,7 +9,7 @@ #include <memory> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h" #include "base/timer/timer.h"
diff --git a/chrome/browser/enterprise/connectors/analysis/local_binary_upload_service_unittest.cc b/chrome/browser/enterprise/connectors/analysis/local_binary_upload_service_unittest.cc index 648eb9d..7fa772e 100644 --- a/chrome/browser/enterprise/connectors/analysis/local_binary_upload_service_unittest.cc +++ b/chrome/browser/enterprise/connectors/analysis/local_binary_upload_service_unittest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/enterprise/connectors/analysis/local_binary_upload_service.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "build/build_config.h" #include "chrome/browser/enterprise/connectors/analysis/analysis_settings.h" #include "chrome/browser/enterprise/connectors/analysis/fake_content_analysis_sdk_manager.h"
diff --git a/chrome/browser/enterprise/connectors/analysis/mock_file_transfer_analysis_delegate.cc b/chrome/browser/enterprise/connectors/analysis/mock_file_transfer_analysis_delegate.cc index 221b114..ebd9361 100644 --- a/chrome/browser/enterprise/connectors/analysis/mock_file_transfer_analysis_delegate.cc +++ b/chrome/browser/enterprise/connectors/analysis/mock_file_transfer_analysis_delegate.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/enterprise/connectors/analysis/mock_file_transfer_analysis_delegate.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/enterprise/connectors/analysis/file_transfer_analysis_delegate.h" #include "chrome/browser/safe_browsing/cloud_content_scanning/deep_scanning_utils.h" #include "components/enterprise/common/proto/connectors.pb.h"
diff --git a/chrome/browser/enterprise/connectors/analysis/mock_file_transfer_analysis_delegate.h b/chrome/browser/enterprise/connectors/analysis/mock_file_transfer_analysis_delegate.h index 9efa672..9bebfef 100644 --- a/chrome/browser/enterprise/connectors/analysis/mock_file_transfer_analysis_delegate.h +++ b/chrome/browser/enterprise/connectors/analysis/mock_file_transfer_analysis_delegate.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_ENTERPRISE_CONNECTORS_ANALYSIS_MOCK_FILE_TRANSFER_ANALYSIS_DELEGATE_H_ #define CHROME_BROWSER_ENTERPRISE_CONNECTORS_ANALYSIS_MOCK_FILE_TRANSFER_ANALYSIS_DELEGATE_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/enterprise/connectors/analysis/file_transfer_analysis_delegate.h" #include "chrome/browser/safe_browsing/cloud_content_scanning/deep_scanning_utils.h" #include "components/enterprise/common/proto/connectors.pb.h"
diff --git a/chrome/browser/enterprise/connectors/analysis/page_print_analysis_request_unittest.cc b/chrome/browser/enterprise/connectors/analysis/page_print_analysis_request_unittest.cc index 7dfecf5..d74e9ed 100644 --- a/chrome/browser/enterprise/connectors/analysis/page_print_analysis_request_unittest.cc +++ b/chrome/browser/enterprise/connectors/analysis/page_print_analysis_request_unittest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/enterprise/connectors/analysis/page_print_analysis_request.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/memory/read_only_shared_memory_region.h" #include "base/run_loop.h" #include "base/test/bind.h"
diff --git a/chrome/browser/enterprise/connectors/common.h b/chrome/browser/enterprise/connectors/common.h index cb009dd..6f4f185c9 100644 --- a/chrome/browser/enterprise/connectors/common.h +++ b/chrome/browser/enterprise/connectors/common.h
@@ -10,7 +10,7 @@ #include <string> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/supports_user_data.h" #include "chrome/browser/enterprise/connectors/analysis/analysis_settings.h"
diff --git a/chrome/browser/enterprise/connectors/device_trust/attestation/ash/ash_attestation_service.cc b/chrome/browser/enterprise/connectors/device_trust/attestation/ash/ash_attestation_service.cc index 0ee98ac..85498c92 100644 --- a/chrome/browser/enterprise/connectors/device_trust/attestation/ash/ash_attestation_service.cc +++ b/chrome/browser/enterprise/connectors/device_trust/attestation/ash/ash_attestation_service.cc
@@ -8,9 +8,9 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/check.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/json/json_writer.h" #include "base/time/time.h" #include "base/values.h"
diff --git a/chrome/browser/enterprise/connectors/device_trust/attestation/common/attestation_service.h b/chrome/browser/enterprise/connectors/device_trust/attestation/common/attestation_service.h index 0076872..510c8ba8 100644 --- a/chrome/browser/enterprise/connectors/device_trust/attestation/common/attestation_service.h +++ b/chrome/browser/enterprise/connectors/device_trust/attestation/common/attestation_service.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/values.h" #include "chrome/browser/enterprise/connectors/device_trust/attestation/common/signals_type.h"
diff --git a/chrome/browser/enterprise/connectors/device_trust/device_trust_browsertest.cc b/chrome/browser/enterprise/connectors/device_trust/device_trust_browsertest.cc index d008d31..af67cac7 100644 --- a/chrome/browser/enterprise/connectors/device_trust/device_trust_browsertest.cc +++ b/chrome/browser/enterprise/connectors/device_trust/device_trust_browsertest.cc
@@ -6,7 +6,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h"
diff --git a/chrome/browser/enterprise/connectors/device_trust/device_trust_service.h b/chrome/browser/enterprise/connectors/device_trust/device_trust_service.h index 5c652381..4882b821 100644 --- a/chrome/browser/enterprise/connectors/device_trust/device_trust_service.h +++ b/chrome/browser/enterprise/connectors/device_trust/device_trust_service.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/values.h" #include "components/keyed_service/core/keyed_service.h"
diff --git a/chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/key_rotation_command.h b/chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/key_rotation_command.h index a055f74..f28cbbb 100644 --- a/chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/key_rotation_command.h +++ b/chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/key_rotation_command.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" namespace enterprise_connectors {
diff --git a/chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/linux_key_rotation_command.cc b/chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/linux_key_rotation_command.cc index 0dc69b3..705aaf59 100644 --- a/chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/linux_key_rotation_command.cc +++ b/chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/linux_key_rotation_command.cc
@@ -8,11 +8,11 @@ #include <utility> #include "base/base64.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/check.h" #include "base/command_line.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/path_service.h" #include "base/process/process.h"
diff --git a/chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/linux_key_rotation_command.h b/chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/linux_key_rotation_command.h index f66f42e..85509d6 100644 --- a/chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/linux_key_rotation_command.h +++ b/chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/linux_key_rotation_command.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_ENTERPRISE_CONNECTORS_DEVICE_TRUST_KEY_MANAGEMENT_BROWSER_COMMANDS_LINUX_KEY_ROTATION_COMMAND_H_ #define CHROME_BROWSER_ENTERPRISE_CONNECTORS_DEVICE_TRUST_KEY_MANAGEMENT_BROWSER_COMMANDS_LINUX_KEY_ROTATION_COMMAND_H_ -#include "base/callback.h" #include "base/command_line.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/process/launch.h" #include "base/process/process.h"
diff --git a/chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/mac_key_rotation_command.cc b/chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/mac_key_rotation_command.cc index a0980cb8..f1c083ac 100644 --- a/chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/mac_key_rotation_command.cc +++ b/chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/mac_key_rotation_command.cc
@@ -7,8 +7,8 @@ #include <string> #include <utility> -#include "base/callback.h" #include "base/check.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/sequence_checker.h" #include "base/syslog_logging.h"
diff --git a/chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/mac_key_rotation_command.h b/chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/mac_key_rotation_command.h index 3438200..96fc04f 100644 --- a/chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/mac_key_rotation_command.h +++ b/chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/mac_key_rotation_command.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_ENTERPRISE_CONNECTORS_DEVICE_TRUST_KEY_MANAGEMENT_BROWSER_COMMANDS_MAC_KEY_ROTATION_COMMAND_H_ #define CHROME_BROWSER_ENTERPRISE_CONNECTORS_DEVICE_TRUST_KEY_MANAGEMENT_BROWSER_COMMANDS_MAC_KEY_ROTATION_COMMAND_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h"
diff --git a/chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/win_key_rotation_command.cc b/chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/win_key_rotation_command.cc index 5ca328d..b68d1f5 100644 --- a/chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/win_key_rotation_command.cc +++ b/chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/win_key_rotation_command.cc
@@ -13,8 +13,8 @@ #include <vector> #include "base/base64.h" -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/syslog_logging.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/win_key_rotation_command.h b/chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/win_key_rotation_command.h index febd77d..0f21f8d1 100644 --- a/chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/win_key_rotation_command.h +++ b/chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/win_key_rotation_command.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_ENTERPRISE_CONNECTORS_DEVICE_TRUST_KEY_MANAGEMENT_BROWSER_COMMANDS_WIN_KEY_ROTATION_COMMAND_H_ #define CHROME_BROWSER_ENTERPRISE_CONNECTORS_DEVICE_TRUST_KEY_MANAGEMENT_BROWSER_COMMANDS_WIN_KEY_ROTATION_COMMAND_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/win/windows_types.h" #include "chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/key_rotation_command.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 0bf319d..9b3dc86 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
@@ -4,9 +4,9 @@ #include "chrome/browser/enterprise/connectors/device_trust/key_management/browser/device_trust_key_manager_impl.h" -#include "base/callback_helpers.h" #include "base/check.h" #include "base/containers/span.h" +#include "base/functional/callback_helpers.h" #include "base/notreached.h" #include "base/task/bind_post_task.h" #include "base/task/task_traits.h"
diff --git a/chrome/browser/enterprise/connectors/device_trust/key_management/browser/device_trust_key_manager_impl.h b/chrome/browser/enterprise/connectors/device_trust/key_management/browser/device_trust_key_manager_impl.h index 91c9880..5430b19 100644 --- a/chrome/browser/enterprise/connectors/device_trust/key_management/browser/device_trust_key_manager_impl.h +++ b/chrome/browser/enterprise/connectors/device_trust/key_management/browser/device_trust_key_manager_impl.h
@@ -8,8 +8,8 @@ #include <memory> #include <vector> -#include "base/callback_forward.h" #include "base/callback_list.h" +#include "base/functional/callback_forward.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h"
diff --git a/chrome/browser/enterprise/connectors/device_trust/key_management/browser/device_trust_key_manager_impl_unittest.cc b/chrome/browser/enterprise/connectors/device_trust/key_management/browser/device_trust_key_manager_impl_unittest.cc index 8787db4c7..ba4731f 100644 --- a/chrome/browser/enterprise/connectors/device_trust/key_management/browser/device_trust_key_manager_impl_unittest.cc +++ b/chrome/browser/enterprise/connectors/device_trust/key_management/browser/device_trust_key_manager_impl_unittest.cc
@@ -5,7 +5,7 @@ #include "chrome/browser/enterprise/connectors/device_trust/key_management/browser/device_trust_key_manager_impl.h" #include "base/barrier_closure.h" -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/task/bind_post_task.h"
diff --git a/chrome/browser/enterprise/connectors/device_trust/key_management/browser/key_rotation_launcher_impl.cc b/chrome/browser/enterprise/connectors/device_trust/key_management/browser/key_rotation_launcher_impl.cc index d71b9ea..4cb422e 100644 --- a/chrome/browser/enterprise/connectors/device_trust/key_management/browser/key_rotation_launcher_impl.cc +++ b/chrome/browser/enterprise/connectors/device_trust/key_management/browser/key_rotation_launcher_impl.cc
@@ -7,8 +7,8 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/enterprise/connectors/device_trust/key_management/browser/key_rotation_launcher_unittest.cc b/chrome/browser/enterprise/connectors/device_trust/key_management/browser/key_rotation_launcher_unittest.cc index ccad499..97f326e 100644 --- a/chrome/browser/enterprise/connectors/device_trust/key_management/browser/key_rotation_launcher_unittest.cc +++ b/chrome/browser/enterprise/connectors/device_trust/key_management/browser/key_rotation_launcher_unittest.cc
@@ -7,8 +7,8 @@ #include <memory> #include <utility> -#include "base/callback_helpers.h" #include "base/check.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h"
diff --git a/chrome/browser/enterprise/connectors/device_trust/key_management/core/network/fetcher/win_network_fetcher.h b/chrome/browser/enterprise/connectors/device_trust/key_management/core/network/fetcher/win_network_fetcher.h index d029fa5..7c62dce 100644 --- a/chrome/browser/enterprise/connectors/device_trust/key_management/core/network/fetcher/win_network_fetcher.h +++ b/chrome/browser/enterprise/connectors/device_trust/key_management/core/network/fetcher/win_network_fetcher.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_ENTERPRISE_CONNECTORS_DEVICE_TRUST_KEY_MANAGEMENT_CORE_NETWORK_FETCHER_WIN_NETWORK_FETCHER_H_ #define CHROME_BROWSER_ENTERPRISE_CONNECTORS_DEVICE_TRUST_KEY_MANAGEMENT_CORE_NETWORK_FETCHER_WIN_NETWORK_FETCHER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" class GURL;
diff --git a/chrome/browser/enterprise/connectors/device_trust/key_management/core/network/fetcher/win_network_fetcher_impl.cc b/chrome/browser/enterprise/connectors/device_trust/key_management/core/network/fetcher/win_network_fetcher_impl.cc index 54a6d8d..e319880 100644 --- a/chrome/browser/enterprise/connectors/device_trust/key_management/core/network/fetcher/win_network_fetcher_impl.cc +++ b/chrome/browser/enterprise/connectors/device_trust/key_management/core/network/fetcher/win_network_fetcher_impl.cc
@@ -7,8 +7,8 @@ #include <string> #include <utility> -#include "base/callback_helpers.h" #include "base/containers/flat_map.h" +#include "base/functional/callback_helpers.h" #include "url/gurl.h" namespace enterprise_connectors {
diff --git a/chrome/browser/enterprise/connectors/device_trust/key_management/core/network/key_network_delegate.h b/chrome/browser/enterprise/connectors/device_trust/key_management/core/network/key_network_delegate.h index 83e82be..7498bbb8 100644 --- a/chrome/browser/enterprise/connectors/device_trust/key_management/core/network/key_network_delegate.h +++ b/chrome/browser/enterprise/connectors/device_trust/key_management/core/network/key_network_delegate.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" class GURL;
diff --git a/chrome/browser/enterprise/connectors/device_trust/key_management/core/network/mojo_key_network_delegate.cc b/chrome/browser/enterprise/connectors/device_trust/key_management/core/network/mojo_key_network_delegate.cc index 19f1460..96651a7d 100644 --- a/chrome/browser/enterprise/connectors/device_trust/key_management/core/network/mojo_key_network_delegate.cc +++ b/chrome/browser/enterprise/connectors/device_trust/key_management/core/network/mojo_key_network_delegate.cc
@@ -8,8 +8,8 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/memory/scoped_refptr.h" #include "base/time/time.h" #include "chrome/browser/enterprise/connectors/device_trust/common/device_trust_constants.h"
diff --git a/chrome/browser/enterprise/connectors/device_trust/key_management/core/network/win_key_network_delegate.cc b/chrome/browser/enterprise/connectors/device_trust/key_management/core/network/win_key_network_delegate.cc index 698a01d8..fe0cacdc 100644 --- a/chrome/browser/enterprise/connectors/device_trust/key_management/core/network/win_key_network_delegate.cc +++ b/chrome/browser/enterprise/connectors/device_trust/key_management/core/network/win_key_network_delegate.cc
@@ -8,8 +8,8 @@ #include <string> #include <utility> -#include "base/callback_helpers.h" #include "base/containers/flat_map.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/histogram_functions.h" #include "base/task/sequenced_task_runner.h" #include "base/time/time.h"
diff --git a/chrome/browser/enterprise/connectors/device_trust/key_management/core/persistence/scoped_key_persistence_delegate_factory.h b/chrome/browser/enterprise/connectors/device_trust/key_management/core/persistence/scoped_key_persistence_delegate_factory.h index f9ad878..c9c96a3 100644 --- a/chrome/browser/enterprise/connectors/device_trust/key_management/core/persistence/scoped_key_persistence_delegate_factory.h +++ b/chrome/browser/enterprise/connectors/device_trust/key_management/core/persistence/scoped_key_persistence_delegate_factory.h
@@ -9,8 +9,8 @@ #include <vector> -#include "base/callback_forward.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_forward.h" +#include "base/functional/callback_helpers.h" #include "chrome/browser/enterprise/connectors/device_trust/key_management/core/persistence/key_persistence_delegate.h" #include "chrome/browser/enterprise/connectors/device_trust/key_management/core/persistence/key_persistence_delegate_factory.h" #include "crypto/scoped_mock_unexportable_key_provider.h"
diff --git a/chrome/browser/enterprise/connectors/device_trust/key_management/installer/key_rotation_manager.h b/chrome/browser/enterprise/connectors/device_trust/key_management/installer/key_rotation_manager.h index e1ea3612f..4eb22f81 100644 --- a/chrome/browser/enterprise/connectors/device_trust/key_management/installer/key_rotation_manager.h +++ b/chrome/browser/enterprise/connectors/device_trust/key_management/installer/key_rotation_manager.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" class GURL;
diff --git a/chrome/browser/enterprise/connectors/device_trust/key_management/installer/key_rotation_manager_impl.cc b/chrome/browser/enterprise/connectors/device_trust/key_management/installer/key_rotation_manager_impl.cc index 163a662..21e37e2 100644 --- a/chrome/browser/enterprise/connectors/device_trust/key_management/installer/key_rotation_manager_impl.cc +++ b/chrome/browser/enterprise/connectors/device_trust/key_management/installer/key_rotation_manager_impl.cc
@@ -8,8 +8,8 @@ #include <string> #include <utility> -#include "base/callback.h" #include "base/check.h" +#include "base/functional/callback.h" #include "base/syslog_logging.h" #include "base/threading/platform_thread.h" #include "chrome/browser/enterprise/connectors/device_trust/key_management/core/network/key_network_delegate.h"
diff --git a/chrome/browser/enterprise/connectors/device_trust/key_management/installer/key_rotation_manager_impl.h b/chrome/browser/enterprise/connectors/device_trust/key_management/installer/key_rotation_manager_impl.h index beeaee0..cd7aa46 100644 --- a/chrome/browser/enterprise/connectors/device_trust/key_management/installer/key_rotation_manager_impl.h +++ b/chrome/browser/enterprise/connectors/device_trust/key_management/installer/key_rotation_manager_impl.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/enterprise/connectors/device_trust/key_management/core/network/key_network_delegate.h" #include "chrome/browser/enterprise/connectors/device_trust/key_management/core/signing_key_pair.h"
diff --git a/chrome/browser/enterprise/connectors/device_trust/key_management/installer/management_service/chrome_management_service.h b/chrome/browser/enterprise/connectors/device_trust/key_management/installer/management_service/chrome_management_service.h index c10b929..879ab99d 100644 --- a/chrome/browser/enterprise/connectors/device_trust/key_management/installer/management_service/chrome_management_service.h +++ b/chrome/browser/enterprise/connectors/device_trust/key_management/installer/management_service/chrome_management_service.h
@@ -8,7 +8,7 @@ #include <cstdint> #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "mojo/public/cpp/bindings/remote.h" #include "services/network/public/mojom/url_loader_factory.mojom.h"
diff --git a/chrome/browser/enterprise/connectors/device_trust/key_management/installer/management_service/rotate_util.cc b/chrome/browser/enterprise/connectors/device_trust/key_management/installer/management_service/rotate_util.cc index 83c13763..39ee60a 100644 --- a/chrome/browser/enterprise/connectors/device_trust/key_management/installer/management_service/rotate_util.cc +++ b/chrome/browser/enterprise/connectors/device_trust/key_management/installer/management_service/rotate_util.cc
@@ -9,8 +9,8 @@ #include <utility> #include "base/base64.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/syslog_logging.h" #include "base/threading/scoped_blocking_call.h"
diff --git a/chrome/browser/enterprise/connectors/device_trust/signals/decorators/browser/browser_signals_decorator_unittest.cc b/chrome/browser/enterprise/connectors/device_trust/signals/decorators/browser/browser_signals_decorator_unittest.cc index 139f7422..4c129d9 100644 --- a/chrome/browser/enterprise/connectors/device_trust/signals/decorators/browser/browser_signals_decorator_unittest.cc +++ b/chrome/browser/enterprise/connectors/device_trust/signals/decorators/browser/browser_signals_decorator_unittest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/enterprise/connectors/device_trust/signals/decorators/browser/browser_signals_decorator.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/run_loop.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/task_environment.h"
diff --git a/chrome/browser/enterprise/connectors/device_trust/signals/decorators/common/common_signals_decorator.cc b/chrome/browser/enterprise/connectors/device_trust/signals/decorators/common/common_signals_decorator.cc index ace5c37d..ce637fe 100644 --- a/chrome/browser/enterprise/connectors/device_trust/signals/decorators/common/common_signals_decorator.cc +++ b/chrome/browser/enterprise/connectors/device_trust/signals/decorators/common/common_signals_decorator.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/enterprise/connectors/device_trust/signals/decorators/common/common_signals_decorator.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/values.h" #include "chrome/browser/enterprise/connectors/device_trust/signals/decorators/common/metrics_utils.h" #include "components/device_signals/core/common/signals_constants.h"
diff --git a/chrome/browser/enterprise/connectors/device_trust/signals/decorators/common/common_signals_decorator_unittest.cc b/chrome/browser/enterprise/connectors/device_trust/signals/decorators/common/common_signals_decorator_unittest.cc index 87c4c6b..4526faa6 100644 --- a/chrome/browser/enterprise/connectors/device_trust/signals/decorators/common/common_signals_decorator_unittest.cc +++ b/chrome/browser/enterprise/connectors/device_trust/signals/decorators/common/common_signals_decorator_unittest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/enterprise/connectors/device_trust/signals/decorators/common/common_signals_decorator.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/run_loop.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/task_environment.h"
diff --git a/chrome/browser/enterprise/connectors/device_trust/signals/decorators/common/context_signals_decorator.cc b/chrome/browser/enterprise/connectors/device_trust/signals/decorators/common/context_signals_decorator.cc index 8846e5b..d5b2595 100644 --- a/chrome/browser/enterprise/connectors/device_trust/signals/decorators/common/context_signals_decorator.cc +++ b/chrome/browser/enterprise/connectors/device_trust/signals/decorators/common/context_signals_decorator.cc
@@ -4,9 +4,9 @@ #include "chrome/browser/enterprise/connectors/device_trust/signals/decorators/common/context_signals_decorator.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/check.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/notreached.h" #include "chrome/browser/enterprise/connectors/device_trust/signals/decorators/common/metrics_utils.h" #include "chrome/browser/enterprise/connectors/device_trust/signals/decorators/common/signals_utils.h"
diff --git a/chrome/browser/enterprise/connectors/device_trust/signals/decorators/common/signals_decorator.h b/chrome/browser/enterprise/connectors/device_trust/signals/decorators/common/signals_decorator.h index b9cc6616..a2028de 100644 --- a/chrome/browser/enterprise/connectors/device_trust/signals/decorators/common/signals_decorator.h +++ b/chrome/browser/enterprise/connectors/device_trust/signals/decorators/common/signals_decorator.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_ENTERPRISE_CONNECTORS_DEVICE_TRUST_SIGNALS_DECORATORS_COMMON_SIGNALS_DECORATOR_H_ #define CHROME_BROWSER_ENTERPRISE_CONNECTORS_DEVICE_TRUST_SIGNALS_DECORATORS_COMMON_SIGNALS_DECORATOR_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/values.h" namespace enterprise_connectors {
diff --git a/chrome/browser/enterprise/connectors/device_trust/signals/signals_service.h b/chrome/browser/enterprise/connectors/device_trust/signals/signals_service.h index 8d8815d..df49868 100644 --- a/chrome/browser/enterprise/connectors/device_trust/signals/signals_service.h +++ b/chrome/browser/enterprise/connectors/device_trust/signals/signals_service.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_ENTERPRISE_CONNECTORS_DEVICE_TRUST_SIGNALS_SIGNALS_SERVICE_H_ #define CHROME_BROWSER_ENTERPRISE_CONNECTORS_DEVICE_TRUST_SIGNALS_SIGNALS_SERVICE_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/values.h" namespace enterprise_connectors {
diff --git a/chrome/browser/enterprise/connectors/device_trust/signals/signals_service_impl.cc b/chrome/browser/enterprise/connectors/device_trust/signals/signals_service_impl.cc index 832988ea..79749aa 100644 --- a/chrome/browser/enterprise/connectors/device_trust/signals/signals_service_impl.cc +++ b/chrome/browser/enterprise/connectors/device_trust/signals/signals_service_impl.cc
@@ -8,8 +8,8 @@ #include <utility> #include "base/barrier_closure.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/values.h" #include "chrome/browser/enterprise/connectors/device_trust/signals/decorators/common/metrics_utils.h" #include "chrome/browser/enterprise/connectors/device_trust/signals/decorators/common/signals_decorator.h"
diff --git a/chrome/browser/enterprise/connectors/device_trust/signals/signals_service_impl_unittest.cc b/chrome/browser/enterprise/connectors/device_trust/signals/signals_service_impl_unittest.cc index e6a19ed..8fe994c 100644 --- a/chrome/browser/enterprise/connectors/device_trust/signals/signals_service_impl_unittest.cc +++ b/chrome/browser/enterprise/connectors/device_trust/signals/signals_service_impl_unittest.cc
@@ -9,7 +9,7 @@ #include <utility> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/values.h"
diff --git a/chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc b/chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc index 24f89f3..13838b56 100644 --- a/chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc +++ b/chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc
@@ -7,8 +7,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/strings/stringprintf.h" #include "base/time/time.h" #include "build/build_config.h"
diff --git a/chrome/browser/enterprise/idle/action.cc b/chrome/browser/enterprise/idle/action.cc index 4f2fff9..e35150f 100644 --- a/chrome/browser/enterprise/idle/action.cc +++ b/chrome/browser/enterprise/idle/action.cc
@@ -7,11 +7,11 @@ #include <cstring> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/callback_list.h" #include "base/check_is_test.h" #include "base/containers/flat_map.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/ranges/algorithm.h" #include "base/threading/thread_task_runner_handle.h" #include "chrome/browser/browsing_data/chrome_browsing_data_remover_constants.h"
diff --git a/chrome/browser/enterprise/idle/action.h b/chrome/browser/enterprise/idle/action.h index 4699b80..c58a8cd1 100644 --- a/chrome/browser/enterprise/idle/action.h +++ b/chrome/browser/enterprise/idle/action.h
@@ -8,9 +8,9 @@ #include <queue> #include <vector> -#include "base/callback.h" #include "base/containers/flat_set.h" #include "base/containers/span.h" +#include "base/functional/callback.h" #include "base/no_destructor.h" #include "content/public/browser/browsing_data_remover.h"
diff --git a/chrome/browser/enterprise/idle/action_runner.cc b/chrome/browser/enterprise/idle/action_runner.cc index e5c2da2..cb5082b 100644 --- a/chrome/browser/enterprise/idle/action_runner.cc +++ b/chrome/browser/enterprise/idle/action_runner.cc
@@ -6,7 +6,7 @@ #include <iterator> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/ranges/algorithm.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/pref_names.h"
diff --git a/chrome/browser/enterprise/idle/browser_closer_unittest.cc b/chrome/browser/enterprise/idle/browser_closer_unittest.cc index c2ed121..c36c01ef 100644 --- a/chrome/browser/enterprise/idle/browser_closer_unittest.cc +++ b/chrome/browser/enterprise/idle/browser_closer_unittest.cc
@@ -8,8 +8,8 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/run_loop.h" #include "base/test/gmock_callback_support.h" #include "base/test/mock_callback.h"
diff --git a/chrome/browser/enterprise/idle/idle_service.cc b/chrome/browser/enterprise/idle/idle_service.cc index 8d112b08..ad5e48a 100644 --- a/chrome/browser/enterprise/idle/idle_service.cc +++ b/chrome/browser/enterprise/idle/idle_service.cc
@@ -6,8 +6,8 @@ #include <algorithm> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/pref_names.h" #include "components/prefs/pref_service.h"
diff --git a/chrome/browser/enterprise/platform_auth/cloud_ap_provider_win.cc b/chrome/browser/enterprise/platform_auth/cloud_ap_provider_win.cc index d9fd18d..47ec00c 100644 --- a/chrome/browser/enterprise/platform_auth/cloud_ap_provider_win.cc +++ b/chrome/browser/enterprise/platform_auth/cloud_ap_provider_win.cc
@@ -16,11 +16,11 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/callback_list.h" #include "base/check.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/logging.h" #include "base/memory/ref_counted.h"
diff --git a/chrome/browser/enterprise/platform_auth/platform_auth_policy_observer.cc b/chrome/browser/enterprise/platform_auth/platform_auth_policy_observer.cc index 6efb4672..ee895ad 100644 --- a/chrome/browser/enterprise/platform_auth/platform_auth_policy_observer.cc +++ b/chrome/browser/enterprise/platform_auth/platform_auth_policy_observer.cc
@@ -6,9 +6,9 @@ #include <stdint.h> -#include "base/bind.h" -#include "base/callback.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "chrome/browser/enterprise/platform_auth/platform_auth_features.h" #include "chrome/browser/enterprise/platform_auth/platform_auth_provider_manager.h" #include "chrome/common/pref_names.h"
diff --git a/chrome/browser/enterprise/platform_auth/platform_auth_provider.h b/chrome/browser/enterprise/platform_auth/platform_auth_provider.h index ff361ac..02ec5bc7 100644 --- a/chrome/browser/enterprise/platform_auth/platform_auth_provider.h +++ b/chrome/browser/enterprise/platform_auth/platform_auth_provider.h
@@ -8,7 +8,7 @@ #include <memory> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/enterprise/platform_auth/platform_auth_provider_manager.h" #include "url/origin.h"
diff --git a/chrome/browser/enterprise/platform_auth/platform_auth_provider_manager.cc b/chrome/browser/enterprise/platform_auth/platform_auth_provider_manager.cc index da1386d..fc160b6 100644 --- a/chrome/browser/enterprise/platform_auth/platform_auth_provider_manager.cc +++ b/chrome/browser/enterprise/platform_auth/platform_auth_provider_manager.cc
@@ -10,10 +10,10 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/check.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_refptr.h"
diff --git a/chrome/browser/enterprise/platform_auth/platform_auth_provider_manager.h b/chrome/browser/enterprise/platform_auth/platform_auth_provider_manager.h index bbd266c..257404b 100644 --- a/chrome/browser/enterprise/platform_auth/platform_auth_provider_manager.h +++ b/chrome/browser/enterprise/platform_auth/platform_auth_provider_manager.h
@@ -12,8 +12,8 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/containers/flat_set.h" +#include "base/functional/callback.h" #include "base/gtest_prod_util.h" #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h"
diff --git a/chrome/browser/enterprise/remote_commands/clear_browsing_data_job.cc b/chrome/browser/enterprise/remote_commands/clear_browsing_data_job.cc index b9bd30d3..0c143f5 100644 --- a/chrome/browser/enterprise/remote_commands/clear_browsing_data_job.cc +++ b/chrome/browser/enterprise/remote_commands/clear_browsing_data_job.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/enterprise/remote_commands/clear_browsing_data_job.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/enterprise/remote_commands/rotate_attestation_credential_job.cc b/chrome/browser/enterprise/remote_commands/rotate_attestation_credential_job.cc index 02963ca7..1545fa43 100644 --- a/chrome/browser/enterprise/remote_commands/rotate_attestation_credential_job.cc +++ b/chrome/browser/enterprise/remote_commands/rotate_attestation_credential_job.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/enterprise/remote_commands/rotate_attestation_credential_job.h" -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/enterprise/remote_commands/rotate_attestation_credential_job_unittest.cc b/chrome/browser/enterprise/remote_commands/rotate_attestation_credential_job_unittest.cc index b97aeaa3a..41bc69b 100644 --- a/chrome/browser/enterprise/remote_commands/rotate_attestation_credential_job_unittest.cc +++ b/chrome/browser/enterprise/remote_commands/rotate_attestation_credential_job_unittest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/enterprise/remote_commands/rotate_attestation_credential_job.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/json/json_writer.h" #include "base/run_loop.h" #include "base/test/bind.h"
diff --git a/chrome/browser/enterprise/reporting/browser_report_generator_android.h b/chrome/browser/enterprise/reporting/browser_report_generator_android.h index 549574b..91c2dfe6 100644 --- a/chrome/browser/enterprise/reporting/browser_report_generator_android.h +++ b/chrome/browser/enterprise/reporting/browser_report_generator_android.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "components/enterprise/browser/reporting/browser_report_generator.h" namespace enterprise_management {
diff --git a/chrome/browser/enterprise/reporting/browser_report_generator_desktop.h b/chrome/browser/enterprise/reporting/browser_report_generator_desktop.h index 1d04688..d5032a4 100644 --- a/chrome/browser/enterprise/reporting/browser_report_generator_desktop.h +++ b/chrome/browser/enterprise/reporting/browser_report_generator_desktop.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "components/enterprise/browser/reporting/browser_report_generator.h" #include "components/version_info/channel.h"
diff --git a/chrome/browser/enterprise/reporting/extension_request/extension_request_observer_factory_unittest.cc b/chrome/browser/enterprise/reporting/extension_request/extension_request_observer_factory_unittest.cc index d1cc73ed..cf36be56 100644 --- a/chrome/browser/enterprise/reporting/extension_request/extension_request_observer_factory_unittest.cc +++ b/chrome/browser/enterprise/reporting/extension_request/extension_request_observer_factory_unittest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/enterprise/reporting/extension_request/extension_request_observer_factory.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "chrome/browser/enterprise/reporting/extension_request/extension_request_observer.h" #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_profile_manager.h"
diff --git a/chrome/browser/enterprise/reporting/report_scheduler_desktop.cc b/chrome/browser/enterprise/reporting/report_scheduler_desktop.cc index 581fbb4..3fedb5b 100644 --- a/chrome/browser/enterprise/reporting/report_scheduler_desktop.cc +++ b/chrome/browser/enterprise/reporting/report_scheduler_desktop.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/enterprise/reporting/report_scheduler_desktop.h" -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/metrics/field_trial_params.h" #include "base/notreached.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/enterprise/reporting/report_scheduler_unittest.cc b/chrome/browser/enterprise/reporting/report_scheduler_unittest.cc index a17f15ed..1280231 100644 --- a/chrome/browser/enterprise/reporting/report_scheduler_unittest.cc +++ b/chrome/browser/enterprise/reporting/report_scheduler_unittest.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/test/gmock_callback_support.h" #include "base/test/metrics/histogram_tester.h"
diff --git a/chrome/browser/enterprise/signals/context_info_fetcher.h b/chrome/browser/enterprise/signals/context_info_fetcher.h index 2832c57e..1346a3e 100644 --- a/chrome/browser/enterprise/signals/context_info_fetcher.h +++ b/chrome/browser/enterprise/signals/context_info_fetcher.h
@@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "build/build_config.h" #include "chrome/browser/enterprise/signals/signals_common.h"
diff --git a/chrome/browser/enterprise/util/android_enterprise_info.h b/chrome/browser/enterprise/util/android_enterprise_info.h index ed41890e..b08a9da 100644 --- a/chrome/browser/enterprise/util/android_enterprise_info.h +++ b/chrome/browser/enterprise/util/android_enterprise_info.h
@@ -7,7 +7,7 @@ #include <queue> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/no_destructor.h" #include "base/sequence_checker.h" #include "build/build_config.h"
diff --git a/chrome/browser/enterprise/util/android_enterprise_info_unittest.cc b/chrome/browser/enterprise/util/android_enterprise_info_unittest.cc index f60f1ce..f1ee991 100644 --- a/chrome/browser/enterprise/util/android_enterprise_info_unittest.cc +++ b/chrome/browser/enterprise/util/android_enterprise_info_unittest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/enterprise/util/android_enterprise_info.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/test/bind.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/error_reporting/chrome_js_error_report_processor.cc b/chrome/browser/error_reporting/chrome_js_error_report_processor.cc index ff154804..f8f2f25e 100644 --- a/chrome/browser/error_reporting/chrome_js_error_report_processor.cc +++ b/chrome/browser/error_reporting/chrome_js_error_report_processor.cc
@@ -7,8 +7,8 @@ #include <tuple> #include <utility> -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/memory/scoped_refptr.h" #include "base/strings/escape.h"
diff --git a/chrome/browser/error_reporting/chrome_js_error_report_processor.h b/chrome/browser/error_reporting/chrome_js_error_report_processor.h index 0985a34..5af9795b 100644 --- a/chrome/browser/error_reporting/chrome_js_error_report_processor.h +++ b/chrome/browser/error_reporting/chrome_js_error_report_processor.h
@@ -12,9 +12,9 @@ #include <string> #include <vector> -#include "base/callback_forward.h" -#include "base/callback_helpers.h" #include "base/containers/flat_map.h" +#include "base/functional/callback_forward.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/time/clock.h" #include "base/time/time.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 016c4ad..4e518eab8 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
@@ -8,10 +8,10 @@ #include <algorithm> -#include "base/callback_helpers.h" #include "base/files/file.h" #include "base/files/file_util.h" #include "base/files/scoped_file.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/posix/eintr_wrapper.h" #include "base/process/launch.h"
diff --git a/chrome/browser/error_reporting/chrome_js_error_report_processor_nonchromeos.cc b/chrome/browser/error_reporting/chrome_js_error_report_processor_nonchromeos.cc index 31415628..28ec2cda 100644 --- a/chrome/browser/error_reporting/chrome_js_error_report_processor_nonchromeos.cc +++ b/chrome/browser/error_reporting/chrome_js_error_report_processor_nonchromeos.cc
@@ -6,9 +6,9 @@ #include <utility> -#include "base/callback_helpers.h" #include "base/files/file.h" #include "base/files/file_path.h" +#include "base/functional/callback_helpers.h" #include "base/path_service.h" #include "base/strings/escape.h" #include "base/strings/strcat.h"
diff --git a/chrome/browser/error_reporting/chrome_js_error_report_processor_unittest.cc b/chrome/browser/error_reporting/chrome_js_error_report_processor_unittest.cc index 47c9139..6f9ec9e 100644 --- a/chrome/browser/error_reporting/chrome_js_error_report_processor_unittest.cc +++ b/chrome/browser/error_reporting/chrome_js_error_report_processor_unittest.cc
@@ -7,8 +7,8 @@ #include <memory> #include <utility> -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/strings/strcat.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/error_reporting/mock_chromeos_crash_reporter.cc b/chrome/browser/error_reporting/mock_chromeos_crash_reporter.cc index 4e79de6..bad458e 100644 --- a/chrome/browser/error_reporting/mock_chromeos_crash_reporter.cc +++ b/chrome/browser/error_reporting/mock_chromeos_crash_reporter.cc
@@ -18,11 +18,11 @@ #include <string> #include "base/at_exit.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" #include "base/files/file_util.h" #include "base/files/scoped_file.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/run_loop.h" #include "base/strings/escape.h"
diff --git a/chrome/browser/extensions/active_tab_apitest.cc b/chrome/browser/extensions/active_tab_apitest.cc index 096b6fb..d1e1a20 100644 --- a/chrome/browser/extensions/active_tab_apitest.cc +++ b/chrome/browser/extensions/active_tab_apitest.cc
@@ -4,7 +4,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/extensions/active_tab_permission_granter.cc b/chrome/browser/extensions/active_tab_permission_granter.cc index 0f59ea9..d82d29c 100644 --- a/chrome/browser/extensions/active_tab_permission_granter.cc +++ b/chrome/browser/extensions/active_tab_permission_granter.cc
@@ -7,10 +7,10 @@ #include <set> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/contains.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "chrome/browser/extensions/extension_action_runner.h" #include "chrome/browser/extensions/extension_util.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/extensions/activity_log/activity_database.cc b/chrome/browser/extensions/activity_log/activity_database.cc index 073ef034..f529fd8 100644 --- a/chrome/browser/extensions/activity_log/activity_database.cc +++ b/chrome/browser/extensions/activity_log/activity_database.cc
@@ -6,8 +6,8 @@ #include <string> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/extensions/activity_log/activity_log.cc b/chrome/browser/extensions/activity_log/activity_log.cc index 4532fa8..eee7ba2 100644 --- a/chrome/browser/extensions/activity_log/activity_log.cc +++ b/chrome/browser/extensions/activity_log/activity_log.cc
@@ -11,8 +11,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/json/json_string_value_serializer.h" #include "base/logging.h" #include "base/memory/scoped_refptr.h"
diff --git a/chrome/browser/extensions/activity_log/activity_log.h b/chrome/browser/extensions/activity_log/activity_log.h index 84a12e2..100fcf1 100644 --- a/chrome/browser/extensions/activity_log/activity_log.h +++ b/chrome/browser/extensions/activity_log/activity_log.h
@@ -11,7 +11,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" #include "base/observer_list_threadsafe.h"
diff --git a/chrome/browser/extensions/activity_log/activity_log_policy.h b/chrome/browser/extensions/activity_log/activity_log_policy.h index e48846c..6a7671a 100644 --- a/chrome/browser/extensions/activity_log/activity_log_policy.h +++ b/chrome/browser/extensions/activity_log/activity_log_policy.h
@@ -13,9 +13,9 @@ #include <string> #include <vector> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/values.h" #include "chrome/browser/extensions/activity_log/activity_actions.h"
diff --git a/chrome/browser/extensions/activity_log/activity_log_unittest.cc b/chrome/browser/extensions/activity_log/activity_log_unittest.cc index 55e7999..6369464 100644 --- a/chrome/browser/extensions/activity_log/activity_log_unittest.cc +++ b/chrome/browser/extensions/activity_log/activity_log_unittest.cc
@@ -8,8 +8,8 @@ #include <memory> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/synchronization/waitable_event.h"
diff --git a/chrome/browser/extensions/activity_log/counting_policy.cc b/chrome/browser/extensions/activity_log/counting_policy.cc index ee48339..754e001c 100644 --- a/chrome/browser/extensions/activity_log/counting_policy.cc +++ b/chrome/browser/extensions/activity_log/counting_policy.cc
@@ -36,9 +36,9 @@ #include <string> #include <vector> -#include "base/bind.h" -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/json/json_reader.h" #include "base/json/json_string_value_serializer.h" #include "base/memory/ptr_util.h"
diff --git a/chrome/browser/extensions/activity_log/counting_policy_unittest.cc b/chrome/browser/extensions/activity_log/counting_policy_unittest.cc index 224bd11..b97c4ee 100644 --- a/chrome/browser/extensions/activity_log/counting_policy_unittest.cc +++ b/chrome/browser/extensions/activity_log/counting_policy_unittest.cc
@@ -10,10 +10,10 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/cancelable_callback.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h"
diff --git a/chrome/browser/extensions/activity_log/fullstream_ui_policy.cc b/chrome/browser/extensions/activity_log/fullstream_ui_policy.cc index d398226..9af8fd3 100644 --- a/chrome/browser/extensions/activity_log/fullstream_ui_policy.cc +++ b/chrome/browser/extensions/activity_log/fullstream_ui_policy.cc
@@ -8,10 +8,10 @@ #include <string> -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/json/json_reader.h" #include "base/json/json_string_value_serializer.h" #include "base/logging.h"
diff --git a/chrome/browser/extensions/activity_log/fullstream_ui_policy_unittest.cc b/chrome/browser/extensions/activity_log/fullstream_ui_policy_unittest.cc index 0a5c249c..ada6f12 100644 --- a/chrome/browser/extensions/activity_log/fullstream_ui_policy_unittest.cc +++ b/chrome/browser/extensions/activity_log/fullstream_ui_policy_unittest.cc
@@ -9,10 +9,10 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/cancelable_callback.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h"
diff --git a/chrome/browser/extensions/alert_apitest.cc b/chrome/browser/extensions/alert_apitest.cc index db7d459..e780091 100644 --- a/chrome/browser/extensions/alert_apitest.cc +++ b/chrome/browser/extensions/alert_apitest.cc
@@ -4,8 +4,8 @@ #include <stddef.h> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/extensions/extension_apitest.h"
diff --git a/chrome/browser/extensions/api/activity_log_private/activity_log_private_api.cc b/chrome/browser/extensions/api/activity_log_private/activity_log_private_api.cc index 95d4172..003beb1 100644 --- a/chrome/browser/extensions/api/activity_log_private/activity_log_private_api.cc +++ b/chrome/browser/extensions/api/activity_log_private/activity_log_private_api.cc
@@ -10,7 +10,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/lazy_instance.h" #include "base/strings/string_number_conversions.h" #include "base/values.h"
diff --git a/chrome/browser/extensions/api/activity_log_private/activity_log_private_apitest.cc b/chrome/browser/extensions/api/activity_log_private/activity_log_private_apitest.cc index a9540f6..87fa8f3 100644 --- a/chrome/browser/extensions/api/activity_log_private/activity_log_private_apitest.cc +++ b/chrome/browser/extensions/api/activity_log_private/activity_log_private_apitest.cc
@@ -5,8 +5,8 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "build/build_config.h" #include "chrome/browser/extensions/activity_log/activity_log.h" #include "chrome/browser/extensions/extension_apitest.h"
diff --git a/chrome/browser/extensions/api/autofill_private/autofill_private_event_router.cc b/chrome/browser/extensions/api/autofill_private/autofill_private_event_router.cc index b293d90..00cd04e 100644 --- a/chrome/browser/extensions/api/autofill_private/autofill_private_event_router.cc +++ b/chrome/browser/extensions/api/autofill_private/autofill_private_event_router.cc
@@ -8,8 +8,8 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/autofill/personal_data_manager_factory.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc b/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc index 97377933..d89bcd0 100644 --- a/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc +++ b/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc
@@ -11,8 +11,8 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/i18n/file_util_icu.h" #include "base/i18n/time_formatting.h" #include "base/lazy_instance.h"
diff --git a/chrome/browser/extensions/api/braille_display_private/braille_controller_brlapi.cc b/chrome/browser/extensions/api/braille_display_private/braille_controller_brlapi.cc index 93c3ec5..6b459d95 100644 --- a/chrome/browser/extensions/api/braille_display_private/braille_controller_brlapi.cc +++ b/chrome/browser/extensions/api/braille_display_private/braille_controller_brlapi.cc
@@ -14,8 +14,8 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/task/thread_pool.h" #include "base/threading/scoped_blocking_call.h"
diff --git a/chrome/browser/extensions/api/braille_display_private/braille_controller_brlapi.h b/chrome/browser/extensions/api/braille_display_private/braille_controller_brlapi.h index ce97358..5d42e40 100644 --- a/chrome/browser/extensions/api/braille_display_private/braille_controller_brlapi.h +++ b/chrome/browser/extensions/api/braille_display_private/braille_controller_brlapi.h
@@ -8,9 +8,9 @@ #include <memory> #include <vector> -#include "base/callback_forward.h" #include "base/files/file_path.h" #include "base/files/file_path_watcher.h" +#include "base/functional/callback_forward.h" #include "base/memory/singleton.h" #include "base/observer_list.h" #include "base/time/time.h"
diff --git a/chrome/browser/extensions/api/braille_display_private/braille_display_private_apitest.cc b/chrome/browser/extensions/api/braille_display_private/braille_display_private_apitest.cc index bbf945b..d5fde0bf 100644 --- a/chrome/browser/extensions/api/braille_display_private/braille_display_private_apitest.cc +++ b/chrome/browser/extensions/api/braille_display_private/braille_display_private_apitest.cc
@@ -4,8 +4,8 @@ #include <stddef.h> -#include "base/bind.h" #include "base/containers/circular_deque.h" +#include "base/functional/bind.h" #include "base/threading/thread_restrictions.h" #include "chrome/browser/ash/accessibility/accessibility_manager.h" #include "chrome/browser/ash/login/lock/screen_locker.h"
diff --git a/chrome/browser/extensions/api/braille_display_private/brlapi_connection.h b/chrome/browser/extensions/api/braille_display_private/brlapi_connection.h index bf3bd431..a69e1af 100644 --- a/chrome/browser/extensions/api/braille_display_private/brlapi_connection.h +++ b/chrome/browser/extensions/api/braille_display_private/brlapi_connection.h
@@ -10,7 +10,7 @@ #include <memory> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "library_loaders/libbrlapi.h" namespace extensions {
diff --git a/chrome/browser/extensions/api/browsing_data/browsing_data_api.cc b/chrome/browser/extensions/api/browsing_data/browsing_data_api.cc index 9faa55a..f7ed6a2 100644 --- a/chrome/browser/extensions/api/browsing_data/browsing_data_api.cc +++ b/chrome/browser/extensions/api/browsing_data/browsing_data_api.cc
@@ -11,7 +11,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/stringprintf.h" #include "base/task/thread_pool.h" #include "chrome/browser/browsing_data/chrome_browsing_data_remover_constants.h"
diff --git a/chrome/browser/extensions/api/browsing_data/browsing_data_test.cc b/chrome/browser/extensions/api/browsing_data/browsing_data_test.cc index be4b623..012c47a 100644 --- a/chrome/browser/extensions/api/browsing_data/browsing_data_test.cc +++ b/chrome/browser/extensions/api/browsing_data/browsing_data_test.cc
@@ -5,7 +5,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "base/test/bind.h" #include "base/values.h"
diff --git a/chrome/browser/extensions/api/browsing_data/browsing_data_unittest.cc b/chrome/browser/extensions/api/browsing_data/browsing_data_unittest.cc index ad2994c..6d9e0cb 100644 --- a/chrome/browser/extensions/api/browsing_data/browsing_data_unittest.cc +++ b/chrome/browser/extensions/api/browsing_data/browsing_data_unittest.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 "base/callback.h" +#include "base/functional/callback.h" #include "base/json/json_string_value_serializer.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h"
diff --git a/chrome/browser/extensions/api/certificate_provider/certificate_provider_api.cc b/chrome/browser/extensions/api/certificate_provider/certificate_provider_api.cc index 1b440ab7..61259d8 100644 --- a/chrome/browser/extensions/api/certificate_provider/certificate_provider_api.cc +++ b/chrome/browser/extensions/api/certificate_provider/certificate_provider_api.cc
@@ -11,7 +11,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/values.h" #include "chrome/browser/certificate_provider/certificate_provider_service.h"
diff --git a/chrome/browser/extensions/api/certificate_provider/certificate_provider_apitest.cc b/chrome/browser/extensions/api/certificate_provider/certificate_provider_apitest.cc index b9e30742..29709a1 100644 --- a/chrome/browser/extensions/api/certificate_provider/certificate_provider_apitest.cc +++ b/chrome/browser/extensions/api/certificate_provider/certificate_provider_apitest.cc
@@ -10,13 +10,13 @@ #include <string> #include <vector> -#include "base/bind.h" -#include "base/callback.h" #include "base/check.h" #include "base/check_op.h" #include "base/containers/span.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/hash/sha1.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h"
diff --git a/chrome/browser/extensions/api/chrome_extensions_api_client.cc b/chrome/browser/extensions/api/chrome_extensions_api_client.cc index 2b64f15..e49e111d 100644 --- a/chrome/browser/extensions/api/chrome_extensions_api_client.cc +++ b/chrome/browser/extensions/api/chrome_extensions_api_client.cc
@@ -7,8 +7,8 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/memory/scoped_refptr.h" #include "base/strings/string_util.h" #include "build/build_config.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 adae9ed..edbf123 100644 --- a/chrome/browser/extensions/api/content_settings/content_settings_api.cc +++ b/chrome/browser/extensions/api/content_settings/content_settings_api.cc
@@ -9,8 +9,8 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "base/strings/stringprintf.h" #include "base/values.h"
diff --git a/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc b/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc index fc8b376..2c3e579 100644 --- a/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc +++ b/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc
@@ -4,8 +4,8 @@ #include <memory> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/extensions/api/context_menus/extension_context_menu_browsertest.cc b/chrome/browser/extensions/api/context_menus/extension_context_menu_browsertest.cc index e0983f3e..14a3e24 100644 --- a/chrome/browser/extensions/api/context_menus/extension_context_menu_browsertest.cc +++ b/chrome/browser/extensions/api/context_menus/extension_context_menu_browsertest.cc
@@ -7,7 +7,7 @@ #include <memory> #include <set> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/scoped_observation.h"
diff --git a/chrome/browser/extensions/api/cookies/cookies_api.cc b/chrome/browser/extensions/api/cookies/cookies_api.cc index f174c08..9521c1e2 100644 --- a/chrome/browser/extensions/api/cookies/cookies_api.cc +++ b/chrome/browser/extensions/api/cookies/cookies_api.cc
@@ -10,8 +10,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/json/json_writer.h" #include "base/lazy_instance.h" #include "base/time/time.h"
diff --git a/chrome/browser/extensions/api/dashboard_private/dashboard_private_api.cc b/chrome/browser/extensions/api/dashboard_private/dashboard_private_api.cc index 2240590..cd283ae9 100644 --- a/chrome/browser/extensions/api/dashboard_private/dashboard_private_api.cc +++ b/chrome/browser/extensions/api/dashboard_private/dashboard_private_api.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/scoped_refptr.h" #include "base/threading/thread_task_runner_handle.h" #include "base/values.h"
diff --git a/chrome/browser/extensions/api/debugger/debugger_api.cc b/chrome/browser/extensions/api/debugger/debugger_api.cc index 88020e4..992fd41 100644 --- a/chrome/browser/extensions/api/debugger/debugger_api.cc +++ b/chrome/browser/extensions/api/debugger/debugger_api.cc
@@ -13,8 +13,8 @@ #include <set> #include <utility> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/lazy_instance.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 35700ff3..dd4468b5 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
@@ -8,8 +8,8 @@ #include <string> #include <utility> -#include "base/callback.h" #include "base/callback_list.h" +#include "base/functional/callback.h" #include "base/lazy_instance.h" #include "base/memory/ptr_util.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/extensions/api/debugger/extension_dev_tools_infobar_delegate.h b/chrome/browser/extensions/api/debugger/extension_dev_tools_infobar_delegate.h index 8fa2dfa..c00912f79 100644 --- a/chrome/browser/extensions/api/debugger/extension_dev_tools_infobar_delegate.h +++ b/chrome/browser/extensions/api/debugger/extension_dev_tools_infobar_delegate.h
@@ -8,8 +8,8 @@ #include <memory> #include <string> -#include "base/callback_forward.h" #include "base/callback_list.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/timer/timer.h" #include "components/infobars/core/confirm_infobar_delegate.h"
diff --git a/chrome/browser/extensions/api/declarative/declarative_apitest.cc b/chrome/browser/extensions/api/declarative/declarative_apitest.cc index cd2bf62..d54e56a 100644 --- a/chrome/browser/extensions/api/declarative/declarative_apitest.cc +++ b/chrome/browser/extensions/api/declarative/declarative_apitest.cc
@@ -5,9 +5,9 @@ #include <stddef.h> #include <memory> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h"
diff --git a/chrome/browser/extensions/api/declarative/rules_registry_service_unittest.cc b/chrome/browser/extensions/api/declarative/rules_registry_service_unittest.cc index 3d3c95ff..22344a23 100644 --- a/chrome/browser/extensions/api/declarative/rules_registry_service_unittest.cc +++ b/chrome/browser/extensions/api/declarative/rules_registry_service_unittest.cc
@@ -9,7 +9,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h" #include "chrome/test/base/testing_profile.h"
diff --git a/chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry.cc b/chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry.cc index 07ad6fe..d3ef9c653 100644 --- a/chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry.cc +++ b/chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry.h" -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/extension_util.h"
diff --git a/chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry.h b/chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry.h index 98ccd1b..c2359b0e 100644 --- a/chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry.h +++ b/chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry.h
@@ -14,7 +14,7 @@ #include <utility> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/extensions/api/declarative_content/content_action.h" #include "chrome/browser/extensions/api/declarative_content/content_condition.h"
diff --git a/chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry_unittest.cc b/chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry_unittest.cc index 778b3b4b..4b44da56 100644 --- a/chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry_unittest.cc +++ b/chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry_unittest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/test/values_test_util.h" #include "chrome/browser/extensions/api/declarative_content/content_predicate.h"
diff --git a/chrome/browser/extensions/api/declarative_content/content_condition.cc b/chrome/browser/extensions/api/declarative_content/content_condition.cc index 5605e3a..67e05a4 100644 --- a/chrome/browser/extensions/api/declarative_content/content_condition.cc +++ b/chrome/browser/extensions/api/declarative_content/content_condition.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/stringprintf.h" #include "base/values.h" #include "extensions/common/api/declarative/declarative_constants.h"
diff --git a/chrome/browser/extensions/api/declarative_content/content_condition_unittest.cc b/chrome/browser/extensions/api/declarative_content/content_condition_unittest.cc index 8033192..a314f5d 100644 --- a/chrome/browser/extensions/api/declarative_content/content_condition_unittest.cc +++ b/chrome/browser/extensions/api/declarative_content/content_condition_unittest.cc
@@ -6,7 +6,7 @@ #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/test/values_test_util.h" #include "base/values.h" #include "testing/gmock/include/gmock/gmock.h"
diff --git a/chrome/browser/extensions/api/declarative_content/declarative_content_apitest.cc b/chrome/browser/extensions/api/declarative_content/declarative_content_apitest.cc index 419c0f8..54ad4ff 100644 --- a/chrome/browser/extensions/api/declarative_content/declarative_content_apitest.cc +++ b/chrome/browser/extensions/api/declarative_content/declarative_content_apitest.cc
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h"
diff --git a/chrome/browser/extensions/api/declarative_content/declarative_content_css_condition_tracker.cc b/chrome/browser/extensions/api/declarative_content/declarative_content_css_condition_tracker.cc index d0d985e2..14af307 100644 --- a/chrome/browser/extensions/api/declarative_content/declarative_content_css_condition_tracker.cc +++ b/chrome/browser/extensions/api/declarative_content/declarative_content_css_condition_tracker.cc
@@ -6,8 +6,8 @@ #include <stddef.h> -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/strings/stringprintf.h" #include "base/values.h"
diff --git a/chrome/browser/extensions/api/declarative_content/declarative_content_css_condition_tracker.h b/chrome/browser/extensions/api/declarative_content/declarative_content_css_condition_tracker.h index 3eee86de..2c8faf6e 100644 --- a/chrome/browser/extensions/api/declarative_content/declarative_content_css_condition_tracker.h +++ b/chrome/browser/extensions/api/declarative_content/declarative_content_css_condition_tracker.h
@@ -12,7 +12,7 @@ #include <unordered_set> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/extensions/api/declarative_content/content_predicate_evaluator.h" #include "content/public/browser/notification_observer.h"
diff --git a/chrome/browser/extensions/api/declarative_content/declarative_content_is_bookmarked_condition_tracker.cc b/chrome/browser/extensions/api/declarative_content/declarative_content_is_bookmarked_condition_tracker.cc index 8a9ca7b8..7f93bd72d 100644 --- a/chrome/browser/extensions/api/declarative_content/declarative_content_is_bookmarked_condition_tracker.cc +++ b/chrome/browser/extensions/api/declarative_content/declarative_content_is_bookmarked_condition_tracker.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/extensions/api/declarative_content/declarative_content_is_bookmarked_condition_tracker.h" -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/strings/stringprintf.h" #include "base/values.h"
diff --git a/chrome/browser/extensions/api/declarative_content/declarative_content_is_bookmarked_condition_tracker.h b/chrome/browser/extensions/api/declarative_content/declarative_content_is_bookmarked_condition_tracker.h index afa02fd..4663f22 100644 --- a/chrome/browser/extensions/api/declarative_content/declarative_content_is_bookmarked_condition_tracker.h +++ b/chrome/browser/extensions/api/declarative_content/declarative_content_is_bookmarked_condition_tracker.h
@@ -8,7 +8,7 @@ #include <map> #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/scoped_observation.h"
diff --git a/chrome/browser/extensions/api/declarative_content/declarative_content_page_url_condition_tracker.cc b/chrome/browser/extensions/api/declarative_content/declarative_content_page_url_condition_tracker.cc index 41d61ad..086b68e 100644 --- a/chrome/browser/extensions/api/declarative_content/declarative_content_page_url_condition_tracker.cc +++ b/chrome/browser/extensions/api/declarative_content/declarative_content_page_url_condition_tracker.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/extensions/api/declarative_content/declarative_content_page_url_condition_tracker.h" -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/strings/stringprintf.h" #include "base/values.h"
diff --git a/chrome/browser/extensions/api/declarative_content/declarative_content_page_url_condition_tracker.h b/chrome/browser/extensions/api/declarative_content/declarative_content_page_url_condition_tracker.h index db24f83b..05de69ac 100644 --- a/chrome/browser/extensions/api/declarative_content/declarative_content_page_url_condition_tracker.h +++ b/chrome/browser/extensions/api/declarative_content/declarative_content_page_url_condition_tracker.h
@@ -9,7 +9,7 @@ #include <set> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/extensions/api/declarative_content/content_predicate_evaluator.h" #include "components/url_matcher/url_matcher.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 fe58d833..c6e83a82 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
@@ -11,10 +11,10 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/containers/contains.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/json/json_string_value_serializer.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h"
diff --git a/chrome/browser/extensions/api/desktop_capture/desktop_capture_base.cc b/chrome/browser/extensions/api/desktop_capture/desktop_capture_base.cc index a4ea310..1cb17c3 100644 --- a/chrome/browser/extensions/api/desktop_capture/desktop_capture_base.cc +++ b/chrome/browser/extensions/api/desktop_capture/desktop_capture_base.cc
@@ -8,10 +8,10 @@ #include <tuple> #include <utility> -#include "base/bind.h" #include "base/command_line.h" #include "base/containers/contains.h" #include "base/containers/cxx20_erase.h" +#include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h" #include "chrome/browser/extensions/extension_tab_util.h"
diff --git a/chrome/browser/extensions/api/developer_private/developer_private_api.cc b/chrome/browser/extensions/api/developer_private/developer_private_api.cc index 8894dfa..e19b467 100644 --- a/chrome/browser/extensions/api/developer_private/developer_private_api.cc +++ b/chrome/browser/extensions/api/developer_private/developer_private_api.cc
@@ -13,10 +13,10 @@ #include <vector> #include "base/barrier_closure.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/containers/contains.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/guid.h" #include "base/lazy_instance.h" #include "base/memory/scoped_refptr.h"
diff --git a/chrome/browser/extensions/api/developer_private/developer_private_api_unittest.cc b/chrome/browser/extensions/api/developer_private/developer_private_api_unittest.cc index e4b548f..52c6b3c 100644 --- a/chrome/browser/extensions/api/developer_private/developer_private_api_unittest.cc +++ b/chrome/browser/extensions/api/developer_private/developer_private_api_unittest.cc
@@ -7,8 +7,8 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/json/json_writer.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_refptr.h"
diff --git a/chrome/browser/extensions/api/developer_private/entry_picker.cc b/chrome/browser/extensions/api/developer_private/entry_picker.cc index b40fea5..915a8d9 100644 --- a/chrome/browser/extensions/api/developer_private/entry_picker.cc +++ b/chrome/browser/extensions/api/developer_private/entry_picker.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/extensions/api/developer_private/entry_picker.h" -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/strings/string_util.h" #include "chrome/browser/extensions/api/developer_private/developer_private_api.h" #include "chrome/browser/platform_util.h"
diff --git a/chrome/browser/extensions/api/developer_private/extension_info_generator.cc b/chrome/browser/extensions/api/developer_private/extension_info_generator.cc index a320a55a..6dc1751 100644 --- a/chrome/browser/extensions/api/developer_private/extension_info_generator.cc +++ b/chrome/browser/extensions/api/developer_private/extension_info_generator.cc
@@ -11,8 +11,8 @@ #include <vector> #include "base/base64.h" -#include "base/bind.h" #include "base/containers/cxx20_erase.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/strings/utf_string_conversions.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/extensions/api/developer_private/extension_info_generator.h b/chrome/browser/extensions/api/developer_private/extension_info_generator.h index a51446e..b431445 100644 --- a/chrome/browser/extensions/api/developer_private/extension_info_generator.h +++ b/chrome/browser/extensions/api/developer_private/extension_info_generator.h
@@ -9,7 +9,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/common/buildflags.h"
diff --git a/chrome/browser/extensions/api/developer_private/extension_info_generator_unittest.cc b/chrome/browser/extensions/api/developer_private/extension_info_generator_unittest.cc index f680979e..ee23e412 100644 --- a/chrome/browser/extensions/api/developer_private/extension_info_generator_unittest.cc +++ b/chrome/browser/extensions/api/developer_private/extension_info_generator_unittest.cc
@@ -8,9 +8,9 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/json/json_file_value_serializer.h" #include "base/json/json_writer.h" #include "base/run_loop.h"
diff --git a/chrome/browser/extensions/api/developer_private/show_permissions_dialog_helper.h b/chrome/browser/extensions/api/developer_private/show_permissions_dialog_helper.h index 88c3f0a..accea58 100644 --- a/chrome/browser/extensions/api/developer_private/show_permissions_dialog_helper.h +++ b/chrome/browser/extensions/api/developer_private/show_permissions_dialog_helper.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/extensions/extension_install_prompt.h"
diff --git a/chrome/browser/extensions/api/device_permissions_manager_unittest.cc b/chrome/browser/extensions/api/device_permissions_manager_unittest.cc index 39c7a2e..1a9316f 100644 --- a/chrome/browser/extensions/api/device_permissions_manager_unittest.cc +++ b/chrome/browser/extensions/api/device_permissions_manager_unittest.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/extensions/api/document_scan/document_scan_api.cc b/chrome/browser/extensions/api/document_scan/document_scan_api.cc index 11ca328..d66b339 100644 --- a/chrome/browser/extensions/api/document_scan/document_scan_api.cc +++ b/chrome/browser/extensions/api/document_scan/document_scan_api.cc
@@ -9,8 +9,8 @@ #include <vector> #include "base/base64.h" -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "chromeos/crosapi/mojom/document_scan.mojom.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/chrome/browser/extensions/api/document_scan/document_scan_api_unittest.cc b/chrome/browser/extensions/api/document_scan/document_scan_api_unittest.cc index 5e3dc9e..307d7eb 100644 --- a/chrome/browser/extensions/api/document_scan/document_scan_api_unittest.cc +++ b/chrome/browser/extensions/api/document_scan/document_scan_api_unittest.cc
@@ -7,7 +7,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted.h" #include "base/values.h" #include "chrome/browser/extensions/api/document_scan/document_scan_api.h"
diff --git a/chrome/browser/extensions/api/downloads/downloads_api.cc b/chrome/browser/extensions/api/downloads/downloads_api.cc index c8b42caf..a4d57e851 100644 --- a/chrome/browser/extensions/api/downloads/downloads_api.cc +++ b/chrome/browser/extensions/api/downloads/downloads_api.cc
@@ -12,12 +12,12 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/containers/flat_map.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/lazy_instance.h" #include "base/logging.h" #include "base/memory/ptr_util.h"
diff --git a/chrome/browser/extensions/api/downloads/downloads_api_browsertest.cc b/chrome/browser/extensions/api/downloads/downloads_api_browsertest.cc index 56b09a7..3c2e12f 100644 --- a/chrome/browser/extensions/api/downloads/downloads_api_browsertest.cc +++ b/chrome/browser/extensions/api/downloads/downloads_api_browsertest.cc
@@ -10,10 +10,10 @@ #include <algorithm> #include <memory> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/circular_deque.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/guid.h" #include "base/json/json_reader.h" #include "base/memory/ptr_util.h"
diff --git a/chrome/browser/extensions/api/downloads/downloads_api_unittest.cc b/chrome/browser/extensions/api/downloads/downloads_api_unittest.cc index ef75ba9..fad9f6a 100644 --- a/chrome/browser/extensions/api/downloads/downloads_api_unittest.cc +++ b/chrome/browser/extensions/api/downloads/downloads_api_unittest.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/download/download_core_service_factory.h" #include "chrome/browser/download/download_core_service_impl.h"
diff --git a/chrome/browser/extensions/api/enterprise_device_attributes/enterprise_device_attributes_api.cc b/chrome/browser/extensions/api/enterprise_device_attributes/enterprise_device_attributes_api.cc index 667144a..474a254 100644 --- a/chrome/browser/extensions/api/enterprise_device_attributes/enterprise_device_attributes_api.cc +++ b/chrome/browser/extensions/api/enterprise_device_attributes/enterprise_device_attributes_api.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/extensions/api/enterprise_device_attributes.h"
diff --git a/chrome/browser/extensions/api/enterprise_hardware_platform/enterprise_hardware_platform_api.cc b/chrome/browser/extensions/api/enterprise_hardware_platform/enterprise_hardware_platform_api.cc index b8923a15..01a92f2 100644 --- a/chrome/browser/extensions/api/enterprise_hardware_platform/enterprise_hardware_platform_api.cc +++ b/chrome/browser/extensions/api/enterprise_hardware_platform/enterprise_hardware_platform_api.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/extensions/api/enterprise_hardware_platform.h" #include "chrome/common/pref_names.h"
diff --git a/chrome/browser/extensions/api/enterprise_networking_attributes/enterprise_networking_attributes_api.cc b/chrome/browser/extensions/api/enterprise_networking_attributes/enterprise_networking_attributes_api.cc index be413a1..abbffdd 100644 --- a/chrome/browser/extensions/api/enterprise_networking_attributes/enterprise_networking_attributes_api.cc +++ b/chrome/browser/extensions/api/enterprise_networking_attributes/enterprise_networking_attributes_api.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/extensions/api/enterprise_networking_attributes/enterprise_networking_attributes_api.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "build/chromeos_buildflags.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/extensions/api/enterprise_networking_attributes.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 a759273..733bca64 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
@@ -10,8 +10,8 @@ #include "ash/constants/ash_features.h" #include "ash/constants/ash_switches.h" -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/json/json_writer.h" #include "base/path_service.h" #include "base/run_loop.h"
diff --git a/chrome/browser/extensions/api/enterprise_platform_keys_private/enterprise_platform_keys_private_api.cc b/chrome/browser/extensions/api/enterprise_platform_keys_private/enterprise_platform_keys_private_api.cc index 3e83ded..e420787 100644 --- a/chrome/browser/extensions/api/enterprise_platform_keys_private/enterprise_platform_keys_private_api.cc +++ b/chrome/browser/extensions/api/enterprise_platform_keys_private/enterprise_platform_keys_private_api.cc
@@ -5,7 +5,7 @@ #include "chrome/browser/extensions/api/enterprise_platform_keys_private/enterprise_platform_keys_private_api.h" #include "base/base64.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/values.h" #include "chrome/browser/ash/attestation/tpm_challenge_key.h" #include "chrome/browser/ash/profiles/profile_helper.h"
diff --git a/chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.h b/chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.h index 9635a49e..20bf5c1 100644 --- a/chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.h +++ b/chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.h
@@ -8,8 +8,8 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "third_party/abseil-cpp/absl/types/optional.h" namespace extensions {
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 46a9004..6bda463 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
@@ -7,8 +7,8 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/strings/stringprintf.h" #include "base/task/single_thread_task_runner.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/extensions/api/extension_action/browser_action_browsertest.cc b/chrome/browser/extensions/api/extension_action/browser_action_browsertest.cc index c8df695..a171d7f 100644 --- a/chrome/browser/extensions/api/extension_action/browser_action_browsertest.cc +++ b/chrome/browser/extensions/api/extension_action/browser_action_browsertest.cc
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "chrome/browser/extensions/extension_browsertest.h" #include "content/public/test/browser_test.h" #include "content/public/test/test_utils.h"
diff --git a/chrome/browser/extensions/api/extension_action/extension_action_api.cc b/chrome/browser/extensions/api/extension_action/extension_action_api.cc index afc4b39..513e8cb2 100644 --- a/chrome/browser/extensions/api/extension_action/extension_action_api.cc +++ b/chrome/browser/extensions/api/extension_action/extension_action_api.cc
@@ -9,7 +9,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/lazy_instance.h" #include "base/location.h" #include "base/metrics/histogram_functions.h"
diff --git a/chrome/browser/extensions/api/favicon/favicon_util.cc b/chrome/browser/extensions/api/favicon/favicon_util.cc index 1e1bffd..32031bc6 100644 --- a/chrome/browser/extensions/api/favicon/favicon_util.cc +++ b/chrome/browser/extensions/api/favicon/favicon_util.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/extensions/api/favicon/favicon_util.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "chrome/browser/favicon/favicon_service_factory.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/extensions/api/favicon/favicon_util.h b/chrome/browser/extensions/api/favicon/favicon_util.h index ccb3023..1de2af9 100644 --- a/chrome/browser/extensions/api/favicon/favicon_util.h +++ b/chrome/browser/extensions/api/favicon/favicon_util.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_EXTENSIONS_API_FAVICON_FAVICON_UTIL_H_ #define CHROME_BROWSER_EXTENSIONS_API_FAVICON_FAVICON_UTIL_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "components/favicon_base/favicon_types.h"
diff --git a/chrome/browser/extensions/api/feedback_private/chrome_feedback_private_delegate.cc b/chrome/browser/extensions/api/feedback_private/chrome_feedback_private_delegate.cc index 73aa3c6..89f654e 100644 --- a/chrome/browser/extensions/api/feedback_private/chrome_feedback_private_delegate.cc +++ b/chrome/browser/extensions/api/feedback_private/chrome_feedback_private_delegate.cc
@@ -7,7 +7,7 @@ #include <memory> #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/values.h" #include "build/chromeos_buildflags.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/extensions/api/feedback_private/feedback_browsertest.cc b/chrome/browser/extensions/api/feedback_private/feedback_browsertest.cc index b637235..017b3f4 100644 --- a/chrome/browser/extensions/api/feedback_private/feedback_browsertest.cc +++ b/chrome/browser/extensions/api/feedback_private/feedback_browsertest.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 "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/extensions/api/file_browser_handler/file_browser_handler_flow_lacros.cc b/chrome/browser/extensions/api/file_browser_handler/file_browser_handler_flow_lacros.cc index 6ce1403..b70db391 100644 --- a/chrome/browser/extensions/api/file_browser_handler/file_browser_handler_flow_lacros.cc +++ b/chrome/browser/extensions/api/file_browser_handler/file_browser_handler_flow_lacros.cc
@@ -8,9 +8,9 @@ #include <set> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/memory/raw_ptr.h" #include "base/values.h"
diff --git a/chrome/browser/extensions/api/file_browser_handler/file_browser_handler_flow_lacros.h b/chrome/browser/extensions/api/file_browser_handler/file_browser_handler_flow_lacros.h index 9edf18a..c84418b0 100644 --- a/chrome/browser/extensions/api/file_browser_handler/file_browser_handler_flow_lacros.h +++ b/chrome/browser/extensions/api/file_browser_handler/file_browser_handler_flow_lacros.h
@@ -8,8 +8,8 @@ #include <string> #include <vector> -#include "base/callback_forward.h" #include "base/files/file_path.h" +#include "base/functional/callback_forward.h" class Profile;
diff --git a/chrome/browser/extensions/api/file_handlers/non_native_file_system_delegate_chromeos.h b/chrome/browser/extensions/api/file_handlers/non_native_file_system_delegate_chromeos.h index a8ef0699..6ce73e4 100644 --- a/chrome/browser/extensions/api/file_handlers/non_native_file_system_delegate_chromeos.h +++ b/chrome/browser/extensions/api/file_handlers/non_native_file_system_delegate_chromeos.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "extensions/browser/api/file_handlers/non_native_file_system_delegate.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/chrome/browser/extensions/api/file_manager/file_browser_handler_api.cc b/chrome/browser/extensions/api/file_manager/file_browser_handler_api.cc index bb63569..095944f 100644 --- a/chrome/browser/extensions/api/file_manager/file_browser_handler_api.cc +++ b/chrome/browser/extensions/api/file_manager/file_browser_handler_api.cc
@@ -20,7 +20,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/threading/thread_task_runner_handle.h" #include "chrome/browser/extensions/api/file_manager/file_selector_impl.h" #include "chrome/browser/extensions/chrome_extension_function_details.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 29b3aea6..c2df699 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
@@ -10,8 +10,8 @@ #include <vector> -#include "base/bind.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/memory/scoped_refptr.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/extensions/api/file_manager/file_selector.h b/chrome/browser/extensions/api/file_manager/file_selector.h index 684e15e3..7923362 100644 --- a/chrome/browser/extensions/api/file_manager/file_selector.h +++ b/chrome/browser/extensions/api/file_manager/file_selector.h
@@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" class Browser;
diff --git a/chrome/browser/extensions/api/file_system/chrome_file_system_delegate.cc b/chrome/browser/extensions/api/file_system/chrome_file_system_delegate.cc index 2dddb64d..eb76373 100644 --- a/chrome/browser/extensions/api/file_system/chrome_file_system_delegate.cc +++ b/chrome/browser/extensions/api/file_system/chrome_file_system_delegate.cc
@@ -8,9 +8,9 @@ #include <utility> #include "apps/saved_files_service.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/check.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/notreached.h" #include "base/path_service.h" #include "chrome/browser/download/chrome_download_manager_delegate.h"
diff --git a/chrome/browser/extensions/api/file_system/chrome_file_system_delegate_ash.cc b/chrome/browser/extensions/api/file_system/chrome_file_system_delegate_ash.cc index 6efbd71..683cc42 100644 --- a/chrome/browser/extensions/api/file_system/chrome_file_system_delegate_ash.cc +++ b/chrome/browser/extensions/api/file_system/chrome_file_system_delegate_ash.cc
@@ -7,9 +7,9 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" #include "base/check.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/path_service.h" #include "chrome/browser/ash/file_manager/volume_manager.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/extensions/api/file_system/chrome_file_system_delegate_lacros.cc b/chrome/browser/extensions/api/file_system/chrome_file_system_delegate_lacros.cc index 85fcc1c4..d30206f1 100644 --- a/chrome/browser/extensions/api/file_system/chrome_file_system_delegate_lacros.cc +++ b/chrome/browser/extensions/api/file_system/chrome_file_system_delegate_lacros.cc
@@ -6,9 +6,9 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/check.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/path_service.h" #include "chromeos/lacros/lacros_service.h"
diff --git a/chrome/browser/extensions/api/file_system/consent_provider_impl.cc b/chrome/browser/extensions/api/file_system/consent_provider_impl.cc index 0d10f809..5d700dd 100644 --- a/chrome/browser/extensions/api/file_system/consent_provider_impl.cc +++ b/chrome/browser/extensions/api/file_system/consent_provider_impl.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/task/single_thread_task_runner.h" #include "build/build_config.h"
diff --git a/chrome/browser/extensions/api/file_system/consent_provider_impl.h b/chrome/browser/extensions/api/file_system/consent_provider_impl.h index e3c374d..5c32def 100644 --- a/chrome/browser/extensions/api/file_system/consent_provider_impl.h +++ b/chrome/browser/extensions/api/file_system/consent_provider_impl.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/scoped_observation.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/extensions/api/file_system/consent_provider_unittest.cc b/chrome/browser/extensions/api/file_system/consent_provider_unittest.cc index f58eeaaa..0a1bedd 100644 --- a/chrome/browser/extensions/api/file_system/consent_provider_unittest.cc +++ b/chrome/browser/extensions/api/file_system/consent_provider_unittest.cc
@@ -8,7 +8,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h"
diff --git a/chrome/browser/extensions/api/file_system/file_entry_picker.h b/chrome/browser/extensions/api/file_system/file_entry_picker.h index 47290ef..0e55ee485 100644 --- a/chrome/browser/extensions/api/file_system/file_entry_picker.h +++ b/chrome/browser/extensions/api/file_system/file_entry_picker.h
@@ -7,7 +7,7 @@ #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "extensions/browser/api/file_system/file_system_delegate.h" #include "ui/shell_dialogs/select_file_dialog.h"
diff --git a/chrome/browser/extensions/api/file_system/file_system_apitest.cc b/chrome/browser/extensions/api/file_system/file_system_apitest.cc index 5d47fea3..1650694 100644 --- a/chrome/browser/extensions/api/file_system/file_system_apitest.cc +++ b/chrome/browser/extensions/api/file_system/file_system_apitest.cc
@@ -3,8 +3,8 @@ // found in the LICENSE file. #include "apps/saved_files_service.h" -#include "base/bind.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/path_service.h" #include "base/scoped_observation.h" #include "base/threading/thread_restrictions.h"
diff --git a/chrome/browser/extensions/api/file_system/file_system_apitest_chromeos.cc b/chrome/browser/extensions/api/file_system/file_system_apitest_chromeos.cc index f3432ee..ba832fe 100644 --- a/chrome/browser/extensions/api/file_system/file_system_apitest_chromeos.cc +++ b/chrome/browser/extensions/api/file_system/file_system_apitest_chromeos.cc
@@ -4,10 +4,10 @@ #include <memory> -#include "base/bind.h" -#include "base/callback.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/memory/ptr_util.h" #include "base/path_service.h"
diff --git a/chrome/browser/extensions/api/file_system/volume_list_provider_lacros.h b/chrome/browser/extensions/api/file_system/volume_list_provider_lacros.h index 45d7a70..00a1a84 100644 --- a/chrome/browser/extensions/api/file_system/volume_list_provider_lacros.h +++ b/chrome/browser/extensions/api/file_system/volume_list_provider_lacros.h
@@ -7,7 +7,7 @@ #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "chromeos/crosapi/mojom/volume_manager.mojom.h" #include "mojo/public/cpp/bindings/receiver.h"
diff --git a/chrome/browser/extensions/api/font_settings/font_settings_api.cc b/chrome/browser/extensions/api/font_settings/font_settings_api.cc index be6d53e..bcfd921 100644 --- a/chrome/browser/extensions/api/font_settings/font_settings_api.cc +++ b/chrome/browser/extensions/api/font_settings/font_settings_api.cc
@@ -11,8 +11,8 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/json/json_writer.h" #include "base/lazy_instance.h" #include "base/strings/string_util.h"
diff --git a/chrome/browser/extensions/api/gcm/extension_gcm_app_handler_unittest.cc b/chrome/browser/extensions/api/gcm/extension_gcm_app_handler_unittest.cc index bfa6200..1b3cfea 100644 --- a/chrome/browser/extensions/api/gcm/extension_gcm_app_handler_unittest.cc +++ b/chrome/browser/extensions/api/gcm/extension_gcm_app_handler_unittest.cc
@@ -8,13 +8,13 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check_op.h" #include "base/command_line.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h"
diff --git a/chrome/browser/extensions/api/gcm/gcm_api.cc b/chrome/browser/extensions/api/gcm/gcm_api.cc index 05df956..87677f2 100644 --- a/chrome/browser/extensions/api/gcm/gcm_api.cc +++ b/chrome/browser/extensions/api/gcm/gcm_api.cc
@@ -12,7 +12,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "chrome/browser/gcm/gcm_profile_service_factory.h"
diff --git a/chrome/browser/extensions/api/gcm/gcm_apitest.cc b/chrome/browser/extensions/api/gcm/gcm_apitest.cc index 7aa642e..d00a73e 100644 --- a/chrome/browser/extensions/api/gcm/gcm_apitest.cc +++ b/chrome/browser/extensions/api/gcm/gcm_apitest.cc
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "chrome/browser/extensions/api/gcm/gcm_api.h" #include "chrome/browser/extensions/extension_apitest.h"
diff --git a/chrome/browser/extensions/api/history/history_api.cc b/chrome/browser/extensions/api/history/history_api.cc index d43d358d..689f768 100644 --- a/chrome/browser/extensions/api/history/history_api.cc +++ b/chrome/browser/extensions/api/history/history_api.cc
@@ -8,10 +8,10 @@ #include <set> #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/json/json_writer.h" #include "base/lazy_instance.h" #include "base/location.h"
diff --git a/chrome/browser/extensions/api/identity/gaia_remote_consent_flow.cc b/chrome/browser/extensions/api/identity/gaia_remote_consent_flow.cc index 2d741bc..d9c65bf 100644 --- a/chrome/browser/extensions/api/identity/gaia_remote_consent_flow.cc +++ b/chrome/browser/extensions/api/identity/gaia_remote_consent_flow.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/extensions/api/identity/gaia_remote_consent_flow.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "base/strings/escape.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/extensions/api/identity/identity_apitest.cc b/chrome/browser/extensions/api/identity/identity_apitest.cc index 90e9cbd..c057bd05 100644 --- a/chrome/browser/extensions/api/identity/identity_apitest.cc +++ b/chrome/browser/extensions/api/identity/identity_apitest.cc
@@ -8,9 +8,9 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/command_line.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h"
diff --git a/chrome/browser/extensions/api/identity/identity_clear_all_cached_auth_tokens_function.cc b/chrome/browser/extensions/api/identity/identity_clear_all_cached_auth_tokens_function.cc index 7a7e5612..06a3fb6 100644 --- a/chrome/browser/extensions/api/identity/identity_clear_all_cached_auth_tokens_function.cc +++ b/chrome/browser/extensions/api/identity/identity_clear_all_cached_auth_tokens_function.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/extensions/api/identity/identity_clear_all_cached_auth_tokens_function.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/task/single_thread_task_runner.h" #include "chrome/browser/extensions/api/identity/identity_api.h"
diff --git a/chrome/browser/extensions/api/identity/identity_get_auth_token_function.cc b/chrome/browser/extensions/api/identity/identity_get_auth_token_function.cc index 6c3c4f1..7e6fea44 100644 --- a/chrome/browser/extensions/api/identity/identity_get_auth_token_function.cc +++ b/chrome/browser/extensions/api/identity/identity_get_auth_token_function.cc
@@ -7,7 +7,7 @@ #include <set> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/metrics/histogram_functions.h" #include "base/notreached.h"
diff --git a/chrome/browser/extensions/api/image_writer_private/destroy_partitions_operation.cc b/chrome/browser/extensions/api/image_writer_private/destroy_partitions_operation.cc index b1d490c..b4ee903 100644 --- a/chrome/browser/extensions/api/image_writer_private/destroy_partitions_operation.cc +++ b/chrome/browser/extensions/api/image_writer_private/destroy_partitions_operation.cc
@@ -4,8 +4,8 @@ #include <string.h> -#include "base/bind.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "chrome/browser/extensions/api/image_writer_private/destroy_partitions_operation.h" #include "chrome/browser/extensions/api/image_writer_private/error_constants.h" #include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/extensions/api/image_writer_private/destroy_partitions_operation_unittest.cc b/chrome/browser/extensions/api/image_writer_private/destroy_partitions_operation_unittest.cc index 819bc5c..bd306e2 100644 --- a/chrome/browser/extensions/api/image_writer_private/destroy_partitions_operation_unittest.cc +++ b/chrome/browser/extensions/api/image_writer_private/destroy_partitions_operation_unittest.cc
@@ -3,7 +3,7 @@ // found in the LICENSE file. #include "chrome/browser/extensions/api/image_writer_private/destroy_partitions_operation.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/extensions/api/image_writer_private/extraction_properties.h b/chrome/browser/extensions/api/image_writer_private/extraction_properties.h index d2d536c..3f5bcd1 100644 --- a/chrome/browser/extensions/api/image_writer_private/extraction_properties.h +++ b/chrome/browser/extensions/api/image_writer_private/extraction_properties.h
@@ -9,8 +9,8 @@ #include <string> -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" namespace extensions { namespace image_writer {
diff --git a/chrome/browser/extensions/api/image_writer_private/image_writer_controller_lacros.h b/chrome/browser/extensions/api/image_writer_private/image_writer_controller_lacros.h index f0d573c2..f8bf7f75 100644 --- a/chrome/browser/extensions/api/image_writer_private/image_writer_controller_lacros.h +++ b/chrome/browser/extensions/api/image_writer_private/image_writer_controller_lacros.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_EXTENSIONS_API_IMAGE_WRITER_PRIVATE_IMAGE_WRITER_CONTROLLER_LACROS_H_ #define CHROME_BROWSER_EXTENSIONS_API_IMAGE_WRITER_PRIVATE_IMAGE_WRITER_CONTROLLER_LACROS_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/scoped_observation.h" #include "chromeos/crosapi/mojom/image_writer.mojom.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 96b5c6f..4ef2a3f 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
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "build/build_config.h" #include "chrome/browser/extensions/api/image_writer_private/error_constants.h" #include "chrome/browser/extensions/api/image_writer_private/operation_manager.h"
diff --git a/chrome/browser/extensions/api/image_writer_private/image_writer_private_api_unittest.cc b/chrome/browser/extensions/api/image_writer_private/image_writer_private_api_unittest.cc index 2435509..fa39f57 100644 --- a/chrome/browser/extensions/api/image_writer_private/image_writer_private_api_unittest.cc +++ b/chrome/browser/extensions/api/image_writer_private/image_writer_private_api_unittest.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 "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/pattern.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/extensions/api/image_writer_private/image_writer_private_apitest.cc b/chrome/browser/extensions/api/image_writer_private/image_writer_private_apitest.cc index 69cea8e3..f5a13d7 100644 --- a/chrome/browser/extensions/api/image_writer_private/image_writer_private_apitest.cc +++ b/chrome/browser/extensions/api/image_writer_private/image_writer_private_apitest.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 "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/pattern.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/extensions/api/image_writer_private/image_writer_utility_client.cc b/chrome/browser/extensions/api/image_writer_private/image_writer_utility_client.cc index bb510a2..66525a0 100644 --- a/chrome/browser/extensions/api/image_writer_private/image_writer_utility_client.cc +++ b/chrome/browser/extensions/api/image_writer_private/image_writer_utility_client.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/task/sequenced_task_runner.h"
diff --git a/chrome/browser/extensions/api/image_writer_private/image_writer_utility_client.h b/chrome/browser/extensions/api/image_writer_private/image_writer_utility_client.h index f49e2b5e..6b1ec48f 100644 --- a/chrome/browser/extensions/api/image_writer_private/image_writer_utility_client.h +++ b/chrome/browser/extensions/api/image_writer_private/image_writer_utility_client.h
@@ -9,8 +9,8 @@ #include <memory> -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "base/sequence_checker.h" #include "base/task/sequenced_task_runner.h"
diff --git a/chrome/browser/extensions/api/image_writer_private/image_writer_utility_client_browsertest.cc b/chrome/browser/extensions/api/image_writer_private/image_writer_utility_client_browsertest.cc index e16d8a4..87b3962 100644 --- a/chrome/browser/extensions/api/image_writer_private/image_writer_utility_client_browsertest.cc +++ b/chrome/browser/extensions/api/image_writer_private/image_writer_utility_client_browsertest.cc
@@ -4,11 +4,11 @@ #include "chrome/browser/extensions/api/image_writer_private/image_writer_utility_client.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/run_loop.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/extensions/api/image_writer_private/operation.cc b/chrome/browser/extensions/api/image_writer_private/operation.cc index ab38d96..da422907 100644 --- a/chrome/browser/extensions/api/image_writer_private/operation.cc +++ b/chrome/browser/extensions/api/image_writer_private/operation.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/task/thread_pool.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/extensions/api/image_writer_private/operation.h b/chrome/browser/extensions/api/image_writer_private/operation.h index 51de9f62..12545f6 100644 --- a/chrome/browser/extensions/api/image_writer_private/operation.h +++ b/chrome/browser/extensions/api/image_writer_private/operation.h
@@ -9,9 +9,9 @@ #include <memory> -#include "base/callback.h" #include "base/files/file.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/callback.h" #include "base/hash/md5.h" #include "base/memory/ref_counted_memory.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/extensions/api/image_writer_private/operation_chromeos.cc b/chrome/browser/extensions/api/image_writer_private/operation_chromeos.cc index eeba235..59d58cc 100644 --- a/chrome/browser/extensions/api/image_writer_private/operation_chromeos.cc +++ b/chrome/browser/extensions/api/image_writer_private/operation_chromeos.cc
@@ -5,7 +5,7 @@ #include <stdint.h> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/extensions/api/image_writer_private/error_constants.h" #include "chrome/browser/extensions/api/image_writer_private/operation.h" #include "chromeos/ash/components/dbus/image_burner/image_burner_client.h"
diff --git a/chrome/browser/extensions/api/image_writer_private/operation_manager.h b/chrome/browser/extensions/api/image_writer_private/operation_manager.h index e9b3aff..b6a70ba 100644 --- a/chrome/browser/extensions/api/image_writer_private/operation_manager.h +++ b/chrome/browser/extensions/api/image_writer_private/operation_manager.h
@@ -7,8 +7,8 @@ #include <map> #include <string> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/scoped_observation.h"
diff --git a/chrome/browser/extensions/api/image_writer_private/operation_manager_unittest.cc b/chrome/browser/extensions/api/image_writer_private/operation_manager_unittest.cc index 345a4908..391a884 100644 --- a/chrome/browser/extensions/api/image_writer_private/operation_manager_unittest.cc +++ b/chrome/browser/extensions/api/image_writer_private/operation_manager_unittest.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "build/build_config.h" #include "chrome/browser/extensions/api/image_writer_private/error_constants.h" #include "chrome/browser/extensions/api/image_writer_private/test_utils.h"
diff --git a/chrome/browser/extensions/api/image_writer_private/operation_nonchromeos.cc b/chrome/browser/extensions/api/image_writer_private/operation_nonchromeos.cc index 2097997..eb08bb8 100644 --- a/chrome/browser/extensions/api/image_writer_private/operation_nonchromeos.cc +++ b/chrome/browser/extensions/api/image_writer_private/operation_nonchromeos.cc
@@ -5,8 +5,8 @@ #include <stdint.h> #include <utility> -#include "base/bind.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "chrome/browser/extensions/api/image_writer_private/error_constants.h" #include "chrome/browser/extensions/api/image_writer_private/operation.h" #include "chrome/browser/extensions/api/image_writer_private/operation_manager.h"
diff --git a/chrome/browser/extensions/api/image_writer_private/operation_unittest.cc b/chrome/browser/extensions/api/image_writer_private/operation_unittest.cc index 0de783bd..64ff5f8b 100644 --- a/chrome/browser/extensions/api/image_writer_private/operation_unittest.cc +++ b/chrome/browser/extensions/api/image_writer_private/operation_unittest.cc
@@ -4,10 +4,10 @@ #include "chrome/browser/extensions/api/image_writer_private/operation.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "build/build_config.h" #include "build/chromeos_buildflags.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 398b49c..22cb31f 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
@@ -3,7 +3,7 @@ // found in the LICENSE file. #include "chrome/browser/extensions/api/image_writer_private/removable_storage_provider.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/lazy_instance.h" #include "base/task/single_thread_task_runner.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/extensions/api/image_writer_private/removable_storage_provider.h b/chrome/browser/extensions/api/image_writer_private/removable_storage_provider.h index 840c561..f898ee4 100644 --- a/chrome/browser/extensions/api/image_writer_private/removable_storage_provider.h +++ b/chrome/browser/extensions/api/image_writer_private/removable_storage_provider.h
@@ -4,7 +4,7 @@ #ifndef CHROME_BROWSER_EXTENSIONS_API_IMAGE_WRITER_PRIVATE_REMOVABLE_STORAGE_PROVIDER_H_ #define CHROME_BROWSER_EXTENSIONS_API_IMAGE_WRITER_PRIVATE_REMOVABLE_STORAGE_PROVIDER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "chrome/common/extensions/api/image_writer_private.h" #include "chrome/common/ref_counted_util.h"
diff --git a/chrome/browser/extensions/api/image_writer_private/removable_storage_provider_chromeos_unittest.cc b/chrome/browser/extensions/api/image_writer_private/removable_storage_provider_chromeos_unittest.cc index 5d0484f..380e38b 100644 --- a/chrome/browser/extensions/api/image_writer_private/removable_storage_provider_chromeos_unittest.cc +++ b/chrome/browser/extensions/api/image_writer_private/removable_storage_provider_chromeos_unittest.cc
@@ -4,7 +4,7 @@ #include <stdint.h> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "chrome/browser/extensions/api/image_writer_private/removable_storage_provider.h" #include "chromeos/ash/components/disks/mock_disk_mount_manager.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 afa96c3..0e720ab 100644 --- a/chrome/browser/extensions/api/image_writer_private/test_utils.cc +++ b/chrome/browser/extensions/api/image_writer_private/test_utils.cc
@@ -7,7 +7,7 @@ #include <string.h> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/path_service.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/extensions/api/image_writer_private/write_from_file_operation.cc b/chrome/browser/extensions/api/image_writer_private/write_from_file_operation.cc index 2e82a3f..8edb4ad 100644 --- a/chrome/browser/extensions/api/image_writer_private/write_from_file_operation.cc +++ b/chrome/browser/extensions/api/image_writer_private/write_from_file_operation.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/extensions/api/image_writer_private/write_from_file_operation.h" -#include "base/bind.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "chrome/browser/extensions/api/image_writer_private/error_constants.h" #include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/extensions/api/image_writer_private/write_from_file_operation_unittest.cc b/chrome/browser/extensions/api/image_writer_private/write_from_file_operation_unittest.cc index a3283177..634b5e5 100644 --- a/chrome/browser/extensions/api/image_writer_private/write_from_file_operation_unittest.cc +++ b/chrome/browser/extensions/api/image_writer_private/write_from_file_operation_unittest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/extensions/api/image_writer_private/write_from_file_operation.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h" #include "chrome/browser/extensions/api/image_writer_private/error_constants.h"
diff --git a/chrome/browser/extensions/api/image_writer_private/write_from_url_operation.cc b/chrome/browser/extensions/api/image_writer_private/write_from_url_operation.cc index 9188286..f3e6ee1 100644 --- a/chrome/browser/extensions/api/image_writer_private/write_from_url_operation.cc +++ b/chrome/browser/extensions/api/image_writer_private/write_from_url_operation.cc
@@ -3,8 +3,8 @@ // found in the LICENSE file. #include "chrome/browser/extensions/api/image_writer_private/write_from_url_operation.h" -#include "base/bind.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "chrome/browser/extensions/api/image_writer_private/error_constants.h" #include "chrome/browser/extensions/api/image_writer_private/operation_manager.h" #include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/extensions/api/image_writer_private/write_from_url_operation_unittest.cc b/chrome/browser/extensions/api/image_writer_private/write_from_url_operation_unittest.cc index 1977f4e..31ee4c1 100644 --- a/chrome/browser/extensions/api/image_writer_private/write_from_url_operation_unittest.cc +++ b/chrome/browser/extensions/api/image_writer_private/write_from_url_operation_unittest.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "chrome/browser/extensions/api/image_writer_private/error_constants.h" #include "chrome/browser/extensions/api/image_writer_private/test_utils.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 8859c63..94fa4cb 100644 --- a/chrome/browser/extensions/api/image_writer_private/zip_extractor.cc +++ b/chrome/browser/extensions/api/image_writer_private/zip_extractor.cc
@@ -7,8 +7,8 @@ #include <algorithm> #include <memory> -#include "base/bind.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/task/thread_pool.h" #include "chrome/browser/extensions/api/image_writer_private/error_constants.h"
diff --git a/chrome/browser/extensions/api/image_writer_private/zip_extractor.h b/chrome/browser/extensions/api/image_writer_private/zip_extractor.h index 53ba2e00..b202937 100644 --- a/chrome/browser/extensions/api/image_writer_private/zip_extractor.h +++ b/chrome/browser/extensions/api/image_writer_private/zip_extractor.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_EXTENSIONS_API_IMAGE_WRITER_PRIVATE_ZIP_EXTRACTOR_H_ #define CHROME_BROWSER_EXTENSIONS_API_IMAGE_WRITER_PRIVATE_ZIP_EXTRACTOR_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "build/build_config.h" #include "chrome/browser/extensions/api/image_writer_private/extraction_properties.h" #include "third_party/zlib/google/zip_reader.h"
diff --git a/chrome/browser/extensions/api/instance_id/instance_id_api.cc b/chrome/browser/extensions/api/instance_id/instance_id_api.cc index 1f77bd4f..7f201b2 100644 --- a/chrome/browser/extensions/api/instance_id/instance_id_api.cc +++ b/chrome/browser/extensions/api/instance_id/instance_id_api.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "base/notreached.h" #include "base/time/time.h"
diff --git a/chrome/browser/extensions/api/instance_id/instance_id_apitest.cc b/chrome/browser/extensions/api/instance_id/instance_id_apitest.cc index 6493dbae..70dae945 100644 --- a/chrome/browser/extensions/api/instance_id/instance_id_apitest.cc +++ b/chrome/browser/extensions/api/instance_id/instance_id_apitest.cc
@@ -5,7 +5,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "chrome/browser/extensions/api/instance_id/instance_id_api.h" #include "chrome/browser/extensions/extension_apitest.h"
diff --git a/chrome/browser/extensions/api/language_settings_private/language_settings_private_api_unittest.cc b/chrome/browser/extensions/api/language_settings_private/language_settings_private_api_unittest.cc index 01abaf8..87944ed 100644 --- a/chrome/browser/extensions/api/language_settings_private/language_settings_private_api_unittest.cc +++ b/chrome/browser/extensions/api/language_settings_private/language_settings_private_api_unittest.cc
@@ -5,8 +5,8 @@ #include <string> #include <vector> -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_refptr.h" #include "base/test/scoped_feature_list.h"
diff --git a/chrome/browser/extensions/api/language_settings_private/language_settings_private_delegate.cc b/chrome/browser/extensions/api/language_settings_private/language_settings_private_delegate.cc index b36d4e2..4a8b88b 100644 --- a/chrome/browser/extensions/api/language_settings_private/language_settings_private_delegate.cc +++ b/chrome/browser/extensions/api/language_settings_private/language_settings_private_delegate.cc
@@ -9,8 +9,8 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/strings/utf_string_conversions.h" #include "build/chromeos_buildflags.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/extensions/api/language_settings_private/language_settings_private_delegate_unittest.cc b/chrome/browser/extensions/api/language_settings_private/language_settings_private_delegate_unittest.cc index d292e9fd..a20f5f8 100644 --- a/chrome/browser/extensions/api/language_settings_private/language_settings_private_delegate_unittest.cc +++ b/chrome/browser/extensions/api/language_settings_private/language_settings_private_delegate_unittest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/extensions/api/language_settings_private/language_settings_private_delegate.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/test/scoped_feature_list.h" #include "build/build_config.h" #include "chrome/browser/extensions/extension_service_test_base.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 c3e29dd..4b6dc94 100644 --- a/chrome/browser/extensions/api/management/chrome_management_api_delegate.cc +++ b/chrome/browser/extensions/api/management/chrome_management_api_delegate.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/strings/strcat.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/extensions/api/management/management_api_unittest.cc b/chrome/browser/extensions/api/management/management_api_unittest.cc index b640ca81..c456f395 100644 --- a/chrome/browser/extensions/api/management/management_api_unittest.cc +++ b/chrome/browser/extensions/api/management/management_api_unittest.cc
@@ -5,7 +5,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_refptr.h"
diff --git a/chrome/browser/extensions/api/management/management_browsertest.cc b/chrome/browser/extensions/api/management/management_browsertest.cc index c81cf490..1f3a8ae 100644 --- a/chrome/browser/extensions/api/management/management_browsertest.cc +++ b/chrome/browser/extensions/api/management/management_browsertest.cc
@@ -4,10 +4,10 @@ #include <stddef.h> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/contains.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ref_counted.h" #include "base/run_loop.h" #include "base/strings/strcat.h"
diff --git a/chrome/browser/extensions/api/mdns/mdns_api_unittest.cc b/chrome/browser/extensions/api/mdns/mdns_api_unittest.cc index ce3a55b9..38305cb 100644 --- a/chrome/browser/extensions/api/mdns/mdns_api_unittest.cc +++ b/chrome/browser/extensions/api/mdns/mdns_api_unittest.cc
@@ -10,7 +10,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/values.h" #include "chrome/browser/extensions/extension_service.h"
diff --git a/chrome/browser/extensions/api/media_perception_private/media_perception_api_delegate_chromeos.cc b/chrome/browser/extensions/api/media_perception_private/media_perception_api_delegate_chromeos.cc index a1385ba8..3014007d 100644 --- a/chrome/browser/extensions/api/media_perception_private/media_perception_api_delegate_chromeos.cc +++ b/chrome/browser/extensions/api/media_perception_private/media_perception_api_delegate_chromeos.cc
@@ -7,7 +7,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/browser_process_platform_part.h" #include "chrome/browser/component_updater/cros_component_installer_chromeos.h"
diff --git a/chrome/browser/extensions/api/media_perception_private/media_perception_api_delegate_chromeos.h b/chrome/browser/extensions/api/media_perception_private/media_perception_api_delegate_chromeos.h index d6bfd4c..95a0b69 100644 --- a/chrome/browser/extensions/api/media_perception_private/media_perception_api_delegate_chromeos.h +++ b/chrome/browser/extensions/api/media_perception_private/media_perception_api_delegate_chromeos.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_EXTENSIONS_API_MEDIA_PERCEPTION_PRIVATE_MEDIA_PERCEPTION_API_DELEGATE_CHROMEOS_H_ #define CHROME_BROWSER_EXTENSIONS_API_MEDIA_PERCEPTION_PRIVATE_MEDIA_PERCEPTION_API_DELEGATE_CHROMEOS_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "extensions/browser/api/media_perception_private/media_perception_api_delegate.h" #include "mojo/public/cpp/bindings/pending_receiver.h"
diff --git a/chrome/browser/extensions/api/messaging/chrome_messaging_delegate.cc b/chrome/browser/extensions/api/messaging/chrome_messaging_delegate.cc index e2bdb66..2ee750a 100644 --- a/chrome/browser/extensions/api/messaging/chrome_messaging_delegate.cc +++ b/chrome/browser/extensions/api/messaging/chrome_messaging_delegate.cc
@@ -6,9 +6,9 @@ #include <memory> -#include "base/callback.h" #include "base/check_op.h" #include "base/containers/contains.h" +#include "base/functional/callback.h" #include "build/build_config.h" #include "chrome/browser/extensions/api/messaging/incognito_connectability.h" #include "chrome/browser/extensions/api/messaging/native_message_port.h"
diff --git a/chrome/browser/extensions/api/messaging/incognito_connectability.cc b/chrome/browser/extensions/api/messaging/incognito_connectability.cc index 4299aeb2..9e5bcc9 100644 --- a/chrome/browser/extensions/api/messaging/incognito_connectability.cc +++ b/chrome/browser/extensions/api/messaging/incognito_connectability.cc
@@ -6,9 +6,9 @@ #include <string> -#include "base/bind.h" #include "base/check_op.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/lazy_instance.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/extensions/api/messaging/incognito_connectability_infobar_delegate.h"
diff --git a/chrome/browser/extensions/api/messaging/incognito_connectability_infobar_delegate.h b/chrome/browser/extensions/api/messaging/incognito_connectability_infobar_delegate.h index 12dbe3e..ad73b35b 100644 --- a/chrome/browser/extensions/api/messaging/incognito_connectability_infobar_delegate.h +++ b/chrome/browser/extensions/api/messaging/incognito_connectability_infobar_delegate.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "chrome/browser/extensions/api/messaging/incognito_connectability.h" #include "components/infobars/core/confirm_infobar_delegate.h"
diff --git a/chrome/browser/extensions/api/messaging/messaging_apitest.cc b/chrome/browser/extensions/api/messaging/messaging_apitest.cc index c91f1ce..6017428 100644 --- a/chrome/browser/extensions/api/messaging/messaging_apitest.cc +++ b/chrome/browser/extensions/api/messaging/messaging_apitest.cc
@@ -9,10 +9,10 @@ #include <utility> #include "base/base64.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/feature_list.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/path_service.h"
diff --git a/chrome/browser/extensions/api/messaging/native_message_port.cc b/chrome/browser/extensions/api/messaging/native_message_port.cc index 8639c12..d6b148b 100644 --- a/chrome/browser/extensions/api/messaging/native_message_port.cc +++ b/chrome/browser/extensions/api/messaging/native_message_port.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/single_thread_task_runner.h" #include "chrome/browser/extensions/api/messaging/native_message_process_host.h" #include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/extensions/api/messaging/native_message_process_host.cc b/chrome/browser/extensions/api/messaging/native_message_process_host.cc index 9b0a726..37dbe92 100644 --- a/chrome/browser/extensions/api/messaging/native_message_process_host.cc +++ b/chrome/browser/extensions/api/messaging/native_message_process_host.cc
@@ -10,8 +10,8 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/process/kill.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/extensions/api/messaging/native_message_process_host_unittest.cc b/chrome/browser/extensions/api/messaging/native_message_process_host_unittest.cc index 41764324..35bb92c 100644 --- a/chrome/browser/extensions/api/messaging/native_message_process_host_unittest.cc +++ b/chrome/browser/extensions/api/messaging/native_message_process_host_unittest.cc
@@ -13,13 +13,13 @@ #include "base/base_paths.h" #include "base/base_switches.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/files/file.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_file.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/json/json_reader.h" #include "base/memory/page_size.h" #include "base/path_service.h"
diff --git a/chrome/browser/extensions/api/messaging/native_messaging_launch_from_native.cc b/chrome/browser/extensions/api/messaging/native_messaging_launch_from_native.cc index 4770e65..735c334 100644 --- a/chrome/browser/extensions/api/messaging/native_messaging_launch_from_native.cc +++ b/chrome/browser/extensions/api/messaging/native_messaging_launch_from_native.cc
@@ -7,8 +7,8 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/strings/strcat.h" #include "base/strings/string_util.h" #include "base/task/sequenced_task_runner.h"
diff --git a/chrome/browser/extensions/api/messaging/native_process_launcher.cc b/chrome/browser/extensions/api/messaging/native_process_launcher.cc index 44f78b6..fcd5dae8 100644 --- a/chrome/browser/extensions/api/messaging/native_process_launcher.cc +++ b/chrome/browser/extensions/api/messaging/native_process_launcher.cc
@@ -11,10 +11,10 @@ #include "base/base64.h" #include "base/base_paths.h" #include "base/base_switches.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/json/json_writer.h" #include "base/logging.h" #include "base/memory/ref_counted.h"
diff --git a/chrome/browser/extensions/api/messaging/native_process_launcher.h b/chrome/browser/extensions/api/messaging/native_process_launcher.h index 59d3578..7b7591f 100644 --- a/chrome/browser/extensions/api/messaging/native_process_launcher.h +++ b/chrome/browser/extensions/api/messaging/native_process_launcher.h
@@ -7,8 +7,8 @@ #include <memory> -#include "base/callback_forward.h" #include "base/files/file.h" +#include "base/functional/callback_forward.h" #include "base/process/process.h" #include "ui/gfx/native_widget_types.h"
diff --git a/chrome/browser/extensions/api/networking_private/networking_private_apitest.cc b/chrome/browser/extensions/api/networking_private/networking_private_apitest.cc index 1b09c3e..84f948c 100644 --- a/chrome/browser/extensions/api/networking_private/networking_private_apitest.cc +++ b/chrome/browser/extensions/api/networking_private/networking_private_apitest.cc
@@ -9,9 +9,9 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "build/build_config.h" #include "chrome/browser/extensions/extension_apitest.h" #include "components/keyed_service/core/keyed_service.h"
diff --git a/chrome/browser/extensions/api/networking_private/networking_private_chromeos_apitest.cc b/chrome/browser/extensions/api/networking_private/networking_private_chromeos_apitest.cc index b501754..31e61d2 100644 --- a/chrome/browser/extensions/api/networking_private/networking_private_chromeos_apitest.cc +++ b/chrome/browser/extensions/api/networking_private/networking_private_chromeos_apitest.cc
@@ -5,10 +5,10 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/extensions/api/networking_private/networking_private_service_client_apitest.cc b/chrome/browser/extensions/api/networking_private/networking_private_service_client_apitest.cc index 8b777e1d..6c84de9e 100644 --- a/chrome/browser/extensions/api/networking_private/networking_private_service_client_apitest.cc +++ b/chrome/browser/extensions/api/networking_private/networking_private_service_client_apitest.cc
@@ -5,9 +5,9 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/extension_apitest.h" #include "components/user_manager/user.h"
diff --git a/chrome/browser/extensions/api/notifications/extension_notification_handler.cc b/chrome/browser/extensions/api/notifications/extension_notification_handler.cc index 738514f..b28495190 100644 --- a/chrome/browser/extensions/api/notifications/extension_notification_handler.cc +++ b/chrome/browser/extensions/api/notifications/extension_notification_handler.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/extensions/api/notifications/extension_notification_handler.h" -#include "base/callback.h" #include "base/check_op.h" +#include "base/functional/callback.h" #include "base/metrics/histogram_macros.h" #include "base/strings/string_piece.h" #include "chrome/browser/extensions/api/notifications/extension_notification_display_helper.h"
diff --git a/chrome/browser/extensions/api/notifications/extension_notification_handler_unittest.cc b/chrome/browser/extensions/api/notifications/extension_notification_handler_unittest.cc index 9481dac..ea75249b 100644 --- a/chrome/browser/extensions/api/notifications/extension_notification_handler_unittest.cc +++ b/chrome/browser/extensions/api/notifications/extension_notification_handler_unittest.cc
@@ -4,8 +4,8 @@ #include <string> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "chrome/browser/extensions/api/notifications/extension_notification_handler.h" #include "chrome/browser/profiles/profile.h" #include "chrome/test/base/testing_browser_process.h"
diff --git a/chrome/browser/extensions/api/notifications/notifications_api.cc b/chrome/browser/extensions/api/notifications/notifications_api.cc index 6d72d36..43eac56 100644 --- a/chrome/browser/extensions/api/notifications/notifications_api.cc +++ b/chrome/browser/extensions/api/notifications/notifications_api.cc
@@ -9,7 +9,7 @@ #include <memory> #include <utility> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/guid.h" #include "base/rand_util.h" #include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/extensions/api/omnibox/omnibox_api.cc b/chrome/browser/extensions/api/omnibox/omnibox_api.cc index eb7affd3..1ed264c 100644 --- a/chrome/browser/extensions/api/omnibox/omnibox_api.cc +++ b/chrome/browser/extensions/api/omnibox/omnibox_api.cc
@@ -11,7 +11,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/lazy_instance.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h"
diff --git a/chrome/browser/extensions/api/omnibox/suggestion_parser.cc b/chrome/browser/extensions/api/omnibox/suggestion_parser.cc index 23cd098..c8b53ad 100644 --- a/chrome/browser/extensions/api/omnibox/suggestion_parser.cc +++ b/chrome/browser/extensions/api/omnibox/suggestion_parser.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/extensions/api/omnibox/suggestion_parser.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/extensions/api/omnibox/suggestion_parser.h b/chrome/browser/extensions/api/omnibox/suggestion_parser.h index c505f1d7..f258502 100644 --- a/chrome/browser/extensions/api/omnibox/suggestion_parser.h +++ b/chrome/browser/extensions/api/omnibox/suggestion_parser.h
@@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "chrome/common/extensions/api/omnibox.h" namespace extensions {
diff --git a/chrome/browser/extensions/api/page_capture/page_capture_api.cc b/chrome/browser/extensions/api/page_capture/page_capture_api.cc index 60a7099..614cc80 100644 --- a/chrome/browser/extensions/api/page_capture/page_capture_api.cc +++ b/chrome/browser/extensions/api/page_capture/page_capture_api.cc
@@ -8,8 +8,8 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/task/thread_pool.h" #include "build/chromeos_buildflags.h" #include "chrome/browser/extensions/extension_tab_util.h"
diff --git a/chrome/browser/extensions/api/passwords_private/password_check_delegate.cc b/chrome/browser/extensions/api/passwords_private/password_check_delegate.cc index 21d0f20..5da06f88 100644 --- a/chrome/browser/extensions/api/passwords_private/password_check_delegate.cc +++ b/chrome/browser/extensions/api/passwords_private/password_check_delegate.cc
@@ -13,9 +13,9 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/containers/flat_set.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted.h" #include "base/metrics/histogram_macros.h" #include "base/numerics/safe_conversions.h"
diff --git a/chrome/browser/extensions/api/passwords_private/password_check_delegate.h b/chrome/browser/extensions/api/passwords_private/password_check_delegate.h index 7f80f77..57375de 100644 --- a/chrome/browser/extensions/api/passwords_private/password_check_delegate.h +++ b/chrome/browser/extensions/api/passwords_private/password_check_delegate.h
@@ -7,8 +7,8 @@ #include <memory> -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/extensions/api/passwords_private/password_check_delegate_unittest.cc b/chrome/browser/extensions/api/passwords_private/password_check_delegate_unittest.cc index ebfb407..bbdf7cd 100644 --- a/chrome/browser/extensions/api/passwords_private/password_check_delegate_unittest.cc +++ b/chrome/browser/extensions/api/passwords_private/password_check_delegate_unittest.cc
@@ -8,8 +8,8 @@ #include <string> #include <vector> -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h"
diff --git a/chrome/browser/extensions/api/passwords_private/passwords_private_api.cc b/chrome/browser/extensions/api/passwords_private/passwords_private_api.cc index 6c89721..dd37ebb6 100644 --- a/chrome/browser/extensions/api/passwords_private/passwords_private_api.cc +++ b/chrome/browser/extensions/api/passwords_private/passwords_private_api.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/metrics/histogram_macros.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/extensions/api/passwords_private/passwords_private_apitest.cc b/chrome/browser/extensions/api/passwords_private/passwords_private_apitest.cc index 8f8091e..86cc4420 100644 --- a/chrome/browser/extensions/api/passwords_private/passwords_private_apitest.cc +++ b/chrome/browser/extensions/api/passwords_private/passwords_private_apitest.cc
@@ -9,8 +9,8 @@ #include <sstream> #include <string> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/numerics/safe_conversions.h"
diff --git a/chrome/browser/extensions/api/passwords_private/passwords_private_delegate.h b/chrome/browser/extensions/api/passwords_private/passwords_private_delegate.h index 26f252c..ed739b2 100644 --- a/chrome/browser/extensions/api/passwords_private/passwords_private_delegate.h +++ b/chrome/browser/extensions/api/passwords_private/passwords_private_delegate.h
@@ -10,7 +10,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/strings/string_piece_forward.h" #include "chrome/common/extensions/api/passwords_private.h" #include "components/keyed_service/core/keyed_service.h"
diff --git a/chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc b/chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc index c73e3d64..16286b49 100644 --- a/chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc +++ b/chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc
@@ -7,9 +7,9 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/histogram_macros.h" #include "base/metrics/user_metrics.h" #include "base/metrics/user_metrics_action.h"
diff --git a/chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.h b/chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.h index 86ef1e23..67765bd 100644 --- a/chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.h +++ b/chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.h
@@ -12,7 +12,7 @@ #include <utility> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "build/build_config.h"
diff --git a/chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl_unittest.cc b/chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl_unittest.cc index 737d0cea1..d7c0db4 100644 --- a/chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl_unittest.cc +++ b/chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl_unittest.cc
@@ -8,8 +8,8 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/extensions/api/passwords_private/passwords_private_event_router.cc b/chrome/browser/extensions/api/passwords_private/passwords_private_event_router.cc index b8750c3..668e400 100644 --- a/chrome/browser/extensions/api/passwords_private/passwords_private_event_router.cc +++ b/chrome/browser/extensions/api/passwords_private/passwords_private_event_router.cc
@@ -8,8 +8,8 @@ #include <vector> #include "base/auto_reset.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/api/passwords_private/passwords_private_delegate.h"
diff --git a/chrome/browser/extensions/api/permissions/permissions_api.cc b/chrome/browser/extensions/api/permissions/permissions_api.cc index b1669bc..d8e0aad3 100644 --- a/chrome/browser/extensions/api/permissions/permissions_api.cc +++ b/chrome/browser/extensions/api/permissions/permissions_api.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/notreached.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/api/permissions/permissions_api_helpers.h"
diff --git a/chrome/browser/extensions/api/platform_keys/platform_keys_apitest_nss.cc b/chrome/browser/extensions/api/platform_keys/platform_keys_apitest_nss.cc index a822c32..7d9a46a 100644 --- a/chrome/browser/extensions/api/platform_keys/platform_keys_apitest_nss.cc +++ b/chrome/browser/extensions/api/platform_keys/platform_keys_apitest_nss.cc
@@ -10,7 +10,7 @@ #include <utility> #include "ash/constants/ash_features.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h" #include "chrome/browser/ash/platform_keys/key_permissions/key_permissions_service.h"
diff --git a/chrome/browser/extensions/api/platform_keys/platform_keys_test_base.cc b/chrome/browser/extensions/api/platform_keys/platform_keys_test_base.cc index 5491ae92..c8ecbe71 100644 --- a/chrome/browser/extensions/api/platform_keys/platform_keys_test_base.cc +++ b/chrome/browser/extensions/api/platform_keys/platform_keys_test_base.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/extensions/api/platform_keys/platform_keys_test_base.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/path_service.h" #include "base/run_loop.h" #include "chrome/browser/ash/platform_keys/platform_keys_service_factory.h"
diff --git a/chrome/browser/extensions/api/platform_keys/verify_trust_api.cc b/chrome/browser/extensions/api/platform_keys/verify_trust_api.cc index 9e8b8c0..70bb6ae 100644 --- a/chrome/browser/extensions/api/platform_keys/verify_trust_api.cc +++ b/chrome/browser/extensions/api/platform_keys/verify_trust_api.cc
@@ -8,9 +8,9 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/lazy_instance.h" #include "base/memory/ref_counted.h" #include "chrome/browser/extensions/api/platform_keys/platform_keys_api.h"
diff --git a/chrome/browser/extensions/api/platform_keys/verify_trust_api.h b/chrome/browser/extensions/api/platform_keys/verify_trust_api.h index 17e6893..5eaf301d 100644 --- a/chrome/browser/extensions/api/platform_keys/verify_trust_api.h +++ b/chrome/browser/extensions/api/platform_keys/verify_trust_api.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/scoped_observation.h" #include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/extensions/api/preference/preference_api.cc b/chrome/browser/extensions/api/preference/preference_api.cc index 86ea5c1..0cb6248c 100644 --- a/chrome/browser/extensions/api/preference/preference_api.cc +++ b/chrome/browser/extensions/api/preference/preference_api.cc
@@ -10,8 +10,8 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/lazy_instance.h" #include "base/values.h" #include "build/build_config.h"
diff --git a/chrome/browser/extensions/api/preference/preference_api_lacros_browsertest.cc b/chrome/browser/extensions/api/preference/preference_api_lacros_browsertest.cc index 369375e8..16329eb 100644 --- a/chrome/browser/extensions/api/preference/preference_api_lacros_browsertest.cc +++ b/chrome/browser/extensions/api/preference/preference_api_lacros_browsertest.cc
@@ -4,8 +4,8 @@ #include <memory> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/task/single_thread_task_runner.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/extension_apitest.h"
diff --git a/chrome/browser/extensions/api/preference/preference_apitest.cc b/chrome/browser/extensions/api/preference/preference_apitest.cc index ef906b0..a8715c0 100644 --- a/chrome/browser/extensions/api/preference/preference_apitest.cc +++ b/chrome/browser/extensions/api/preference/preference_apitest.cc
@@ -4,8 +4,8 @@ #include <memory> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/extensions/api/printer_provider/printer_provider_apitest.cc b/chrome/browser/extensions/api/printer_provider/printer_provider_apitest.cc index b5cedb5a..7362f38b 100644 --- a/chrome/browser/extensions/api/printer_provider/printer_provider_apitest.cc +++ b/chrome/browser/extensions/api/printer_provider/printer_provider_apitest.cc
@@ -8,8 +8,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/json/json_string_value_serializer.h" #include "base/memory/ref_counted_memory.h" #include "base/run_loop.h"
diff --git a/chrome/browser/extensions/api/printing/fake_print_job_controller.cc b/chrome/browser/extensions/api/printing/fake_print_job_controller.cc index 1215173..d89bcef2 100644 --- a/chrome/browser/extensions/api/printing/fake_print_job_controller.cc +++ b/chrome/browser/extensions/api/printing/fake_print_job_controller.cc
@@ -7,8 +7,8 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/printing/print_job.h"
diff --git a/chrome/browser/extensions/api/printing/fake_print_job_controller_ash.cc b/chrome/browser/extensions/api/printing/fake_print_job_controller_ash.cc index d5ccf99..11cf6c0 100644 --- a/chrome/browser/extensions/api/printing/fake_print_job_controller_ash.cc +++ b/chrome/browser/extensions/api/printing/fake_print_job_controller_ash.cc
@@ -7,9 +7,9 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/check.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/ash/printing/cups_print_job.h"
diff --git a/chrome/browser/extensions/api/printing/print_job_controller.cc b/chrome/browser/extensions/api/printing/print_job_controller.cc index 43374700..9efccf6e 100644 --- a/chrome/browser/extensions/api/printing/print_job_controller.cc +++ b/chrome/browser/extensions/api/printing/print_job_controller.cc
@@ -7,9 +7,9 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/check.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "build/chromeos_buildflags.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/extensions/api/printing/print_job_submitter.cc b/chrome/browser/extensions/api/printing/print_job_submitter.cc index 0ca5183..0b58560f 100644 --- a/chrome/browser/extensions/api/printing/print_job_submitter.cc +++ b/chrome/browser/extensions/api/printing/print_job_submitter.cc
@@ -7,10 +7,10 @@ #include <cstring> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/check_op.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/strings/utf_string_conversions.h" #include "base/task/sequenced_task_runner.h" #include "base/values.h"
diff --git a/chrome/browser/extensions/api/printing/print_job_submitter.h b/chrome/browser/extensions/api/printing/print_job_submitter.h index 4ef59567..9fa0b77 100644 --- a/chrome/browser/extensions/api/printing/print_job_submitter.h +++ b/chrome/browser/extensions/api/printing/print_job_submitter.h
@@ -9,7 +9,7 @@ #include <string> #include "base/auto_reset.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/read_only_shared_memory_region.h" #include "base/memory/scoped_refptr.h"
diff --git a/chrome/browser/extensions/api/printing/printing_api.cc b/chrome/browser/extensions/api/printing/printing_api.cc index 951cfd93..6fbc6c11 100644 --- a/chrome/browser/extensions/api/printing/printing_api.cc +++ b/chrome/browser/extensions/api/printing/printing_api.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/values.h" #include "chrome/browser/extensions/api/printing/printing_api_handler.h" #include "chrome/browser/extensions/chrome_extension_function_details.h"
diff --git a/chrome/browser/extensions/api/printing/printing_api_handler.cc b/chrome/browser/extensions/api/printing/printing_api_handler.cc index e40f1fa..ff9b6e99 100644 --- a/chrome/browser/extensions/api/printing/printing_api_handler.cc +++ b/chrome/browser/extensions/api/printing/printing_api_handler.cc
@@ -6,12 +6,12 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/check.h" #include "base/check_op.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/no_destructor.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/extensions/api/printing/printing_api_handler.h b/chrome/browser/extensions/api/printing/printing_api_handler.h index cde591d..277204b4 100644 --- a/chrome/browser/extensions/api/printing/printing_api_handler.h +++ b/chrome/browser/extensions/api/printing/printing_api_handler.h
@@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/task/sequenced_task_runner.h"
diff --git a/chrome/browser/extensions/api/printing/printing_apitest.cc b/chrome/browser/extensions/api/printing/printing_apitest.cc index 6bf4854..1884e314 100644 --- a/chrome/browser/extensions/api/printing/printing_apitest.cc +++ b/chrome/browser/extensions/api/printing/printing_apitest.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 "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/crosapi/crosapi_manager.h" #include "chrome/browser/ash/printing/cups_print_job_manager_factory.h" #include "chrome/browser/ash/printing/cups_printers_manager_factory.h"
diff --git a/chrome/browser/extensions/api/processes/processes_api.cc b/chrome/browser/extensions/api/processes/processes_api.cc index 7794e6ee..4ff70e2 100644 --- a/chrome/browser/extensions/api/processes/processes_api.cc +++ b/chrome/browser/extensions/api/processes/processes_api.cc
@@ -10,7 +10,7 @@ #include <set> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/lazy_instance.h" #include "base/metrics/histogram.h" #include "base/process/process.h"
diff --git a/chrome/browser/extensions/api/quick_unlock_private/quick_unlock_private_api.cc b/chrome/browser/extensions/api/quick_unlock_private/quick_unlock_private_api.cc index 873f00f..b96b8baf 100644 --- a/chrome/browser/extensions/api/quick_unlock_private/quick_unlock_private_api.cc +++ b/chrome/browser/extensions/api/quick_unlock_private/quick_unlock_private_api.cc
@@ -9,8 +9,8 @@ #include "ash/constants/ash_features.h" #include "ash/constants/ash_pref_names.h" -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/ranges/algorithm.h" #include "chrome/browser/ash/login/quick_unlock/auth_token.h" #include "chrome/browser/ash/login/quick_unlock/pin_backend.h"
diff --git a/chrome/browser/extensions/api/quick_unlock_private/quick_unlock_private_api.h b/chrome/browser/extensions/api/quick_unlock_private/quick_unlock_private_api.h index b01561d..d17408f 100644 --- a/chrome/browser/extensions/api/quick_unlock_private/quick_unlock_private_api.h +++ b/chrome/browser/extensions/api/quick_unlock_private/quick_unlock_private_api.h
@@ -8,7 +8,7 @@ #include <memory> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "chrome/browser/extensions/chrome_extension_function_details.h" #include "chrome/common/extensions/api/quick_unlock_private.h"
diff --git a/chrome/browser/extensions/api/quick_unlock_private/quick_unlock_private_api_lacros.cc b/chrome/browser/extensions/api/quick_unlock_private/quick_unlock_private_api_lacros.cc index 4c6efb39..7014839 100644 --- a/chrome/browser/extensions/api/quick_unlock_private/quick_unlock_private_api_lacros.cc +++ b/chrome/browser/extensions/api/quick_unlock_private/quick_unlock_private_api_lacros.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/common/extensions/api/quick_unlock_private.h" #include "chromeos/lacros/lacros_service.h" #include "content/public/browser/browser_task_traits.h"
diff --git a/chrome/browser/extensions/api/quick_unlock_private/quick_unlock_private_api_lacros.h b/chrome/browser/extensions/api/quick_unlock_private/quick_unlock_private_api_lacros.h index 0225819..8cea4521 100644 --- a/chrome/browser/extensions/api/quick_unlock_private/quick_unlock_private_api_lacros.h +++ b/chrome/browser/extensions/api/quick_unlock_private/quick_unlock_private_api_lacros.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_EXTENSIONS_API_QUICK_UNLOCK_PRIVATE_QUICK_UNLOCK_PRIVATE_API_LACROS_H_ #define CHROME_BROWSER_EXTENSIONS_API_QUICK_UNLOCK_PRIVATE_QUICK_UNLOCK_PRIVATE_API_LACROS_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/common/extensions/api/quick_unlock_private.h" #include "chromeos/crosapi/mojom/authentication.mojom.h" #include "extensions/browser/extension_function.h"
diff --git a/chrome/browser/extensions/api/quick_unlock_private/quick_unlock_private_api_unittest.cc b/chrome/browser/extensions/api/quick_unlock_private/quick_unlock_private_api_unittest.cc index c82e4ef..59e2fe8 100644 --- a/chrome/browser/extensions/api/quick_unlock_private/quick_unlock_private_api_unittest.cc +++ b/chrome/browser/extensions/api/quick_unlock_private/quick_unlock_private_api_unittest.cc
@@ -10,9 +10,9 @@ #include "ash/constants/ash_features.h" #include "ash/constants/ash_pref_names.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/scoped_refptr.h" #include "base/no_destructor.h" #include "base/run_loop.h"
diff --git a/chrome/browser/extensions/api/quick_unlock_private/quick_unlock_private_ash_utils.cc b/chrome/browser/extensions/api/quick_unlock_private/quick_unlock_private_ash_utils.cc index 74bbca67..bf66ae0 100644 --- a/chrome/browser/extensions/api/quick_unlock_private/quick_unlock_private_ash_utils.cc +++ b/chrome/browser/extensions/api/quick_unlock_private/quick_unlock_private_ash_utils.cc
@@ -7,7 +7,7 @@ #include <utility> #include "ash/constants/ash_features.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/login/quick_unlock/auth_token.h" #include "chrome/browser/ash/login/quick_unlock/fingerprint_storage.h" #include "chrome/browser/ash/login/quick_unlock/pin_storage_prefs.h"
diff --git a/chrome/browser/extensions/api/quick_unlock_private/quick_unlock_private_ash_utils.h b/chrome/browser/extensions/api/quick_unlock_private/quick_unlock_private_ash_utils.h index 2275096..178dce6a 100644 --- a/chrome/browser/extensions/api/quick_unlock_private/quick_unlock_private_ash_utils.h +++ b/chrome/browser/extensions/api/quick_unlock_private/quick_unlock_private_ash_utils.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "chromeos/ash/components/login/auth/auth_factor_editor.h"
diff --git a/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc b/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc index ed798bc..b9afa21 100644 --- a/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc +++ b/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc
@@ -9,7 +9,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/lazy_instance.h" #include "base/location.h" #include "base/metrics/histogram_macros.h"
diff --git a/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate_unittest.cc b/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate_unittest.cc index 834a22d..4547183 100644 --- a/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate_unittest.cc +++ b/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate_unittest.cc
@@ -6,10 +6,10 @@ #include <set> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/containers/contains.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h"
diff --git a/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router.cc b/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router.cc index 3731433..2abb9df 100644 --- a/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router.cc +++ b/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router.cc
@@ -7,9 +7,9 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/json/values_util.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router_unittest.cc b/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router_unittest.cc index 6883d1a..693c46fd0 100644 --- a/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router_unittest.cc +++ b/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router_unittest.cc
@@ -8,8 +8,8 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/json/json_reader.h" #include "base/memory/raw_ptr.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/extensions/api/sessions/sessions_apitest.cc b/chrome/browser/extensions/api/sessions/sessions_apitest.cc index 06aa172..3377202 100644 --- a/chrome/browser/extensions/api/sessions/sessions_apitest.cc +++ b/chrome/browser/extensions/api/sessions/sessions_apitest.cc
@@ -7,9 +7,9 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/path_service.h" #include "base/strings/pattern.h"
diff --git a/chrome/browser/extensions/api/settings_private/generated_prefs.cc b/chrome/browser/extensions/api/settings_private/generated_prefs.cc index 2b730b9..cf2d051b 100644 --- a/chrome/browser/extensions/api/settings_private/generated_prefs.cc +++ b/chrome/browser/extensions/api/settings_private/generated_prefs.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/extensions/api/settings_private/generated_prefs.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h" #include "chrome/browser/content_settings/generated_cookie_prefs.h"
diff --git a/chrome/browser/extensions/api/settings_private/settings_private_delegate.h b/chrome/browser/extensions/api/settings_private/settings_private_delegate.h index 03b231e9..e493ea2f 100644 --- a/chrome/browser/extensions/api/settings_private/settings_private_delegate.h +++ b/chrome/browser/extensions/api/settings_private/settings_private_delegate.h
@@ -9,7 +9,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/extensions/api/settings_private/prefs_util.h" #include "chrome/common/extensions/api/settings_private.h"
diff --git a/chrome/browser/extensions/api/settings_private/settings_private_event_router.cc b/chrome/browser/extensions/api/settings_private/settings_private_event_router.cc index 4e17df3..f0ec976c 100644 --- a/chrome/browser/extensions/api/settings_private/settings_private_event_router.cc +++ b/chrome/browser/extensions/api/settings_private/settings_private_event_router.cc
@@ -7,8 +7,8 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/task/single_thread_task_runner.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/extensions/api/socket/socket_api_unittest.cc b/chrome/browser/extensions/api/socket/socket_api_unittest.cc index 3ef22823..d8432d46 100644 --- a/chrome/browser/extensions/api/socket/socket_api_unittest.cc +++ b/chrome/browser/extensions/api/socket/socket_api_unittest.cc
@@ -4,7 +4,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/threading/sequenced_task_runner_handle.h" #include "base/values.h" #include "chrome/browser/browser_process_impl.h"
diff --git a/chrome/browser/extensions/api/socket/udp_socket_unittest.cc b/chrome/browser/extensions/api/socket/udp_socket_unittest.cc index 4003340..578a1637 100644 --- a/chrome/browser/extensions/api/socket/udp_socket_unittest.cc +++ b/chrome/browser/extensions/api/socket/udp_socket_unittest.cc
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/extensions/api/sockets_tcp_server/sockets_tcp_server_api_unittest.cc b/chrome/browser/extensions/api/sockets_tcp_server/sockets_tcp_server_api_unittest.cc index cf4d415..3566a3a2 100644 --- a/chrome/browser/extensions/api/sockets_tcp_server/sockets_tcp_server_api_unittest.cc +++ b/chrome/browser/extensions/api/sockets_tcp_server/sockets_tcp_server_api_unittest.cc
@@ -4,7 +4,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/threading/sequenced_task_runner_handle.h" #include "base/values.h" #include "chrome/browser/browser_process_impl.h"
diff --git a/chrome/browser/extensions/api/storage/policy_value_store_unittest.cc b/chrome/browser/extensions/api/storage/policy_value_store_unittest.cc index fb25d61..5d37046 100644 --- a/chrome/browser/extensions/api/storage/policy_value_store_unittest.cc +++ b/chrome/browser/extensions/api/storage/policy_value_store_unittest.cc
@@ -6,10 +6,10 @@ #include <memory> -#include "base/bind.h" -#include "base/callback.h" #include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/json/json_writer.h" #include "base/memory/ref_counted.h" #include "components/policy/core/common/external_data_fetcher.h"
diff --git a/chrome/browser/extensions/api/storage/settings_apitest.cc b/chrome/browser/extensions/api/storage/settings_apitest.cc index a2b7f95..ebc2256 100644 --- a/chrome/browser/extensions/api/storage/settings_apitest.cc +++ b/chrome/browser/extensions/api/storage/settings_apitest.cc
@@ -4,7 +4,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/json/json_writer.h" #include "base/memory/ref_counted.h" #include "base/run_loop.h"
diff --git a/chrome/browser/extensions/api/storage/settings_sync_unittest.cc b/chrome/browser/extensions/api/storage/settings_sync_unittest.cc index 19c4f160..c5abeb5 100644 --- a/chrome/browser/extensions/api/storage/settings_sync_unittest.cc +++ b/chrome/browser/extensions/api/storage/settings_sync_unittest.cc
@@ -7,8 +7,8 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/memory/raw_ptr.h"
diff --git a/chrome/browser/extensions/api/storage/settings_sync_util.cc b/chrome/browser/extensions/api/storage/settings_sync_util.cc index 4a6a14f..c4f06ca 100644 --- a/chrome/browser/extensions/api/storage/settings_sync_util.cc +++ b/chrome/browser/extensions/api/storage/settings_sync_util.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/extensions/api/storage/settings_sync_util.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/json/json_writer.h" #include "base/values.h" #include "chrome/browser/extensions/api/storage/sync_value_store_cache.h"
diff --git a/chrome/browser/extensions/api/storage/settings_sync_util.h b/chrome/browser/extensions/api/storage/settings_sync_util.h index 63fded3c..da40566 100644 --- a/chrome/browser/extensions/api/storage/settings_sync_util.h +++ b/chrome/browser/extensions/api/storage/settings_sync_util.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "components/sync/model/sync_change.h" #include "components/sync/model/sync_data.h"
diff --git a/chrome/browser/extensions/api/storage/sync_value_store_cache.cc b/chrome/browser/extensions/api/storage/sync_value_store_cache.cc index b7a0641..1d28c4d 100644 --- a/chrome/browser/extensions/api/storage/sync_value_store_cache.cc +++ b/chrome/browser/extensions/api/storage/sync_value_store_cache.cc
@@ -8,7 +8,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/sequenced_task_runner.h" #include "chrome/browser/extensions/api/storage/sync_storage_backend.h" #include "chrome/browser/sync/glue/sync_start_util.h"
diff --git a/chrome/browser/extensions/api/system_display/system_display_extension_apitest.cc b/chrome/browser/extensions/api/system_display/system_display_extension_apitest.cc index 50e69a2..8d219af 100644 --- a/chrome/browser/extensions/api/system_display/system_display_extension_apitest.cc +++ b/chrome/browser/extensions/api/system_display/system_display_extension_apitest.cc
@@ -5,8 +5,8 @@ #include <memory> #include <string> -#include "base/bind.h" #include "base/debug/leak_annotations.h" +#include "base/functional/bind.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h" #include "chrome/browser/extensions/extension_apitest.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 8268d8d..1975a46e 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
@@ -10,9 +10,9 @@ #include "base/base64.h" #include "base/base_switches.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/path_service.h" #include "base/strings/string_piece.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/extensions/api/tabs/tabs_api.cc b/chrome/browser/extensions/api/tabs/tabs_api.cc index 3137816..4a6a78a 100644 --- a/chrome/browser/extensions/api/tabs/tabs_api.cc +++ b/chrome/browser/extensions/api/tabs/tabs_api.cc
@@ -12,10 +12,10 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/check_op.h" #include "base/command_line.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted_memory.h" @@ -1589,11 +1589,8 @@ return false; } - const bool is_javascript_scheme = url.SchemeIs(url::kJavaScriptScheme); - UMA_HISTOGRAM_BOOLEAN("Extensions.ApiTabUpdateJavascript", - is_javascript_scheme); // JavaScript URLs are forbidden in chrome.tabs.update(). - if (is_javascript_scheme) { + if (url.SchemeIs(url::kJavaScriptScheme)) { *error = tabs_constants::kJavaScriptUrlsNotAllowedInTabsUpdate; return false; }
diff --git a/chrome/browser/extensions/api/tabs/tabs_event_router.cc b/chrome/browser/extensions/api/tabs/tabs_event_router.cc index acbe01e..a76d096 100644 --- a/chrome/browser/extensions/api/tabs/tabs_event_router.cc +++ b/chrome/browser/extensions/api/tabs/tabs_event_router.cc
@@ -10,7 +10,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/api/tabs/tabs_constants.h" #include "chrome/browser/extensions/api/tabs/tabs_windows_api.h"
diff --git a/chrome/browser/extensions/api/tabs/windows_event_router.cc b/chrome/browser/extensions/api/tabs/windows_event_router.cc index 3e7498c..1294e98 100644 --- a/chrome/browser/extensions/api/tabs/windows_event_router.cc +++ b/chrome/browser/extensions/api/tabs/windows_event_router.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/browser_process_platform_part.h"
diff --git a/chrome/browser/extensions/api/terminal/startup_status.cc b/chrome/browser/extensions/api/terminal/startup_status.cc index b725d724..bd68d81 100644 --- a/chrome/browser/extensions/api/terminal/startup_status.cc +++ b/chrome/browser/extensions/api/terminal/startup_status.cc
@@ -9,7 +9,7 @@ #include <memory> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/strings/strcat.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/extensions/api/terminal/startup_status_unittest.cc b/chrome/browser/extensions/api/terminal/startup_status_unittest.cc index b0c8fd8..4fabe01 100644 --- a/chrome/browser/extensions/api/terminal/startup_status_unittest.cc +++ b/chrome/browser/extensions/api/terminal/startup_status_unittest.cc
@@ -7,7 +7,7 @@ #include <memory> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "testing/gtest/include/gtest/gtest.h" namespace extensions {
diff --git a/chrome/browser/extensions/api/terminal/terminal_private_api.cc b/chrome/browser/extensions/api/terminal/terminal_private_api.cc index 8c4f889..e81b6d70 100644 --- a/chrome/browser/extensions/api/terminal/terminal_private_api.cc +++ b/chrome/browser/extensions/api/terminal/terminal_private_api.cc
@@ -12,12 +12,12 @@ #include "ash/constants/ash_features.h" #include "ash/constants/ash_pref_names.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" #include "base/containers/contains.h" #include "base/containers/flat_set.h" #include "base/containers/span.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/json/json_writer.h" #include "base/lazy_instance.h" #include "base/memory/scoped_refptr.h"
diff --git a/chrome/browser/extensions/api/terminal/terminal_private_apitest.cc b/chrome/browser/extensions/api/terminal/terminal_private_apitest.cc index 5f74e5b..643fc13 100644 --- a/chrome/browser/extensions/api/terminal/terminal_private_apitest.cc +++ b/chrome/browser/extensions/api/terminal/terminal_private_apitest.cc
@@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/bind.h" #include "base/command_line.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/run_loop.h" #include "base/test/bind.h"
diff --git a/chrome/browser/extensions/api/top_sites/top_sites_api.cc b/chrome/browser/extensions/api/top_sites/top_sites_api.cc index 5c31f774..e011852eb 100644 --- a/chrome/browser/extensions/api/top_sites/top_sites_api.cc +++ b/chrome/browser/extensions/api/top_sites/top_sites_api.cc
@@ -9,7 +9,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/values.h" #include "chrome/browser/history/top_sites_factory.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/extensions/api/top_sites/top_sites_apitest.cc b/chrome/browser/extensions/api/top_sites/top_sites_apitest.cc index 98e081c..9f38b38 100644 --- a/chrome/browser/extensions/api/top_sites/top_sites_apitest.cc +++ b/chrome/browser/extensions/api/top_sites/top_sites_apitest.cc
@@ -4,7 +4,7 @@ #include <stddef.h> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/values.h" #include "build/build_config.h"
diff --git a/chrome/browser/extensions/api/virtual_keyboard_private/chrome_virtual_keyboard_delegate.cc b/chrome/browser/extensions/api/virtual_keyboard_private/chrome_virtual_keyboard_delegate.cc index 57c4c352..37575a2 100644 --- a/chrome/browser/extensions/api/virtual_keyboard_private/chrome_virtual_keyboard_delegate.cc +++ b/chrome/browser/extensions/api/virtual_keyboard_private/chrome_virtual_keyboard_delegate.cc
@@ -13,10 +13,10 @@ #include "ash/public/cpp/clipboard_image_model_factory.h" #include "ash/public/cpp/keyboard/keyboard_switches.h" #include "ash/public/cpp/keyboard/keyboard_types.h" -#include "base/bind.h" #include "base/check.h" #include "base/command_line.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/metrics/field_trial_params.h" #include "base/metrics/user_metrics.h" #include "base/metrics/user_metrics_action.h"
diff --git a/chrome/browser/extensions/api/vpn_provider/vpn_provider_apitest.cc b/chrome/browser/extensions/api/vpn_provider/vpn_provider_apitest.cc index bba3e74..334949d 100644 --- a/chrome/browser/extensions/api/vpn_provider/vpn_provider_apitest.cc +++ b/chrome/browser/extensions/api/vpn_provider/vpn_provider_apitest.cc
@@ -5,9 +5,9 @@ #include <stddef.h> #include <stdint.h> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/test/test_future.h" #include "chrome/browser/chromeos/extensions/vpn_provider/vpn_provider_api.h"
diff --git a/chrome/browser/extensions/api/web_authentication_proxy/remote_session_state_change.cc b/chrome/browser/extensions/api/web_authentication_proxy/remote_session_state_change.cc index e73ca7e..448544eb 100644 --- a/chrome/browser/extensions/api/web_authentication_proxy/remote_session_state_change.cc +++ b/chrome/browser/extensions/api/web_authentication_proxy/remote_session_state_change.cc
@@ -7,9 +7,9 @@ #include <memory> #include "base/base_paths.h" -#include "base/bind.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/path_service.h"
diff --git a/chrome/browser/extensions/api/web_authentication_proxy/remote_session_state_change.h b/chrome/browser/extensions/api/web_authentication_proxy/remote_session_state_change.h index 2829b0c5..050021cbd 100644 --- a/chrome/browser/extensions/api/web_authentication_proxy/remote_session_state_change.h +++ b/chrome/browser/extensions/api/web_authentication_proxy/remote_session_state_change.h
@@ -7,9 +7,9 @@ #include <memory> -#include "base/callback.h" #include "base/files/file_path.h" #include "base/files/file_path_watcher.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h" #include "base/task/task_traits.h"
diff --git a/chrome/browser/extensions/api/web_authentication_proxy/web_authentication_proxy_api.cc b/chrome/browser/extensions/api/web_authentication_proxy/web_authentication_proxy_api.cc index dda04c6..15e99cb 100644 --- a/chrome/browser/extensions/api/web_authentication_proxy/web_authentication_proxy_api.cc +++ b/chrome/browser/extensions/api/web_authentication_proxy/web_authentication_proxy_api.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/extensions/api/web_authentication_proxy/web_authentication_proxy_api.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "chrome/browser/extensions/api/web_authentication_proxy/web_authentication_proxy_service.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/extensions/api/web_navigation/web_navigation_api.h b/chrome/browser/extensions/api/web_navigation/web_navigation_api.h index cb9f0fbf..211d52f 100644 --- a/chrome/browser/extensions/api/web_navigation/web_navigation_api.h +++ b/chrome/browser/extensions/api/web_navigation/web_navigation_api.h
@@ -11,7 +11,7 @@ #include <map> #include <set> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/extensions/api/web_navigation/frame_navigation_state.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc b/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc index 452ffb8..f2aa9cd7 100644 --- a/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc +++ b/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc
@@ -5,10 +5,10 @@ #include <list> #include <set> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc b/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc index 7c9ee31..a97e407 100644 --- a/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc +++ b/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc
@@ -9,11 +9,11 @@ #include <memory> #include <tuple> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/containers/queue.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/json/json_reader.h" #include "base/json/json_string_value_serializer.h" #include "base/memory/ptr_util.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 64bfdb3..bab70ca 100644 --- a/chrome/browser/extensions/api/web_request/web_request_apitest.cc +++ b/chrome/browser/extensions/api/web_request/web_request_apitest.cc
@@ -8,10 +8,10 @@ #include <vector> #include "base/base64.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/containers/contains.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/json/json_reader.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h"
diff --git a/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_api.cc b/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_api.cc index 253f280..f768b22 100644 --- a/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_api.cc +++ b/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_api.cc
@@ -8,7 +8,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/lazy_instance.h" #include "base/strings/string_number_conversions.h" #include "chrome/browser/extensions/extension_tab_util.h"
diff --git a/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_browsertest.cc b/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_browsertest.cc index bef6d768..014e563 100644 --- a/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_browsertest.cc +++ b/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_browsertest.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/json/json_writer.h" #include "base/run_loop.h" #include "base/strings/string_util.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 75693fd..98a0c58 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
@@ -7,9 +7,9 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/check_op.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/hash/hash.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_apitest.cc b/chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_apitest.cc index f1ff53d..a40a77c 100644 --- a/chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_apitest.cc +++ b/chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_apitest.cc
@@ -7,9 +7,9 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/json/json_writer.h" #include "base/memory/raw_ptr.h" #include "base/strings/string_split.h"
diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc index a0e5a625..2a81d039 100644 --- a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc +++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
@@ -11,8 +11,8 @@ #include <vector> #include "base/base64.h" -#include "base/bind.h" #include "base/containers/cxx20_erase_vector.h" +#include "base/functional/bind.h" #include "base/json/values_util.h" #include "base/lazy_instance.h" #include "base/memory/scoped_refptr.h"
diff --git a/chrome/browser/extensions/app_background_page_apitest.cc b/chrome/browser/extensions/app_background_page_apitest.cc index 69e2fc6..a8b4959 100644 --- a/chrome/browser/extensions/app_background_page_apitest.cc +++ b/chrome/browser/extensions/app_background_page_apitest.cc
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/bind.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/path_service.h"
diff --git a/chrome/browser/extensions/background_xhr_browsertest.cc b/chrome/browser/extensions/background_xhr_browsertest.cc index aca5be1..da1cddc 100644 --- a/chrome/browser/extensions/background_xhr_browsertest.cc +++ b/chrome/browser/extensions/background_xhr_browsertest.cc
@@ -4,7 +4,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/json/json_reader.h" #include "base/strings/escape.h" #include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/extensions/blocklist.cc b/chrome/browser/extensions/blocklist.cc index 6cf8fc0..ee4ee0f2 100644 --- a/chrome/browser/extensions/blocklist.cc +++ b/chrome/browser/extensions/blocklist.cc
@@ -8,9 +8,9 @@ #include <iterator> #include <memory> -#include "base/bind.h" #include "base/callback_list.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/lazy_instance.h" #include "base/memory/ref_counted.h" #include "base/observer_list.h"
diff --git a/chrome/browser/extensions/blocklist.h b/chrome/browser/extensions/blocklist.h index dc9bf428..f40c437 100644 --- a/chrome/browser/extensions/blocklist.h +++ b/chrome/browser/extensions/blocklist.h
@@ -12,8 +12,8 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/callback_list.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h"
diff --git a/chrome/browser/extensions/blocklist_check.cc b/chrome/browser/extensions/blocklist_check.cc index 7476612..b04df0a 100644 --- a/chrome/browser/extensions/blocklist_check.cc +++ b/chrome/browser/extensions/blocklist_check.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/extensions/blocklist_check.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/extensions/blocklist.h" #include "extensions/common/extension.h"
diff --git a/chrome/browser/extensions/blocklist_state_fetcher.cc b/chrome/browser/extensions/blocklist_state_fetcher.cc index b564b65..251b8aa 100644 --- a/chrome/browser/extensions/blocklist_state_fetcher.cc +++ b/chrome/browser/extensions/blocklist_state_fetcher.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/extensions/blocklist_state_fetcher.h" -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/strings/escape.h" #include "base/task/single_thread_task_runner.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/extensions/blocklist_state_fetcher.h b/chrome/browser/extensions/blocklist_state_fetcher.h index e517f70..bc9644e 100644 --- a/chrome/browser/extensions/blocklist_state_fetcher.h +++ b/chrome/browser/extensions/blocklist_state_fetcher.h
@@ -10,7 +10,7 @@ #include <set> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "components/safe_browsing/core/browser/db/util.h" #include "extensions/browser/blocklist_state.h"
diff --git a/chrome/browser/extensions/blocklist_state_fetcher_unittest.cc b/chrome/browser/extensions/blocklist_state_fetcher_unittest.cc index 744df7f..4e5e6a8 100644 --- a/chrome/browser/extensions/blocklist_state_fetcher_unittest.cc +++ b/chrome/browser/extensions/blocklist_state_fetcher_unittest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/extensions/blocklist_state_fetcher.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "chrome/browser/extensions/test_blocklist_state_fetcher.h" #include "chrome/common/safe_browsing/crx_info.pb.h"
diff --git a/chrome/browser/extensions/blocklist_unittest.cc b/chrome/browser/extensions/blocklist_unittest.cc index 3bbd35e..eee1446 100644 --- a/chrome/browser/extensions/blocklist_unittest.cc +++ b/chrome/browser/extensions/blocklist_unittest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/extensions/blocklist.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h" #include "chrome/browser/extensions/blocklist_state_fetcher.h"
diff --git a/chrome/browser/extensions/chrome_app_api_browsertest.cc b/chrome/browser/extensions/chrome_app_api_browsertest.cc index ca9eb938..4a536ec 100644 --- a/chrome/browser/extensions/chrome_app_api_browsertest.cc +++ b/chrome/browser/extensions/chrome_app_api_browsertest.cc
@@ -5,8 +5,8 @@ #include <memory> #include <string> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/json/json_reader.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/extensions/chrome_app_icon.h b/chrome/browser/extensions/chrome_app_icon.h index f9c9f0d..c278c66 100644 --- a/chrome/browser/extensions/chrome_app_icon.h +++ b/chrome/browser/extensions/chrome_app_icon.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "build/chromeos_buildflags.h" #include "extensions/browser/extension_icon_image.h"
diff --git a/chrome/browser/extensions/chrome_app_icon_loader.h b/chrome/browser/extensions/chrome_app_icon_loader.h index 4dac594..1fa75b58 100644 --- a/chrome/browser/extensions/chrome_app_icon_loader.h +++ b/chrome/browser/extensions/chrome_app_icon_loader.h
@@ -9,7 +9,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/extensions/chrome_app_icon_delegate.h" #include "chrome/browser/ui/app_icon_loader.h"
diff --git a/chrome/browser/extensions/chrome_app_icon_service.cc b/chrome/browser/extensions/chrome_app_icon_service.cc index 4feea478..9b4e2a6 100644 --- a/chrome/browser/extensions/chrome_app_icon_service.cc +++ b/chrome/browser/extensions/chrome_app_icon_service.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/extensions/chrome_app_icon_service.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/single_thread_task_runner.h" #include "build/chromeos_buildflags.h" #include "chrome/browser/extensions/chrome_app_icon.h"
diff --git a/chrome/browser/extensions/chrome_app_icon_service.h b/chrome/browser/extensions/chrome_app_icon_service.h index 468bae1..7594a8e 100644 --- a/chrome/browser/extensions/chrome_app_icon_service.h +++ b/chrome/browser/extensions/chrome_app_icon_service.h
@@ -9,7 +9,7 @@ #include <memory> #include <set> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/scoped_observation.h"
diff --git a/chrome/browser/extensions/chrome_app_icon_unittest.cc b/chrome/browser/extensions/chrome_app_icon_unittest.cc index b8cf6936..9b5b157 100644 --- a/chrome/browser/extensions/chrome_app_icon_unittest.cc +++ b/chrome/browser/extensions/chrome_app_icon_unittest.cc
@@ -7,7 +7,7 @@ #include <vector> #include "ash/public/cpp/app_list/app_list_config.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "build/chromeos_buildflags.h" #include "chrome/browser/extensions/chrome_app_icon.h"
diff --git a/chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc b/chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc index 69126850..ca00722 100644 --- a/chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc +++ b/chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc
@@ -12,8 +12,8 @@ #include <string> #include <vector> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "base/strings/string_piece.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/extensions/chrome_extension_function_unittest.cc b/chrome/browser/extensions/chrome_extension_function_unittest.cc index edce945..f44f13b 100644 --- a/chrome/browser/extensions/chrome_extension_function_unittest.cc +++ b/chrome/browser/extensions/chrome_extension_function_unittest.cc
@@ -4,8 +4,8 @@ #include <memory> -#include "base/bind.h" #include "base/dcheck_is_on.h" +#include "base/functional/bind.h" #include "base/memory/scoped_refptr.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/extensions/chrome_extension_test_notification_observer.cc b/chrome/browser/extensions/chrome_extension_test_notification_observer.cc index 1e7b4af..334df41 100644 --- a/chrome/browser/extensions/chrome_extension_test_notification_observer.cc +++ b/chrome/browser/extensions/chrome_extension_test_notification_observer.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/extensions/chrome_extension_test_notification_observer.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/scoped_observation.h" #include "chrome/browser/extensions/extension_action_test_util.h" #include "chrome/browser/extensions/extension_util.h"
diff --git a/chrome/browser/extensions/chrome_extensions_browser_interface_binders.cc b/chrome/browser/extensions/chrome_extensions_browser_interface_binders.cc index c3e9e08..4d775228 100644 --- a/chrome/browser/extensions/chrome_extensions_browser_interface_binders.cc +++ b/chrome/browser/extensions/chrome_extensions_browser_interface_binders.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/extensions/chrome_extensions_browser_interface_binders.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "build/branding_buildflags.h" #include "build/chromeos_buildflags.h" #include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/extensions/chrome_url_request_util.cc b/chrome/browser/extensions/chrome_url_request_util.cc index dd63ef8..cb9d9bb 100644 --- a/chrome/browser/extensions/chrome_url_request_util.cc +++ b/chrome/browser/extensions/chrome_url_request_util.cc
@@ -7,8 +7,8 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted_memory.h" #include "base/memory/weak_ptr.h" #include "base/path_service.h"
diff --git a/chrome/browser/extensions/chrome_zipfile_installer.cc b/chrome/browser/extensions/chrome_zipfile_installer.cc index 83eacb2e..3080344 100644 --- a/chrome/browser/extensions/chrome_zipfile_installer.cc +++ b/chrome/browser/extensions/chrome_zipfile_installer.cc
@@ -4,9 +4,9 @@ #include "chrome/browser/extensions/chrome_zipfile_installer.h" -#include "base/bind.h" #include "base/check.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/load_error_reporter.h"
diff --git a/chrome/browser/extensions/clipboard_extension_helper_chromeos.h b/chrome/browser/extensions/clipboard_extension_helper_chromeos.h index 33aac1b..3334b38 100644 --- a/chrome/browser/extensions/clipboard_extension_helper_chromeos.h +++ b/chrome/browser/extensions/clipboard_extension_helper_chromeos.h
@@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "extensions/browser/api/clipboard/clipboard_api.h" #include "extensions/common/api/clipboard.h"
diff --git a/chrome/browser/extensions/component_loader.cc b/chrome/browser/extensions/component_loader.cc index 87b39b9..e5bb97d 100644 --- a/chrome/browser/extensions/component_loader.cc +++ b/chrome/browser/extensions/component_loader.cc
@@ -6,12 +6,12 @@ #include <string> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/feature_list.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/json/json_string_value_serializer.h" #include "base/metrics/histogram_macros.h" #include "base/path_service.h"
diff --git a/chrome/browser/extensions/component_loader.h b/chrome/browser/extensions/component_loader.h index 4baaa0c3..7af36d2 100644 --- a/chrome/browser/extensions/component_loader.h +++ b/chrome/browser/extensions/component_loader.h
@@ -10,8 +10,8 @@ #include <string> #include <vector> -#include "base/callback_forward.h" #include "base/files/file_path.h" +#include "base/functional/callback_forward.h" #include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h"
diff --git a/chrome/browser/extensions/content_script_apitest.cc b/chrome/browser/extensions/content_script_apitest.cc index a2552b8f..ddab0622 100644 --- a/chrome/browser/extensions/content_script_apitest.cc +++ b/chrome/browser/extensions/content_script_apitest.cc
@@ -4,8 +4,8 @@ #include <stddef.h> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/run_loop.h" #include "base/strings/strcat.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/extensions/content_verifier_browsertest.cc b/chrome/browser/extensions/content_verifier_browsertest.cc index 353ac8d..6b42aa7 100644 --- a/chrome/browser/extensions/content_verifier_browsertest.cc +++ b/chrome/browser/extensions/content_verifier_browsertest.cc
@@ -7,8 +7,8 @@ #include <set> #include <string> -#include "base/callback_helpers.h" #include "base/files/file_util.h" +#include "base/functional/callback_helpers.h" #include "base/strings/string_split.h" #include "base/test/scoped_feature_list.h" #include "base/test/task_environment.h"
diff --git a/chrome/browser/extensions/content_verifier_hash_fetch_behavior_browsertest.cc b/chrome/browser/extensions/content_verifier_hash_fetch_behavior_browsertest.cc index b9278ca..1cb0283 100644 --- a/chrome/browser/extensions/content_verifier_hash_fetch_behavior_browsertest.cc +++ b/chrome/browser/extensions/content_verifier_hash_fetch_behavior_browsertest.cc
@@ -5,8 +5,8 @@ #include <memory> #include <string> -#include "base/bind.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/test/bind.h" #include "build/build_config.h" #include "chrome/browser/extensions/browsertest_util.h"
diff --git a/chrome/browser/extensions/content_verifier_test_utils.cc b/chrome/browser/extensions/content_verifier_test_utils.cc index 59c4e20e..457d0b0 100644 --- a/chrome/browser/extensions/content_verifier_test_utils.cc +++ b/chrome/browser/extensions/content_verifier_test_utils.cc
@@ -6,9 +6,9 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/run_loop.h" #include "content/public/test/test_utils.h" #include "extensions/browser/external_install_info.h"
diff --git a/chrome/browser/extensions/content_verifier_test_utils.h b/chrome/browser/extensions/content_verifier_test_utils.h index 0c49748..d4710f3d 100644 --- a/chrome/browser/extensions/content_verifier_test_utils.h +++ b/chrome/browser/extensions/content_verifier_test_utils.h
@@ -11,8 +11,8 @@ #include <string> #include <vector> -#include "base/callback_helpers.h" #include "base/files/file_path.h" +#include "base/functional/callback_helpers.h" #include "base/time/time.h" #include "chrome/browser/extensions/corrupted_extension_reinstaller.h" #include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/extensions/context_menu_matcher.h b/chrome/browser/extensions/context_menu_matcher.h index 246431b..811f738 100644 --- a/chrome/browser/extensions/context_menu_matcher.h +++ b/chrome/browser/extensions/context_menu_matcher.h
@@ -12,7 +12,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/extensions/menu_manager.h" #include "ui/base/models/simple_menu_model.h"
diff --git a/chrome/browser/extensions/corb_and_cors_extension_browsertest.cc b/chrome/browser/extensions/corb_and_cors_extension_browsertest.cc index 5122fd2..0f9d8ba 100644 --- a/chrome/browser/extensions/corb_and_cors_extension_browsertest.cc +++ b/chrome/browser/extensions/corb_and_cors_extension_browsertest.cc
@@ -5,8 +5,8 @@ #include <string> #include <vector> -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/json/json_reader.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h"
diff --git a/chrome/browser/extensions/corrupted_extension_reinstaller.cc b/chrome/browser/extensions/corrupted_extension_reinstaller.cc index 50d6a2e..542e41b 100644 --- a/chrome/browser/extensions/corrupted_extension_reinstaller.cc +++ b/chrome/browser/extensions/corrupted_extension_reinstaller.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/extensions/corrupted_extension_reinstaller.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "base/task/single_thread_task_runner.h" #include "chrome/browser/extensions/extension_service.h"
diff --git a/chrome/browser/extensions/corrupted_extension_reinstaller.h b/chrome/browser/extensions/corrupted_extension_reinstaller.h index 9bc2c7a..83a4b62 100644 --- a/chrome/browser/extensions/corrupted_extension_reinstaller.h +++ b/chrome/browser/extensions/corrupted_extension_reinstaller.h
@@ -7,7 +7,7 @@ #include <map> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h"
diff --git a/chrome/browser/extensions/corrupted_extension_reinstaller_unittest.cc b/chrome/browser/extensions/corrupted_extension_reinstaller_unittest.cc index f06b573..a66d0632 100644 --- a/chrome/browser/extensions/corrupted_extension_reinstaller_unittest.cc +++ b/chrome/browser/extensions/corrupted_extension_reinstaller_unittest.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/test/simple_test_tick_clock.h" #include "base/threading/thread_task_runner_handle.h" #include "chrome/browser/extensions/extension_service.h"
diff --git a/chrome/browser/extensions/crx_installer.cc b/chrome/browser/extensions/crx_installer.cc index b44a281..51e592ca 100644 --- a/chrome/browser/extensions/crx_installer.cc +++ b/chrome/browser/extensions/crx_installer.cc
@@ -8,10 +8,10 @@ #include <set> #include <utility> -#include "base/bind.h" #include "base/command_line.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/lazy_instance.h" #include "base/metrics/histogram_macros.h" #include "base/strings/string_util.h"
diff --git a/chrome/browser/extensions/crx_installer_browsertest.cc b/chrome/browser/extensions/crx_installer_browsertest.cc index b50cf31..2d040c4e 100644 --- a/chrome/browser/extensions/crx_installer_browsertest.cc +++ b/chrome/browser/extensions/crx_installer_browsertest.cc
@@ -10,11 +10,11 @@ #include <utility> #include "base/at_exit.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h"
diff --git a/chrome/browser/extensions/data_deleter.cc b/chrome/browser/extensions/data_deleter.cc index f362491..fabf3b0 100644 --- a/chrome/browser/extensions/data_deleter.cc +++ b/chrome/browser/extensions/data_deleter.cc
@@ -5,7 +5,7 @@ #include "chrome/browser/extensions/data_deleter.h" #include "base/barrier_closure.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_refptr.h" #include "base/task/task_runner.h"
diff --git a/chrome/browser/extensions/data_deleter.h b/chrome/browser/extensions/data_deleter.h index 45c14a7b..1e508d8 100644 --- a/chrome/browser/extensions/data_deleter.h +++ b/chrome/browser/extensions/data_deleter.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_EXTENSIONS_DATA_DELETER_H_ #define CHROME_BROWSER_EXTENSIONS_DATA_DELETER_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" class Profile;
diff --git a/chrome/browser/extensions/devtools_util.cc b/chrome/browser/extensions/devtools_util.cc index 7a4a80d..8e3ea63 100644 --- a/chrome/browser/extensions/devtools_util.cc +++ b/chrome/browser/extensions/devtools_util.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/extensions/devtools_util.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/devtools/devtools_window.h" #include "chrome/browser/profiles/profile.h" #include "extensions/browser/extension_host.h"
diff --git a/chrome/browser/extensions/error_console/error_console.cc b/chrome/browser/extensions/error_console/error_console.cc index 099c374..aa2dae1f 100644 --- a/chrome/browser/extensions/error_console/error_console.cc +++ b/chrome/browser/extensions/error_console/error_console.cc
@@ -7,8 +7,8 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/lazy_instance.h" #include "base/observer_list.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/extensions/event_router_forwarder.cc b/chrome/browser/extensions/event_router_forwarder.cc index 82fa50d..7aeb076 100644 --- a/chrome/browser/extensions/event_router_forwarder.cc +++ b/chrome/browser/extensions/event_router_forwarder.cc
@@ -8,7 +8,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/values.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/extensions/event_router_forwarder_unittest.cc b/chrome/browser/extensions/event_router_forwarder_unittest.cc index 4aa6c59..e336f9b 100644 --- a/chrome/browser/extensions/event_router_forwarder_unittest.cc +++ b/chrome/browser/extensions/event_router_forwarder_unittest.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/test/thread_test_helper.h"
diff --git a/chrome/browser/extensions/extension_action_runner.cc b/chrome/browser/extensions/extension_action_runner.cc index 511981c..4aade600 100644 --- a/chrome/browser/extensions/extension_action_runner.cc +++ b/chrome/browser/extensions/extension_action_runner.cc
@@ -9,9 +9,9 @@ #include <vector> #include "base/auto_reset.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/metrics/histogram_macros.h" #include "base/ranges/algorithm.h"
diff --git a/chrome/browser/extensions/extension_action_runner.h b/chrome/browser/extensions/extension_action_runner.h index 543421f5..d8dba82 100644 --- a/chrome/browser/extensions/extension_action_runner.h +++ b/chrome/browser/extensions/extension_action_runner.h
@@ -12,7 +12,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/scoped_observation.h"
diff --git a/chrome/browser/extensions/extension_action_runner_unittest.cc b/chrome/browser/extensions/extension_action_runner_unittest.cc index 356b4c0..3dda4dd 100644 --- a/chrome/browser/extensions/extension_action_runner_unittest.cc +++ b/chrome/browser/extensions/extension_action_runner_unittest.cc
@@ -7,7 +7,7 @@ #include <map> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/values.h" #include "chrome/browser/extensions/active_tab_permission_granter.h"
diff --git a/chrome/browser/extensions/extension_action_storage_manager.cc b/chrome/browser/extensions/extension_action_storage_manager.cc index de10927c..3ec33ec 100644 --- a/chrome/browser/extensions/extension_action_storage_manager.cc +++ b/chrome/browser/extensions/extension_action_storage_manager.cc
@@ -10,7 +10,7 @@ #include <utility> #include "base/base64.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/string_number_conversions.h" #include "base/values.h" #include "extensions/browser/extension_action_manager.h"
diff --git a/chrome/browser/extensions/extension_action_test_util.cc b/chrome/browser/extensions/extension_action_test_util.cc index cb3bc54..6b561614d 100644 --- a/chrome/browser/extensions/extension_action_test_util.cc +++ b/chrome/browser/extensions/extension_action_test_util.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "chrome/browser/extensions/tab_helper.h" #include "chrome/browser/extensions/test_extension_system.h"
diff --git a/chrome/browser/extensions/extension_apitest.cc b/chrome/browser/extensions/extension_apitest.cc index 11ff673e84..751ae92 100644 --- a/chrome/browser/extensions/extension_apitest.cc +++ b/chrome/browser/extensions/extension_apitest.cc
@@ -10,10 +10,10 @@ #include <utility> #include "base/base_switches.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/feature_list.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/path_service.h" #include "base/strings/escape.h" #include "base/strings/string_split.h"
diff --git a/chrome/browser/extensions/extension_assets_manager.h b/chrome/browser/extensions/extension_assets_manager.h index 7473b39..0d961c79c 100644 --- a/chrome/browser/extensions/extension_assets_manager.h +++ b/chrome/browser/extensions/extension_assets_manager.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" class Profile;
diff --git a/chrome/browser/extensions/extension_assets_manager_chromeos.cc b/chrome/browser/extensions/extension_assets_manager_chromeos.cc index e2d9af1..0ce1166 100644 --- a/chrome/browser/extensions/extension_assets_manager_chromeos.cc +++ b/chrome/browser/extensions/extension_assets_manager_chromeos.cc
@@ -12,9 +12,9 @@ #include <vector> #include "ash/constants/ash_switches.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/memory/singleton.h" #include "base/system/sys_info.h" #include "base/task/sequenced_task_runner.h"
diff --git a/chrome/browser/extensions/extension_browsertest.cc b/chrome/browser/extensions/extension_browsertest.cc index 9c670d5..c21501c 100644 --- a/chrome/browser/extensions/extension_browsertest.cc +++ b/chrome/browser/extensions/extension_browsertest.cc
@@ -10,11 +10,11 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/command_line.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/json/json_file_value_serializer.h" #include "base/path_service.h" #include "base/run_loop.h"
diff --git a/chrome/browser/extensions/extension_context_menu_model.cc b/chrome/browser/extensions/extension_context_menu_model.cc index 8a92bab..95d0e8c 100644 --- a/chrome/browser/extensions/extension_context_menu_model.cc +++ b/chrome/browser/extensions/extension_context_menu_model.cc
@@ -6,9 +6,9 @@ #include <memory> -#include "base/bind.h" #include "base/containers/contains.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "base/metrics/user_metrics.h" #include "base/metrics/user_metrics_action.h"
diff --git a/chrome/browser/extensions/extension_context_menu_model_unittest.cc b/chrome/browser/extensions/extension_context_menu_model_unittest.cc index 494c550..84807e3 100644 --- a/chrome/browser/extensions/extension_context_menu_model_unittest.cc +++ b/chrome/browser/extensions/extension_context_menu_model_unittest.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/json/json_reader.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h"
diff --git a/chrome/browser/extensions/extension_disabled_ui.cc b/chrome/browser/extensions/extension_disabled_ui.cc index fbf132e..89e92dd4 100644 --- a/chrome/browser/extensions/extension_disabled_ui.cc +++ b/chrome/browser/extensions/extension_disabled_ui.cc
@@ -7,7 +7,7 @@ #include <memory> #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/metrics/histogram_macros.h"
diff --git a/chrome/browser/extensions/extension_garbage_collector.cc b/chrome/browser/extensions/extension_garbage_collector.cc index 525ab76..fdace5e 100644 --- a/chrome/browser/extensions/extension_garbage_collector.cc +++ b/chrome/browser/extensions/extension_garbage_collector.cc
@@ -10,10 +10,10 @@ #include <unordered_set> #include <utility> -#include "base/bind.h" #include "base/check_op.h" #include "base/files/file_enumerator.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/notreached.h" #include "base/one_shot_event.h"
diff --git a/chrome/browser/extensions/extension_garbage_collector_chromeos.cc b/chrome/browser/extensions/extension_garbage_collector_chromeos.cc index 8b7a992..f54c6aa 100644 --- a/chrome/browser/extensions/extension_garbage_collector_chromeos.cc +++ b/chrome/browser/extensions/extension_garbage_collector_chromeos.cc
@@ -4,7 +4,7 @@ #include <stddef.h> -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/profiles/profile_helper.h" #include "chrome/browser/extensions/extension_assets_manager_chromeos.h" #include "chrome/browser/extensions/extension_garbage_collector_chromeos.h"
diff --git a/chrome/browser/extensions/extension_gcm_app_handler.cc b/chrome/browser/extensions/extension_gcm_app_handler.cc index 1dbee2c..fee502b 100644 --- a/chrome/browser/extensions/extension_gcm_app_handler.cc +++ b/chrome/browser/extensions/extension_gcm_app_handler.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/lazy_instance.h" #include "base/location.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/extensions/extension_icon_manager.cc b/chrome/browser/extensions/extension_icon_manager.cc index ca60329..7b766ea 100644 --- a/chrome/browser/extensions/extension_icon_manager.cc +++ b/chrome/browser/extensions/extension_icon_manager.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/extensions/extension_icon_manager.h" -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "components/vector_icons/vector_icons.h" #include "extensions/browser/image_loader.h" #include "extensions/common/constants.h"
diff --git a/chrome/browser/extensions/extension_install_prompt.cc b/chrome/browser/extensions/extension_install_prompt.cc index 855896ac..4aa0ae7 100644 --- a/chrome/browser/extensions/extension_install_prompt.cc +++ b/chrome/browser/extensions/extension_install_prompt.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/observer_list.h" #include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/extensions/extension_install_prompt.h b/chrome/browser/extensions/extension_install_prompt.h index a8feacb..19a8885 100644 --- a/chrome/browser/extensions/extension_install_prompt.h +++ b/chrome/browser/extensions/extension_install_prompt.h
@@ -11,8 +11,8 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/extensions/extension_install_prompt_test_helper.cc b/chrome/browser/extensions/extension_install_prompt_test_helper.cc index efb2c3a..1cfd4197 100644 --- a/chrome/browser/extensions/extension_install_prompt_test_helper.cc +++ b/chrome/browser/extensions/extension_install_prompt_test_helper.cc
@@ -7,8 +7,8 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "testing/gtest/include/gtest/gtest.h" ExtensionInstallPromptTestHelper::ExtensionInstallPromptTestHelper() {}
diff --git a/chrome/browser/extensions/extension_install_prompt_unittest.cc b/chrome/browser/extensions/extension_install_prompt_unittest.cc index d0a58eb..20403a74 100644 --- a/chrome/browser/extensions/extension_install_prompt_unittest.cc +++ b/chrome/browser/extensions/extension_install_prompt_unittest.cc
@@ -9,7 +9,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted.h" #include "base/run_loop.h" #include "base/test/scoped_feature_list.h"
diff --git a/chrome/browser/extensions/extension_management.cc b/chrome/browser/extensions/extension_management.cc index 3488182..4cfbfce0 100644 --- a/chrome/browser/extensions/extension_management.cc +++ b/chrome/browser/extensions/extension_management.cc
@@ -8,10 +8,10 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/contains.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h"
diff --git a/chrome/browser/extensions/extension_message_bubble_controller.cc b/chrome/browser/extensions/extension_message_bubble_controller.cc index bebbb3f5..4e8a721 100644 --- a/chrome/browser/extensions/extension_message_bubble_controller.cc +++ b/chrome/browser/extensions/extension_message_bubble_controller.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/lazy_instance.h" #include "base/metrics/histogram_macros.h" #include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/extensions/extension_message_bubble_controller_unittest.cc b/chrome/browser/extensions/extension_message_bubble_controller_unittest.cc index 25dd5ca..7ec96d7 100644 --- a/chrome/browser/extensions/extension_message_bubble_controller_unittest.cc +++ b/chrome/browser/extensions/extension_message_bubble_controller_unittest.cc
@@ -7,9 +7,9 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/extensions/extension_modules_apitest.cc b/chrome/browser/extensions/extension_modules_apitest.cc index 57a2464..ead8fc03 100644 --- a/chrome/browser/extensions/extension_modules_apitest.cc +++ b/chrome/browser/extensions/extension_modules_apitest.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 "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/stringprintf.h" #include "chrome/browser/extensions/extension_apitest.h" #include "components/network_session_configurator/common/network_switches.h"
diff --git a/chrome/browser/extensions/extension_security_exploit_browsertest.cc b/chrome/browser/extensions/extension_security_exploit_browsertest.cc index 65776eb7..b3d4fc26 100644 --- a/chrome/browser/extensions/extension_security_exploit_browsertest.cc +++ b/chrome/browser/extensions/extension_security_exploit_browsertest.cc
@@ -4,8 +4,8 @@ #include <memory> -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc index 2fdbadf..82adadf 100644 --- a/chrome/browser/extensions/extension_service.cc +++ b/chrome/browser/extensions/extension_service.cc
@@ -12,14 +12,14 @@ #include <utility> #include "base/barrier_closure.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/check_op.h" #include "base/command_line.h" #include "base/containers/contains.h" #include "base/debug/alias.h" #include "base/debug/dump_without_crashing.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h"
diff --git a/chrome/browser/extensions/extension_service_sync_unittest.cc b/chrome/browser/extensions/extension_service_sync_unittest.cc index 0c20ef69..2801843f 100644 --- a/chrome/browser/extensions/extension_service_sync_unittest.cc +++ b/chrome/browser/extensions/extension_service_sync_unittest.cc
@@ -9,9 +9,9 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/command_line.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/memory/raw_ref.h"
diff --git a/chrome/browser/extensions/extension_service_test_base.cc b/chrome/browser/extensions/extension_service_test_base.cc index d3574e7e..c5a0100d 100644 --- a/chrome/browser/extensions/extension_service_test_base.cc +++ b/chrome/browser/extensions/extension_service_test_base.cc
@@ -6,9 +6,9 @@ #include <utility> -#include "base/bind.h" #include "base/command_line.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted.h" #include "base/path_service.h" #include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/extensions/extension_service_test_with_install.cc b/chrome/browser/extensions/extension_service_test_with_install.cc index 9794f6a..653c9cd 100644 --- a/chrome/browser/extensions/extension_service_test_with_install.cc +++ b/chrome/browser/extensions/extension_service_test_with_install.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/extensions/extension_service_test_with_install.h" -#include "base/bind.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/ranges/algorithm.h" #include "base/strings/utf_string_conversions.h" #include "base/test/bind.h"
diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc index 16fd9867..a4ce12c 100644 --- a/chrome/browser/extensions/extension_service_unittest.cc +++ b/chrome/browser/extensions/extension_service_unittest.cc
@@ -14,11 +14,11 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/command_line.h" #include "base/containers/contains.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/json/json_file_value_serializer.h" #include "base/json/json_reader.h" #include "base/json/json_string_value_serializer.h"
diff --git a/chrome/browser/extensions/extension_special_storage_policy.cc b/chrome/browser/extensions/extension_special_storage_policy.cc index 38935ec..4fe6561fb 100644 --- a/chrome/browser/extensions/extension_special_storage_policy.cc +++ b/chrome/browser/extensions/extension_special_storage_policy.cc
@@ -8,13 +8,13 @@ #include <stdint.h> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/check.h" #include "base/check_op.h" #include "base/command_line.h" #include "base/containers/contains.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/metrics/histogram_macros.h"
diff --git a/chrome/browser/extensions/extension_sync_service.cc b/chrome/browser/extensions/extension_sync_service.cc index 5d4c2cc..6a253ce 100644 --- a/chrome/browser/extensions/extension_sync_service.cc +++ b/chrome/browser/extensions/extension_sync_service.cc
@@ -7,7 +7,7 @@ #include <utility> #include "base/auto_reset.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/histogram_functions.h" #include "base/one_shot_event.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/extensions/extension_system_impl.cc b/chrome/browser/extensions/extension_system_impl.cc index 9b03fb3b..95c4f6b 100644 --- a/chrome/browser/extensions/extension_system_impl.cc +++ b/chrome/browser/extensions/extension_system_impl.cc
@@ -8,10 +8,10 @@ #include <memory> #include "base/base_switches.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/memory/weak_ptr.h" #include "base/strings/string_tokenizer.h" #include "base/time/time.h"
diff --git a/chrome/browser/extensions/extension_tab_util.h b/chrome/browser/extensions/extension_tab_util.h index b6edd6b..06a5842 100644 --- a/chrome/browser/extensions/extension_tab_util.h +++ b/chrome/browser/extensions/extension_tab_util.h
@@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/types/expected.h" #include "base/values.h" #include "chrome/common/extensions/api/tabs.h"
diff --git a/chrome/browser/extensions/extension_uninstall_dialog.cc b/chrome/browser/extensions/extension_uninstall_dialog.cc index 735a1ff..2654c6b9 100644 --- a/chrome/browser/extensions/extension_uninstall_dialog.cc +++ b/chrome/browser/extensions/extension_uninstall_dialog.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/extensions/extension_uninstall_dialog.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/histogram_macros.h" #include "base/metrics/user_metrics.h" #include "base/metrics/user_metrics_action.h"
diff --git a/chrome/browser/extensions/extension_url_loader_throttle_browsertest.cc b/chrome/browser/extensions/extension_url_loader_throttle_browsertest.cc index 3704524..23c6d78 100644 --- a/chrome/browser/extensions/extension_url_loader_throttle_browsertest.cc +++ b/chrome/browser/extensions/extension_url_loader_throttle_browsertest.cc
@@ -5,7 +5,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/extensions/extension_web_ui.cc b/chrome/browser/extensions/extension_web_ui.cc index fcd675d..4a206150 100644 --- a/chrome/browser/extensions/extension_web_ui.cc +++ b/chrome/browser/extensions/extension_web_ui.cc
@@ -12,8 +12,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/memory/scoped_refptr.h" #include "base/ranges/algorithm.h" #include "base/strings/string_util.h"
diff --git a/chrome/browser/extensions/extension_web_ui_override_registrar.cc b/chrome/browser/extensions/extension_web_ui_override_registrar.cc index ab34cbe..f2b0343 100644 --- a/chrome/browser/extensions/extension_web_ui_override_registrar.cc +++ b/chrome/browser/extensions/extension_web_ui_override_registrar.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/extensions/extension_web_ui_override_registrar.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/lazy_instance.h" #include "base/one_shot_event.h" #include "chrome/browser/extensions/extension_web_ui.h"
diff --git a/chrome/browser/extensions/extension_web_ui_unittest.cc b/chrome/browser/extensions/extension_web_ui_unittest.cc index c00781f3..05bc331 100644 --- a/chrome/browser/extensions/extension_web_ui_unittest.cc +++ b/chrome/browser/extensions/extension_web_ui_unittest.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "build/build_config.h"
diff --git a/chrome/browser/extensions/extension_with_management_policy_apitest.cc b/chrome/browser/extensions/extension_with_management_policy_apitest.cc index e1161cf..fd4fd2d 100644 --- a/chrome/browser/extensions/extension_with_management_policy_apitest.cc +++ b/chrome/browser/extensions/extension_with_management_policy_apitest.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/extensions/extension_with_management_policy_apitest.h" -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "components/policy/core/browser/browser_policy_connector.h" #include "net/dns/mock_host_resolver.h" #include "net/test/embedded_test_server/http_request.h"
diff --git a/chrome/browser/extensions/external_install_error.cc b/chrome/browser/extensions/external_install_error.cc index 3e3b3752..cd434f3 100644 --- a/chrome/browser/extensions/external_install_error.cc +++ b/chrome/browser/extensions/external_install_error.cc
@@ -9,7 +9,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h"
diff --git a/chrome/browser/extensions/external_pref_loader.cc b/chrome/browser/extensions/external_pref_loader.cc index dc7caf8..4ad0ba4a 100644 --- a/chrome/browser/extensions/external_pref_loader.cc +++ b/chrome/browser/extensions/external_pref_loader.cc
@@ -7,11 +7,11 @@ #include <set> #include <utility> -#include "base/bind.h" #include "base/containers/contains.h" #include "base/files/file_enumerator.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/json/json_file_value_serializer.h" #include "base/json/json_string_value_serializer.h" #include "base/logging.h"
diff --git a/chrome/browser/extensions/external_pref_loader_unittest.cc b/chrome/browser/extensions/external_pref_loader_unittest.cc index 04e48a9e..659d61a 100644 --- a/chrome/browser/extensions/external_pref_loader_unittest.cc +++ b/chrome/browser/extensions/external_pref_loader_unittest.cc
@@ -8,7 +8,7 @@ #include <utility> #include "ash/constants/ash_pref_names.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/test/scoped_feature_list.h" #include "chrome/browser/extensions/external_provider_impl.h"
diff --git a/chrome/browser/extensions/external_provider_impl_unittest.cc b/chrome/browser/extensions/external_provider_impl_unittest.cc index 0e814f4..391e7cb 100644 --- a/chrome/browser/extensions/external_provider_impl_unittest.cc +++ b/chrome/browser/extensions/external_provider_impl_unittest.cc
@@ -8,10 +8,10 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/command_line.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/path_service.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/extensions/external_registry_loader_win.cc b/chrome/browser/extensions/external_registry_loader_win.cc index 24a2e1c..7ceb9da9 100644 --- a/chrome/browser/extensions/external_registry_loader_win.cc +++ b/chrome/browser/extensions/external_registry_loader_win.cc
@@ -7,11 +7,11 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_file.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/metrics/histogram_macros.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/extensions/fake_safe_browsing_database_manager.cc b/chrome/browser/extensions/fake_safe_browsing_database_manager.cc index b001e648..e6bf5ec0 100644 --- a/chrome/browser/extensions/fake_safe_browsing_database_manager.cc +++ b/chrome/browser/extensions/fake_safe_browsing_database_manager.cc
@@ -10,8 +10,8 @@ #include <iterator> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ref_counted.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/extensions/fetch_apitest.cc b/chrome/browser/extensions/fetch_apitest.cc index 25e6c723..2465cc4 100644 --- a/chrome/browser/extensions/fetch_apitest.cc +++ b/chrome/browser/extensions/fetch_apitest.cc
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/strings/stringprintf.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/ui/browser_navigator_params.h"
diff --git a/chrome/browser/extensions/file_iframe_apitest.cc b/chrome/browser/extensions/file_iframe_apitest.cc index 97f38e4..4f4d1fe 100644 --- a/chrome/browser/extensions/file_iframe_apitest.cc +++ b/chrome/browser/extensions/file_iframe_apitest.cc
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/bind.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/strings/stringprintf.h" #include "base/threading/thread_restrictions.h" #include "chrome/browser/extensions/extension_browsertest.h"
diff --git a/chrome/browser/extensions/forced_extensions/force_installed_metrics.cc b/chrome/browser/extensions/forced_extensions/force_installed_metrics.cc index 0668a9c..55061f5 100644 --- a/chrome/browser/extensions/forced_extensions/force_installed_metrics.cc +++ b/chrome/browser/extensions/forced_extensions/force_installed_metrics.cc
@@ -6,7 +6,7 @@ #include <set> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/extensions/forced_extensions/force_installed_tracker.cc b/chrome/browser/extensions/forced_extensions/force_installed_tracker.cc index 221f55fd..80532264 100644 --- a/chrome/browser/extensions/forced_extensions/force_installed_tracker.cc +++ b/chrome/browser/extensions/forced_extensions/force_installed_tracker.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/extensions/forced_extensions/force_installed_tracker.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/observer_list.h" #include "base/values.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/extensions/global_shortcut_listener_win.cc b/chrome/browser/extensions/global_shortcut_listener_win.cc index 51cc1dd..943168e 100644 --- a/chrome/browser/extensions/global_shortcut_listener_win.cc +++ b/chrome/browser/extensions/global_shortcut_listener_win.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/extensions/global_shortcut_listener_win.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/win/win_util.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/media_keys_listener_manager.h"
diff --git a/chrome/browser/extensions/install_tracker.cc b/chrome/browser/extensions/install_tracker.cc index c2d4e41a..1376a6a 100644 --- a/chrome/browser/extensions/install_tracker.cc +++ b/chrome/browser/extensions/install_tracker.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/extensions/install_tracker.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/observer_list.h" #include "chrome/browser/extensions/install_tracker_factory.h" #include "extensions/browser/extension_prefs.h"
diff --git a/chrome/browser/extensions/install_verifier.cc b/chrome/browser/extensions/install_verifier.cc index 4871612..73ffa2f 100644 --- a/chrome/browser/extensions/install_verifier.cc +++ b/chrome/browser/extensions/install_verifier.cc
@@ -9,9 +9,9 @@ #include <utility> #include "base/base_switches.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/metrics/field_trial.h" #include "base/metrics/histogram_macros.h" #include "base/one_shot_event.h"
diff --git a/chrome/browser/extensions/install_verifier.h b/chrome/browser/extensions/install_verifier.h index 6c35b26..d8c62db3 100644 --- a/chrome/browser/extensions/install_verifier.h +++ b/chrome/browser/extensions/install_verifier.h
@@ -9,8 +9,8 @@ #include <set> #include <string> -#include "base/callback.h" #include "base/containers/queue.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h"
diff --git a/chrome/browser/extensions/isolated_app_browsertest.cc b/chrome/browser/extensions/isolated_app_browsertest.cc index e741544..963eff1d 100644 --- a/chrome/browser/extensions/isolated_app_browsertest.cc +++ b/chrome/browser/extensions/isolated_app_browsertest.cc
@@ -5,7 +5,7 @@ #include <stddef.h> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/escape.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/extensions/load_error_reporter.cc b/chrome/browser/extensions/load_error_reporter.cc index 5dec413..322d26c 100644 --- a/chrome/browser/extensions/load_error_reporter.cc +++ b/chrome/browser/extensions/load_error_reporter.cc
@@ -7,9 +7,9 @@ #include "base/task/single_thread_task_runner.h" #include "build/build_config.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/observer_list.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/extensions/menu_manager.cc b/chrome/browser/extensions/menu_manager.cc index 7f17454..2be596a 100644 --- a/chrome/browser/extensions/menu_manager.cc +++ b/chrome/browser/extensions/menu_manager.cc
@@ -8,9 +8,9 @@ #include <tuple> #include <utility> -#include "base/bind.h" #include "base/check_op.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/json/json_writer.h" #include "base/notreached.h" #include "base/observer_list.h"
diff --git a/chrome/browser/extensions/menu_manager_unittest.cc b/chrome/browser/extensions/menu_manager_unittest.cc index 354ee56..cf5260e 100644 --- a/chrome/browser/extensions/menu_manager_unittest.cc +++ b/chrome/browser/extensions/menu_manager_unittest.cc
@@ -8,8 +8,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/json/json_reader.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/extensions/navigation_observer.cc b/chrome/browser/extensions/navigation_observer.cc index a0951b9..4c81650 100644 --- a/chrome/browser/extensions/navigation_observer.cc +++ b/chrome/browser/extensions/navigation_observer.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/profiles/profile.h" #include "content/public/browser/navigation_controller.h"
diff --git a/chrome/browser/extensions/navigation_observer_browsertest.cc b/chrome/browser/extensions/navigation_observer_browsertest.cc index 88d8772e5..a35833e4 100644 --- a/chrome/browser/extensions/navigation_observer_browsertest.cc +++ b/chrome/browser/extensions/navigation_observer_browsertest.cc
@@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "chrome/browser/extensions/chrome_test_extension_loader.h"
diff --git a/chrome/browser/extensions/options_page_apitest.cc b/chrome/browser/extensions/options_page_apitest.cc index 191e3d1..3128813e6 100644 --- a/chrome/browser/extensions/options_page_apitest.cc +++ b/chrome/browser/extensions/options_page_apitest.cc
@@ -4,7 +4,7 @@ #include <stddef.h> -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tabs/tab_strip_model.h"
diff --git a/chrome/browser/extensions/pack_extension_job.cc b/chrome/browser/extensions/pack_extension_job.cc index 5a1975e..a7b666b 100644 --- a/chrome/browser/extensions/pack_extension_job.cc +++ b/chrome/browser/extensions/pack_extension_job.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/sys_string_conversions.h" #include "base/strings/utf_string_conversions.h" #include "base/task/sequenced_task_runner.h"
diff --git a/chrome/browser/extensions/permissions_updater.cc b/chrome/browser/extensions/permissions_updater.cc index c326601e..f21cdef 100644 --- a/chrome/browser/extensions/permissions_updater.cc +++ b/chrome/browser/extensions/permissions_updater.cc
@@ -8,9 +8,9 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ref_counted.h" #include "base/no_destructor.h" #include "base/values.h"
diff --git a/chrome/browser/extensions/permissions_updater.h b/chrome/browser/extensions/permissions_updater.h index c5de669f..43846185 100644 --- a/chrome/browser/extensions/permissions_updater.h +++ b/chrome/browser/extensions/permissions_updater.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "extensions/browser/extension_event_histogram_value.h"
diff --git a/chrome/browser/extensions/permissions_updater_unittest.cc b/chrome/browser/extensions/permissions_updater_unittest.cc index ec68ad2..96304a6 100644 --- a/chrome/browser/extensions/permissions_updater_unittest.cc +++ b/chrome/browser/extensions/permissions_updater_unittest.cc
@@ -7,9 +7,9 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/json/json_file_value_serializer.h" #include "base/memory/ref_counted.h" #include "base/run_loop.h"
diff --git a/chrome/browser/extensions/process_manager_browsertest.cc b/chrome/browser/extensions/process_manager_browsertest.cc index 2ff7aeaa..00516db1 100644 --- a/chrome/browser/extensions/process_manager_browsertest.cc +++ b/chrome/browser/extensions/process_manager_browsertest.cc
@@ -7,8 +7,8 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/path_service.h" #include "base/run_loop.h" #include "base/stl_util.h"
diff --git a/chrome/browser/extensions/scripting_permissions_modifier_unittest.cc b/chrome/browser/extensions/scripting_permissions_modifier_unittest.cc index be876db..a47d920 100644 --- a/chrome/browser/extensions/scripting_permissions_modifier_unittest.cc +++ b/chrome/browser/extensions/scripting_permissions_modifier_unittest.cc
@@ -4,7 +4,7 @@ #include <utility> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/strings/stringprintf.h" #include "base/test/values_test_util.h" #include "chrome/browser/extensions/chrome_test_extension_loader.h"
diff --git a/chrome/browser/extensions/service_worker_apitest.cc b/chrome/browser/extensions/service_worker_apitest.cc index c9442da7..8a6de5f 100644 --- a/chrome/browser/extensions/service_worker_apitest.cc +++ b/chrome/browser/extensions/service_worker_apitest.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/json/json_reader.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h"
diff --git a/chrome/browser/extensions/shared_module_service.cc b/chrome/browser/extensions/shared_module_service.cc index 2c7f6be9..835019d5 100644 --- a/chrome/browser/extensions/shared_module_service.cc +++ b/chrome/browser/extensions/shared_module_service.cc
@@ -7,8 +7,8 @@ #include <set> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/version.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/pending_extension_manager.h"
diff --git a/chrome/browser/extensions/shared_worker_apitest.cc b/chrome/browser/extensions/shared_worker_apitest.cc index 89c9a26..e5487e1 100644 --- a/chrome/browser/extensions/shared_worker_apitest.cc +++ b/chrome/browser/extensions/shared_worker_apitest.cc
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/callback_helpers.h" #include "base/files/file_path.h" +#include "base/functional/callback_helpers.h" #include "chrome/browser/extensions/extension_apitest.h" #include "content/public/test/browser_test.h" #include "extensions/browser/extension_host.h"
diff --git a/chrome/browser/extensions/startup_helper.cc b/chrome/browser/extensions/startup_helper.cc index b275a66..ab59dc2 100644 --- a/chrome/browser/extensions/startup_helper.cc +++ b/chrome/browser/extensions/startup_helper.cc
@@ -4,10 +4,10 @@ #include "chrome/browser/extensions/startup_helper.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ref.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/extensions/subscribe_page_action_browsertest.cc b/chrome/browser/extensions/subscribe_page_action_browsertest.cc index 6eaa6bf6..13da8dde 100644 --- a/chrome/browser/extensions/subscribe_page_action_browsertest.cc +++ b/chrome/browser/extensions/subscribe_page_action_browsertest.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 "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/ui/browser.h"
diff --git a/chrome/browser/extensions/system_display/display_info_provider_chromeos.cc b/chrome/browser/extensions/system_display/display_info_provider_chromeos.cc index 5f82c63d2..fb446eeb 100644 --- a/chrome/browser/extensions/system_display/display_info_provider_chromeos.cc +++ b/chrome/browser/extensions/system_display/display_info_provider_chromeos.cc
@@ -14,7 +14,7 @@ #include "chromeos/lacros/lacros_service.h" #endif -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/string_number_conversions.h" #include "chrome/browser/extensions/system_display/display_info_provider.h" #include "chrome/browser/extensions/system_display/display_info_provider_utils.h"
diff --git a/chrome/browser/extensions/system_display/display_info_provider_chromeos_unittest.cc b/chrome/browser/extensions/system_display/display_info_provider_chromeos_unittest.cc index 7c83fb0..da1c835 100644 --- a/chrome/browser/extensions/system_display/display_info_provider_chromeos_unittest.cc +++ b/chrome/browser/extensions/system_display/display_info_provider_chromeos_unittest.cc
@@ -16,8 +16,8 @@ #include "ash/public/cpp/tablet_mode.h" #include "ash/public/cpp/test/shell_test_api.h" #include "ash/shell.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" #include "chrome/browser/extensions/system_display/display_info_provider_chromeos.h"
diff --git a/chrome/browser/extensions/tab_helper.cc b/chrome/browser/extensions/tab_helper.cc index 61350bc..b6aa97c 100644 --- a/chrome/browser/extensions/tab_helper.cc +++ b/chrome/browser/extensions/tab_helper.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h"
diff --git a/chrome/browser/extensions/test_blocklist.cc b/chrome/browser/extensions/test_blocklist.cc index fd32514..c288523 100644 --- a/chrome/browser/extensions/test_blocklist.cc +++ b/chrome/browser/extensions/test_blocklist.cc
@@ -6,8 +6,8 @@ #include <set> -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h" #include "chrome/browser/extensions/blocklist.h"
diff --git a/chrome/browser/extensions/test_extension_prefs.cc b/chrome/browser/extensions/test_extension_prefs.cc index 70cc080..7573d3e 100644 --- a/chrome/browser/extensions/test_extension_prefs.cc +++ b/chrome/browser/extensions/test_extension_prefs.cc
@@ -7,9 +7,9 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/synchronization/waitable_event.h" #include "base/task/sequenced_task_runner.h"
diff --git a/chrome/browser/extensions/theme_installed_infobar_delegate.h b/chrome/browser/extensions/theme_installed_infobar_delegate.h index 9fbc12d..e266c60 100644 --- a/chrome/browser/extensions/theme_installed_infobar_delegate.h +++ b/chrome/browser/extensions/theme_installed_infobar_delegate.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/themes/theme_service.h" #include "chrome/browser/themes/theme_service_observer.h"
diff --git a/chrome/browser/extensions/unpacked_installer.cc b/chrome/browser/extensions/unpacked_installer.cc index 58c07fd..c04e0d55 100644 --- a/chrome/browser/extensions/unpacked_installer.cc +++ b/chrome/browser/extensions/unpacked_installer.cc
@@ -7,9 +7,9 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/path_service.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/extensions/unpacked_installer.h b/chrome/browser/extensions/unpacked_installer.h index 0cfa4b3a..8b0e8468 100644 --- a/chrome/browser/extensions/unpacked_installer.h +++ b/chrome/browser/extensions/unpacked_installer.h
@@ -10,8 +10,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/extensions/update_install_gate_unittest.cc b/chrome/browser/extensions/update_install_gate_unittest.cc index 3e73e5d8..041a330 100644 --- a/chrome/browser/extensions/update_install_gate_unittest.cc +++ b/chrome/browser/extensions/update_install_gate_unittest.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h"
diff --git a/chrome/browser/extensions/updater/chrome_update_client_config.cc b/chrome/browser/extensions/updater/chrome_update_client_config.cc index 25e6680..db4da31 100644 --- a/chrome/browser/extensions/updater/chrome_update_client_config.cc +++ b/chrome/browser/extensions/updater/chrome_update_client_config.cc
@@ -10,11 +10,11 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" #include "base/containers/flat_map.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/no_destructor.h" #include "base/path_service.h"
diff --git a/chrome/browser/extensions/updater/chrome_update_client_config.h b/chrome/browser/extensions/updater/chrome_update_client_config.h index d518d3f..fa1904e 100644 --- a/chrome/browser/extensions/updater/chrome_update_client_config.h +++ b/chrome/browser/extensions/updater/chrome_update_client_config.h
@@ -9,8 +9,8 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/containers/flat_map.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/time/time.h"
diff --git a/chrome/browser/extensions/updater/extension_cache_impl.cc b/chrome/browser/extensions/updater/extension_cache_impl.cc index be14ee551..16b43be 100644 --- a/chrome/browser/extensions/updater/extension_cache_impl.cc +++ b/chrome/browser/extensions/updater/extension_cache_impl.cc
@@ -7,8 +7,8 @@ #include <stddef.h> #include <stdint.h> -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/memory/singleton.h" #include "base/metrics/histogram_macros.h" #include "base/task/sequenced_task_runner.h"
diff --git a/chrome/browser/extensions/updater/extension_cache_impl.h b/chrome/browser/extensions/updater/extension_cache_impl.h index 54e56f9..9bab0c94e 100644 --- a/chrome/browser/extensions/updater/extension_cache_impl.h +++ b/chrome/browser/extensions/updater/extension_cache_impl.h
@@ -10,8 +10,8 @@ #include <string> #include <vector> -#include "base/callback_forward.h" #include "base/files/file_path.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "extensions/browser/updater/extension_cache.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 4757c41..33a727c 100644 --- a/chrome/browser/extensions/updater/extension_update_client_base_browsertest.cc +++ b/chrome/browser/extensions/updater/extension_update_client_base_browsertest.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/path_service.h" #include "base/run_loop.h"
diff --git a/chrome/browser/extensions/updater/extension_updater.cc b/chrome/browser/extensions/updater/extension_updater.cc index 702a66d..956b02a 100644 --- a/chrome/browser/extensions/updater/extension_updater.cc +++ b/chrome/browser/extensions/updater/extension_updater.cc
@@ -11,10 +11,10 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/containers/contains.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/metrics/histogram_macros.h" #include "base/rand_util.h"
diff --git a/chrome/browser/extensions/updater/extension_updater.h b/chrome/browser/extensions/updater/extension_updater.h index 7567613e..6ecee11 100644 --- a/chrome/browser/extensions/updater/extension_updater.h +++ b/chrome/browser/extensions/updater/extension_updater.h
@@ -13,8 +13,8 @@ #include <string> #include "base/auto_reset.h" -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h"
diff --git a/chrome/browser/extensions/updater/extension_updater_unittest.cc b/chrome/browser/extensions/updater/extension_updater_unittest.cc index 98755386..2aecb35b 100644 --- a/chrome/browser/extensions/updater/extension_updater_unittest.cc +++ b/chrome/browser/extensions/updater/extension_updater_unittest.cc
@@ -14,11 +14,11 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/containers/contains.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/ranges/algorithm.h"
diff --git a/chrome/browser/extensions/updater/local_extension_cache.cc b/chrome/browser/extensions/updater/local_extension_cache.cc index f9a0228..1bd2f1a 100644 --- a/chrome/browser/extensions/updater/local_extension_cache.cc +++ b/chrome/browser/extensions/updater/local_extension_cache.cc
@@ -4,11 +4,11 @@ #include "chrome/browser/extensions/updater/local_extension_cache.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/files/file.h" #include "base/files/file_enumerator.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/strings/string_util.h" #include "base/system/sys_info.h"
diff --git a/chrome/browser/extensions/updater/local_extension_cache.h b/chrome/browser/extensions/updater/local_extension_cache.h index db9d47d..e20f896 100644 --- a/chrome/browser/extensions/updater/local_extension_cache.h +++ b/chrome/browser/extensions/updater/local_extension_cache.h
@@ -12,8 +12,8 @@ #include <memory> #include <string> -#include "base/callback_forward.h" #include "base/files/file_path.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h"
diff --git a/chrome/browser/extensions/updater/local_extension_cache_unittest.cc b/chrome/browser/extensions/updater/local_extension_cache_unittest.cc index 2cd867b..e014cdb 100644 --- a/chrome/browser/extensions/updater/local_extension_cache_unittest.cc +++ b/chrome/browser/extensions/updater/local_extension_cache_unittest.cc
@@ -7,10 +7,10 @@ #include <stddef.h> #include <stdint.h> -#include "base/bind.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h"
diff --git a/chrome/browser/extensions/user_script_listener.cc b/chrome/browser/extensions/user_script_listener.cc index 90ce2af..3851ff2 100644 --- a/chrome/browser/extensions/user_script_listener.cc +++ b/chrome/browser/extensions/user_script_listener.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/chrome_content_browser_client_extensions_part.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/extensions/user_script_listener_unittest.cc b/chrome/browser/extensions/user_script_listener_unittest.cc index 29f978ca..50e4166d 100644 --- a/chrome/browser/extensions/user_script_listener_unittest.cc +++ b/chrome/browser/extensions/user_script_listener_unittest.cc
@@ -6,9 +6,9 @@ #include <memory> -#include "base/bind.h" #include "base/command_line.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/json/json_file_value_serializer.h" #include "base/memory/raw_ptr.h" #include "base/path_service.h"
diff --git a/chrome/browser/extensions/web_contents_browsertest.cc b/chrome/browser/extensions/web_contents_browsertest.cc index eb1d955b..60adf97c 100644 --- a/chrome/browser/extensions/web_contents_browsertest.cc +++ b/chrome/browser/extensions/web_contents_browsertest.cc
@@ -4,7 +4,7 @@ #include <map> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/stringprintf.h" #include "chrome/browser/devtools/devtools_window.h" #include "chrome/browser/devtools/devtools_window_testing.h"
diff --git a/chrome/browser/extensions/webstore_data_fetcher.cc b/chrome/browser/extensions/webstore_data_fetcher.cc index 1ad7703..fba8a66 100644 --- a/chrome/browser/extensions/webstore_data_fetcher.cc +++ b/chrome/browser/extensions/webstore_data_fetcher.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/field_trial_params.h" #include "base/values.h" #include "chrome/browser/extensions/webstore_data_fetcher_delegate.h"
diff --git a/chrome/browser/extensions/webstore_install_helper.cc b/chrome/browser/extensions/webstore_install_helper.cc index 72a60eb..b5a1b3ac 100644 --- a/chrome/browser/extensions/webstore_install_helper.cc +++ b/chrome/browser/extensions/webstore_install_helper.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/values.h" #include "chrome/browser/bitmap_fetcher/bitmap_fetcher.h" #include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/extensions/webstore_installer.cc b/chrome/browser/extensions/webstore_installer.cc index f585c59..55a728f 100644 --- a/chrome/browser/extensions/webstore_installer.cc +++ b/chrome/browser/extensions/webstore_installer.cc
@@ -13,9 +13,9 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/command_line.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/metrics/field_trial.h" #include "base/path_service.h" #include "base/rand_util.h"
diff --git a/chrome/browser/extensions/webstore_reinstaller_browsertest.cc b/chrome/browser/extensions/webstore_reinstaller_browsertest.cc index 3b2c772..3e7ed79 100644 --- a/chrome/browser/extensions/webstore_reinstaller_browsertest.cc +++ b/chrome/browser/extensions/webstore_reinstaller_browsertest.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 "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/webstore_installer_test.h"
diff --git a/chrome/browser/extensions/webstore_standalone_installer.cc b/chrome/browser/extensions/webstore_standalone_installer.cc index 02ee4e9b..c09cf045 100644 --- a/chrome/browser/extensions/webstore_standalone_installer.cc +++ b/chrome/browser/extensions/webstore_standalone_installer.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/scoped_refptr.h" #include "base/values.h" #include "base/version.h"
diff --git a/chrome/browser/extensions/webstore_standalone_installer.h b/chrome/browser/extensions/webstore_standalone_installer.h index 30b3fe33..aa691583 100644 --- a/chrome/browser/extensions/webstore_standalone_installer.h +++ b/chrome/browser/extensions/webstore_standalone_installer.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/scoped_observation.h"
diff --git a/chrome/browser/extensions/zipfile_installer_unittest.cc b/chrome/browser/extensions/zipfile_installer_unittest.cc index d71465e..edde7b8 100644 --- a/chrome/browser/extensions/zipfile_installer_unittest.cc +++ b/chrome/browser/extensions/zipfile_installer_unittest.cc
@@ -5,11 +5,11 @@ #include <memory> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/path_service.h"
diff --git a/chrome/browser/external_protocol/external_protocol_handler.cc b/chrome/browser/external_protocol/external_protocol_handler.cc index 5140893..e0acf5ec 100644 --- a/chrome/browser/external_protocol/external_protocol_handler.cc +++ b/chrome/browser/external_protocol/external_protocol_handler.cc
@@ -8,8 +8,8 @@ #include <utility> -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "base/notreached.h" #include "base/strings/escape.h"
diff --git a/chrome/browser/fast_checkout/fast_checkout_capabilities_fetcher.h b/chrome/browser/fast_checkout/fast_checkout_capabilities_fetcher.h index 049cfda..7822978 100644 --- a/chrome/browser/fast_checkout/fast_checkout_capabilities_fetcher.h +++ b/chrome/browser/fast_checkout/fast_checkout_capabilities_fetcher.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_FAST_CHECKOUT_FAST_CHECKOUT_CAPABILITIES_FETCHER_H_ #define CHROME_BROWSER_FAST_CHECKOUT_FAST_CHECKOUT_CAPABILITIES_FETCHER_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "components/keyed_service/core/keyed_service.h" namespace autofill {
diff --git a/chrome/browser/fast_checkout/fast_checkout_capabilities_fetcher_impl.cc b/chrome/browser/fast_checkout/fast_checkout_capabilities_fetcher_impl.cc index cf1d26c8..89170f8 100644 --- a/chrome/browser/fast_checkout/fast_checkout_capabilities_fetcher_impl.cc +++ b/chrome/browser/fast_checkout/fast_checkout_capabilities_fetcher_impl.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/notreached.h" #include "chrome/browser/fast_checkout/fast_checkout_features.h"
diff --git a/chrome/browser/fast_checkout/fast_checkout_tab_helper.cc b/chrome/browser/fast_checkout/fast_checkout_tab_helper.cc index 139340e8..fa621be 100644 --- a/chrome/browser/fast_checkout/fast_checkout_tab_helper.cc +++ b/chrome/browser/fast_checkout/fast_checkout_tab_helper.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/fast_checkout/fast_checkout_tab_helper.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "chrome/browser/fast_checkout/fast_checkout_capabilities_fetcher.h" #include "chrome/browser/fast_checkout/fast_checkout_capabilities_fetcher_factory.h" #include "components/commerce/core/heuristics/commerce_heuristics_provider.h"
diff --git a/chrome/browser/fast_checkout/fast_checkout_tab_helper_browsertest.cc b/chrome/browser/fast_checkout/fast_checkout_tab_helper_browsertest.cc index d9d0301..5c80d92 100644 --- a/chrome/browser/fast_checkout/fast_checkout_tab_helper_browsertest.cc +++ b/chrome/browser/fast_checkout/fast_checkout_tab_helper_browsertest.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "chrome/browser/fast_checkout/fast_checkout_capabilities_fetcher_factory.h"
diff --git a/chrome/browser/fast_checkout/mock_fast_checkout_capabilities_fetcher.h b/chrome/browser/fast_checkout/mock_fast_checkout_capabilities_fetcher.h index 8c82364..44dfcc31 100644 --- a/chrome/browser/fast_checkout/mock_fast_checkout_capabilities_fetcher.h +++ b/chrome/browser/fast_checkout/mock_fast_checkout_capabilities_fetcher.h
@@ -7,7 +7,7 @@ #include "chrome/browser/fast_checkout/fast_checkout_capabilities_fetcher.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "components/autofill/core/common/signatures.h" #include "testing/gmock/include/gmock/gmock.h" #include "url/origin.h"
diff --git a/chrome/browser/fast_shutdown_browsertest.cc b/chrome/browser/fast_shutdown_browsertest.cc index 08806d6..1c8aa23 100644 --- a/chrome/browser/fast_shutdown_browsertest.cc +++ b/chrome/browser/fast_shutdown_browsertest.cc
@@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/bind.h" #include "base/command_line.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/favicon/chrome_favicon_client.cc b/chrome/browser/favicon/chrome_favicon_client.cc index ab7342ec..067201b 100644 --- a/chrome/browser/favicon/chrome_favicon_client.cc +++ b/chrome/browser/favicon/chrome_favicon_client.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/favicon/chrome_favicon_client.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/singleton.h" #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h" #include "chrome/common/url_constants.h"
diff --git a/chrome/browser/favicon/content_favicon_driver_browsertest.cc b/chrome/browser/favicon/content_favicon_driver_browsertest.cc index ffa5a8f..b352033 100644 --- a/chrome/browser/favicon/content_favicon_driver_browsertest.cc +++ b/chrome/browser/favicon/content_favicon_driver_browsertest.cc
@@ -7,8 +7,8 @@ #include <set> #include <string> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/favicon/favicon_service_factory.cc b/chrome/browser/favicon/favicon_service_factory.cc index 143b43f..3a32626 100644 --- a/chrome/browser/favicon/favicon_service_factory.cc +++ b/chrome/browser/favicon/favicon_service_factory.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/singleton.h" #include "chrome/browser/favicon/chrome_favicon_client.h"
diff --git a/chrome/browser/feature_guide/notifications/feature_notification_guide_service.h b/chrome/browser/feature_guide/notifications/feature_notification_guide_service.h index a6d744b6..7cd08c83c 100644 --- a/chrome/browser/feature_guide/notifications/feature_notification_guide_service.h +++ b/chrome/browser/feature_guide/notifications/feature_notification_guide_service.h
@@ -8,8 +8,8 @@ #include <memory> #include <set> -#include "base/callback.h" #include "base/feature_list.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/supports_user_data.h" #include "chrome/browser/feature_guide/notifications/feature_type.h"
diff --git a/chrome/browser/feature_guide/notifications/internal/feature_notification_guide_service_impl.cc b/chrome/browser/feature_guide/notifications/internal/feature_notification_guide_service_impl.cc index 667c67aa..3565a1c 100644 --- a/chrome/browser/feature_guide/notifications/internal/feature_notification_guide_service_impl.cc +++ b/chrome/browser/feature_guide/notifications/internal/feature_notification_guide_service_impl.cc
@@ -6,8 +6,8 @@ #include <string> -#include "base/callback.h" #include "base/containers/contains.h" +#include "base/functional/callback.h" #include "base/strings/string_number_conversions.h" #include "base/time/clock.h" #include "build/build_config.h"
diff --git a/chrome/browser/feed/android/refresh_task_scheduler_impl.h b/chrome/browser/feed/android/refresh_task_scheduler_impl.h index 710987a..815c7a5 100644 --- a/chrome/browser/feed/android/refresh_task_scheduler_impl.h +++ b/chrome/browser/feed/android/refresh_task_scheduler_impl.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_FEED_ANDROID_REFRESH_TASK_SCHEDULER_IMPL_H_ #define CHROME_BROWSER_FEED_ANDROID_REFRESH_TASK_SCHEDULER_IMPL_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "components/feed/core/v2/public/refresh_task_scheduler.h"
diff --git a/chrome/browser/feed/android/web_feed_bridge.cc b/chrome/browser/feed/android/web_feed_bridge.cc index 0550c33..1c051f3 100644 --- a/chrome/browser/feed/android/web_feed_bridge.cc +++ b/chrome/browser/feed/android/web_feed_bridge.cc
@@ -7,7 +7,7 @@ #include "base/android/jni_array.h" #include "base/android/jni_string.h" #include "base/android/scoped_java_ref.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/no_destructor.h"
diff --git a/chrome/browser/feed/rss_links_fetcher.cc b/chrome/browser/feed/rss_links_fetcher.cc index 2447327..5ae8351 100644 --- a/chrome/browser/feed/rss_links_fetcher.cc +++ b/chrome/browser/feed/rss_links_fetcher.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/feed/rss_links_fetcher.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "components/feed/mojom/rss_link_reader.mojom.h" #include "content/public/browser/render_frame_host.h" #include "content/public/browser/web_contents.h"
diff --git a/chrome/browser/feed/web_feed_page_information_fetcher.cc b/chrome/browser/feed/web_feed_page_information_fetcher.cc index 29171d8..b87bb673b 100644 --- a/chrome/browser/feed/web_feed_page_information_fetcher.cc +++ b/chrome/browser/feed/web_feed_page_information_fetcher.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/feed/web_feed_page_information_fetcher.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "chrome/browser/feed/rss_links_fetcher.h" #include "content/public/browser/render_frame_host.h"
diff --git a/chrome/browser/feed/web_feed_page_information_fetcher.h b/chrome/browser/feed/web_feed_page_information_fetcher.h index 44380ff..c2e9a913 100644 --- a/chrome/browser/feed/web_feed_page_information_fetcher.h +++ b/chrome/browser/feed/web_feed_page_information_fetcher.h
@@ -7,7 +7,7 @@ #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/metrics/histogram_functions.h"
diff --git a/chrome/browser/feed/web_feed_tab_helper.cc b/chrome/browser/feed/web_feed_tab_helper.cc index de9af4e..3c8bacb 100644 --- a/chrome/browser/feed/web_feed_tab_helper.cc +++ b/chrome/browser/feed/web_feed_tab_helper.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/feed/web_feed_util.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/navigation_handle.h"
diff --git a/chrome/browser/feed/web_feed_ui_util.cc b/chrome/browser/feed/web_feed_ui_util.cc index 603219d..c3af5308 100644 --- a/chrome/browser/feed/web_feed_ui_util.cc +++ b/chrome/browser/feed/web_feed_ui_util.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/feed/web_feed_ui_util.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/feed/web_feed_tab_helper.h" #include "chrome/browser/feed/web_feed_util.h"
diff --git a/chrome/browser/feed/web_feed_util.cc b/chrome/browser/feed/web_feed_util.cc index 25ec04f..0a7a678 100644 --- a/chrome/browser/feed/web_feed_util.cc +++ b/chrome/browser/feed/web_feed_util.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/feed/web_feed_util.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/feed/feed_service_factory.h" #include "chrome/browser/feed/web_feed_page_information_fetcher.h"
diff --git a/chrome/browser/feed/web_feed_util.h b/chrome/browser/feed/web_feed_util.h index 0faa060..0cad596 100644 --- a/chrome/browser/feed/web_feed_util.h +++ b/chrome/browser/feed/web_feed_util.h
@@ -6,7 +6,7 @@ #define CHROME_BROWSER_FEED_WEB_FEED_UTIL_H_ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "components/feed/core/v2/public/types.h" #include "components/feed/core/v2/public/web_feed_subscriptions.h"
diff --git a/chrome/browser/feedback/android/process_id_feedback_source.cc b/chrome/browser/feedback/android/process_id_feedback_source.cc index 70ede928..882a0c1 100644 --- a/chrome/browser/feedback/android/process_id_feedback_source.cc +++ b/chrome/browser/feedback/android/process_id_feedback_source.cc
@@ -8,7 +8,7 @@ #include "content/public/browser/browser_task_traits.h" #include "base/android/jni_array.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "content/public/browser/browser_child_process_host_iterator.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/child_process_data.h"
diff --git a/chrome/browser/feedback/feedback_uploader_chrome.cc b/chrome/browser/feedback/feedback_uploader_chrome.cc index 4907ace..79adfef6 100644 --- a/chrome/browser/feedback/feedback_uploader_chrome.cc +++ b/chrome/browser/feedback/feedback_uploader_chrome.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/feedback/feedback_uploader_chrome.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/stringprintf.h" #include "build/chromeos_buildflags.h" #include "build/config/chromebox_for_meetings/buildflags.h"
diff --git a/chrome/browser/feedback/show_feedback_page.cc b/chrome/browser/feedback/show_feedback_page.cc index 99d1861..8468461 100644 --- a/chrome/browser/feedback/show_feedback_page.cc +++ b/chrome/browser/feedback/show_feedback_page.cc
@@ -26,7 +26,7 @@ #if BUILDFLAG(IS_CHROMEOS_ASH) #include "ash/webui/os_feedback_ui/url_constants.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/strcat.h" #include "chrome/browser/ash/crosapi/browser_manager.h" #include "chrome/browser/ash/system_web_apps/types/system_web_app_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 4f684eb..22bf506 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
@@ -9,7 +9,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/functional/callback_helpers.h" #include "base/json/json_string_value_serializer.h" #include "base/logging.h"
diff --git a/chrome/browser/feedback/system_logs/log_sources/crash_ids_source.cc b/chrome/browser/feedback/system_logs/log_sources/crash_ids_source.cc index eaa0654e..54c9d78 100644 --- a/chrome/browser/feedback/system_logs/log_sources/crash_ids_source.cc +++ b/chrome/browser/feedback/system_logs/log_sources/crash_ids_source.cc
@@ -6,7 +6,7 @@ #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/time/time.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/feedback/system_logs/log_sources/crash_ids_source.h b/chrome/browser/feedback/system_logs/log_sources/crash_ids_source.h index 8adb95f9..13ae718 100644 --- a/chrome/browser/feedback/system_logs/log_sources/crash_ids_source.h +++ b/chrome/browser/feedback/system_logs/log_sources/crash_ids_source.h
@@ -7,7 +7,7 @@ #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "components/feedback/system_logs/system_logs_source.h" #include "components/upload_list/upload_list.h"
diff --git a/chrome/browser/file_select_helper.cc b/chrome/browser/file_select_helper.cc index 6d81cb7..1d3b4b65 100644 --- a/chrome/browser/file_select_helper.cc +++ b/chrome/browser/file_select_helper.cc
@@ -10,8 +10,8 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h"
diff --git a/chrome/browser/file_select_helper_contacts_android.cc b/chrome/browser/file_select_helper_contacts_android.cc index 87f92b35..d723b0b2 100644 --- a/chrome/browser/file_select_helper_contacts_android.cc +++ b/chrome/browser/file_select_helper_contacts_android.cc
@@ -4,9 +4,9 @@ #include "chrome/browser/file_select_helper_contacts_android.h" -#include "base/bind.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/task/thread_pool.h" #include "chrome/browser/profiles/profile.h" #include "content/public/browser/browser_task_traits.h"
diff --git a/chrome/browser/file_select_helper_mac.mm b/chrome/browser/file_select_helper_mac.mm index 23d4cd2..6192599f 100644 --- a/chrome/browser/file_select_helper_mac.mm +++ b/chrome/browser/file_select_helper_mac.mm
@@ -7,10 +7,10 @@ #include <Cocoa/Cocoa.h> #include <sys/stat.h> -#include "base/bind.h" #include "base/files/file.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/mac/foundation_util.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/file_system_access/file_system_access_permission_request_manager.h b/chrome/browser/file_system_access/file_system_access_permission_request_manager.h index 416ccc28..c5aec88 100644 --- a/chrome/browser/file_system_access/file_system_access_permission_request_manager.h +++ b/chrome/browser/file_system_access/file_system_access_permission_request_manager.h
@@ -5,9 +5,9 @@ #ifndef CHROME_BROWSER_FILE_SYSTEM_ACCESS_FILE_SYSTEM_ACCESS_PERMISSION_REQUEST_MANAGER_H_ #define CHROME_BROWSER_FILE_SYSTEM_ACCESS_FILE_SYSTEM_ACCESS_PERMISSION_REQUEST_MANAGER_H_ -#include "base/callback_helpers.h" #include "base/containers/circular_deque.h" #include "base/files/file_path.h" +#include "base/functional/callback_helpers.h" #include "base/memory/weak_ptr.h" #include "content/public/browser/file_system_access_permission_context.h" #include "content/public/browser/web_contents_observer.h"
diff --git a/chrome/browser/first_party_sets/first_party_sets_navigation_throttle.cc b/chrome/browser/first_party_sets/first_party_sets_navigation_throttle.cc index af20c5d7..4c97c8f 100644 --- a/chrome/browser/first_party_sets/first_party_sets_navigation_throttle.cc +++ b/chrome/browser/first_party_sets/first_party_sets_navigation_throttle.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "base/time/time.h" #include "base/timer/timer.h"
diff --git a/chrome/browser/first_party_sets/first_party_sets_policy_service_unittest.cc b/chrome/browser/first_party_sets/first_party_sets_policy_service_unittest.cc index d6ef43a..5a9aa67 100644 --- a/chrome/browser/first_party_sets/first_party_sets_policy_service_unittest.cc +++ b/chrome/browser/first_party_sets/first_party_sets_policy_service_unittest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/first_party_sets/first_party_sets_policy_service.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h"
diff --git a/chrome/browser/first_party_sets/scoped_mock_first_party_sets_handler.cc b/chrome/browser/first_party_sets/scoped_mock_first_party_sets_handler.cc index acf0fcf..55705bf4 100644 --- a/chrome/browser/first_party_sets/scoped_mock_first_party_sets_handler.cc +++ b/chrome/browser/first_party_sets/scoped_mock_first_party_sets_handler.cc
@@ -6,8 +6,8 @@ #include <string> -#include "base/callback.h" #include "base/feature_list.h" +#include "base/functional/callback.h" #include "base/task/sequenced_task_runner.h" #include "base/types/optional_util.h" #include "content/public/browser/first_party_sets_handler.h"
diff --git a/chrome/browser/first_party_sets/scoped_mock_first_party_sets_handler.h b/chrome/browser/first_party_sets/scoped_mock_first_party_sets_handler.h index 2408e4f9..817785f 100644 --- a/chrome/browser/first_party_sets/scoped_mock_first_party_sets_handler.h +++ b/chrome/browser/first_party_sets/scoped_mock_first_party_sets_handler.h
@@ -8,8 +8,8 @@ #include <string> #include <utility> -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "content/public/browser/first_party_sets_handler.h" #include "net/first_party_sets/first_party_sets_cache_filter.h"
diff --git a/chrome/browser/first_run/first_run.cc b/chrome/browser/first_run/first_run.cc index 9807a42..dedf5ae 100644 --- a/chrome/browser/first_run/first_run.cc +++ b/chrome/browser/first_run/first_run.cc
@@ -9,10 +9,10 @@ #include <tuple> #include <utility> -#include "base/bind.h" #include "base/command_line.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "base/metrics/user_metrics.h" #include "base/no_destructor.h"
diff --git a/chrome/browser/first_run/first_run_dialog.h b/chrome/browser/first_run/first_run_dialog.h index cdde982..19eeb90f 100644 --- a/chrome/browser/first_run/first_run_dialog.h +++ b/chrome/browser/first_run/first_run_dialog.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_FIRST_RUN_FIRST_RUN_DIALOG_H_ #define CHROME_BROWSER_FIRST_RUN_FIRST_RUN_DIALOG_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/first_run/first_run_internal_posix.cc b/chrome/browser/first_run/first_run_internal_posix.cc index 75aca58..9fc31cfb 100644 --- a/chrome/browser/first_run/first_run_internal_posix.cc +++ b/chrome/browser/first_run/first_run_internal_posix.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/first_run/first_run_internal.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/no_destructor.h" #include "build/branding_buildflags.h" #include "build/build_config.h"
diff --git a/chrome/browser/first_run/first_run_internal_posix_browsertest.cc b/chrome/browser/first_run/first_run_internal_posix_browsertest.cc index 4b7f08e..3f8b810 100644 --- a/chrome/browser/first_run/first_run_internal_posix_browsertest.cc +++ b/chrome/browser/first_run/first_run_internal_posix_browsertest.cc
@@ -4,9 +4,9 @@ #include <signal.h> -#include "base/bind.h" #include "base/command_line.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/path_service.h" #include "base/task/sequenced_task_runner.h" #include "build/branding_buildflags.h"
diff --git a/chrome/browser/first_run/first_run_internal_win.cc b/chrome/browser/first_run/first_run_internal_win.cc index 662cf58..bb6b183 100644 --- a/chrome/browser/first_run/first_run_internal_win.cc +++ b/chrome/browser/first_run/first_run_internal_win.cc
@@ -9,11 +9,11 @@ #include <stdint.h> #include "base/base_paths.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/path_service.h" #include "base/process/kill.h"
diff --git a/chrome/browser/first_run/scoped_relaunch_chrome_browser_override.h b/chrome/browser/first_run/scoped_relaunch_chrome_browser_override.h index 7d4491a..ecca24d7 100644 --- a/chrome/browser/first_run/scoped_relaunch_chrome_browser_override.h +++ b/chrome/browser/first_run/scoped_relaunch_chrome_browser_override.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_FIRST_RUN_SCOPED_RELAUNCH_CHROME_BROWSER_OVERRIDE_H_ #define CHROME_BROWSER_FIRST_RUN_SCOPED_RELAUNCH_CHROME_BROWSER_OVERRIDE_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/first_run/upgrade_util.h" namespace upgrade_util {
diff --git a/chrome/browser/first_run/upgrade_util.cc b/chrome/browser/first_run/upgrade_util.cc index 64ce4fa..62103f76 100644 --- a/chrome/browser/first_run/upgrade_util.cc +++ b/chrome/browser/first_run/upgrade_util.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/callback.h" #include "base/command_line.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/memory/ptr_util.h" #include "build/build_config.h"
diff --git a/chrome/browser/first_run/upgrade_util.h b/chrome/browser/first_run/upgrade_util.h index 3828d10..81e9633 100644 --- a/chrome/browser/first_run/upgrade_util.h +++ b/chrome/browser/first_run/upgrade_util.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/font_family_cache.cc b/chrome/browser/font_family_cache.cc index 9771429..9a3c581b 100644 --- a/chrome/browser/font_family_cache.cc +++ b/chrome/browser/font_family_cache.cc
@@ -8,7 +8,7 @@ #include <map> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/font_pref_change_notifier.cc b/chrome/browser/font_pref_change_notifier.cc index 6baf26f..56dfc75 100644 --- a/chrome/browser/font_pref_change_notifier.cc +++ b/chrome/browser/font_pref_change_notifier.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/font_pref_change_notifier.h" -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/observer_list.h" #include "base/strings/string_util.h" #include "chrome/common/pref_names_util.h"
diff --git a/chrome/browser/font_pref_change_notifier.h b/chrome/browser/font_pref_change_notifier.h index 103909e..f5a16814 100644 --- a/chrome/browser/font_pref_change_notifier.h +++ b/chrome/browser/font_pref_change_notifier.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_FONT_PREF_CHANGE_NOTIFIER_H_ #define CHROME_BROWSER_FONT_PREF_CHANGE_NOTIFIER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/observer_list.h" #include "components/keyed_service/core/keyed_service.h"
diff --git a/chrome/browser/font_pref_change_notifier_unittest.cc b/chrome/browser/font_pref_change_notifier_unittest.cc index 83dbffa..ce73466c 100644 --- a/chrome/browser/font_pref_change_notifier_unittest.cc +++ b/chrome/browser/font_pref_change_notifier_unittest.cc
@@ -3,7 +3,7 @@ // found in the LICENSE file. #include "chrome/browser/font_pref_change_notifier.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/common/pref_names_util.h" #include "components/prefs/pref_registry_simple.h" #include "components/prefs/testing_pref_service.h"
diff --git a/chrome/browser/fuchsia/chrome_browser_main_parts_fuchsia.cc b/chrome/browser/fuchsia/chrome_browser_main_parts_fuchsia.cc index d6961d4..a99fcf8 100644 --- a/chrome/browser/fuchsia/chrome_browser_main_parts_fuchsia.cc +++ b/chrome/browser/fuchsia/chrome_browser_main_parts_fuchsia.cc
@@ -19,13 +19,13 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/check.h" #include "base/command_line.h" #include "base/fuchsia/fuchsia_logging.h" #include "base/fuchsia/process_context.h" #include "base/fuchsia/process_lifecycle.h" #include "base/fuchsia/scoped_service_binding.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/notreached.h" #include "base/numerics/clamped_math.h"
diff --git a/chrome/browser/fuchsia/element_manager_impl.cc b/chrome/browser/fuchsia/element_manager_impl.cc index c22e2aa..2aa3cb7 100644 --- a/chrome/browser/fuchsia/element_manager_impl.cc +++ b/chrome/browser/fuchsia/element_manager_impl.cc
@@ -6,9 +6,9 @@ #include <lib/fpromise/promise.h> -#include "base/bind.h" #include "base/command_line.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/strings/string_util.h" #include "chrome/browser/chrome_browser_main.h"
diff --git a/chrome/browser/fuchsia/element_manager_impl.h b/chrome/browser/fuchsia/element_manager_impl.h index 0371a76..aa85a83 100644 --- a/chrome/browser/fuchsia/element_manager_impl.h +++ b/chrome/browser/fuchsia/element_manager_impl.h
@@ -8,9 +8,9 @@ #include <fuchsia/element/cpp/fidl.h> #include <lib/fidl/cpp/interface_request.h> -#include "base/callback.h" #include "base/containers/flat_map.h" #include "base/fuchsia/scoped_service_binding.h" +#include "base/functional/callback.h" #include "chrome/browser/ui/browser_list_observer.h" #include "components/fuchsia_component_support/annotations_manager.h"
diff --git a/chrome/browser/gcm/gcm_profile_service_factory.cc b/chrome/browser/gcm/gcm_profile_service_factory.cc index 3897cb1..da8f5c1 100644 --- a/chrome/browser/gcm/gcm_profile_service_factory.cc +++ b/chrome/browser/gcm/gcm_profile_service_factory.cc
@@ -5,7 +5,7 @@ #include "chrome/browser/gcm/gcm_profile_service_factory.h" #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/no_destructor.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/gcm/gcm_profile_service_unittest.cc b/chrome/browser/gcm/gcm_profile_service_unittest.cc index c3021b45..389b773c 100644 --- a/chrome/browser/gcm/gcm_profile_service_unittest.cc +++ b/chrome/browser/gcm/gcm_profile_service_unittest.cc
@@ -5,9 +5,9 @@ #include <memory> #include <vector> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/task/sequenced_task_runner.h"
diff --git a/chrome/browser/geolocation/geolocation_browsertest.cc b/chrome/browser/geolocation/geolocation_browsertest.cc index 4e85356..c9a1fd1 100644 --- a/chrome/browser/geolocation/geolocation_browsertest.cc +++ b/chrome/browser/geolocation/geolocation_browsertest.cc
@@ -6,8 +6,8 @@ #include <string> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/strings/escape.h"
diff --git a/chrome/browser/geolocation/geolocation_permission_context_delegate.cc b/chrome/browser/geolocation/geolocation_permission_context_delegate.cc index b9786232..aa72952 100644 --- a/chrome/browser/geolocation/geolocation_permission_context_delegate.cc +++ b/chrome/browser/geolocation/geolocation_permission_context_delegate.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/geolocation/geolocation_permission_context_delegate.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/profiles/profile.h" #include "components/permissions/permission_request_id.h" #include "components/permissions/permission_util.h"
diff --git a/chrome/browser/geolocation/geolocation_permission_context_delegate.h b/chrome/browser/geolocation/geolocation_permission_context_delegate.h index 3698bdcd4..9a72fd5 100644 --- a/chrome/browser/geolocation/geolocation_permission_context_delegate.h +++ b/chrome/browser/geolocation/geolocation_permission_context_delegate.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_GEOLOCATION_GEOLOCATION_PERMISSION_CONTEXT_DELEGATE_H_ #define CHROME_BROWSER_GEOLOCATION_GEOLOCATION_PERMISSION_CONTEXT_DELEGATE_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/geolocation/geolocation_permission_context_extensions.h" #include "components/permissions/contexts/geolocation_permission_context.h"
diff --git a/chrome/browser/geolocation/geolocation_permission_context_extensions.cc b/chrome/browser/geolocation/geolocation_permission_context_extensions.cc index 23f23fad..96b0f8a 100644 --- a/chrome/browser/geolocation/geolocation_permission_context_extensions.cc +++ b/chrome/browser/geolocation/geolocation_permission_context_extensions.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/geolocation/geolocation_permission_context_extensions.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "extensions/buildflags/buildflags.h" #if BUILDFLAG(ENABLE_EXTENSIONS)
diff --git a/chrome/browser/geolocation/geolocation_permission_context_extensions.h b/chrome/browser/geolocation/geolocation_permission_context_extensions.h index 45a6b8fa..19243c3c 100644 --- a/chrome/browser/geolocation/geolocation_permission_context_extensions.h +++ b/chrome/browser/geolocation/geolocation_permission_context_extensions.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_GEOLOCATION_GEOLOCATION_PERMISSION_CONTEXT_EXTENSIONS_H_ #define CHROME_BROWSER_GEOLOCATION_GEOLOCATION_PERMISSION_CONTEXT_EXTENSIONS_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "components/content_settings/core/common/content_settings.h" #include "extensions/buildflags/buildflags.h"
diff --git a/chrome/browser/google/google_brand_chromeos.cc b/chrome/browser/google/google_brand_chromeos.cc index 4736baa..69b404b 100644 --- a/chrome/browser/google/google_brand_chromeos.cc +++ b/chrome/browser/google/google_brand_chromeos.cc
@@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/bind.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/strings/string_piece.h" #include "base/strings/string_util.h"
diff --git a/chrome/browser/google/google_brand_chromeos.h b/chrome/browser/google/google_brand_chromeos.h index 276ccb9..a3703e4f 100644 --- a/chrome/browser/google/google_brand_chromeos.h +++ b/chrome/browser/google/google_brand_chromeos.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" namespace google_brand { namespace chromeos {
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 c77ed6f..50741c4 100644 --- a/chrome/browser/google/google_search_domain_mixing_metrics_emitter.cc +++ b/chrome/browser/google/google_search_domain_mixing_metrics_emitter.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/google/google_search_domain_mixing_metrics_emitter.h" -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/threading/thread_task_runner_handle.h" #include "base/time/time.h"
diff --git a/chrome/browser/google/google_update_policy_fetcher_win.cc b/chrome/browser/google/google_update_policy_fetcher_win.cc index 422fb8b..bda62246 100644 --- a/chrome/browser/google/google_update_policy_fetcher_win.cc +++ b/chrome/browser/google/google_update_policy_fetcher_win.cc
@@ -10,7 +10,7 @@ #include <tuple> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/numerics/safe_conversions.h" #include "base/strings/string_split.h" #include "base/strings/string_util_win.h"
diff --git a/chrome/browser/google/google_update_policy_fetcher_win_util.h b/chrome/browser/google/google_update_policy_fetcher_win_util.h index cc7d248..4048250 100644 --- a/chrome/browser/google/google_update_policy_fetcher_win_util.h +++ b/chrome/browser/google/google_update_policy_fetcher_win_util.h
@@ -8,7 +8,7 @@ #include <wtypes.h> #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/values.h" #include "components/policy/core/common/policy_map.h" #include "google_update/google_update_idl.h"
diff --git a/chrome/browser/google/google_update_win.cc b/chrome/browser/google/google_update_win.cc index aaa77dd..dfc83c6 100644 --- a/chrome/browser/google/google_update_win.cc +++ b/chrome/browser/google/google_update_win.cc
@@ -11,10 +11,10 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/metrics/histogram_functions.h" #include "base/no_destructor.h"
diff --git a/chrome/browser/google/google_update_win.h b/chrome/browser/google/google_update_win.h index 2a818c9..a2edd0da 100644 --- a/chrome/browser/google/google_update_win.h +++ b/chrome/browser/google/google_update_win.h
@@ -9,7 +9,7 @@ #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "google_update/google_update_idl.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/chrome/browser/google/google_update_win_unittest.cc b/chrome/browser/google/google_update_win_unittest.cc index 7605401..efaa6d8 100644 --- a/chrome/browser/google/google_update_win_unittest.cc +++ b/chrome/browser/google/google_update_win_unittest.cc
@@ -12,8 +12,8 @@ #include <string> #include "base/base_paths.h" -#include "base/bind.h" #include "base/containers/queue.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted.h" #include "base/path_service.h" #include "base/strings/string_util.h"
diff --git a/chrome/browser/gpu/gpu_mode_manager.cc b/chrome/browser/gpu/gpu_mode_manager.cc index 71ddda1..d917818 100644 --- a/chrome/browser/gpu/gpu_mode_manager.cc +++ b/chrome/browser/gpu/gpu_mode_manager.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/gpu/gpu_mode_manager.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/histogram_macros.h" #include "base/metrics/user_metrics.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/guest_view/mime_handler_view/chrome_mime_handler_view_browsertest.cc b/chrome/browser/guest_view/mime_handler_view/chrome_mime_handler_view_browsertest.cc index ed5d7929..d6cd2275 100644 --- a/chrome/browser/guest_view/mime_handler_view/chrome_mime_handler_view_browsertest.cc +++ b/chrome/browser/guest_view/mime_handler_view/chrome_mime_handler_view_browsertest.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 "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h"
diff --git a/chrome/browser/guest_view/mime_handler_view/chrome_mime_handler_view_interactive_uitest.cc b/chrome/browser/guest_view/mime_handler_view/chrome_mime_handler_view_interactive_uitest.cc index 01b4158d..5fd45be 100644 --- a/chrome/browser/guest_view/mime_handler_view/chrome_mime_handler_view_interactive_uitest.cc +++ b/chrome/browser/guest_view/mime_handler_view/chrome_mime_handler_view_interactive_uitest.cc
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/run_loop.h" #include "base/test/test_timeouts.h"
diff --git a/chrome/browser/guest_view/web_view/chrome_web_view_permission_helper_delegate.cc b/chrome/browser/guest_view/web_view/chrome_web_view_permission_helper_delegate.cc index ac94ef5..507e630 100644 --- a/chrome/browser/guest_view/web_view/chrome_web_view_permission_helper_delegate.cc +++ b/chrome/browser/guest_view/web_view/chrome_web_view_permission_helper_delegate.cc
@@ -7,7 +7,7 @@ #include <map> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/user_metrics.h" #include "chrome/common/buildflags.h" #include "content/public/browser/browser_context.h"
diff --git a/chrome/browser/hid/hid_policy_allowed_devices.cc b/chrome/browser/hid/hid_policy_allowed_devices.cc index 64f018e..90a66fd 100644 --- a/chrome/browser/hid/hid_policy_allowed_devices.cc +++ b/chrome/browser/hid/hid_policy_allowed_devices.cc
@@ -7,8 +7,8 @@ #include <string> #include <vector> -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/values.h" #include "chrome/common/pref_names.h" #include "components/prefs/pref_registry_simple.h"
diff --git a/chrome/browser/history/chrome_history_client.cc b/chrome/browser/history/chrome_history_client.cc index 57e5bb67..dc30c839 100644 --- a/chrome/browser/history/chrome_history_client.cc +++ b/chrome/browser/history/chrome_history_client.cc
@@ -4,9 +4,9 @@ #include "chrome/browser/history/chrome_history_client.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/check_op.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/time/time.h" #include "chrome/browser/history/chrome_history_backend_client.h" #include "chrome/browser/history/history_utils.h"
diff --git a/chrome/browser/history/chrome_history_client.h b/chrome/browser/history/chrome_history_client.h index 01d87fc6..d0619f9 100644 --- a/chrome/browser/history/chrome_history_client.h +++ b/chrome/browser/history/chrome_history_client.h
@@ -8,8 +8,8 @@ #include <memory> #include <set> -#include "base/callback.h" #include "base/callback_list.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "components/bookmarks/browser/base_bookmark_model_observer.h" #include "components/history/core/browser/history_client.h"
diff --git a/chrome/browser/history/domain_diversity_reporter_factory.cc b/chrome/browser/history/domain_diversity_reporter_factory.cc index 8fa2177f..01cc0fb 100644 --- a/chrome/browser/history/domain_diversity_reporter_factory.cc +++ b/chrome/browser/history/domain_diversity_reporter_factory.cc
@@ -6,7 +6,7 @@ #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/no_destructor.h" #include "base/time/default_clock.h" #include "build/build_config.h"
diff --git a/chrome/browser/history/history_browsertest.cc b/chrome/browser/history/history_browsertest.cc index bc0f805..961e9082 100644 --- a/chrome/browser/history/history_browsertest.cc +++ b/chrome/browser/history/history_browsertest.cc
@@ -5,8 +5,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/test/bind.h"
diff --git a/chrome/browser/history/redirect_browsertest.cc b/chrome/browser/history/redirect_browsertest.cc index ad7317b8..545fef9 100644 --- a/chrome/browser/history/redirect_browsertest.cc +++ b/chrome/browser/history/redirect_browsertest.cc
@@ -10,9 +10,9 @@ #include <memory> #include <string> -#include "base/bind.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/run_loop.h" #include "base/strings/string_util.h"
diff --git a/chrome/browser/history/top_sites_factory.cc b/chrome/browser/history/top_sites_factory.cc index e1396167..5b6330d 100644 --- a/chrome/browser/history/top_sites_factory.cc +++ b/chrome/browser/history/top_sites_factory.cc
@@ -8,9 +8,9 @@ #include <memory> -#include "base/bind.h" #include "base/command_line.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/memory/singleton.h" #include "build/branding_buildflags.h" #include "build/build_config.h"
diff --git a/chrome/browser/history_clusters/history_clusters_tab_helper_unittest.cc b/chrome/browser/history_clusters/history_clusters_tab_helper_unittest.cc index 1a881dd..fc9418c 100644 --- a/chrome/browser/history_clusters/history_clusters_tab_helper_unittest.cc +++ b/chrome/browser/history_clusters/history_clusters_tab_helper_unittest.cc
@@ -7,7 +7,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/task/cancelable_task_tracker.h"
diff --git a/chrome/browser/icon_loader.cc b/chrome/browser/icon_loader.cc index 8504604..5fe15c5 100644 --- a/chrome/browser/icon_loader.cc +++ b/chrome/browser/icon_loader.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.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/icon_loader.h b/chrome/browser/icon_loader.h index 09ef563..b74ff94 100644 --- a/chrome/browser/icon_loader.h +++ b/chrome/browser/icon_loader.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_ICON_LOADER_H_ #define CHROME_BROWSER_ICON_LOADER_H_ -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/task/single_thread_task_runner.h" #include "base/task/task_traits.h" #include "build/build_config.h"
diff --git a/chrome/browser/icon_loader_auralinux.cc b/chrome/browser/icon_loader_auralinux.cc index 28618ea..233a3839 100644 --- a/chrome/browser/icon_loader_auralinux.cc +++ b/chrome/browser/icon_loader_auralinux.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/icon_loader.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/nix/mime_util_xdg.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/icon_loader_fuchsia.cc b/chrome/browser/icon_loader_fuchsia.cc index fed81136..3b47f0c 100644 --- a/chrome/browser/icon_loader_fuchsia.cc +++ b/chrome/browser/icon_loader_fuchsia.cc
@@ -8,8 +8,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/memory/scoped_refptr.h" #include "base/notreached.h"
diff --git a/chrome/browser/icon_loader_mac.mm b/chrome/browser/icon_loader_mac.mm index a75303f..69b7b4eb 100644 --- a/chrome/browser/icon_loader_mac.mm +++ b/chrome/browser/icon_loader_mac.mm
@@ -6,8 +6,8 @@ #import <AppKit/AppKit.h> -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/strings/sys_string_conversions.h" #include "base/task/thread_pool.h" #include "base/threading/thread.h"
diff --git a/chrome/browser/icon_loader_win.cc b/chrome/browser/icon_loader_win.cc index 4c3d3076..79b3fab0 100644 --- a/chrome/browser/icon_loader_win.cc +++ b/chrome/browser/icon_loader_win.cc
@@ -7,9 +7,9 @@ #include <windows.h> #include <shellapi.h> -#include "base/bind.h" -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/strings/string_util.h" #include "base/task/thread_pool.h" #include "base/threading/scoped_blocking_call.h"
diff --git a/chrome/browser/icon_manager.cc b/chrome/browser/icon_manager.cc index 41d5b170..118b135 100644 --- a/chrome/browser/icon_manager.cc +++ b/chrome/browser/icon_manager.cc
@@ -7,7 +7,7 @@ #include <memory> #include <tuple> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/task_runner.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkCanvas.h"
diff --git a/chrome/browser/idle/idle_detection_permission_context.cc b/chrome/browser/idle/idle_detection_permission_context.cc index a43e6f1..11e5a8d 100644 --- a/chrome/browser/idle/idle_detection_permission_context.cc +++ b/chrome/browser/idle/idle_detection_permission_context.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/idle/idle_detection_permission_context.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/rand_util.h" #include "chrome/browser/visibility_timer_tab_helper.h"
diff --git a/chrome/browser/image_decoder/image_decoder.cc b/chrome/browser/image_decoder/image_decoder.cc index 6986261..0a96262 100644 --- a/chrome/browser/image_decoder/image_decoder.cc +++ b/chrome/browser/image_decoder/image_decoder.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/task/single_thread_task_runner.h" #include "build/build_config.h" #include "ipc/ipc_channel.h"
diff --git a/chrome/browser/image_editor/event_capture_mac.h b/chrome/browser/image_editor/event_capture_mac.h index a1b25d6..b30d4504 100644 --- a/chrome/browser/image_editor/event_capture_mac.h +++ b/chrome/browser/image_editor/event_capture_mac.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_IMAGE_EDITOR_EVENT_CAPTURE_MAC_H_ #define CHROME_BROWSER_IMAGE_EDITOR_EVENT_CAPTURE_MAC_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "components/remote_cocoa/app_shim/mouse_capture.h" #include "components/remote_cocoa/app_shim/mouse_capture_delegate.h"
diff --git a/chrome/browser/image_editor/event_capture_mac.mm b/chrome/browser/image_editor/event_capture_mac.mm index 92be6858..b970dff 100644 --- a/chrome/browser/image_editor/event_capture_mac.mm +++ b/chrome/browser/image_editor/event_capture_mac.mm
@@ -6,8 +6,8 @@ #import <Cocoa/Cocoa.h> -#include "base/callback.h" #include "base/check.h" +#include "base/functional/callback.h" #include "base/memory/ptr_util.h" #include "ui/events/event.h" #include "ui/events/event_utils.h"
diff --git a/chrome/browser/image_editor/screenshot_flow.cc b/chrome/browser/image_editor/screenshot_flow.cc index 31ea453..3076885 100644 --- a/chrome/browser/image_editor/screenshot_flow.cc +++ b/chrome/browser/image_editor/screenshot_flow.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/memory/raw_ptr.h" #include "base/supports_user_data.h"
diff --git a/chrome/browser/image_editor/screenshot_flow.h b/chrome/browser/image_editor/screenshot_flow.h index 9102cfe9..7003fce 100644 --- a/chrome/browser/image_editor/screenshot_flow.h +++ b/chrome/browser/image_editor/screenshot_flow.h
@@ -8,8 +8,8 @@ #include <memory> #include <string> -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/supports_user_data.h" #include "build/build_config.h" #include "content/public/browser/web_contents_observer.h"
diff --git a/chrome/browser/image_fetcher/image_decoder_impl.cc b/chrome/browser/image_fetcher/image_decoder_impl.cc index f2171846..12e93f5 100644 --- a/chrome/browser/image_fetcher/image_decoder_impl.cc +++ b/chrome/browser/image_fetcher/image_decoder_impl.cc
@@ -4,7 +4,7 @@ #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/ranges/algorithm.h" #include "chrome/browser/image_fetcher/image_decoder_impl.h"
diff --git a/chrome/browser/image_fetcher/image_fetcher_impl_browsertest.cc b/chrome/browser/image_fetcher/image_fetcher_impl_browsertest.cc index 020c629..bb9b9ce 100644 --- a/chrome/browser/image_fetcher/image_fetcher_impl_browsertest.cc +++ b/chrome/browser/image_fetcher/image_fetcher_impl_browsertest.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "chrome/browser/image_fetcher/image_decoder_impl.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/image_fetcher/image_fetcher_service_factory.cc b/chrome/browser/image_fetcher/image_fetcher_service_factory.cc index 04f44af..e382438 100644 --- a/chrome/browser/image_fetcher/image_fetcher_service_factory.cc +++ b/chrome/browser/image_fetcher/image_fetcher_service_factory.cc
@@ -7,9 +7,9 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback.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/external_process_importer_client.cc b/chrome/browser/importer/external_process_importer_client.cc index f823a30..9a6d4b1 100644 --- a/chrome/browser/importer/external_process_importer_client.cc +++ b/chrome/browser/importer/external_process_importer_client.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/string_number_conversions.h" #include "build/build_config.h" #include "chrome/browser/importer/external_process_importer_host.h"
diff --git a/chrome/browser/importer/external_process_importer_host.cc b/chrome/browser/importer/external_process_importer_host.cc index 6d10389..a1af11d 100644 --- a/chrome/browser/importer/external_process_importer_host.cc +++ b/chrome/browser/importer/external_process_importer_host.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/importer/external_process_importer_client.h"
diff --git a/chrome/browser/importer/ie_importer_browsertest_win.cc b/chrome/browser/importer/ie_importer_browsertest_win.cc index d03ebe7..c911d24 100644 --- a/chrome/browser/importer/ie_importer_browsertest_win.cc +++ b/chrome/browser/importer/ie_importer_browsertest_win.cc
@@ -19,10 +19,10 @@ #include <string> #include <vector> -#include "base/bind.h" #include "base/compiler_specific.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/importer/importer_list.cc b/chrome/browser/importer/importer_list.cc index b6cd6b3..d31c78f6 100644 --- a/chrome/browser/importer/importer_list.cc +++ b/chrome/browser/importer/importer_list.cc
@@ -6,7 +6,7 @@ #include <stdint.h> -#include "base/bind.h" +#include "base/functional/bind.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/importer_list.h b/chrome/browser/importer/importer_list.h index ade8309d..bec612d3 100644 --- a/chrome/browser/importer/importer_list.h +++ b/chrome/browser/importer/importer_list.h
@@ -10,7 +10,7 @@ #include <string> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h" #include "chrome/common/importer/importer_data_types.h"
diff --git a/chrome/browser/importer/importer_lock_dialog.h b/chrome/browser/importer/importer_lock_dialog.h index 5aaeb4de..94899c5e 100644 --- a/chrome/browser/importer/importer_lock_dialog.h +++ b/chrome/browser/importer/importer_lock_dialog.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_IMPORTER_IMPORTER_LOCK_DIALOG_H_ #define CHROME_BROWSER_IMPORTER_IMPORTER_LOCK_DIALOG_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "ui/gfx/native_widget_types.h" namespace importer {
diff --git a/chrome/browser/importer/profile_writer_unittest.cc b/chrome/browser/importer/profile_writer_unittest.cc index 41a64e3..0356f28c 100644 --- a/chrome/browser/importer/profile_writer_unittest.cc +++ b/chrome/browser/importer/profile_writer_unittest.cc
@@ -8,7 +8,7 @@ #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" #include "base/test/bind.h"
diff --git a/chrome/browser/infobars/infobar_responder.cc b/chrome/browser/infobars/infobar_responder.cc index f09637f..81c80d85 100644 --- a/chrome/browser/infobars/infobar_responder.cc +++ b/chrome/browser/infobars/infobar_responder.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/infobars/infobar_responder.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/task/single_thread_task_runner.h" #include "components/infobars/content/content_infobar_manager.h"
diff --git a/chrome/browser/infobars/infobars_browsertest.cc b/chrome/browser/infobars/infobars_browsertest.cc index 9b89f32..a100f8f 100644 --- a/chrome/browser/infobars/infobars_browsertest.cc +++ b/chrome/browser/infobars/infobars_browsertest.cc
@@ -5,10 +5,10 @@ #include <tuple> #include <utility> -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/containers/flat_map.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h" #include "build/buildflag.h"
diff --git a/chrome/browser/install_verification/win/module_list_unittest.cc b/chrome/browser/install_verification/win/module_list_unittest.cc index cd4e5ce..8a3b4954 100644 --- a/chrome/browser/install_verification/win/module_list_unittest.cc +++ b/chrome/browser/install_verification/win/module_list_unittest.cc
@@ -10,8 +10,8 @@ #include <memory> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/win/win_util.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/installable/installable_manager_browsertest.cc b/chrome/browser/installable/installable_manager_browsertest.cc index eb6e3d7..e0a345c 100644 --- a/chrome/browser/installable/installable_manager_browsertest.cc +++ b/chrome/browser/installable/installable_manager_browsertest.cc
@@ -10,8 +10,8 @@ #include <string> #include <tuple> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/installable/installed_webapp_bridge.h b/chrome/browser/installable/installed_webapp_bridge.h index 4fe99482..c2ca4524 100644 --- a/chrome/browser/installable/installed_webapp_bridge.h +++ b/chrome/browser/installable/installed_webapp_bridge.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_INSTALLABLE_INSTALLED_WEBAPP_BRIDGE_H_ #define CHROME_BROWSER_INSTALLABLE_INSTALLED_WEBAPP_BRIDGE_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/installable/installed_webapp_provider.h" #include "components/content_settings/core/common/content_settings.h" #include "components/content_settings/core/common/content_settings_types.h"
diff --git a/chrome/browser/installable/installed_webapp_geolocation_bridge.cc b/chrome/browser/installable/installed_webapp_geolocation_bridge.cc index eb1eb15..20e7124 100644 --- a/chrome/browser/installable/installed_webapp_geolocation_bridge.cc +++ b/chrome/browser/installable/installed_webapp_geolocation_bridge.cc
@@ -8,7 +8,7 @@ #include "base/android/jni_android.h" #include "base/android/jni_string.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "chrome/android/chrome_jni_headers/InstalledWebappGeolocationBridge_jni.h" #include "chrome/browser/installable/installed_webapp_geolocation_context.h"
diff --git a/chrome/browser/intranet_redirect_detector.cc b/chrome/browser/intranet_redirect_detector.cc index dc1291c..c38a6b4 100644 --- a/chrome/browser/intranet_redirect_detector.cc +++ b/chrome/browser/intranet_redirect_detector.cc
@@ -8,9 +8,9 @@ #include <utility> -#include "base/bind.h" #include "base/command_line.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/rand_util.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/invalidation/profile_invalidation_provider_factory.cc b/chrome/browser/invalidation/profile_invalidation_provider_factory.cc index 98847c8..e5b0617 100644 --- a/chrome/browser/invalidation/profile_invalidation_provider_factory.cc +++ b/chrome/browser/invalidation/profile_invalidation_provider_factory.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/k_anonymity_service/k_anonymity_service_client.cc b/chrome/browser/k_anonymity_service/k_anonymity_service_client.cc index c9bcf83..9bbad45 100644 --- a/chrome/browser/k_anonymity_service/k_anonymity_service_client.cc +++ b/chrome/browser/k_anonymity_service/k_anonymity_service_client.cc
@@ -6,8 +6,8 @@ #include "base/base64.h" #include "base/base64url.h" -#include "base/callback.h" #include "base/feature_list.h" +#include "base/functional/callback.h" #include "base/json/json_writer.h" #include "base/strings/strcat.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/k_anonymity_service/k_anonymity_service_client.h b/chrome/browser/k_anonymity_service/k_anonymity_service_client.h index 609ad21..a988aa9 100644 --- a/chrome/browser/k_anonymity_service/k_anonymity_service_client.h +++ b/chrome/browser/k_anonymity_service/k_anonymity_service_client.h
@@ -10,8 +10,8 @@ #include <vector> #include "base/base64.h" -#include "base/callback.h" #include "base/containers/circular_deque.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/time/time.h" #include "chrome/browser/k_anonymity_service/k_anonymity_service_storage.h"
diff --git a/chrome/browser/k_anonymity_service/k_anonymity_service_client_unittest.cc b/chrome/browser/k_anonymity_service/k_anonymity_service_client_unittest.cc index 122b3cc..7f242b2 100644 --- a/chrome/browser/k_anonymity_service/k_anonymity_service_client_unittest.cc +++ b/chrome/browser/k_anonymity_service/k_anonymity_service_client_unittest.cc
@@ -3,8 +3,8 @@ // found in the LICENSE file. #include "chrome/browser/k_anonymity_service/k_anonymity_service_client.h" -#include "base/callback.h" #include "base/containers/flat_map.h" +#include "base/functional/callback.h" #include "base/run_loop.h" #include "base/strings/string_util.h" #include "base/test/bind.h"
diff --git a/chrome/browser/k_anonymity_service/k_anonymity_trust_token_getter.h b/chrome/browser/k_anonymity_service/k_anonymity_trust_token_getter.h index d617bfb..3ecd8125 100644 --- a/chrome/browser/k_anonymity_service/k_anonymity_trust_token_getter.h +++ b/chrome/browser/k_anonymity_service/k_anonymity_trust_token_getter.h
@@ -8,8 +8,8 @@ #include <memory> #include <string> -#include "base/callback.h" #include "base/containers/circular_deque.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "chrome/browser/k_anonymity_service/k_anonymity_service_storage.h"
diff --git a/chrome/browser/k_anonymity_service/k_anonymity_trust_token_getter_unittest.cc b/chrome/browser/k_anonymity_service/k_anonymity_trust_token_getter_unittest.cc index 83e07f2b..d793ae5 100644 --- a/chrome/browser/k_anonymity_service/k_anonymity_trust_token_getter_unittest.cc +++ b/chrome/browser/k_anonymity_service/k_anonymity_trust_token_getter_unittest.cc
@@ -6,7 +6,7 @@ #include <inttypes.h> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/run_loop.h" #include "base/strings/strcat.h" #include "base/test/bind.h"
diff --git a/chrome/browser/lacros/account_manager/account_manager_util.cc b/chrome/browser/lacros/account_manager/account_manager_util.cc index 43acee1..1e15713 100644 --- a/chrome/browser/lacros/account_manager/account_manager_util.cc +++ b/chrome/browser/lacros/account_manager/account_manager_util.cc
@@ -7,9 +7,9 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/containers/cxx20_erase.h" #include "base/containers/flat_set.h" +#include "base/functional/bind.h" #include "base/ranges/algorithm.h" #include "chrome/browser/profiles/profile_attributes_entry.h" #include "chrome/browser/profiles/profile_attributes_storage.h"
diff --git a/chrome/browser/lacros/account_manager/account_manager_util_unittest.cc b/chrome/browser/lacros/account_manager/account_manager_util_unittest.cc index ec3b522..97d192f 100644 --- a/chrome/browser/lacros/account_manager/account_manager_util_unittest.cc +++ b/chrome/browser/lacros/account_manager/account_manager_util_unittest.cc
@@ -7,10 +7,10 @@ #include <algorithm> #include <vector> -#include "base/callback.h" -#include "base/callback_forward.h" #include "base/containers/flat_map.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" +#include "base/functional/callback_forward.h" #include "base/test/mock_callback.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_attributes_entry.h"
diff --git a/chrome/browser/lacros/account_manager/account_profile_mapper.cc b/chrome/browser/lacros/account_manager/account_profile_mapper.cc index 4360c15c..002aa6d 100644 --- a/chrome/browser/lacros/account_manager/account_profile_mapper.cc +++ b/chrome/browser/lacros/account_manager/account_profile_mapper.cc
@@ -4,9 +4,6 @@ #include "chrome/browser/lacros/account_manager/account_profile_mapper.h" -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/check.h" #include "base/containers/contains.h" #include "base/containers/cxx20_erase.h" @@ -14,6 +11,9 @@ #include "base/containers/flat_set.h" #include "base/containers/unique_ptr_adapters.h" #include "base/debug/dump_without_crashing.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/notreached.h" #include "base/ranges/algorithm.h"
diff --git a/chrome/browser/lacros/account_manager/account_profile_mapper.h b/chrome/browser/lacros/account_manager/account_profile_mapper.h index e6de09a..df0b62b7 100644 --- a/chrome/browser/lacros/account_manager/account_profile_mapper.h +++ b/chrome/browser/lacros/account_manager/account_profile_mapper.h
@@ -9,8 +9,8 @@ #include <string> #include <vector> -#include "base/callback_forward.h" #include "base/files/file_path.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h"
diff --git a/chrome/browser/lacros/account_manager/account_profile_mapper_unittest.cc b/chrome/browser/lacros/account_manager/account_profile_mapper_unittest.cc index 15d8e219..7597cab 100644 --- a/chrome/browser/lacros/account_manager/account_profile_mapper_unittest.cc +++ b/chrome/browser/lacros/account_manager/account_profile_mapper_unittest.cc
@@ -8,11 +8,11 @@ #include <utility> #include <vector> -#include "base/callback.h" -#include "base/callback_forward.h" #include "base/containers/flat_map.h" #include "base/containers/flat_set.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/scoped_observation.h" #include "base/test/mock_callback.h"
diff --git a/chrome/browser/lacros/account_manager/add_account_helper.cc b/chrome/browser/lacros/account_manager/add_account_helper.cc index e36618d..d32502a7 100644 --- a/chrome/browser/lacros/account_manager/add_account_helper.cc +++ b/chrome/browser/lacros/account_manager/add_account_helper.cc
@@ -6,10 +6,10 @@ #include <string> -#include "base/bind.h" -#include "base/callback.h" #include "base/check.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "chrome/browser/profiles/profile_attributes_storage.h" #include "chrome/browser/profiles/profile_avatar_icon_util.h" #include "chrome/browser/profiles/profile_manager.h"
diff --git a/chrome/browser/lacros/account_manager/get_account_information_helper.cc b/chrome/browser/lacros/account_manager/get_account_information_helper.cc index 06fb9df..1733af54 100644 --- a/chrome/browser/lacros/account_manager/get_account_information_helper.cc +++ b/chrome/browser/lacros/account_manager/get_account_information_helper.cc
@@ -8,8 +8,8 @@ #include <string> #include "base/barrier_closure.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "chrome/browser/lacros/account_manager/account_profile_mapper.h" #include "chrome/browser/lacros/identity_manager_lacros.h" #include "ui/gfx/image/image.h"
diff --git a/chrome/browser/lacros/account_manager/get_account_information_helper_unittest.cc b/chrome/browser/lacros/account_manager/get_account_information_helper_unittest.cc index 52fdafe..fb1489f 100644 --- a/chrome/browser/lacros/account_manager/get_account_information_helper_unittest.cc +++ b/chrome/browser/lacros/account_manager/get_account_information_helper_unittest.cc
@@ -6,7 +6,7 @@ #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/test/mock_callback.h" #include "chrome/browser/lacros/account_manager/account_profile_mapper.h" #include "chrome/browser/lacros/identity_manager_lacros.h"
diff --git a/chrome/browser/lacros/account_manager/signin_helper_lacros.cc b/chrome/browser/lacros/account_manager/signin_helper_lacros.cc index e7ac882..efbb0243 100644 --- a/chrome/browser/lacros/account_manager/signin_helper_lacros.cc +++ b/chrome/browser/lacros/account_manager/signin_helper_lacros.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/lacros/account_manager/signin_helper_lacros.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/ranges/algorithm.h" #include "chrome/browser/lacros/account_manager/account_manager_util.h" #include "chrome/browser/ui/profile_picker.h"
diff --git a/chrome/browser/lacros/account_manager/signin_helper_lacros.h b/chrome/browser/lacros/account_manager/signin_helper_lacros.h index 295846f..ff28974 100644 --- a/chrome/browser/lacros/account_manager/signin_helper_lacros.h +++ b/chrome/browser/lacros/account_manager/signin_helper_lacros.h
@@ -7,8 +7,8 @@ #include <memory> -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/scoped_observation.h" #include "chrome/browser/lacros/account_manager/account_profile_mapper.h"
diff --git a/chrome/browser/lacros/app_mode/chrome_kiosk_launch_controller_lacros.cc b/chrome/browser/lacros/app_mode/chrome_kiosk_launch_controller_lacros.cc index fd8a45d..d8d25c3 100644 --- a/chrome/browser/lacros/app_mode/chrome_kiosk_launch_controller_lacros.cc +++ b/chrome/browser/lacros/app_mode/chrome_kiosk_launch_controller_lacros.cc
@@ -5,7 +5,7 @@ #include "chrome/browser/lacros/app_mode/chrome_kiosk_launch_controller_lacros.h" #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/notreached.h" #include "chrome/browser/chromeos/app_mode/chrome_kiosk_app_installer.h" #include "chrome/browser/chromeos/app_mode/chrome_kiosk_app_launcher.h"
diff --git a/chrome/browser/lacros/app_mode/kiosk_session_service_lacros.cc b/chrome/browser/lacros/app_mode/kiosk_session_service_lacros.cc index 187cdb7..c7ce7bf 100644 --- a/chrome/browser/lacros/app_mode/kiosk_session_service_lacros.cc +++ b/chrome/browser/lacros/app_mode/kiosk_session_service_lacros.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/lacros/app_mode/kiosk_session_service_lacros.h" -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chromeos/app_mode/app_session.h" #include "chrome/browser/ui/browser.h"
diff --git a/chrome/browser/lacros/arc/arc_intent_helper_mojo_lacros.cc b/chrome/browser/lacros/arc/arc_intent_helper_mojo_lacros.cc index 456b1a2..361faf9 100644 --- a/chrome/browser/lacros/arc/arc_intent_helper_mojo_lacros.cc +++ b/chrome/browser/lacros/arc/arc_intent_helper_mojo_lacros.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/lacros/arc/arc_intent_helper_mojo_lacros.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "chromeos/lacros/lacros_service.h"
diff --git a/chrome/browser/lacros/browser_service_lacros.cc b/chrome/browser/lacros/browser_service_lacros.cc index a8061f4..f33350b 100644 --- a/chrome/browser/lacros/browser_service_lacros.cc +++ b/chrome/browser/lacros/browser_service_lacros.cc
@@ -4,12 +4,12 @@ #include "chrome/browser/lacros/browser_service_lacros.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/check.h" #include "base/command_line.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/memory/raw_ptr.h" #include "base/metrics/statistics_recorder.h"
diff --git a/chrome/browser/lacros/browser_test_util.cc b/chrome/browser/lacros/browser_test_util.cc index d8b5fc3..329d2b9c 100644 --- a/chrome/browser/lacros/browser_test_util.cc +++ b/chrome/browser/lacros/browser_test_util.cc
@@ -5,7 +5,7 @@ #include "chrome/browser/lacros/browser_test_util.h" #include "base/memory/raw_ptr.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/time/time.h" #include "base/timer/timer.h"
diff --git a/chrome/browser/lacros/cert/cert_db_initializer.h b/chrome/browser/lacros/cert/cert_db_initializer.h index f0850db..a1cb4b9 100644 --- a/chrome/browser/lacros/cert/cert_db_initializer.h +++ b/chrome/browser/lacros/cert/cert_db_initializer.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_LACROS_CERT_CERT_DB_INITIALIZER_H_ #define CHROME_BROWSER_LACROS_CERT_CERT_DB_INITIALIZER_H_ -#include "base/callback.h" #include "base/callback_list.h" +#include "base/functional/callback.h" #include "chrome/browser/net/nss_service.h" class CertDbInitializer {
diff --git a/chrome/browser/lacros/cert/cert_db_initializer_io_impl.h b/chrome/browser/lacros/cert/cert_db_initializer_io_impl.h index f03cebb..4b8c2d4 100644 --- a/chrome/browser/lacros/cert/cert_db_initializer_io_impl.h +++ b/chrome/browser/lacros/cert/cert_db_initializer_io_impl.h
@@ -7,9 +7,9 @@ #include <memory> -#include "base/callback_forward.h" #include "base/callback_list.h" #include "base/files/file_path.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "base/task/sequenced_task_runner.h" #include "chromeos/crosapi/mojom/cert_database.mojom.h"
diff --git a/chrome/browser/lacros/cert/client_cert_store_lacros.cc b/chrome/browser/lacros/cert/client_cert_store_lacros.cc index a9dae5a..2350e3c3 100644 --- a/chrome/browser/lacros/cert/client_cert_store_lacros.cc +++ b/chrome/browser/lacros/cert/client_cert_store_lacros.cc
@@ -4,9 +4,9 @@ #include "chrome/browser/lacros/cert/client_cert_store_lacros.h" -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/memory/scoped_refptr.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/lacros/component_policy_lacros_browsertest.cc b/chrome/browser/lacros/component_policy_lacros_browsertest.cc index f98d6bb..f3622a27 100644 --- a/chrome/browser/lacros/component_policy_lacros_browsertest.cc +++ b/chrome/browser/lacros/component_policy_lacros_browsertest.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 "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/test/values_test_util.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/lacros/device_oauth2_token_service_lacros.cc b/chrome/browser/lacros/device_oauth2_token_service_lacros.cc index ecfab58..b045f079 100644 --- a/chrome/browser/lacros/device_oauth2_token_service_lacros.cc +++ b/chrome/browser/lacros/device_oauth2_token_service_lacros.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/lacros/device_oauth2_token_service_lacros.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "chromeos/crosapi/mojom/account_manager.mojom.h" #include "chromeos/lacros/lacros_service.h" #include "components/account_manager_core/account_manager_util.h"
diff --git a/chrome/browser/lacros/device_settings_lacros.cc b/chrome/browser/lacros/device_settings_lacros.cc index a887e54..8e2a0928 100644 --- a/chrome/browser/lacros/device_settings_lacros.cc +++ b/chrome/browser/lacros/device_settings_lacros.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/observer_list.h" #include "base/sequence_checker.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/lacros/download_controller_client_lacros.cc b/chrome/browser/lacros/download_controller_client_lacros.cc index 2288e106..69b7539 100644 --- a/chrome/browser/lacros/download_controller_client_lacros.cc +++ b/chrome/browser/lacros/download_controller_client_lacros.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/lacros/download_controller_client_lacros.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile_manager.h" #include "chromeos/crosapi/mojom/download_controller.mojom.h"
diff --git a/chrome/browser/lacros/fullscreen_controller_client_lacros.cc b/chrome/browser/lacros/fullscreen_controller_client_lacros.cc index 7f75a98..7e14854a 100644 --- a/chrome/browser/lacros/fullscreen_controller_client_lacros.cc +++ b/chrome/browser/lacros/fullscreen_controller_client_lacros.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/lacros/fullscreen_controller_client_lacros.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h"
diff --git a/chrome/browser/lacros/fullscreen_controller_client_lacros_unittest.cc b/chrome/browser/lacros/fullscreen_controller_client_lacros_unittest.cc index bf88fde..7bc766c 100644 --- a/chrome/browser/lacros/fullscreen_controller_client_lacros_unittest.cc +++ b/chrome/browser/lacros/fullscreen_controller_client_lacros_unittest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/lacros/fullscreen_controller_client_lacros.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/test/test_future.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/lacros/identity_manager_lacros.cc b/chrome/browser/lacros/identity_manager_lacros.cc index b57e1e7..baa7a7e 100644 --- a/chrome/browser/lacros/identity_manager_lacros.cc +++ b/chrome/browser/lacros/identity_manager_lacros.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/lacros/identity_manager_lacros.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "chromeos/lacros/lacros_service.h" namespace {
diff --git a/chrome/browser/lacros/lacros_extension_apps_controller.cc b/chrome/browser/lacros/lacros_extension_apps_controller.cc index 94d39851..7b60155 100644 --- a/chrome/browser/lacros/lacros_extension_apps_controller.cc +++ b/chrome/browser/lacros/lacros_extension_apps_controller.cc
@@ -7,7 +7,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/notreached.h" #include "chrome/browser/apps/app_service/app_icon/app_icon_factory.h" #include "chrome/browser/apps/app_service/app_launch_params.h"
diff --git a/chrome/browser/lacros/lacros_extension_apps_controller_lacros_browsertest.cc b/chrome/browser/lacros/lacros_extension_apps_controller_lacros_browsertest.cc index 8f3db39..4ceb969a 100644 --- a/chrome/browser/lacros/lacros_extension_apps_controller_lacros_browsertest.cc +++ b/chrome/browser/lacros/lacros_extension_apps_controller_lacros_browsertest.cc
@@ -10,7 +10,7 @@ #include <string> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/timer/timer.h" #include "chrome/browser/extensions/chrome_test_extension_loader.h"
diff --git a/chrome/browser/lacros/lacros_file_system_provider.cc b/chrome/browser/lacros/lacros_file_system_provider.cc index 30d315cc..8037bf5 100644 --- a/chrome/browser/lacros/lacros_file_system_provider.cc +++ b/chrome/browser/lacros/lacros_file_system_provider.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/lacros/lacros_file_system_provider.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/ranges/algorithm.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chromeos/extensions/file_system_provider/service_worker_lifetime_manager.h"
diff --git a/chrome/browser/lacros/metrics_reporting_observer.cc b/chrome/browser/lacros/metrics_reporting_observer.cc index 3a6c9bd..b5c1ae6 100644 --- a/chrome/browser/lacros/metrics_reporting_observer.cc +++ b/chrome/browser/lacros/metrics_reporting_observer.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/lacros/metrics_reporting_observer.h" -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/metrics/metrics_reporting_state.h"
diff --git a/chrome/browser/lacros/net/network_change_manager_bridge.cc b/chrome/browser/lacros/net/network_change_manager_bridge.cc index bd9efaa..61c516cb 100644 --- a/chrome/browser/lacros/net/network_change_manager_bridge.cc +++ b/chrome/browser/lacros/net/network_change_manager_bridge.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/lacros/net/network_change_manager_bridge.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chromeos/lacros/lacros_service.h" #include "content/public/browser/network_service_instance.h" #include "content/public/common/network_service_util.h"
diff --git a/chrome/browser/lacros/net/proxy_config_service_lacros.cc b/chrome/browser/lacros/net/proxy_config_service_lacros.cc index 4aac886..28ef1b2 100644 --- a/chrome/browser/lacros/net/proxy_config_service_lacros.cc +++ b/chrome/browser/lacros/net/proxy_config_service_lacros.cc
@@ -6,9 +6,9 @@ #include <memory> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/values.h" #include "chrome/browser/lacros/net/lacros_extension_proxy_tracker.h"
diff --git a/chrome/browser/lacros/prefs_ash_observer.cc b/chrome/browser/lacros/prefs_ash_observer.cc index f98ce9b5..58da35d 100644 --- a/chrome/browser/lacros/prefs_ash_observer.cc +++ b/chrome/browser/lacros/prefs_ash_observer.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/lacros/prefs_ash_observer.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "chrome/common/pref_names.h" #include "chromeos/crosapi/mojom/prefs.mojom.h"
diff --git a/chrome/browser/lacros/remote_apps/remote_apps_proxy_lacros.h b/chrome/browser/lacros/remote_apps/remote_apps_proxy_lacros.h index 97343da9..b52bad2 100644 --- a/chrome/browser/lacros/remote_apps/remote_apps_proxy_lacros.h +++ b/chrome/browser/lacros/remote_apps/remote_apps_proxy_lacros.h
@@ -9,7 +9,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "chromeos/components/remote_apps/mojom/remote_apps.mojom.h" #include "components/keyed_service/core/keyed_service.h"
diff --git a/chrome/browser/lacros/remote_apps/remote_apps_proxy_lacros_unittest.cc b/chrome/browser/lacros/remote_apps/remote_apps_proxy_lacros_unittest.cc index d18ca24..c70b453 100644 --- a/chrome/browser/lacros/remote_apps/remote_apps_proxy_lacros_unittest.cc +++ b/chrome/browser/lacros/remote_apps/remote_apps_proxy_lacros_unittest.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/notreached.h" #include "base/run_loop.h"
diff --git a/chrome/browser/lacros/screen_manager_lacros_browsertest.cc b/chrome/browser/lacros/screen_manager_lacros_browsertest.cc index 444f831..fbd4992 100644 --- a/chrome/browser/lacros/screen_manager_lacros_browsertest.cc +++ b/chrome/browser/lacros/screen_manager_lacros_browsertest.cc
@@ -6,7 +6,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/rand_util.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/lacros/sync/sync_explicit_passphrase_client_lacros.cc b/chrome/browser/lacros/sync/sync_explicit_passphrase_client_lacros.cc index 865bcab..f953db7c 100644 --- a/chrome/browser/lacros/sync/sync_explicit_passphrase_client_lacros.cc +++ b/chrome/browser/lacros/sync/sync_explicit_passphrase_client_lacros.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/lacros/sync/sync_explicit_passphrase_client_lacros.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "chromeos/crosapi/mojom/account_manager.mojom.h" #include "components/account_manager_core/account.h" #include "components/account_manager_core/account_manager_util.h"
diff --git a/chrome/browser/lacros/sync/sync_user_settings_client_lacros.cc b/chrome/browser/lacros/sync/sync_user_settings_client_lacros.cc index bc29ff71..636140da 100644 --- a/chrome/browser/lacros/sync/sync_user_settings_client_lacros.cc +++ b/chrome/browser/lacros/sync/sync_user_settings_client_lacros.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/lacros/sync/sync_user_settings_client_lacros.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "chromeos/crosapi/mojom/sync.mojom.h" #include "components/sync/driver/sync_service.h" #include "components/sync/driver/sync_user_settings.h"
diff --git a/chrome/browser/lacros/wallpaper_lacros_browsertest.cc b/chrome/browser/lacros/wallpaper_lacros_browsertest.cc index 413c2818..188fea98 100644 --- a/chrome/browser/lacros/wallpaper_lacros_browsertest.cc +++ b/chrome/browser/lacros/wallpaper_lacros_browsertest.cc
@@ -3,8 +3,8 @@ // found in the LICENSE file. #include "base/base_paths.h" -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/path_service.h" #include "chrome/test/base/in_process_browser_test.h" #include "chromeos/crosapi/mojom/wallpaper.mojom-test-utils.h"
diff --git a/chrome/browser/lacros/web_app_provider_bridge_lacros.cc b/chrome/browser/lacros/web_app_provider_bridge_lacros.cc index 1fadc68..b88214b 100644 --- a/chrome/browser/lacros/web_app_provider_bridge_lacros.cc +++ b/chrome/browser/lacros/web_app_provider_bridge_lacros.cc
@@ -3,7 +3,7 @@ // found in the LICENSE file. #include "chrome/browser/lacros/web_app_provider_bridge_lacros.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/apps/app_service/webapk/webapk_utils.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/lacros/webauthn_request_registrar_lacros.cc b/chrome/browser/lacros/webauthn_request_registrar_lacros.cc index f822dd2..a630c46 100644 --- a/chrome/browser/lacros/webauthn_request_registrar_lacros.cc +++ b/chrome/browser/lacros/webauthn_request_registrar_lacros.cc
@@ -6,8 +6,8 @@ #include <string> -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/notreached.h" #include "ui/aura/window.h" #include "ui/base/class_property.h"
diff --git a/chrome/browser/lacros/webauthn_request_registrar_lacros.h b/chrome/browser/lacros/webauthn_request_registrar_lacros.h index 731c872..61616b9 100644 --- a/chrome/browser/lacros/webauthn_request_registrar_lacros.h +++ b/chrome/browser/lacros/webauthn_request_registrar_lacros.h
@@ -8,7 +8,7 @@ #include <stdint.h> #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/sequence_checker.h" #include "chromeos/components/webauthn/webauthn_request_registrar.h"
diff --git a/chrome/browser/lens/region_search/lens_region_search_controller.cc b/chrome/browser/lens/region_search/lens_region_search_controller.cc index 6005ca01..ac26b2b 100644 --- a/chrome/browser/lens/region_search/lens_region_search_controller.cc +++ b/chrome/browser/lens/region_search/lens_region_search_controller.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h" #include "chrome/browser/image_editor/screenshot_flow.h"
diff --git a/chrome/browser/lifetime/application_lifetime_desktop.cc b/chrome/browser/lifetime/application_lifetime_desktop.cc index 3d83cd8..66a1e60 100644 --- a/chrome/browser/lifetime/application_lifetime_desktop.cc +++ b/chrome/browser/lifetime/application_lifetime_desktop.cc
@@ -5,8 +5,8 @@ #include "chrome/browser/lifetime/application_lifetime_desktop.h" #include "chrome/browser/lifetime/application_lifetime.h" -#include "base/bind.h" #include "base/callback_list.h" +#include "base/functional/bind.h" #include "base/no_destructor.h" #include "base/process/process.h" #include "base/threading/hang_watcher.h"
diff --git a/chrome/browser/lifetime/application_lifetime_desktop.h b/chrome/browser/lifetime/application_lifetime_desktop.h index 3faa4e6b..70a2678 100644 --- a/chrome/browser/lifetime/application_lifetime_desktop.h +++ b/chrome/browser/lifetime/application_lifetime_desktop.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_LIFETIME_APPLICATION_LIFETIME_DESKTOP_H_ #define CHROME_BROWSER_LIFETIME_APPLICATION_LIFETIME_DESKTOP_H_ -#include "base/callback.h" #include "base/callback_list.h" +#include "base/functional/callback.h" static_assert(!BUILDFLAG(IS_ANDROID), "For non-Android Chrome only");
diff --git a/chrome/browser/lifetime/browser_close_manager.cc b/chrome/browser/lifetime/browser_close_manager.cc index 9210206..ac79a59e 100644 --- a/chrome/browser/lifetime/browser_close_manager.cc +++ b/chrome/browser/lifetime/browser_close_manager.cc
@@ -7,8 +7,8 @@ #include <iterator> #include <vector> -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/ranges/algorithm.h" #include "build/build_config.h" #include "chrome/browser/background/background_mode_manager.h"
diff --git a/chrome/browser/lifetime/browser_close_manager.h b/chrome/browser/lifetime/browser_close_manager.h index d42e490..837bf9ea 100644 --- a/chrome/browser/lifetime/browser_close_manager.h +++ b/chrome/browser/lifetime/browser_close_manager.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_LIFETIME_BROWSER_CLOSE_MANAGER_H_ #define CHROME_BROWSER_LIFETIME_BROWSER_CLOSE_MANAGER_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h"
diff --git a/chrome/browser/lifetime/browser_close_manager_browsertest.cc b/chrome/browser/lifetime/browser_close_manager_browsertest.cc index c5112c4..c31dca5 100644 --- a/chrome/browser/lifetime/browser_close_manager_browsertest.cc +++ b/chrome/browser/lifetime/browser_close_manager_browsertest.cc
@@ -8,11 +8,11 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/callback_list.h" #include "base/command_line.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/threading/thread_restrictions.h"
diff --git a/chrome/browser/lifetime/browser_shutdown.cc b/chrome/browser/lifetime/browser_shutdown.cc index 6e4704e..a5d7e1c3 100644 --- a/chrome/browser/lifetime/browser_shutdown.cc +++ b/chrome/browser/lifetime/browser_shutdown.cc
@@ -10,11 +10,11 @@ #include <memory> #include <string> -#include "base/bind.h" #include "base/clang_profiling_buildflags.h" #include "base/command_line.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "base/path_service.h" #include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/local_discovery/endpoint_resolver.cc b/chrome/browser/local_discovery/endpoint_resolver.cc index 0a5e3bd..67bf0c4 100644 --- a/chrome/browser/local_discovery/endpoint_resolver.cc +++ b/chrome/browser/local_discovery/endpoint_resolver.cc
@@ -4,9 +4,9 @@ #include "chrome/browser/local_discovery/endpoint_resolver.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/debug/dump_without_crashing.h" +#include "base/functional/bind.h" #include "build/build_config.h" #include "chrome/browser/local_discovery/service_discovery_shared_client.h" #include "chrome/common/chrome_switches.h"
diff --git a/chrome/browser/local_discovery/endpoint_resolver.h b/chrome/browser/local_discovery/endpoint_resolver.h index 3ba5e9a6..a019abe 100644 --- a/chrome/browser/local_discovery/endpoint_resolver.h +++ b/chrome/browser/local_discovery/endpoint_resolver.h
@@ -9,7 +9,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/local_discovery/service_discovery_client.h" namespace net {
diff --git a/chrome/browser/local_discovery/fake_service_discovery_device_lister.cc b/chrome/browser/local_discovery/fake_service_discovery_device_lister.cc index 88f4728..894e8b4 100644 --- a/chrome/browser/local_discovery/fake_service_discovery_device_lister.cc +++ b/chrome/browser/local_discovery/fake_service_discovery_device_lister.cc
@@ -6,9 +6,9 @@ #include <utility> -#include "base/bind.h" #include "base/check.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/strings/strcat.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/local_discovery/fake_service_discovery_device_lister.h b/chrome/browser/local_discovery/fake_service_discovery_device_lister.h index 1ea88ba..021fa7d 100644 --- a/chrome/browser/local_discovery/fake_service_discovery_device_lister.h +++ b/chrome/browser/local_discovery/fake_service_discovery_device_lister.h
@@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/task/task_runner.h" #include "chrome/browser/local_discovery/service_discovery_client.h"
diff --git a/chrome/browser/local_discovery/local_domain_resolver_unittest.cc b/chrome/browser/local_discovery/local_domain_resolver_unittest.cc index a3af03cf..5165e2d 100644 --- a/chrome/browser/local_discovery/local_domain_resolver_unittest.cc +++ b/chrome/browser/local_discovery/local_domain_resolver_unittest.cc
@@ -4,7 +4,7 @@ #include <stdint.h> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/local_discovery/service_discovery_client.h b/chrome/browser/local_discovery/service_discovery_client.h index aa678aea..bbe08ee5 100644 --- a/chrome/browser/local_discovery/service_discovery_client.h +++ b/chrome/browser/local_discovery/service_discovery_client.h
@@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/time/time.h" #include "net/base/address_family.h" #include "net/base/host_port_pair.h"
diff --git a/chrome/browser/local_discovery/service_discovery_client_impl.cc b/chrome/browser/local_discovery/service_discovery_client_impl.cc index 70d3f1c..c627b09 100644 --- a/chrome/browser/local_discovery/service_discovery_client_impl.cc +++ b/chrome/browser/local_discovery/service_discovery_client_impl.cc
@@ -5,9 +5,9 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/check_op.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/notreached.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/local_discovery/service_discovery_client_impl.h b/chrome/browser/local_discovery/service_discovery_client_impl.h index a4373e9e2..1098f37 100644 --- a/chrome/browser/local_discovery/service_discovery_client_impl.h +++ b/chrome/browser/local_discovery/service_discovery_client_impl.h
@@ -12,8 +12,8 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/cancelable_callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/local_discovery/service_discovery_client.h"
diff --git a/chrome/browser/local_discovery/service_discovery_client_mac.mm b/chrome/browser/local_discovery/service_discovery_client_mac.mm index 4570aa4..28e1cf5 100644 --- a/chrome/browser/local_discovery/service_discovery_client_mac.mm +++ b/chrome/browser/local_discovery/service_discovery_client_mac.mm
@@ -12,7 +12,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/mac/foundation_util.h" #include "base/message_loop/message_pump_type.h" #include "base/strings/sys_string_conversions.h"
diff --git a/chrome/browser/local_discovery/service_discovery_client_mac_unittest.mm b/chrome/browser/local_discovery/service_discovery_client_mac_unittest.mm index 34dcef3..2e938db 100644 --- a/chrome/browser/local_discovery/service_discovery_client_mac_unittest.mm +++ b/chrome/browser/local_discovery/service_discovery_client_mac_unittest.mm
@@ -5,9 +5,9 @@ #import <Cocoa/Cocoa.h> #include <stdint.h> -#include "base/bind.h" -#include "base/callback.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/mac/scoped_nsobject.h" #include "base/run_loop.h" #include "base/threading/thread.h"
diff --git a/chrome/browser/local_discovery/service_discovery_client_mdns.cc b/chrome/browser/local_discovery/service_discovery_client_mdns.cc index 6be91fb..244a3c7 100644 --- a/chrome/browser/local_discovery/service_discovery_client_mdns.cc +++ b/chrome/browser/local_discovery/service_discovery_client_mdns.cc
@@ -9,7 +9,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/observer_list.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/local_discovery/service_discovery_client_unittest.cc b/chrome/browser/local_discovery/service_discovery_client_unittest.cc index ca1075d..be9208f2 100644 --- a/chrome/browser/local_discovery/service_discovery_client_unittest.cc +++ b/chrome/browser/local_discovery/service_discovery_client_unittest.cc
@@ -4,7 +4,7 @@ #include <stdint.h> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/weak_ptr.h" #include "base/run_loop.h"
diff --git a/chrome/browser/local_discovery/service_discovery_device_lister.cc b/chrome/browser/local_discovery/service_discovery_device_lister.cc index e315b66..4e9fdeb 100644 --- a/chrome/browser/local_discovery/service_discovery_device_lister.cc +++ b/chrome/browser/local_discovery/service_discovery_device_lister.cc
@@ -7,8 +7,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/memory/raw_ptr.h"
diff --git a/chrome/browser/long_screenshots/long_screenshots_tab_service.cc b/chrome/browser/long_screenshots/long_screenshots_tab_service.cc index d9211ba..3c40648 100644 --- a/chrome/browser/long_screenshots/long_screenshots_tab_service.cc +++ b/chrome/browser/long_screenshots/long_screenshots_tab_service.cc
@@ -10,8 +10,8 @@ #include "base/android/jni_android.h" #include "base/android/jni_array.h" #include "base/android/jni_string.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/memory_pressure_listener.h" #include "base/memory/memory_pressure_monitor.h" #include "components/google/core/common/google_util.h"
diff --git a/chrome/browser/long_screenshots/long_screenshots_tab_service.h b/chrome/browser/long_screenshots/long_screenshots_tab_service.h index db2a0436..4efa5181 100644 --- a/chrome/browser/long_screenshots/long_screenshots_tab_service.h +++ b/chrome/browser/long_screenshots/long_screenshots_tab_service.h
@@ -10,8 +10,8 @@ #include "base/android/jni_android.h" #include "base/android/scoped_java_ref.h" -#include "base/callback_forward.h" #include "base/files/file_path.h" +#include "base/functional/callback_forward.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "base/strings/string_piece.h"
diff --git a/chrome/browser/lookalikes/lookalike_url_navigation_throttle.cc b/chrome/browser/lookalikes/lookalike_url_navigation_throttle.cc index b0810c5..0430413 100644 --- a/chrome/browser/lookalikes/lookalike_url_navigation_throttle.cc +++ b/chrome/browser/lookalikes/lookalike_url_navigation_throttle.cc
@@ -12,12 +12,11 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" #include "base/containers/contains.h" #include "base/feature_list.h" #include "base/files/file_path.h" #include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/metrics/field_trial_params.h" #include "base/metrics/histogram_macros.h"
diff --git a/chrome/browser/lookalikes/lookalike_url_navigation_throttle_browsertest.cc b/chrome/browser/lookalikes/lookalike_url_navigation_throttle_browsertest.cc index 34983fb..68a5f68 100644 --- a/chrome/browser/lookalikes/lookalike_url_navigation_throttle_browsertest.cc +++ b/chrome/browser/lookalikes/lookalike_url_navigation_throttle_browsertest.cc
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/path_service.h" #include "base/strings/pattern.h" #include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/lookalikes/lookalike_url_service.cc b/chrome/browser/lookalikes/lookalike_url_service.cc index 10f69c4..5844842 100644 --- a/chrome/browser/lookalikes/lookalike_url_service.cc +++ b/chrome/browser/lookalikes/lookalike_url_service.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/memory/singleton.h" #include "base/metrics/field_trial_params.h"
diff --git a/chrome/browser/lookalikes/lookalike_url_service.h b/chrome/browser/lookalikes/lookalike_url_service.h index 180b0de..37e284c 100644 --- a/chrome/browser/lookalikes/lookalike_url_service.h +++ b/chrome/browser/lookalikes/lookalike_url_service.h
@@ -7,7 +7,7 @@ #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/metrics/field_trial_params.h"
diff --git a/chrome/browser/mac/keystone_glue.mm b/chrome/browser/mac/keystone_glue.mm index 727888c..512488f 100644 --- a/chrome/browser/mac/keystone_glue.mm +++ b/chrome/browser/mac/keystone_glue.mm
@@ -11,8 +11,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/file_version_info.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/mac/authorization_util.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 91cc13df..cec25d6 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
@@ -7,8 +7,8 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/json/values_util.h" #include "base/logging.h" #include "base/memory/raw_ptr.h"
diff --git a/chrome/browser/media/android/cdm/media_drm_origin_id_manager.h b/chrome/browser/media/android/cdm/media_drm_origin_id_manager.h index f586cb8..326e1f3 100644 --- a/chrome/browser/media/android/cdm/media_drm_origin_id_manager.h +++ b/chrome/browser/media/android/cdm/media_drm_origin_id_manager.h
@@ -7,8 +7,8 @@ #include <memory> -#include "base/callback.h" #include "base/containers/queue.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/threading/thread_checker.h"
diff --git a/chrome/browser/media/android/cdm/media_drm_origin_id_manager_unittest.cc b/chrome/browser/media/android/cdm/media_drm_origin_id_manager_unittest.cc index 4c5cf7a..69d4a8e1 100644 --- a/chrome/browser/media/android/cdm/media_drm_origin_id_manager_unittest.cc +++ b/chrome/browser/media/android/cdm/media_drm_origin_id_manager_unittest.cc
@@ -8,9 +8,9 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/json/json_string_value_serializer.h" #include "base/json/values_util.h" #include "base/memory/raw_ptr.h"
diff --git a/chrome/browser/media/android/cdm/media_drm_storage_factory.cc b/chrome/browser/media/android/cdm/media_drm_storage_factory.cc index 8333087..5fe8158 100644 --- a/chrome/browser/media/android/cdm/media_drm_storage_factory.cc +++ b/chrome/browser/media/android/cdm/media_drm_storage_factory.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/metrics/histogram_functions.h" #include "chrome/browser/media/android/cdm/media_drm_origin_id_manager.h"
diff --git a/chrome/browser/media/android/cdm/per_device_provisioning_permission.cc b/chrome/browser/media/android/cdm/per_device_provisioning_permission.cc index 9f517b7a..2f46d3ab 100644 --- a/chrome/browser/media/android/cdm/per_device_provisioning_permission.cc +++ b/chrome/browser/media/android/cdm/per_device_provisioning_permission.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/no_destructor.h" #include "base/time/time.h"
diff --git a/chrome/browser/media/android/cdm/per_device_provisioning_permission.h b/chrome/browser/media/android/cdm/per_device_provisioning_permission.h index 8b2de9ef..87e97ec4 100644 --- a/chrome/browser/media/android/cdm/per_device_provisioning_permission.h +++ b/chrome/browser/media/android/cdm/per_device_provisioning_permission.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_MEDIA_ANDROID_CDM_PER_DEVICE_PROVISIONING_PERMISSION_H_ #define CHROME_BROWSER_MEDIA_ANDROID_CDM_PER_DEVICE_PROVISIONING_PERMISSION_H_ -#include "base/callback.h" +#include "base/functional/callback.h" namespace content { class RenderFrameHost;
diff --git a/chrome/browser/media/cast_mirroring_service_host.cc b/chrome/browser/media/cast_mirroring_service_host.cc index f60d6087..b9cf248 100644 --- a/chrome/browser/media/cast_mirroring_service_host.cc +++ b/chrome/browser/media/cast_mirroring_service_host.cc
@@ -7,10 +7,10 @@ #include <algorithm> #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/memory/read_only_shared_memory_region.h" #include "base/memory/ref_counted.h"
diff --git a/chrome/browser/media/cast_remoting_connector.cc b/chrome/browser/media/cast_remoting_connector.cc index 17ca6e6d..7e9f1ca 100644 --- a/chrome/browser/media/cast_remoting_connector.cc +++ b/chrome/browser/media/cast_remoting_connector.cc
@@ -7,9 +7,9 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h"
diff --git a/chrome/browser/media/cast_remoting_connector_unittest.cc b/chrome/browser/media/cast_remoting_connector_unittest.cc index e16a70f..59b5ee7 100644 --- a/chrome/browser/media/cast_remoting_connector_unittest.cc +++ b/chrome/browser/media/cast_remoting_connector_unittest.cc
@@ -8,8 +8,8 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/run_loop.h" #include "build/build_config.h"
diff --git a/chrome/browser/media/cdm_document_service_impl.cc b/chrome/browser/media/cdm_document_service_impl.cc index a2ce92a..299b130 100644 --- a/chrome/browser/media/cdm_document_service_impl.cc +++ b/chrome/browser/media/cdm_document_service_impl.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h" #include "content/public/browser/browser_context.h"
diff --git a/chrome/browser/media/cdm_document_service_impl.h b/chrome/browser/media/cdm_document_service_impl.h index 00178228..1ca0813 100644 --- a/chrome/browser/media/cdm_document_service_impl.h +++ b/chrome/browser/media/cdm_document_service_impl.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "build/build_config.h"
diff --git a/chrome/browser/media/cdm_pref_service_helper.h b/chrome/browser/media/cdm_pref_service_helper.h index 2162708d..dfaa974 100644 --- a/chrome/browser/media/cdm_pref_service_helper.h +++ b/chrome/browser/media/cdm_pref_service_helper.h
@@ -8,7 +8,7 @@ #include <map> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/time/time.h" #include "base/unguessable_token.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/chrome/browser/media/cdm_storage_id.cc b/chrome/browser/media/cdm_storage_id.cc index c0a88e5..b00a68a 100644 --- a/chrome/browser/media/cdm_storage_id.cc +++ b/chrome/browser/media/cdm_storage_id.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/media/cdm_storage_id.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h" @@ -17,7 +17,7 @@ #include "url/origin.h" #if BUILDFLAG(IS_CHROMEOS) -#include "base/bind.h" +#include "base/functional/bind.h" #include "mojo/public/cpp/bindings/callback_helpers.h" #endif
diff --git a/chrome/browser/media/cdm_storage_id.h b/chrome/browser/media/cdm_storage_id.h index 8aa50b79..dc2dfae1 100644 --- a/chrome/browser/media/cdm_storage_id.h +++ b/chrome/browser/media/cdm_storage_id.h
@@ -9,7 +9,7 @@ #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" namespace url { class Origin;
diff --git a/chrome/browser/media/history/media_history_browsertest.cc b/chrome/browser/media/history/media_history_browsertest.cc index 7195c54..b4a66e21 100644 --- a/chrome/browser/media/history/media_history_browsertest.cc +++ b/chrome/browser/media/history/media_history_browsertest.cc
@@ -5,7 +5,7 @@ #include "chrome/browser/media/history/media_history_playback_table.h" #include "chrome/browser/media/history/media_history_store.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/media/history/media_history_keyed_service.h b/chrome/browser/media/history/media_history_keyed_service.h index 0ab22dd..bdcc396 100644 --- a/chrome/browser/media/history/media_history_keyed_service.h +++ b/chrome/browser/media/history/media_history_keyed_service.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_MEDIA_HISTORY_MEDIA_HISTORY_KEYED_SERVICE_H_ #define CHROME_BROWSER_MEDIA_HISTORY_MEDIA_HISTORY_KEYED_SERVICE_H_ -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/scoped_observation.h" #include "base/time/time.h"
diff --git a/chrome/browser/media/history/media_history_keyed_service_unittest.cc b/chrome/browser/media/history/media_history_keyed_service_unittest.cc index 2937f53..f8efc90 100644 --- a/chrome/browser/media/history/media_history_keyed_service_unittest.cc +++ b/chrome/browser/media/history/media_history_keyed_service_unittest.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/test/bind.h" #include "base/test/gmock_callback_support.h"
diff --git a/chrome/browser/media/history/media_history_store.cc b/chrome/browser/media/history/media_history_store.cc index fbad38dd..2b16464 100644 --- a/chrome/browser/media/history/media_history_store.cc +++ b/chrome/browser/media/history/media_history_store.cc
@@ -6,9 +6,9 @@ #include <tuple> -#include "base/callback.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/callback.h" #include "base/strings/stringprintf.h" #include "build/build_config.h" #include "chrome/browser/media/history/media_history_images_table.h"
diff --git a/chrome/browser/media/history/media_history_store.h b/chrome/browser/media/history/media_history_store.h index 35b0207..bdabeec9 100644 --- a/chrome/browser/media/history/media_history_store.h +++ b/chrome/browser/media/history/media_history_store.h
@@ -8,8 +8,8 @@ #include <set> #include <vector> -#include "base/callback_forward.h" #include "base/files/file_path.h" +#include "base/functional/callback_forward.h" #include "base/memory/ref_counted.h" #include "base/synchronization/atomic_flag.h" #include "base/task/updateable_sequenced_task_runner.h"
diff --git a/chrome/browser/media/history/media_history_store_unittest.cc b/chrome/browser/media/history/media_history_store_unittest.cc index 51a9227..32e7e08a 100644 --- a/chrome/browser/media/history/media_history_store_unittest.cc +++ b/chrome/browser/media/history/media_history_store_unittest.cc
@@ -4,9 +4,9 @@ #include "chrome/browser/media/history/media_history_store.h" -#include "base/callback_helpers.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/media/media_access_handler.h b/chrome/browser/media/media_access_handler.h index f715d13..a9d3ae5 100644 --- a/chrome/browser/media/media_access_handler.h +++ b/chrome/browser/media/media_access_handler.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_MEDIA_MEDIA_ACCESS_HANDLER_H_ #define CHROME_BROWSER_MEDIA_MEDIA_ACCESS_HANDLER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "content/public/browser/media_request_state.h" #include "content/public/browser/media_stream_request.h" #include "third_party/blink/public/common/mediastream/media_stream_request.h"
diff --git a/chrome/browser/media/media_engagement_browsertest.cc b/chrome/browser/media/media_engagement_browsertest.cc index 398ad5e..6f31cb2 100644 --- a/chrome/browser/media/media_engagement_browsertest.cc +++ b/chrome/browser/media/media_engagement_browsertest.cc
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/media/media_engagement_contents_observer.cc b/chrome/browser/media/media_engagement_contents_observer.cc index d81e246..e453bba 100644 --- a/chrome/browser/media/media_engagement_contents_observer.cc +++ b/chrome/browser/media/media_engagement_contents_observer.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/histogram.h" #include "base/metrics/histogram_macros.h" #include "base/task/sequenced_task_runner.h"
diff --git a/chrome/browser/media/media_engagement_service.cc b/chrome/browser/media/media_engagement_service.cc index 18e14d19..dca598a 100644 --- a/chrome/browser/media/media_engagement_service.cc +++ b/chrome/browser/media/media_engagement_service.cc
@@ -7,7 +7,7 @@ #include <functional> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/time/clock.h" #include "base/time/default_clock.h" #include "base/time/time.h"
diff --git a/chrome/browser/media/media_engagement_service_unittest.cc b/chrome/browser/media/media_engagement_service_unittest.cc index 0fa00d8..40ce01b 100644 --- a/chrome/browser/media/media_engagement_service_unittest.cc +++ b/chrome/browser/media/media_engagement_service_unittest.cc
@@ -8,9 +8,9 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h"
diff --git a/chrome/browser/media/offscreen_tab.cc b/chrome/browser/media/offscreen_tab.cc index 5d7675b..3205aa9 100644 --- a/chrome/browser/media/offscreen_tab.cc +++ b/chrome/browser/media/offscreen_tab.cc
@@ -7,7 +7,7 @@ #include <algorithm> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/task/single_thread_task_runner.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/media/output_protection_impl.cc b/chrome/browser/media/output_protection_impl.cc index 4899162..56971a2 100644 --- a/chrome/browser/media/output_protection_impl.cc +++ b/chrome/browser/media/output_protection_impl.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "chrome/browser/media/output_protection_proxy.h" #include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/media/output_protection_proxy.cc b/chrome/browser/media/output_protection_proxy.cc index af41688..6f3c087 100644 --- a/chrome/browser/media/output_protection_proxy.cc +++ b/chrome/browser/media/output_protection_proxy.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h" #include "chrome/browser/media/webrtc/media_capture_devices_dispatcher.h"
diff --git a/chrome/browser/media/protected_media_identifier_permission_context.cc b/chrome/browser/media/protected_media_identifier_permission_context.cc index cbcc5bca..2ead6e0 100644 --- a/chrome/browser/media/protected_media_identifier_permission_context.cc +++ b/chrome/browser/media/protected_media_identifier_permission_context.cc
@@ -4,9 +4,9 @@ #include "chrome/browser/media/protected_media_identifier_permission_context.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/user_metrics.h" #include "base/strings/string_split.h" #include "build/build_config.h"
diff --git a/chrome/browser/media/router/chrome_media_router_factory_unittest.cc b/chrome/browser/media/router/chrome_media_router_factory_unittest.cc index b22a402..bfa66d3 100644 --- a/chrome/browser/media/router/chrome_media_router_factory_unittest.cc +++ b/chrome/browser/media/router/chrome_media_router_factory_unittest.cc
@@ -4,7 +4,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/media/router/chrome_media_router_factory.h" #include "chrome/test/base/testing_profile.h" #include "components/media_router/browser/media_router_factory.h"
diff --git a/chrome/browser/media/router/discovery/access_code/access_code_cast_discovery_interface.cc b/chrome/browser/media/router/discovery/access_code/access_code_cast_discovery_interface.cc index e65b1592..7910799 100644 --- a/chrome/browser/media/router/discovery/access_code/access_code_cast_discovery_interface.cc +++ b/chrome/browser/media/router/discovery/access_code/access_code_cast_discovery_interface.cc
@@ -7,7 +7,7 @@ #include <cstddef> #include <string> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/metrics/histogram_functions.h"
diff --git a/chrome/browser/media/router/discovery/access_code/access_code_cast_discovery_interface.h b/chrome/browser/media/router/discovery/access_code/access_code_cast_discovery_interface.h index 94aff68..7fe58f3 100644 --- a/chrome/browser/media/router/discovery/access_code/access_code_cast_discovery_interface.h +++ b/chrome/browser/media/router/discovery/access_code/access_code_cast_discovery_interface.h
@@ -5,10 +5,10 @@ #ifndef CHROME_BROWSER_MEDIA_ROUTER_DISCOVERY_ACCESS_CODE_ACCESS_CODE_CAST_DISCOVERY_INTERFACE_H_ #define CHROME_BROWSER_MEDIA_ROUTER_DISCOVERY_ACCESS_CODE_ACCESS_CODE_CAST_DISCOVERY_INTERFACE_H_ -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_forward.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/media/router/discovery/access_code/discovery_resources.pb.h"
diff --git a/chrome/browser/media/router/discovery/access_code/access_code_cast_sink_service.cc b/chrome/browser/media/router/discovery/access_code/access_code_cast_sink_service.cc index 7d18ea5..95ffa4d 100644 --- a/chrome/browser/media/router/discovery/access_code/access_code_cast_sink_service.cc +++ b/chrome/browser/media/router/discovery/access_code/access_code_cast_sink_service.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/media/router/discovery/access_code/access_code_cast_sink_service.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/ranges/algorithm.h" #include "base/task/bind_post_task.h" #include "base/task/sequenced_task_runner.h"
diff --git a/chrome/browser/media/router/discovery/access_code/access_code_cast_sink_service_browsertest.cc b/chrome/browser/media/router/discovery/access_code/access_code_cast_sink_service_browsertest.cc index 0131a1a..2b20f49 100644 --- a/chrome/browser/media/router/discovery/access_code/access_code_cast_sink_service_browsertest.cc +++ b/chrome/browser/media/router/discovery/access_code/access_code_cast_sink_service_browsertest.cc
@@ -4,7 +4,6 @@ #include "chrome/test/media_router/access_code_cast/access_code_cast_integration_browsertest.h" -#include "base/test/metrics/histogram_tester.h" #include "chrome/browser/media/router/discovery/access_code/access_code_cast_constants.h" #include "chrome/browser/media/router/discovery/access_code/access_code_media_sink_util.h" #include "chrome/browser/media/router/discovery/access_code/access_code_test_util.h" @@ -47,8 +46,6 @@ // then ensures the devices was not saved when the browsertest starts up // again. - base::HistogramTester histogram_tester; - // Mock a successful fetch from our server. SetEndpointFetcherMockResponse(kEndpointResponseSuccess, net::HTTP_OK, net::OK); @@ -75,10 +72,6 @@ UpdateRoutes({media_route_cast}); base::RunLoop().RunUntilIdle(); - // Recorded once from the route created when pressing submit. - histogram_tester.ExpectTotalCount( - "AccessCodeCast.Discovery.DeviceDurationOnRoute", 1); - EXPECT_CALL(*mock_cast_media_sink_service_impl(), DisconnectAndRemoveSink(_)); UpdateRoutes({}); WaitForPrefRemoval("cast:<1234>");
diff --git a/chrome/browser/media/router/discovery/access_code/access_code_cast_sink_service_factory_unittest.cc b/chrome/browser/media/router/discovery/access_code/access_code_cast_sink_service_factory_unittest.cc index b524d0e..b8dce08 100644 --- a/chrome/browser/media/router/discovery/access_code/access_code_cast_sink_service_factory_unittest.cc +++ b/chrome/browser/media/router/discovery/access_code/access_code_cast_sink_service_factory_unittest.cc
@@ -4,7 +4,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "chrome/browser/media/router/chrome_media_router_factory.h"
diff --git a/chrome/browser/media/router/discovery/dial/device_description_fetcher.cc b/chrome/browser/media/router/discovery/dial/device_description_fetcher.cc index 4b2251b7..241b36f 100644 --- a/chrome/browser/media/router/discovery/dial/device_description_fetcher.cc +++ b/chrome/browser/media/router/discovery/dial/device_description_fetcher.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/stringprintf.h" #include "chrome/browser/media/router/discovery/dial/dial_device_data.h" #include "net/base/ip_address.h"
diff --git a/chrome/browser/media/router/discovery/dial/device_description_fetcher.h b/chrome/browser/media/router/discovery/dial/device_description_fetcher.h index 03116a9..3e2855c 100644 --- a/chrome/browser/media/router/discovery/dial/device_description_fetcher.h +++ b/chrome/browser/media/router/discovery/dial/device_description_fetcher.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/sequence_checker.h" #include "chrome/browser/media/router/discovery/dial/dial_device_data.h" #include "chrome/browser/media/router/discovery/dial/dial_url_fetcher.h"
diff --git a/chrome/browser/media/router/discovery/dial/device_description_fetcher_unittest.cc b/chrome/browser/media/router/discovery/dial/device_description_fetcher_unittest.cc index dd134a09..ac475c94 100644 --- a/chrome/browser/media/router/discovery/dial/device_description_fetcher_unittest.cc +++ b/chrome/browser/media/router/discovery/dial/device_description_fetcher_unittest.cc
@@ -6,8 +6,8 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/run_loop.h"
diff --git a/chrome/browser/media/router/discovery/dial/device_description_service.cc b/chrome/browser/media/router/discovery/dial/device_description_service.cc index f7d67d7..8f47c2e 100644 --- a/chrome/browser/media/router/discovery/dial/device_description_service.cc +++ b/chrome/browser/media/router/discovery/dial/device_description_service.cc
@@ -13,8 +13,8 @@ #include <sstream> #endif -#include "base/bind.h" #include "base/containers/cxx20_erase.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "base/ranges/algorithm.h" #include "chrome/browser/media/router/discovery/dial/device_description_fetcher.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 a432ab68..f506391 100644 --- a/chrome/browser/media/router/discovery/dial/device_description_service.h +++ b/chrome/browser/media/router/discovery/dial/device_description_service.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/gtest_prod_util.h" #include "base/sequence_checker.h" #include "base/time/time.h"
diff --git a/chrome/browser/media/router/discovery/dial/dial_app_discovery_service.cc b/chrome/browser/media/router/discovery/dial/dial_app_discovery_service.cc index d4e1946..c290ed2 100644 --- a/chrome/browser/media/router/discovery/dial/dial_app_discovery_service.cc +++ b/chrome/browser/media/router/discovery/dial/dial_app_discovery_service.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/media/router/discovery/dial/dial_app_discovery_service.h" -#include "base/bind.h" #include "base/containers/cxx20_erase.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/media/router/discovery/dial/dial_app_discovery_service.h b/chrome/browser/media/router/discovery/dial/dial_app_discovery_service.h index 6ee6114..527ea7e 100644 --- a/chrome/browser/media/router/discovery/dial/dial_app_discovery_service.h +++ b/chrome/browser/media/router/discovery/dial/dial_app_discovery_service.h
@@ -9,7 +9,7 @@ #include <set> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/media/router/discovery/dial/dial_app_discovery_service_unittest.cc b/chrome/browser/media/router/discovery/dial/dial_app_discovery_service_unittest.cc index 0d6e23f..4baab99c 100644 --- a/chrome/browser/media/router/discovery/dial/dial_app_discovery_service_unittest.cc +++ b/chrome/browser/media/router/discovery/dial/dial_app_discovery_service_unittest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/media/router/discovery/dial/dial_app_discovery_service.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/test/mock_callback.h" #include "chrome/browser/media/router/discovery/dial/dial_url_fetcher.h"
diff --git a/chrome/browser/media/router/discovery/dial/dial_media_sink_service.cc b/chrome/browser/media/router/discovery/dial/dial_media_sink_service.cc index c0d5157..60581cf3 100644 --- a/chrome/browser/media/router/discovery/dial/dial_media_sink_service.cc +++ b/chrome/browser/media/router/discovery/dial/dial_media_sink_service.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/media/router/discovery/dial/dial_media_sink_service.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/sequenced_task_runner.h" #include "chrome/browser/media/router/discovery/dial/dial_media_sink_service_impl.h" #include "components/media_router/common/media_source.h"
diff --git a/chrome/browser/media/router/discovery/dial/dial_media_sink_service_impl.cc b/chrome/browser/media/router/discovery/dial/dial_media_sink_service_impl.cc index 826d9be..a5537010 100644 --- a/chrome/browser/media/router/discovery/dial/dial_media_sink_service_impl.cc +++ b/chrome/browser/media/router/discovery/dial/dial_media_sink_service_impl.cc
@@ -7,8 +7,8 @@ #include <algorithm> #include <memory> -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/strings/strcat.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/media/router/discovery/dial/dial_media_sink_service_impl_unittest.cc b/chrome/browser/media/router/discovery/dial/dial_media_sink_service_impl_unittest.cc index 797452c..9ec1723c 100644 --- a/chrome/browser/media/router/discovery/dial/dial_media_sink_service_impl_unittest.cc +++ b/chrome/browser/media/router/discovery/dial/dial_media_sink_service_impl_unittest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/media/router/discovery/dial/dial_media_sink_service_impl.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/task/sequenced_task_runner.h"
diff --git a/chrome/browser/media/router/discovery/dial/dial_registry.cc b/chrome/browser/media/router/discovery/dial/dial_registry.cc index aaf7acb..9e82a56 100644 --- a/chrome/browser/media/router/discovery/dial/dial_registry.cc +++ b/chrome/browser/media/router/discovery/dial/dial_registry.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/string_number_conversions.h" #include "base/time/default_clock.h" #include "base/time/time.h"
diff --git a/chrome/browser/media/router/discovery/dial/dial_service_impl.cc b/chrome/browser/media/router/discovery/dial/dial_service_impl.cc index 7bfb433..699ba3c 100644 --- a/chrome/browser/media/router/discovery/dial/dial_service_impl.cc +++ b/chrome/browser/media/router/discovery/dial/dial_service_impl.cc
@@ -11,9 +11,9 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" #include "base/check_op.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h"
diff --git a/chrome/browser/media/router/discovery/dial/dial_url_fetcher.cc b/chrome/browser/media/router/discovery/dial/dial_url_fetcher.cc index f680ca5f..13d1d0b 100644 --- a/chrome/browser/media/router/discovery/dial/dial_url_fetcher.cc +++ b/chrome/browser/media/router/discovery/dial/dial_url_fetcher.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/media/router/discovery/dial/dial_url_fetcher.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/strcat.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/media/router/discovery/dial/dial_url_fetcher.h b/chrome/browser/media/router/discovery/dial/dial_url_fetcher.h index 3636c68..89de1f3 100644 --- a/chrome/browser/media/router/discovery/dial/dial_url_fetcher.h +++ b/chrome/browser/media/router/discovery/dial/dial_url_fetcher.h
@@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "services/network/public/mojom/url_response_head.mojom-forward.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/chrome/browser/media/router/discovery/dial/dial_url_fetcher_unittest.cc b/chrome/browser/media/router/discovery/dial/dial_url_fetcher_unittest.cc index e1430b1e..aba8d85 100644 --- a/chrome/browser/media/router/discovery/dial/dial_url_fetcher_unittest.cc +++ b/chrome/browser/media/router/discovery/dial/dial_url_fetcher_unittest.cc
@@ -5,8 +5,8 @@ #include <memory> #include <string> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/run_loop.h" #include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/media/router/discovery/dial/safe_dial_app_info_parser.cc b/chrome/browser/media/router/discovery/dial/safe_dial_app_info_parser.cc index b20cc70..a50328e 100644 --- a/chrome/browser/media/router/discovery/dial/safe_dial_app_info_parser.cc +++ b/chrome/browser/media/router/discovery/dial/safe_dial_app_info_parser.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/string_util.h" #include "chrome/browser/media/router/data_decoder_util.h" #include "services/data_decoder/public/cpp/safe_xml_parser.h"
diff --git a/chrome/browser/media/router/discovery/dial/safe_dial_app_info_parser.h b/chrome/browser/media/router/discovery/dial/safe_dial_app_info_parser.h index d760167..ea594173 100644 --- a/chrome/browser/media/router/discovery/dial/safe_dial_app_info_parser.h +++ b/chrome/browser/media/router/discovery/dial/safe_dial_app_info_parser.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/media/router/discovery/dial/parsed_dial_app_info.h" #include "services/data_decoder/public/cpp/data_decoder.h"
diff --git a/chrome/browser/media/router/discovery/dial/safe_dial_app_info_parser_unittest.cc b/chrome/browser/media/router/discovery/dial/safe_dial_app_info_parser_unittest.cc index 820d36d..9bda6cfcf 100644 --- a/chrome/browser/media/router/discovery/dial/safe_dial_app_info_parser_unittest.cc +++ b/chrome/browser/media/router/discovery/dial/safe_dial_app_info_parser_unittest.cc
@@ -5,7 +5,7 @@ #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/strings/string_util.h" #include "content/public/test/browser_task_environment.h"
diff --git a/chrome/browser/media/router/discovery/dial/safe_dial_device_description_parser.cc b/chrome/browser/media/router/discovery/dial/safe_dial_device_description_parser.cc index 472ea22..4feddc8 100644 --- a/chrome/browser/media/router/discovery/dial/safe_dial_device_description_parser.cc +++ b/chrome/browser/media/router/discovery/dial/safe_dial_device_description_parser.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/stringprintf.h" #include "chrome/browser/media/router/data_decoder_util.h" #include "services/data_decoder/public/cpp/safe_xml_parser.h"
diff --git a/chrome/browser/media/router/discovery/dial/safe_dial_device_description_parser.h b/chrome/browser/media/router/discovery/dial/safe_dial_device_description_parser.h index 9304bc2..35e8289ca 100644 --- a/chrome/browser/media/router/discovery/dial/safe_dial_device_description_parser.h +++ b/chrome/browser/media/router/discovery/dial/safe_dial_device_description_parser.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/media/router/discovery/dial/parsed_dial_device_description.h" #include "services/data_decoder/public/cpp/data_decoder.h"
diff --git a/chrome/browser/media/router/discovery/dial/safe_dial_device_description_parser_unittest.cc b/chrome/browser/media/router/discovery/dial/safe_dial_device_description_parser_unittest.cc index 94677897..54dc22b 100644 --- a/chrome/browser/media/router/discovery/dial/safe_dial_device_description_parser_unittest.cc +++ b/chrome/browser/media/router/discovery/dial/safe_dial_device_description_parser_unittest.cc
@@ -5,7 +5,7 @@ #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/strings/string_util.h" #include "content/public/test/browser_task_environment.h"
diff --git a/chrome/browser/media/router/discovery/discovery_network_monitor.h b/chrome/browser/media/router/discovery/discovery_network_monitor.h index 5255624..c40e2d3 100644 --- a/chrome/browser/media/router/discovery/discovery_network_monitor.h +++ b/chrome/browser/media/router/discovery/discovery_network_monitor.h
@@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/lazy_instance.h" #include "base/observer_list_threadsafe.h" #include "base/sequence_checker.h"
diff --git a/chrome/browser/media/router/discovery/discovery_network_monitor_unittest.cc b/chrome/browser/media/router/discovery/discovery_network_monitor_unittest.cc index a7e6647..8fa7121 100644 --- a/chrome/browser/media/router/discovery/discovery_network_monitor_unittest.cc +++ b/chrome/browser/media/router/discovery/discovery_network_monitor_unittest.cc
@@ -7,7 +7,7 @@ #include <functional> #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/task/thread_pool/thread_pool_instance.h" #include "content/public/test/browser_task_environment.h"
diff --git a/chrome/browser/media/router/discovery/mdns/cast_media_sink_service.cc b/chrome/browser/media/router/discovery/mdns/cast_media_sink_service.cc index 2a99f14..dc1caa8 100644 --- a/chrome/browser/media/router/discovery/mdns/cast_media_sink_service.cc +++ b/chrome/browser/media/router/discovery/mdns/cast_media_sink_service.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/media/router/discovery/mdns/cast_media_sink_service.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/sequenced_task_runner.h" #include "build/build_config.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/media/router/discovery/mdns/cast_media_sink_service_impl.cc b/chrome/browser/media/router/discovery/mdns/cast_media_sink_service_impl.cc index 894adc63..09365fc 100644 --- a/chrome/browser/media/router/discovery/mdns/cast_media_sink_service_impl.cc +++ b/chrome/browser/media/router/discovery/mdns/cast_media_sink_service_impl.cc
@@ -4,9 +4,9 @@ #include "chrome/browser/media/router/discovery/mdns/cast_media_sink_service_impl.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/rand_util.h" #include "base/ranges/algorithm.h" #include "base/strings/strcat.h"
diff --git a/chrome/browser/media/router/discovery/mdns/cast_media_sink_service_impl_unittest.cc b/chrome/browser/media/router/discovery/mdns/cast_media_sink_service_impl_unittest.cc index d9966c5..5a40075 100644 --- a/chrome/browser/media/router/discovery/mdns/cast_media_sink_service_impl_unittest.cc +++ b/chrome/browser/media/router/discovery/mdns/cast_media_sink_service_impl_unittest.cc
@@ -8,7 +8,7 @@ #include <utility> #include <vector> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/ranges/algorithm.h" #include "base/run_loop.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 70adac6..d85b473 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
@@ -4,8 +4,8 @@ #include "chrome/browser/media/router/mojo/media_route_provider_util_win.h" -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/path_service.h"
diff --git a/chrome/browser/media/router/mojo/media_route_provider_util_win.h b/chrome/browser/media/router/mojo/media_route_provider_util_win.h index 7b83251b..7fb0a708 100644 --- a/chrome/browser/media/router/mojo/media_route_provider_util_win.h +++ b/chrome/browser/media/router/mojo/media_route_provider_util_win.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_MEDIA_ROUTER_MOJO_MEDIA_ROUTE_PROVIDER_UTIL_WIN_H_ #define CHROME_BROWSER_MEDIA_ROUTER_MOJO_MEDIA_ROUTE_PROVIDER_UTIL_WIN_H_ -#include "base/callback.h" +#include "base/functional/callback.h" namespace media_router {
diff --git a/chrome/browser/media/router/mojo/media_router_desktop.cc b/chrome/browser/media/router/mojo/media_router_desktop.cc index 1fac3e36..1d355bc 100644 --- a/chrome/browser/media/router/mojo/media_router_desktop.cc +++ b/chrome/browser/media/router/mojo/media_router_desktop.cc
@@ -4,9 +4,9 @@ #include "chrome/browser/media/router/mojo/media_router_desktop.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/strings/string_util.h" #include "build/build_config.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/media/router/mojo/media_router_mojo_impl.cc b/chrome/browser/media/router/mojo/media_router_mojo_impl.cc index e4fd52c..bd00d18 100644 --- a/chrome/browser/media/router/mojo/media_router_mojo_impl.cc +++ b/chrome/browser/media/router/mojo/media_router_mojo_impl.cc
@@ -8,8 +8,8 @@ #include <utility> -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "base/observer_list.h" #include "base/ranges/algorithm.h"
diff --git a/chrome/browser/media/router/mojo/media_router_mojo_impl.h b/chrome/browser/media/router/mojo/media_router_mojo_impl.h index b2b2b16..445ad2bb 100644 --- a/chrome/browser/media/router/mojo/media_router_mojo_impl.h +++ b/chrome/browser/media/router/mojo/media_router_mojo_impl.h
@@ -13,7 +13,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/media/router/mojo/media_router_mojo_impl_unittest.cc b/chrome/browser/media/router/mojo/media_router_mojo_impl_unittest.cc index 8464b78..c180970b 100644 --- a/chrome/browser/media/router/mojo/media_router_mojo_impl_unittest.cc +++ b/chrome/browser/media/router/mojo/media_router_mojo_impl_unittest.cc
@@ -12,8 +12,8 @@ #include <utility> #include "base/base64.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/json/string_escape.h" #include "base/memory/ref_counted.h" #include "base/run_loop.h"
diff --git a/chrome/browser/media/router/presentation/presentation_service_delegate_impl_unittest.cc b/chrome/browser/media/router/presentation/presentation_service_delegate_impl_unittest.cc index eeaeb3b0..274d97c 100644 --- a/chrome/browser/media/router/presentation/presentation_service_delegate_impl_unittest.cc +++ b/chrome/browser/media/router/presentation/presentation_service_delegate_impl_unittest.cc
@@ -4,8 +4,8 @@ #include "components/media_router/browser/presentation/presentation_service_delegate_impl.h" -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/test/mock_callback.h" #include "build/build_config.h"
diff --git a/chrome/browser/media/router/providers/cast/app_activity.cc b/chrome/browser/media/router/providers/cast/app_activity.cc index a67d441b..0d3144d 100644 --- a/chrome/browser/media/router/providers/cast/app_activity.cc +++ b/chrome/browser/media/router/providers/cast/app_activity.cc
@@ -7,8 +7,8 @@ #include <memory> #include <vector> -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/ranges/algorithm.h" #include "chrome/browser/media/router/providers/cast/cast_activity_manager.h" #include "chrome/browser/media/router/providers/cast/cast_session_client.h"
diff --git a/chrome/browser/media/router/providers/cast/app_activity_unittest.cc b/chrome/browser/media/router/providers/cast/app_activity_unittest.cc index 91b8330d..9ff0f345 100644 --- a/chrome/browser/media/router/providers/cast/app_activity_unittest.cc +++ b/chrome/browser/media/router/providers/cast/app_activity_unittest.cc
@@ -10,7 +10,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/test/bind.h" #include "base/test/mock_callback.h"
diff --git a/chrome/browser/media/router/providers/cast/cast_activity_manager.cc b/chrome/browser/media/router/providers/cast/cast_activity_manager.cc index 7e1848c3..93d0aa6a 100644 --- a/chrome/browser/media/router/providers/cast/cast_activity_manager.cc +++ b/chrome/browser/media/router/providers/cast/cast_activity_manager.cc
@@ -8,10 +8,10 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/contains.h" #include "base/containers/cxx20_erase.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/json/json_reader.h" #include "base/metrics/histogram_functions.h" #include "base/ranges/algorithm.h"
diff --git a/chrome/browser/media/router/providers/cast/cast_activity_manager_unittest.cc b/chrome/browser/media/router/providers/cast/cast_activity_manager_unittest.cc index 4e9063c..81f9401 100644 --- a/chrome/browser/media/router/providers/cast/cast_activity_manager_unittest.cc +++ b/chrome/browser/media/router/providers/cast/cast_activity_manager_unittest.cc
@@ -10,8 +10,8 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/json/json_reader.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h"
diff --git a/chrome/browser/media/router/providers/cast/cast_activity_test_base.cc b/chrome/browser/media/router/providers/cast/cast_activity_test_base.cc index 8e27f83..aa4566a 100644 --- a/chrome/browser/media/router/providers/cast/cast_activity_test_base.cc +++ b/chrome/browser/media/router/providers/cast/cast_activity_test_base.cc
@@ -11,8 +11,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/containers/cxx20_erase.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/test/bind.h" #include "base/test/mock_callback.h"
diff --git a/chrome/browser/media/router/providers/cast/cast_app_discovery_service.cc b/chrome/browser/media/router/providers/cast/cast_app_discovery_service.cc index 3ee3e69..ad4347a2 100644 --- a/chrome/browser/media/router/providers/cast/cast_app_discovery_service.cc +++ b/chrome/browser/media/router/providers/cast/cast_app_discovery_service.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/media/router/providers/cast/cast_app_discovery_service.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/strcat.h" #include "base/strings/stringprintf.h" #include "base/time/tick_clock.h"
diff --git a/chrome/browser/media/router/providers/cast/cast_app_discovery_service.h b/chrome/browser/media/router/providers/cast/cast_app_discovery_service.h index 4c6054036..7d88cbc6 100644 --- a/chrome/browser/media/router/providers/cast/cast_app_discovery_service.h +++ b/chrome/browser/media/router/providers/cast/cast_app_discovery_service.h
@@ -8,10 +8,10 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/callback_list.h" #include "base/containers/flat_map.h" #include "base/containers/flat_set.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/task/sequenced_task_runner.h"
diff --git a/chrome/browser/media/router/providers/cast/cast_app_discovery_service_unittest.cc b/chrome/browser/media/router/providers/cast/cast_app_discovery_service_unittest.cc index 6af3e0a..1058f430 100644 --- a/chrome/browser/media/router/providers/cast/cast_app_discovery_service_unittest.cc +++ b/chrome/browser/media/router/providers/cast/cast_app_discovery_service_unittest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/media/router/providers/cast/cast_app_discovery_service.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/test/simple_test_tick_clock.h" #include "base/test/task_environment.h" #include "base/test/test_simple_task_runner.h"
diff --git a/chrome/browser/media/router/providers/cast/cast_media_controller.cc b/chrome/browser/media/router/providers/cast/cast_media_controller.cc index c93818f..00bfd7c 100644 --- a/chrome/browser/media/router/providers/cast/cast_media_controller.cc +++ b/chrome/browser/media/router/providers/cast/cast_media_controller.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/media/router/providers/cast/cast_media_controller.h" -#include "base/callback_helpers.h" #include "base/containers/contains.h" +#include "base/functional/callback_helpers.h" #include "base/rand_util.h" #include "base/strings/string_number_conversions.h" #include "base/values.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 8462f5d6..d30e96c 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
@@ -8,9 +8,9 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/containers/contains.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/strings/string_split.h" #include "chrome/browser/media/router/media_router_feature.h" #include "chrome/browser/media/router/providers/cast/cast_activity_manager.h"
diff --git a/chrome/browser/media/router/providers/cast/cast_media_route_provider_unittest.cc b/chrome/browser/media/router/providers/cast/cast_media_route_provider_unittest.cc index 7db7b067..24b32ab 100644 --- a/chrome/browser/media/router/providers/cast/cast_media_route_provider_unittest.cc +++ b/chrome/browser/media/router/providers/cast/cast_media_route_provider_unittest.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/task/sequenced_task_runner.h" #include "base/test/scoped_feature_list.h"
diff --git a/chrome/browser/media/router/providers/cast/cast_session_client_unittest.cc b/chrome/browser/media/router/providers/cast/cast_session_client_unittest.cc index c46f3286..c0f4fba 100644 --- a/chrome/browser/media/router/providers/cast/cast_session_client_unittest.cc +++ b/chrome/browser/media/router/providers/cast/cast_session_client_unittest.cc
@@ -8,7 +8,7 @@ #include <tuple> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/run_loop.h" #include "base/test/mock_log.h"
diff --git a/chrome/browser/media/router/providers/cast/cast_session_tracker.cc b/chrome/browser/media/router/providers/cast/cast_session_tracker.cc index edf8c304..1bf6ff65 100644 --- a/chrome/browser/media/router/providers/cast/cast_session_tracker.cc +++ b/chrome/browser/media/router/providers/cast/cast_session_tracker.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/media/router/providers/cast/cast_session_tracker.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/observer_list.h" #include "base/ranges/algorithm.h" #include "chrome/browser/media/router/providers/cast/chrome_cast_message_handler.h"
diff --git a/chrome/browser/media/router/providers/cast/chrome_cast_message_handler.cc b/chrome/browser/media/router/providers/cast/chrome_cast_message_handler.cc index 4c877df8..b24dbb75 100644 --- a/chrome/browser/media/router/providers/cast/chrome_cast_message_handler.cc +++ b/chrome/browser/media/router/providers/cast/chrome_cast_message_handler.cc
@@ -6,7 +6,7 @@ #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/media/router/data_decoder_util.h" #include "components/embedder_support/user_agent_utils.h"
diff --git a/chrome/browser/media/router/providers/cast/dual_media_sink_service.cc b/chrome/browser/media/router/providers/cast/dual_media_sink_service.cc index c98da76..26291db 100644 --- a/chrome/browser/media/router/providers/cast/dual_media_sink_service.cc +++ b/chrome/browser/media/router/providers/cast/dual_media_sink_service.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/media/router/providers/cast/dual_media_sink_service.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/time/default_tick_clock.h" #include "chrome/browser/media/router/discovery/dial/dial_media_sink_service.h" #include "chrome/browser/media/router/discovery/dial/dial_media_sink_service_impl.h"
diff --git a/chrome/browser/media/router/providers/cast/dual_media_sink_service.h b/chrome/browser/media/router/providers/cast/dual_media_sink_service.h index 0806f61..45c1711 100644 --- a/chrome/browser/media/router/providers/cast/dual_media_sink_service.h +++ b/chrome/browser/media/router/providers/cast/dual_media_sink_service.h
@@ -9,9 +9,9 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/callback_list.h" #include "base/containers/flat_map.h" +#include "base/functional/callback.h" #include "base/gtest_prod_util.h" #include "base/sequence_checker.h" #include "build/build_config.h"
diff --git a/chrome/browser/media/router/providers/cast/dual_media_sink_service_unittest.cc b/chrome/browser/media/router/providers/cast/dual_media_sink_service_unittest.cc index 29582491..3990e82 100644 --- a/chrome/browser/media/router/providers/cast/dual_media_sink_service_unittest.cc +++ b/chrome/browser/media/router/providers/cast/dual_media_sink_service_unittest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/media/router/providers/cast/dual_media_sink_service.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "chrome/browser/media/router/test/provider_test_helpers.h"
diff --git a/chrome/browser/media/router/providers/cast/mirroring_activity.cc b/chrome/browser/media/router/providers/cast/mirroring_activity.cc index 78afa1d4..7463a8e 100644 --- a/chrome/browser/media/router/providers/cast/mirroring_activity.cc +++ b/chrome/browser/media/router/providers/cast/mirroring_activity.cc
@@ -9,8 +9,8 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/metrics/histogram_functions.h"
diff --git a/chrome/browser/media/router/providers/cast/mirroring_activity.h b/chrome/browser/media/router/providers/cast/mirroring_activity.h index 1fb933c..cda11d6 100644 --- a/chrome/browser/media/router/providers/cast/mirroring_activity.h +++ b/chrome/browser/media/router/providers/cast/mirroring_activity.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/gtest_prod_util.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h"
diff --git a/chrome/browser/media/router/providers/dial/dial_activity_manager.cc b/chrome/browser/media/router/providers/dial/dial_activity_manager.cc index 55761c0..0aa8c6d 100644 --- a/chrome/browser/media/router/providers/dial/dial_activity_manager.cc +++ b/chrome/browser/media/router/providers/dial/dial_activity_manager.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/media/router/providers/dial/dial_activity_manager.h" -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/ranges/algorithm.h" #include "base/strings/string_split.h" #include "chrome/browser/media/router/discovery/dial/dial_app_discovery_service.h"
diff --git a/chrome/browser/media/router/providers/dial/dial_activity_manager_unittest.cc b/chrome/browser/media/router/providers/dial/dial_activity_manager_unittest.cc index a467b39..3682491 100644 --- a/chrome/browser/media/router/providers/dial/dial_activity_manager_unittest.cc +++ b/chrome/browser/media/router/providers/dial/dial_activity_manager_unittest.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/test/task_environment.h" #include "chrome/browser/media/router/discovery/dial/dial_app_discovery_service.h" #include "chrome/browser/media/router/providers/dial/dial_internal_message_util.h"
diff --git a/chrome/browser/media/router/providers/dial/dial_media_route_provider.cc b/chrome/browser/media/router/providers/dial/dial_media_route_provider.cc index 98b7128b..b258d10 100644 --- a/chrome/browser/media/router/providers/dial/dial_media_route_provider.cc +++ b/chrome/browser/media/router/providers/dial/dial_media_route_provider.cc
@@ -6,9 +6,9 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/flat_map.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/no_destructor.h" #include "base/strings/strcat.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/media/router/providers/dial/dial_media_route_provider_unittest.cc b/chrome/browser/media/router/providers/dial/dial_media_route_provider_unittest.cc index efa94e7c..f6924a9 100644 --- a/chrome/browser/media/router/providers/dial/dial_media_route_provider_unittest.cc +++ b/chrome/browser/media/router/providers/dial/dial_media_route_provider_unittest.cc
@@ -7,8 +7,8 @@ #include <map> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/media/router/providers/openscreen/network_service_async_packet_sender.h b/chrome/browser/media/router/providers/openscreen/network_service_async_packet_sender.h index fa937b7..a3a5df9 100644 --- a/chrome/browser/media/router/providers/openscreen/network_service_async_packet_sender.h +++ b/chrome/browser/media/router/providers/openscreen/network_service_async_packet_sender.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_MEDIA_ROUTER_PROVIDERS_OPENSCREEN_NETWORK_SERVICE_ASYNC_PACKET_SENDER_H_ #define CHROME_BROWSER_MEDIA_ROUTER_PROVIDERS_OPENSCREEN_NETWORK_SERVICE_ASYNC_PACKET_SENDER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "mojo/public/cpp/bindings/remote.h" #include "net/base/net_errors.h"
diff --git a/chrome/browser/media/router/providers/test/test_media_route_provider.cc b/chrome/browser/media/router/providers/test/test_media_route_provider.cc index 625ccd9..3473e1eb 100644 --- a/chrome/browser/media/router/providers/test/test_media_route_provider.cc +++ b/chrome/browser/media/router/providers/test/test_media_route_provider.cc
@@ -9,8 +9,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_traits.h"
diff --git a/chrome/browser/media/router/providers/test/test_media_route_provider.h b/chrome/browser/media/router/providers/test/test_media_route_provider.h index a9c6e223..4e421e2 100644 --- a/chrome/browser/media/router/providers/test/test_media_route_provider.h +++ b/chrome/browser/media/router/providers/test/test_media_route_provider.h
@@ -10,7 +10,7 @@ #include <utility> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/media/offscreen_tab.h" #include "components/media_router/common/media_route.h"
diff --git a/chrome/browser/media/router/providers/wired_display/wired_display_media_route_provider.cc b/chrome/browser/media/router/providers/wired_display/wired_display_media_route_provider.cc index e3c4782..b38aeeff 100644 --- a/chrome/browser/media/router/providers/wired_display/wired_display_media_route_provider.cc +++ b/chrome/browser/media/router/providers/wired_display/wired_display_media_route_provider.cc
@@ -8,9 +8,9 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/containers/contains.h" #include "base/containers/cxx20_erase.h" +#include "base/functional/bind.h" #include "base/i18n/number_formatting.h" #include "base/ranges/algorithm.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/media/router/providers/wired_display/wired_display_media_route_provider.h b/chrome/browser/media/router/providers/wired_display/wired_display_media_route_provider.h index 301223a..cdc654c8 100644 --- a/chrome/browser/media/router/providers/wired_display/wired_display_media_route_provider.h +++ b/chrome/browser/media/router/providers/wired_display/wired_display_media_route_provider.h
@@ -11,8 +11,8 @@ #include <utility> #include <vector> -#include "base/callback.h" #include "base/containers/flat_set.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/media/router/discovery/media_sink_discovery_metrics.h" #include "chrome/browser/media/router/providers/wired_display/wired_display_presentation_receiver.h"
diff --git a/chrome/browser/media/router/providers/wired_display/wired_display_media_route_provider_unittest.cc b/chrome/browser/media/router/providers/wired_display/wired_display_media_route_provider_unittest.cc index 046d738..b39df139 100644 --- a/chrome/browser/media/router/providers/wired_display/wired_display_media_route_provider_unittest.cc +++ b/chrome/browser/media/router/providers/wired_display/wired_display_media_route_provider_unittest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/media/router/providers/wired_display/wired_display_media_route_provider.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "chrome/browser/media/router/providers/wired_display/wired_display_presentation_receiver.h"
diff --git a/chrome/browser/media/router/providers/wired_display/wired_display_presentation_receiver.h b/chrome/browser/media/router/providers/wired_display/wired_display_presentation_receiver.h index c6114d7..deb3f39 100644 --- a/chrome/browser/media/router/providers/wired_display/wired_display_presentation_receiver.h +++ b/chrome/browser/media/router/providers/wired_display/wired_display_presentation_receiver.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" class GURL;
diff --git a/chrome/browser/media/router/providers/wired_display/wired_display_presentation_receiver_factory.h b/chrome/browser/media/router/providers/wired_display/wired_display_presentation_receiver_factory.h index c1cb6831..2c3da0c7 100644 --- a/chrome/browser/media/router/providers/wired_display/wired_display_presentation_receiver_factory.h +++ b/chrome/browser/media/router/providers/wired_display/wired_display_presentation_receiver_factory.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/lazy_instance.h" #include "chrome/browser/media/router/providers/wired_display/wired_display_presentation_receiver.h"
diff --git a/chrome/browser/media/router/test/media_router_mojo_test.cc b/chrome/browser/media/router/test/media_router_mojo_test.cc index 230c92b..7ffa401 100644 --- a/chrome/browser/media/router/test/media_router_mojo_test.cc +++ b/chrome/browser/media/router/test/media_router_mojo_test.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" using testing::_;
diff --git a/chrome/browser/media/router/test/provider_test_helpers.cc b/chrome/browser/media/router/test/provider_test_helpers.cc index 78aaa09c..4155401 100644 --- a/chrome/browser/media/router/test/provider_test_helpers.cc +++ b/chrome/browser/media/router/test/provider_test_helpers.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/media/router/test/provider_test_helpers.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/json/json_reader.h" #include "base/strings/stringprintf.h" #include "chrome/browser/media/router/discovery/dial/dial_app_discovery_service.h"
diff --git a/chrome/browser/media/webrtc/audio_debug_recordings_handler.cc b/chrome/browser/media/webrtc/audio_debug_recordings_handler.cc index 4f771d12..d95de82 100644 --- a/chrome/browser/media/webrtc/audio_debug_recordings_handler.cc +++ b/chrome/browser/media/webrtc/audio_debug_recordings_handler.cc
@@ -7,9 +7,9 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/command_line.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/strings/string_number_conversions.h" #include "base/task/thread_pool.h" #include "base/time/time.h"
diff --git a/chrome/browser/media/webrtc/audio_debug_recordings_handler.h b/chrome/browser/media/webrtc/audio_debug_recordings_handler.h index 37412c25..fea4e800 100644 --- a/chrome/browser/media/webrtc/audio_debug_recordings_handler.h +++ b/chrome/browser/media/webrtc/audio_debug_recordings_handler.h
@@ -11,8 +11,8 @@ #include <memory> #include <string> -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/time/time.h"
diff --git a/chrome/browser/media/webrtc/chrome_screen_enumerator.cc b/chrome/browser/media/webrtc/chrome_screen_enumerator.cc index 284077bc2..92b1ff7d 100644 --- a/chrome/browser/media/webrtc/chrome_screen_enumerator.cc +++ b/chrome/browser/media/webrtc/chrome_screen_enumerator.cc
@@ -21,7 +21,7 @@ #include "ash/shell.h" #include "ui/aura/window.h" #elif BUILDFLAG(IS_CHROMEOS_LACROS) -#include "base/callback.h" +#include "base/functional/callback.h" #include "content/public/browser/desktop_capture.h" #endif
diff --git a/chrome/browser/media/webrtc/chrome_screen_enumerator.h b/chrome/browser/media/webrtc/chrome_screen_enumerator.h index 6cebe5c..1dd7a50 100644 --- a/chrome/browser/media/webrtc/chrome_screen_enumerator.h +++ b/chrome/browser/media/webrtc/chrome_screen_enumerator.h
@@ -10,7 +10,7 @@ #include <memory> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "build/buildflag.h" #include "build/chromeos_buildflags.h" #include "third_party/abseil-cpp/absl/types/optional.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 22cee1a..b58072af 100644 --- a/chrome/browser/media/webrtc/current_tab_desktop_media_list.cc +++ b/chrome/browser/media/webrtc/current_tab_desktop_media_list.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/media/webrtc/current_tab_desktop_media_list.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/hash/hash.h" #include "base/task/bind_post_task.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/media/webrtc/desktop_capture_access_handler.cc b/chrome/browser/media/webrtc/desktop_capture_access_handler.cc index f220ca2c..76d6107 100644 --- a/chrome/browser/media/webrtc/desktop_capture_access_handler.cc +++ b/chrome/browser/media/webrtc/desktop_capture_access_handler.cc
@@ -8,9 +8,9 @@ #include <string> #include <vector> -#include "base/bind.h" #include "base/check.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h"
diff --git a/chrome/browser/media/webrtc/desktop_capture_access_handler_unittest.cc b/chrome/browser/media/webrtc/desktop_capture_access_handler_unittest.cc index 2ef6845..3916789 100644 --- a/chrome/browser/media/webrtc/desktop_capture_access_handler_unittest.cc +++ b/chrome/browser/media/webrtc/desktop_capture_access_handler_unittest.cc
@@ -8,8 +8,8 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "build/build_config.h"
diff --git a/chrome/browser/media/webrtc/desktop_media_list.cc b/chrome/browser/media/webrtc/desktop_media_list.cc index 204df6f3..790e7fb 100644 --- a/chrome/browser/media/webrtc/desktop_media_list.cc +++ b/chrome/browser/media/webrtc/desktop_media_list.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/media/webrtc/desktop_media_list.h" -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/memory/weak_ptr.h" #include "content/public/browser/web_contents.h"
diff --git a/chrome/browser/media/webrtc/desktop_media_list.h b/chrome/browser/media/webrtc/desktop_media_list.h index 2892ec2c..42da00a 100644 --- a/chrome/browser/media/webrtc/desktop_media_list.h +++ b/chrome/browser/media/webrtc/desktop_media_list.h
@@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/time/time.h" #include "content/public/browser/desktop_media_id.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/chrome/browser/media/webrtc/desktop_media_list_ash.cc b/chrome/browser/media/webrtc/desktop_media_list_ash.cc index 67f170cc..0ae576c4 100644 --- a/chrome/browser/media/webrtc/desktop_media_list_ash.cc +++ b/chrome/browser/media/webrtc/desktop_media_list_ash.cc
@@ -9,8 +9,8 @@ #include "ash/public/cpp/shell_window_ids.h" #include "ash/shell.h" #include "ash/wm/desks/desks_util.h" -#include "base/bind.h" #include "base/containers/adapters.h" +#include "base/functional/bind.h" #include "chrome/grit/generated_resources.h" #include "media/base/video_util.h" #include "ui/base/l10n/l10n_util.h"
diff --git a/chrome/browser/media/webrtc/desktop_media_list_base.cc b/chrome/browser/media/webrtc/desktop_media_list_base.cc index c49e83d5..0389599a 100644 --- a/chrome/browser/media/webrtc/desktop_media_list_base.cc +++ b/chrome/browser/media/webrtc/desktop_media_list_base.cc
@@ -7,7 +7,7 @@ #include <set> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/hash/hash.h" #include "chrome/browser/media/webrtc/desktop_media_list.h" #include "content/public/browser/browser_task_traits.h"
diff --git a/chrome/browser/media/webrtc/desktop_media_list_base.h b/chrome/browser/media/webrtc/desktop_media_list_base.h index 202cfa1d..f25dede 100644 --- a/chrome/browser/media/webrtc/desktop_media_list_base.h +++ b/chrome/browser/media/webrtc/desktop_media_list_base.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_MEDIA_WEBRTC_DESKTOP_MEDIA_LIST_BASE_H_ #define CHROME_BROWSER_MEDIA_WEBRTC_DESKTOP_MEDIA_LIST_BASE_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/time/time.h" #include "chrome/browser/media/webrtc/desktop_media_list.h"
diff --git a/chrome/browser/media/webrtc/desktop_media_picker.h b/chrome/browser/media/webrtc/desktop_media_picker.h index aa3fa138..a7923b6e 100644 --- a/chrome/browser/media/webrtc/desktop_media_picker.h +++ b/chrome/browser/media/webrtc/desktop_media_picker.h
@@ -9,7 +9,7 @@ #include <string> #include <utility> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "content/public/browser/desktop_media_id.h" #include "content/public/browser/media_stream_request.h"
diff --git a/chrome/browser/media/webrtc/desktop_media_picker_controller.cc b/chrome/browser/media/webrtc/desktop_media_picker_controller.cc index 0960256..a696d51 100644 --- a/chrome/browser/media/webrtc/desktop_media_picker_controller.cc +++ b/chrome/browser/media/webrtc/desktop_media_picker_controller.cc
@@ -8,9 +8,9 @@ #include <tuple> #include <utility> -#include "base/bind.h" #include "base/command_line.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h" #include "chrome/browser/media/webrtc/capture_policy_utils.h"
diff --git a/chrome/browser/media/webrtc/desktop_media_picker_factory.h b/chrome/browser/media/webrtc/desktop_media_picker_factory.h index 46c06be..bbfdfe3 100644 --- a/chrome/browser/media/webrtc/desktop_media_picker_factory.h +++ b/chrome/browser/media/webrtc/desktop_media_picker_factory.h
@@ -8,7 +8,7 @@ #include <memory> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "chrome/browser/media/webrtc/desktop_media_list.h" #include "chrome/browser/media/webrtc/desktop_media_picker.h" #include "content/public/browser/desktop_media_id.h"
diff --git a/chrome/browser/media/webrtc/display_media_access_handler.cc b/chrome/browser/media/webrtc/display_media_access_handler.cc index 3d6d561..ed70736 100644 --- a/chrome/browser/media/webrtc/display_media_access_handler.cc +++ b/chrome/browser/media/webrtc/display_media_access_handler.cc
@@ -8,11 +8,11 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" #include "base/containers/contains.h" #include "base/containers/cxx20_erase.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h" #include "chrome/browser/bad_message.h"
diff --git a/chrome/browser/media/webrtc/display_media_access_handler_unittest.cc b/chrome/browser/media/webrtc/display_media_access_handler_unittest.cc index 3f21586..f8b83034 100644 --- a/chrome/browser/media/webrtc/display_media_access_handler_unittest.cc +++ b/chrome/browser/media/webrtc/display_media_access_handler_unittest.cc
@@ -8,7 +8,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/media/webrtc/fake_desktop_media_list.cc b/chrome/browser/media/webrtc/fake_desktop_media_list.cc index 1b977da..832e0da 100644 --- a/chrome/browser/media/webrtc/fake_desktop_media_list.cc +++ b/chrome/browser/media/webrtc/fake_desktop_media_list.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/strings/string_number_conversions.h" #include "chrome/browser/media/webrtc/desktop_media_list.h" #include "chrome/browser/media/webrtc/desktop_media_list_observer.h"
diff --git a/chrome/browser/media/webrtc/fake_desktop_media_picker_factory.cc b/chrome/browser/media/webrtc/fake_desktop_media_picker_factory.cc index 33ad12c..e5455b66 100644 --- a/chrome/browser/media/webrtc/fake_desktop_media_picker_factory.cc +++ b/chrome/browser/media/webrtc/fake_desktop_media_picker_factory.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/weak_ptr.h" #include "base/task/single_thread_task_runner.h" #include "chrome/browser/media/webrtc/fake_desktop_media_list.h"
diff --git a/chrome/browser/media/webrtc/media_authorization_wrapper_mac.h b/chrome/browser/media/webrtc/media_authorization_wrapper_mac.h index 3ebab6b..6089bf1 100644 --- a/chrome/browser/media/webrtc/media_authorization_wrapper_mac.h +++ b/chrome/browser/media/webrtc/media_authorization_wrapper_mac.h
@@ -7,7 +7,7 @@ #import <Foundation/NSString.h> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" namespace system_media_permissions {
diff --git a/chrome/browser/media/webrtc/media_capture_devices_dispatcher.cc b/chrome/browser/media/webrtc/media_capture_devices_dispatcher.cc index 7c17451..08c918d 100644 --- a/chrome/browser/media/webrtc/media_capture_devices_dispatcher.cc +++ b/chrome/browser/media/webrtc/media_capture_devices_dispatcher.cc
@@ -7,9 +7,9 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/check_op.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/metrics/field_trial.h" #include "base/observer_list.h" #include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/media/webrtc/media_capture_devices_dispatcher.h b/chrome/browser/media/webrtc/media_capture_devices_dispatcher.h index 921794e36..fe0a563d 100644 --- a/chrome/browser/media/webrtc/media_capture_devices_dispatcher.h +++ b/chrome/browser/media/webrtc/media_capture_devices_dispatcher.h
@@ -10,7 +10,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/singleton.h" #include "base/observer_list.h" #include "components/webrtc/media_stream_device_enumerator_impl.h"
diff --git a/chrome/browser/media/webrtc/media_stream_capture_indicator.cc b/chrome/browser/media/webrtc/media_stream_capture_indicator.cc index 2d1a2a3..e4b7c148 100644 --- a/chrome/browser/media/webrtc/media_stream_capture_indicator.cc +++ b/chrome/browser/media/webrtc/media_stream_capture_indicator.cc
@@ -10,10 +10,10 @@ #include <string> #include <utility> -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/check_op.h" #include "base/containers/contains.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/notreached.h" #include "base/observer_list.h" #include "build/build_config.h"
diff --git a/chrome/browser/media/webrtc/media_stream_capture_indicator.h b/chrome/browser/media/webrtc/media_stream_capture_indicator.h index 6c33d22..5243e74 100644 --- a/chrome/browser/media/webrtc/media_stream_capture_indicator.h +++ b/chrome/browser/media/webrtc/media_stream_capture_indicator.h
@@ -8,7 +8,7 @@ #include <unordered_map> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/observer_list.h"
diff --git a/chrome/browser/media/webrtc/media_stream_capture_indicator_unittest.cc b/chrome/browser/media/webrtc/media_stream_capture_indicator_unittest.cc index 914463e..a5b3bc4 100644 --- a/chrome/browser/media/webrtc/media_stream_capture_indicator_unittest.cc +++ b/chrome/browser/media/webrtc/media_stream_capture_indicator_unittest.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/media/webrtc/media_stream_capture_indicator.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "chrome/browser/media/webrtc/desktop_capture_devices_util.h" #include "chrome/browser/media/webrtc/media_capture_devices_dispatcher.h" #include "chrome/test/base/chrome_render_view_host_test_harness.h"
diff --git a/chrome/browser/media/webrtc/media_stream_device_permission_context_unittest.cc b/chrome/browser/media/webrtc/media_stream_device_permission_context_unittest.cc index f590409..2bda3e3d 100644 --- a/chrome/browser/media/webrtc/media_stream_device_permission_context_unittest.cc +++ b/chrome/browser/media/webrtc/media_stream_device_permission_context_unittest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/media/webrtc/media_stream_device_permission_context.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "build/build_config.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h" #include "chrome/test/base/chrome_render_view_host_test_harness.h"
diff --git a/chrome/browser/media/webrtc/media_stream_devices_controller_browsertest.cc b/chrome/browser/media/webrtc/media_stream_devices_controller_browsertest.cc index 7353c93..75a457ff 100644 --- a/chrome/browser/media/webrtc/media_stream_devices_controller_browsertest.cc +++ b/chrome/browser/media/webrtc/media_stream_devices_controller_browsertest.cc
@@ -5,8 +5,8 @@ #include <memory> #include <string> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/metrics/field_trial.h" #include "base/run_loop.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
diff --git a/chrome/browser/media/webrtc/native_desktop_media_list.cc b/chrome/browser/media/webrtc/native_desktop_media_list.cc index 836f7683..97d16183 100644 --- a/chrome/browser/media/webrtc/native_desktop_media_list.cc +++ b/chrome/browser/media/webrtc/native_desktop_media_list.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/hash/hash.h" #include "base/message_loop/message_pump_type.h" #include "base/ranges/algorithm.h"
diff --git a/chrome/browser/media/webrtc/permission_bubble_media_access_handler.cc b/chrome/browser/media/webrtc/permission_bubble_media_access_handler.cc index 5c4369b..a812358 100644 --- a/chrome/browser/media/webrtc/permission_bubble_media_access_handler.cc +++ b/chrome/browser/media/webrtc/permission_bubble_media_access_handler.cc
@@ -7,8 +7,8 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/field_trial.h" #include "build/build_config.h" #include "chrome/browser/media/webrtc/media_capture_devices_dispatcher.h"
diff --git a/chrome/browser/media/webrtc/same_origin_observer.h b/chrome/browser/media/webrtc/same_origin_observer.h index 25d4bdc..129049a6 100644 --- a/chrome/browser/media/webrtc/same_origin_observer.h +++ b/chrome/browser/media/webrtc/same_origin_observer.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_MEDIA_WEBRTC_SAME_ORIGIN_OBSERVER_H_ #define CHROME_BROWSER_MEDIA_WEBRTC_SAME_ORIGIN_OBSERVER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "content/public/browser/web_contents_observer.h" #include "url/origin.h"
diff --git a/chrome/browser/media/webrtc/system_media_capture_permissions_mac.h b/chrome/browser/media/webrtc/system_media_capture_permissions_mac.h index 4f78bbc..cff84c5 100644 --- a/chrome/browser/media/webrtc/system_media_capture_permissions_mac.h +++ b/chrome/browser/media/webrtc/system_media_capture_permissions_mac.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_MEDIA_WEBRTC_SYSTEM_MEDIA_CAPTURE_PERMISSIONS_MAC_H_ #define CHROME_BROWSER_MEDIA_WEBRTC_SYSTEM_MEDIA_CAPTURE_PERMISSIONS_MAC_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" namespace system_media_permissions {
diff --git a/chrome/browser/media/webrtc/system_media_capture_permissions_mac.mm b/chrome/browser/media/webrtc/system_media_capture_permissions_mac.mm index 018a4fcc..bafc005 100644 --- a/chrome/browser/media/webrtc/system_media_capture_permissions_mac.mm +++ b/chrome/browser/media/webrtc/system_media_capture_permissions_mac.mm
@@ -6,11 +6,11 @@ #import <AVFoundation/AVFoundation.h> -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/check.h" #include "base/command_line.h" #include "base/feature_list.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/mac/foundation_util.h" #include "base/mac/scoped_cftyperef.h" #include "base/no_destructor.h"
diff --git a/chrome/browser/media/webrtc/tab_capture_access_handler.cc b/chrome/browser/media/webrtc/tab_capture_access_handler.cc index 694151e..68aaec2 100644 --- a/chrome/browser/media/webrtc/tab_capture_access_handler.cc +++ b/chrome/browser/media/webrtc/tab_capture_access_handler.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/extensions/api/tab_capture/tab_capture_registry.h" #include "chrome/browser/media/webrtc/capture_policy_utils.h" #include "chrome/browser/media/webrtc/media_capture_devices_dispatcher.h"
diff --git a/chrome/browser/media/webrtc/tab_capture_access_handler_unittest.cc b/chrome/browser/media/webrtc/tab_capture_access_handler_unittest.cc index df55e189..d99de36 100644 --- a/chrome/browser/media/webrtc/tab_capture_access_handler_unittest.cc +++ b/chrome/browser/media/webrtc/tab_capture_access_handler_unittest.cc
@@ -8,7 +8,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "build/build_config.h" #include "chrome/browser/extensions/api/tab_capture/tab_capture_registry.h"
diff --git a/chrome/browser/media/webrtc/tab_desktop_media_list.cc b/chrome/browser/media/webrtc/tab_desktop_media_list.cc index a0115ca..aaf5f78a 100644 --- a/chrome/browser/media/webrtc/tab_desktop_media_list.cc +++ b/chrome/browser/media/webrtc/tab_desktop_media_list.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" #include "base/containers/adapters.h" +#include "base/functional/bind.h" #include "base/hash/hash.h" #include "base/task/bind_post_task.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/media/webrtc/tab_desktop_media_list.h b/chrome/browser/media/webrtc/tab_desktop_media_list.h index 5cef359f8..007f972 100644 --- a/chrome/browser/media/webrtc/tab_desktop_media_list.h +++ b/chrome/browser/media/webrtc/tab_desktop_media_list.h
@@ -7,7 +7,7 @@ #include <map> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "chrome/browser/media/webrtc/desktop_media_list_base.h" // Implementation of DesktopMediaList that shows tab/WebContents.
diff --git a/chrome/browser/media/webrtc/webrtc_browsertest_common.cc b/chrome/browser/media/webrtc/webrtc_browsertest_common.cc index 7551b2a..a96f35b 100644 --- a/chrome/browser/media/webrtc/webrtc_browsertest_common.cc +++ b/chrome/browser/media/webrtc/webrtc_browsertest_common.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/media/webrtc/webrtc_browsertest_common.h" -#include "base/callback_forward.h" #include "base/files/file_util.h" +#include "base/functional/callback_forward.h" #include "base/path_service.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/media/webrtc/webrtc_browsertest_common.h b/chrome/browser/media/webrtc/webrtc_browsertest_common.h index 45e47a9..2838b2e 100644 --- a/chrome/browser/media/webrtc/webrtc_browsertest_common.h +++ b/chrome/browser/media/webrtc/webrtc_browsertest_common.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/callback_forward.h" #include "base/files/file_path.h" +#include "base/functional/callback_forward.h" #include "base/process/process_handle.h" #include "base/time/time.h"
diff --git a/chrome/browser/media/webrtc/webrtc_desktop_capture_browsertest.cc b/chrome/browser/media/webrtc/webrtc_desktop_capture_browsertest.cc index 184d6f9..78a9a6c6 100644 --- a/chrome/browser/media/webrtc/webrtc_desktop_capture_browsertest.cc +++ b/chrome/browser/media/webrtc/webrtc_desktop_capture_browsertest.cc
@@ -3,9 +3,9 @@ // found in the LICENSE file. #include "base/barrier_closure.h" -#include "base/bind.h" -#include "base/callback_forward.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/ranges/algorithm.h" #include "base/run_loop.h"
diff --git a/chrome/browser/media/webrtc/webrtc_event_log_manager.cc b/chrome/browser/media/webrtc/webrtc_event_log_manager.cc index cf1346e0a..8f7fb7f 100644 --- a/chrome/browser/media/webrtc/webrtc_event_log_manager.cc +++ b/chrome/browser/media/webrtc/webrtc_event_log_manager.cc
@@ -6,8 +6,8 @@ #include <limits> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/task/thread_pool.h" #include "build/build_config.h"
diff --git a/chrome/browser/media/webrtc/webrtc_event_log_manager.h b/chrome/browser/media/webrtc/webrtc_event_log_manager.h index 5298aef..79d0ee7 100644 --- a/chrome/browser/media/webrtc/webrtc_event_log_manager.h +++ b/chrome/browser/media/webrtc/webrtc_event_log_manager.h
@@ -10,9 +10,9 @@ #include <utility> #include <vector> -#include "base/callback.h" #include "base/containers/flat_set.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h"
diff --git a/chrome/browser/media/webrtc/webrtc_event_log_manager_keyed_service.cc b/chrome/browser/media/webrtc/webrtc_event_log_manager_keyed_service.cc index c7ec9b0f..782c32be 100644 --- a/chrome/browser/media/webrtc/webrtc_event_log_manager_keyed_service.cc +++ b/chrome/browser/media/webrtc/webrtc_event_log_manager_keyed_service.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/media/webrtc/webrtc_event_log_manager_keyed_service.h" -#include "base/callback.h" #include "base/check.h" +#include "base/functional/callback.h" #include "chrome/browser/media/webrtc/webrtc_event_log_manager.h" #include "content/public/browser/browser_context.h"
diff --git a/chrome/browser/media/webrtc/webrtc_event_log_manager_remote.cc b/chrome/browser/media/webrtc/webrtc_event_log_manager_remote.cc index 16d7e939..28072c5c 100644 --- a/chrome/browser/media/webrtc/webrtc_event_log_manager_remote.cc +++ b/chrome/browser/media/webrtc/webrtc_event_log_manager_remote.cc
@@ -7,12 +7,12 @@ #include <iterator> #include <utility> -#include "base/bind.h" #include "base/command_line.h" #include "base/files/file.h" #include "base/files/file_enumerator.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/ranges/algorithm.h" #include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/media/webrtc/webrtc_event_log_manager_unittest.cc b/chrome/browser/media/webrtc/webrtc_event_log_manager_unittest.cc index 95acfee..5839ba2 100644 --- a/chrome/browser/media/webrtc/webrtc_event_log_manager_unittest.cc +++ b/chrome/browser/media/webrtc/webrtc_event_log_manager_unittest.cc
@@ -16,11 +16,11 @@ #include <vector> #include "base/big_endian.h" -#include "base/bind.h" #include "base/files/file.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h"
diff --git a/chrome/browser/media/webrtc/webrtc_event_log_uploader.cc b/chrome/browser/media/webrtc/webrtc_event_log_uploader.cc index d21e53b..bfbb963 100644 --- a/chrome/browser/media/webrtc/webrtc_event_log_uploader.cc +++ b/chrome/browser/media/webrtc/webrtc_event_log_uploader.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/media/webrtc/webrtc_event_log_uploader.h" -#include "base/bind.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/strings/stringprintf.h" #include "build/build_config.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 25856b3..ec1b1bd 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
@@ -7,10 +7,10 @@ #include <memory> #include <string> -#include "base/bind.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/run_loop.h"
diff --git a/chrome/browser/media/webrtc/webrtc_log_uploader.cc b/chrome/browser/media/webrtc/webrtc_log_uploader.cc index c618835..f964d5bc9 100644 --- a/chrome/browser/media/webrtc/webrtc_log_uploader.cc +++ b/chrome/browser/media/webrtc/webrtc_log_uploader.cc
@@ -8,9 +8,9 @@ #include <cstdlib> #include <utility> -#include "base/bind.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/metrics/histogram_functions.h" #include "base/pickle.h"
diff --git a/chrome/browser/media/webrtc/webrtc_log_uploader_unittest.cc b/chrome/browser/media/webrtc/webrtc_log_uploader_unittest.cc index f61c1fbe..6afa1865 100644 --- a/chrome/browser/media/webrtc/webrtc_log_uploader_unittest.cc +++ b/chrome/browser/media/webrtc/webrtc_log_uploader_unittest.cc
@@ -9,11 +9,11 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/files/file.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h"
diff --git a/chrome/browser/media/webrtc/webrtc_log_util.cc b/chrome/browser/media/webrtc/webrtc_log_util.cc index f29a998..3c93784 100644 --- a/chrome/browser/media/webrtc/webrtc_log_util.cc +++ b/chrome/browser/media/webrtc/webrtc_log_util.cc
@@ -6,7 +6,7 @@ #include <vector> -#include "base/bind.h" +#include "base/functional/bind.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 e643e30..2769530c 100644 --- a/chrome/browser/media/webrtc/webrtc_logging_controller.cc +++ b/chrome/browser/media/webrtc/webrtc_logging_controller.cc
@@ -8,9 +8,9 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/command_line.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/metrics/histogram_functions.h" #include "base/supports_user_data.h"
diff --git a/chrome/browser/media/webrtc/webrtc_logging_controller.h b/chrome/browser/media/webrtc/webrtc_logging_controller.h index 13734c6..33be946 100644 --- a/chrome/browser/media/webrtc/webrtc_logging_controller.h +++ b/chrome/browser/media/webrtc/webrtc_logging_controller.h
@@ -13,7 +13,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.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 8b48046..e057e9d 100644 --- a/chrome/browser/media/webrtc/webrtc_rtp_dump_handler.cc +++ b/chrome/browser/media/webrtc/webrtc_rtp_dump_handler.cc
@@ -6,9 +6,9 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/strings/string_number_conversions.h" #include "base/task/sequenced_task_runner.h"
diff --git a/chrome/browser/media/webrtc/webrtc_rtp_dump_handler.h b/chrome/browser/media/webrtc/webrtc_rtp_dump_handler.h index 921d609..5f645c74 100644 --- a/chrome/browser/media/webrtc/webrtc_rtp_dump_handler.h +++ b/chrome/browser/media/webrtc/webrtc_rtp_dump_handler.h
@@ -10,8 +10,8 @@ #include <memory> -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h" #include "chrome/browser/media/webrtc/rtp_dump_type.h"
diff --git a/chrome/browser/media/webrtc/webrtc_rtp_dump_handler_unittest.cc b/chrome/browser/media/webrtc/webrtc_rtp_dump_handler_unittest.cc index 105fb1be..db4761e 100644 --- a/chrome/browser/media/webrtc/webrtc_rtp_dump_handler_unittest.cc +++ b/chrome/browser/media/webrtc/webrtc_rtp_dump_handler_unittest.cc
@@ -10,10 +10,10 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/logging.h" #include "base/run_loop.h"
diff --git a/chrome/browser/media/webrtc/webrtc_rtp_dump_writer.cc b/chrome/browser/media/webrtc/webrtc_rtp_dump_writer.cc index 4eeecad..3fc8a6f9 100644 --- a/chrome/browser/media/webrtc/webrtc_rtp_dump_writer.cc +++ b/chrome/browser/media/webrtc/webrtc_rtp_dump_writer.cc
@@ -7,8 +7,8 @@ #include <string.h> #include "base/big_endian.h" -#include "base/bind.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/task/thread_pool.h" #include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/media/webrtc/webrtc_rtp_dump_writer.h b/chrome/browser/media/webrtc/webrtc_rtp_dump_writer.h index 52fb6721..0af0caf 100644 --- a/chrome/browser/media/webrtc/webrtc_rtp_dump_writer.h +++ b/chrome/browser/media/webrtc/webrtc_rtp_dump_writer.h
@@ -10,8 +10,8 @@ #include <memory> -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h" #include "base/task/sequenced_task_runner.h"
diff --git a/chrome/browser/media/webrtc/webrtc_rtp_dump_writer_unittest.cc b/chrome/browser/media/webrtc/webrtc_rtp_dump_writer_unittest.cc index feb2ee1..dac874169 100644 --- a/chrome/browser/media/webrtc/webrtc_rtp_dump_writer_unittest.cc +++ b/chrome/browser/media/webrtc/webrtc_rtp_dump_writer_unittest.cc
@@ -11,9 +11,9 @@ #include <memory> #include "base/big_endian.h" -#include "base/bind.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/task/sequenced_task_runner.h" #include "build/build_config.h"
diff --git a/chrome/browser/media/webrtc/webrtc_text_log_handler.cc b/chrome/browser/media/webrtc/webrtc_text_log_handler.cc index 0f2253cd..1ecdeb3c 100644 --- a/chrome/browser/media/webrtc/webrtc_text_log_handler.cc +++ b/chrome/browser/media/webrtc/webrtc_text_log_handler.cc
@@ -10,10 +10,10 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/check_op.h" #include "base/cpu.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "base/notreached.h" #include "base/strings/strcat.h"
diff --git a/chrome/browser/media/webrtc/webrtc_text_log_handler.h b/chrome/browser/media/webrtc/webrtc_text_log_handler.h index 81a1459e..635f152 100644 --- a/chrome/browser/media/webrtc/webrtc_text_log_handler.h +++ b/chrome/browser/media/webrtc/webrtc_text_log_handler.h
@@ -9,7 +9,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h" #include "base/time/time.h"
diff --git a/chrome/browser/media_galleries/chromeos/mtp_device_delegate_impl_chromeos.cc b/chrome/browser/media_galleries/chromeos/mtp_device_delegate_impl_chromeos.cc index 07d6a7d9..31f1ee04 100644 --- a/chrome/browser/media_galleries/chromeos/mtp_device_delegate_impl_chromeos.cc +++ b/chrome/browser/media_galleries/chromeos/mtp_device_delegate_impl_chromeos.cc
@@ -14,10 +14,10 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/containers/circular_deque.h" #include "base/containers/contains.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/notreached.h" #include "base/numerics/safe_conversions.h" #include "base/posix/eintr_wrapper.h"
diff --git a/chrome/browser/media_galleries/chromeos/mtp_device_delegate_impl_chromeos.h b/chrome/browser/media_galleries/chromeos/mtp_device_delegate_impl_chromeos.h index 30c532f5..1abe1f00 100644 --- a/chrome/browser/media_galleries/chromeos/mtp_device_delegate_impl_chromeos.h +++ b/chrome/browser/media_galleries/chromeos/mtp_device_delegate_impl_chromeos.h
@@ -14,9 +14,9 @@ #include <utility> #include <vector> -#include "base/callback.h" #include "base/containers/circular_deque.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/media_galleries/chromeos/mtp_device_task_helper.h"
diff --git a/chrome/browser/media_galleries/chromeos/mtp_device_task_helper.cc b/chrome/browser/media_galleries/chromeos/mtp_device_task_helper.cc index 39b8829..63a9595 100644 --- a/chrome/browser/media_galleries/chromeos/mtp_device_task_helper.cc +++ b/chrome/browser/media_galleries/chromeos/mtp_device_task_helper.cc
@@ -9,9 +9,9 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check_op.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/ranges/algorithm.h" #include "chrome/browser/media_galleries/chromeos/mtp_device_object_enumerator.h" #include "chrome/browser/media_galleries/chromeos/mtp_read_file_worker.h"
diff --git a/chrome/browser/media_galleries/chromeos/mtp_device_task_helper.h b/chrome/browser/media_galleries/chromeos/mtp_device_task_helper.h index 67d835f..fd7ff542 100644 --- a/chrome/browser/media_galleries/chromeos/mtp_device_task_helper.h +++ b/chrome/browser/media_galleries/chromeos/mtp_device_task_helper.h
@@ -12,7 +12,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/media_galleries/fileapi/mtp_device_async_delegate.h" #include "services/device/public/mojom/mtp_file_entry.mojom.h"
diff --git a/chrome/browser/media_galleries/chromeos/mtp_read_file_worker.cc b/chrome/browser/media_galleries/chromeos/mtp_read_file_worker.cc index 5fb4972..fde820c 100644 --- a/chrome/browser/media_galleries/chromeos/mtp_read_file_worker.cc +++ b/chrome/browser/media_galleries/chromeos/mtp_read_file_worker.cc
@@ -6,9 +6,9 @@ #include <utility> -#include "base/bind.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/numerics/safe_conversions.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/media_galleries/chromeos/mtp_read_file_worker.h b/chrome/browser/media_galleries/chromeos/mtp_read_file_worker.h index a67afd7..2bd69c0a 100644 --- a/chrome/browser/media_galleries/chromeos/mtp_read_file_worker.h +++ b/chrome/browser/media_galleries/chromeos/mtp_read_file_worker.h
@@ -10,8 +10,8 @@ #include <memory> #include <string> -#include "base/callback.h" #include "base/files/file.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" class SnapshotFileDetails;
diff --git a/chrome/browser/media_galleries/chromeos/snapshot_file_details.h b/chrome/browser/media_galleries/chromeos/snapshot_file_details.h index c7dd09b..82108b7 100644 --- a/chrome/browser/media_galleries/chromeos/snapshot_file_details.h +++ b/chrome/browser/media_galleries/chromeos/snapshot_file_details.h
@@ -7,9 +7,9 @@ #include <stdint.h> -#include "base/callback.h" #include "base/files/file.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "chrome/browser/media_galleries/fileapi/mtp_device_async_delegate.h" // Used to represent snapshot file request params.
diff --git a/chrome/browser/media_galleries/fileapi/av_scanning_file_validator.cc b/chrome/browser/media_galleries/fileapi/av_scanning_file_validator.cc index 5d5e3be7..de5dfef 100644 --- a/chrome/browser/media_galleries/fileapi/av_scanning_file_validator.cc +++ b/chrome/browser/media_galleries/fileapi/av_scanning_file_validator.cc
@@ -6,14 +6,14 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "build/build_config.h" #include "components/download/public/common/quarantine_connection.h" #include "content/public/browser/browser_thread.h" #if BUILDFLAG(IS_WIN) -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "components/services/quarantine/public/mojom/quarantine.mojom.h" #include "mojo/public/cpp/bindings/remote.h" #include "url/gurl.h"
diff --git a/chrome/browser/media_galleries/fileapi/device_media_async_file_util.cc b/chrome/browser/media_galleries/fileapi/device_media_async_file_util.cc index 062b0ba..883718fe 100644 --- a/chrome/browser/media_galleries/fileapi/device_media_async_file_util.cc +++ b/chrome/browser/media_galleries/fileapi/device_media_async_file_util.cc
@@ -8,10 +8,10 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/task/single_thread_task_runner.h" #include "chrome/browser/media_galleries/fileapi/media_path_filter.h"
diff --git a/chrome/browser/media_galleries/fileapi/media_file_system_backend.cc b/chrome/browser/media_galleries/fileapi/media_file_system_backend.cc index 681c9fa..a0ead8e3 100644 --- a/chrome/browser/media_galleries/fileapi/media_file_system_backend.cc +++ b/chrome/browser/media_galleries/fileapi/media_file_system_backend.cc
@@ -8,9 +8,9 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/check_op.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/lazy_instance.h" #include "base/notreached.h" #include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/media_galleries/fileapi/media_file_system_backend.h b/chrome/browser/media_galleries/fileapi/media_file_system_backend.h index f10e532e..5273fd3 100644 --- a/chrome/browser/media_galleries/fileapi/media_file_system_backend.h +++ b/chrome/browser/media_galleries/fileapi/media_file_system_backend.h
@@ -10,8 +10,8 @@ #include <memory> #include <string> -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/media_galleries/fileapi/media_file_validator_browsertest.cc b/chrome/browser/media_galleries/fileapi/media_file_validator_browsertest.cc index c7db75ea..08196d2 100644 --- a/chrome/browser/media_galleries/fileapi/media_file_validator_browsertest.cc +++ b/chrome/browser/media_galleries/fileapi/media_file_validator_browsertest.cc
@@ -7,11 +7,11 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/path_service.h" #include "base/run_loop.h"
diff --git a/chrome/browser/media_galleries/fileapi/mtp_device_async_delegate.h b/chrome/browser/media_galleries/fileapi/mtp_device_async_delegate.h index d77fde0..8672892 100644 --- a/chrome/browser/media_galleries/fileapi/mtp_device_async_delegate.h +++ b/chrome/browser/media_galleries/fileapi/mtp_device_async_delegate.h
@@ -7,8 +7,8 @@ #include <stdint.h> -#include "base/callback.h" #include "base/files/file.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "storage/browser/file_system/async_file_util.h" #include "storage/browser/file_system/watcher_manager.h"
diff --git a/chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc b/chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc index dcead526..59aa941a 100644 --- a/chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc +++ b/chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc
@@ -7,8 +7,8 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "chrome/browser/media_galleries/fileapi/mtp_device_async_delegate.h" #include "content/public/browser/browser_thread.h" #include "storage/browser/file_system/external_mount_points.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 5565333b..8151547 100644 --- a/chrome/browser/media_galleries/fileapi/mtp_file_stream_reader.h +++ b/chrome/browser/media_galleries/fileapi/mtp_file_stream_reader.h
@@ -7,8 +7,8 @@ #include <stdint.h> -#include "base/bind.h" #include "base/files/file.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/time/time.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 c616133..ed15f47d 100644 --- a/chrome/browser/media_galleries/fileapi/native_media_file_util.cc +++ b/chrome/browser/media_galleries/fileapi/native_media_file_util.cc
@@ -7,11 +7,11 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/files/file_enumerator.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/strings/string_piece.h" #include "base/strings/string_util.h" #include "base/task/sequenced_task_runner.h"
diff --git a/chrome/browser/media_galleries/fileapi/native_media_file_util_unittest.cc b/chrome/browser/media_galleries/fileapi/native_media_file_util_unittest.cc index a2b1348..8907a09 100644 --- a/chrome/browser/media_galleries/fileapi/native_media_file_util_unittest.cc +++ b/chrome/browser/media_galleries/fileapi/native_media_file_util_unittest.cc
@@ -12,11 +12,11 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" #include "base/format_macros.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/scoped_refptr.h" #include "base/strings/stringprintf.h" #include "base/task/sequenced_task_runner.h"
diff --git a/chrome/browser/media_galleries/fileapi/readahead_file_stream_reader.cc b/chrome/browser/media_galleries/fileapi/readahead_file_stream_reader.cc index 12c2e638..e0be7293 100644 --- a/chrome/browser/media_galleries/fileapi/readahead_file_stream_reader.cc +++ b/chrome/browser/media_galleries/fileapi/readahead_file_stream_reader.cc
@@ -9,7 +9,7 @@ #include <algorithm> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/numerics/safe_conversions.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.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 e6f6ea5..e5c024a 100644 --- a/chrome/browser/media_galleries/fileapi/supported_audio_video_checker.cc +++ b/chrome/browser/media_galleries/fileapi/supported_audio_video_checker.cc
@@ -9,10 +9,10 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" #include "base/check_op.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/lazy_instance.h" #include "base/location.h" #include "base/task/task_traits.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 7bd5e357..fd3ce7c 100644 --- a/chrome/browser/media_galleries/fileapi/supported_image_type_validator.cc +++ b/chrome/browser/media_galleries/fileapi/supported_image_type_validator.cc
@@ -7,10 +7,10 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/check_op.h" #include "base/files/file.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/memory/weak_ptr.h" #include "base/task/task_traits.h"
diff --git a/chrome/browser/media_galleries/gallery_watch_manager.cc b/chrome/browser/media_galleries/gallery_watch_manager.cc index 2860bfa2..cf037d3 100644 --- a/chrome/browser/media_galleries/gallery_watch_manager.cc +++ b/chrome/browser/media_galleries/gallery_watch_manager.cc
@@ -8,9 +8,9 @@ #include <tuple> -#include "base/bind.h" #include "base/check_op.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/sequence_checker.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/media_galleries/gallery_watch_manager.h b/chrome/browser/media_galleries/gallery_watch_manager.h index 19b1c91..7561670 100644 --- a/chrome/browser/media_galleries/gallery_watch_manager.h +++ b/chrome/browser/media_galleries/gallery_watch_manager.h
@@ -9,9 +9,9 @@ #include <memory> #include <string> -#include "base/callback_forward.h" #include "base/files/file_path.h" #include "base/files/file_path_watcher.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/media_galleries/gallery_watch_manager_unittest.cc b/chrome/browser/media_galleries/gallery_watch_manager_unittest.cc index 3be0901..7d33ac9 100644 --- a/chrome/browser/media_galleries/gallery_watch_manager_unittest.cc +++ b/chrome/browser/media_galleries/gallery_watch_manager_unittest.cc
@@ -6,12 +6,12 @@ #include <memory> -#include "base/bind.h" #include "base/command_line.h" #include "base/containers/contains.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/test/scoped_path_override.h"
diff --git a/chrome/browser/media_galleries/mac/mtp_device_delegate_impl_mac.mm b/chrome/browser/media_galleries/mac/mtp_device_delegate_impl_mac.mm index 070f2ff1..a154b2a 100644 --- a/chrome/browser/media_galleries/mac/mtp_device_delegate_impl_mac.mm +++ b/chrome/browser/media_galleries/mac/mtp_device_delegate_impl_mac.mm
@@ -9,7 +9,7 @@ #include <algorithm> #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/mac/scoped_nsobject.h" #include "base/memory/raw_ptr.h" #include "components/services/filesystem/public/mojom/types.mojom.h"
diff --git a/chrome/browser/media_galleries/mac/mtp_device_delegate_impl_mac_unittest.mm b/chrome/browser/media_galleries/mac/mtp_device_delegate_impl_mac_unittest.mm index f242280..36f6caa 100644 --- a/chrome/browser/media_galleries/mac/mtp_device_delegate_impl_mac_unittest.mm +++ b/chrome/browser/media_galleries/mac/mtp_device_delegate_impl_mac_unittest.mm
@@ -7,10 +7,10 @@ #import <Foundation/Foundation.h> #import <ImageCaptureCore/ImageCaptureCore.h> -#include "base/bind.h" #include "base/files/file.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/mac/foundation_util.h" #include "base/mac/scoped_nsobject.h" #include "base/strings/sys_string_conversions.h"
diff --git a/chrome/browser/media_galleries/media_file_system_registry.cc b/chrome/browser/media_galleries/media_file_system_registry.cc index 1329984..121e3cb 100644 --- a/chrome/browser/media_galleries/media_file_system_registry.cc +++ b/chrome/browser/media_galleries/media_file_system_registry.cc
@@ -11,11 +11,11 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" #include "base/check_op.h" #include "base/containers/contains.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/notreached.h"
diff --git a/chrome/browser/media_galleries/media_file_system_registry_unittest.cc b/chrome/browser/media_galleries/media_file_system_registry_unittest.cc index a28d877..8d0f650 100644 --- a/chrome/browser/media_galleries/media_file_system_registry_unittest.cc +++ b/chrome/browser/media_galleries/media_file_system_registry_unittest.cc
@@ -14,12 +14,12 @@ #include <set> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/containers/contains.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/path_service.h"
diff --git a/chrome/browser/media_galleries/media_galleries_dialog_controller_test_util.h b/chrome/browser/media_galleries/media_galleries_dialog_controller_test_util.h index 8b3a193..96be6c5 100644 --- a/chrome/browser/media_galleries/media_galleries_dialog_controller_test_util.h +++ b/chrome/browser/media_galleries/media_galleries_dialog_controller_test_util.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_MEDIA_GALLERIES_MEDIA_GALLERIES_DIALOG_CONTROLLER_TEST_UTIL_H_ #define CHROME_BROWSER_MEDIA_GALLERIES_MEDIA_GALLERIES_DIALOG_CONTROLLER_TEST_UTIL_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/media_galleries/media_galleries_dialog_controller.h" class MockMediaGalleriesDialog : public MediaGalleriesDialog {
diff --git a/chrome/browser/media_galleries/media_galleries_permission_controller.cc b/chrome/browser/media_galleries/media_galleries_permission_controller.cc index b5d86b2e..b4dc2c0 100644 --- a/chrome/browser/media_galleries/media_galleries_permission_controller.cc +++ b/chrome/browser/media_galleries/media_galleries_permission_controller.cc
@@ -5,8 +5,8 @@ #include "chrome/browser/media_galleries/media_galleries_permission_controller.h" #include "base/base_paths.h" -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/path_service.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/media_galleries/media_galleries_permission_controller.h b/chrome/browser/media_galleries/media_galleries_permission_controller.h index 0f55cb8..776665ac 100644 --- a/chrome/browser/media_galleries/media_galleries_permission_controller.h +++ b/chrome/browser/media_galleries/media_galleries_permission_controller.h
@@ -12,7 +12,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/media_galleries/media_galleries_dialog_controller.h" #include "chrome/browser/media_galleries/media_galleries_preferences.h"
diff --git a/chrome/browser/media_galleries/media_galleries_permission_controller_unittest.cc b/chrome/browser/media_galleries/media_galleries_permission_controller_unittest.cc index 73f7501..6470fba 100644 --- a/chrome/browser/media_galleries/media_galleries_permission_controller_unittest.cc +++ b/chrome/browser/media_galleries/media_galleries_permission_controller_unittest.cc
@@ -7,9 +7,9 @@ #include <memory> #include <string> -#include "base/bind.h" #include "base/command_line.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/strings/string_util.h"
diff --git a/chrome/browser/media_galleries/media_galleries_preferences.cc b/chrome/browser/media_galleries/media_galleries_preferences.cc index 8f95c4b..51629a4f 100644 --- a/chrome/browser/media_galleries/media_galleries_preferences.cc +++ b/chrome/browser/media_galleries/media_galleries_preferences.cc
@@ -11,9 +11,9 @@ #include <utility> #include "base/base_paths_posix.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/i18n/time_formatting.h" #include "base/observer_list.h" #include "base/path_service.h"
diff --git a/chrome/browser/media_galleries/media_galleries_preferences.h b/chrome/browser/media_galleries/media_galleries_preferences.h index a3cf85c..4b6660c6 100644 --- a/chrome/browser/media_galleries/media_galleries_preferences.h +++ b/chrome/browser/media_galleries/media_galleries_preferences.h
@@ -12,8 +12,8 @@ #include <string> #include <vector> -#include "base/callback_forward.h" #include "base/files/file_path.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h"
diff --git a/chrome/browser/media_galleries/media_gallery_context_menu.h b/chrome/browser/media_galleries/media_gallery_context_menu.h index f800375..28bd371 100644 --- a/chrome/browser/media_galleries/media_gallery_context_menu.h +++ b/chrome/browser/media_galleries/media_gallery_context_menu.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_MEDIA_GALLERIES_MEDIA_GALLERY_CONTEXT_MENU_H_ #define CHROME_BROWSER_MEDIA_GALLERIES_MEDIA_GALLERY_CONTEXT_MENU_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/media_galleries/media_galleries_preferences.h" #include "ui/base/models/simple_menu_model.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 310b77a..a9e2a96 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
@@ -13,9 +13,9 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/check_op.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted.h" #include "base/notreached.h" #include "base/strings/string_split.h"
diff --git a/chrome/browser/media_galleries/win/mtp_device_delegate_impl_win.h b/chrome/browser/media_galleries/win/mtp_device_delegate_impl_win.h index 407585cc..579f57cb 100644 --- a/chrome/browser/media_galleries/win/mtp_device_delegate_impl_win.h +++ b/chrome/browser/media_galleries/win/mtp_device_delegate_impl_win.h
@@ -11,9 +11,9 @@ #include <memory> #include <string> -#include "base/callback.h" #include "base/containers/queue.h" #include "base/files/file.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/media_galleries/fileapi/mtp_device_async_delegate.h"
diff --git a/chrome/browser/media_galleries/win/mtp_device_delegate_impl_win_unittest.cc b/chrome/browser/media_galleries/win/mtp_device_delegate_impl_win_unittest.cc index e477e32..d63de98 100644 --- a/chrome/browser/media_galleries/win/mtp_device_delegate_impl_win_unittest.cc +++ b/chrome/browser/media_galleries/win/mtp_device_delegate_impl_win_unittest.cc
@@ -7,10 +7,10 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/command_line.h" #include "base/containers/contains.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/memory/enterprise_memory_limit_evaluator.cc b/chrome/browser/memory/enterprise_memory_limit_evaluator.cc index 9a7b10b..993aae63 100644 --- a/chrome/browser/memory/enterprise_memory_limit_evaluator.cc +++ b/chrome/browser/memory/enterprise_memory_limit_evaluator.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/memory/enterprise_memory_limit_evaluator.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/sequenced_task_runner.h" #include "components/performance_manager/public/decorators/process_metrics_decorator.h" #include "components/performance_manager/public/graph/process_node.h"
diff --git a/chrome/browser/memory/enterprise_memory_limit_evaluator.h b/chrome/browser/memory/enterprise_memory_limit_evaluator.h index 5c9ab68..68fe57c0 100644 --- a/chrome/browser/memory/enterprise_memory_limit_evaluator.h +++ b/chrome/browser/memory/enterprise_memory_limit_evaluator.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_MEMORY_ENTERPRISE_MEMORY_LIMIT_EVALUATOR_H_ #define CHROME_BROWSER_MEMORY_ENTERPRISE_MEMORY_LIMIT_EVALUATOR_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h"
diff --git a/chrome/browser/memory/enterprise_memory_limit_pref_observer.cc b/chrome/browser/memory/enterprise_memory_limit_pref_observer.cc index 74bb767..c6ee62e6 100644 --- a/chrome/browser/memory/enterprise_memory_limit_pref_observer.cc +++ b/chrome/browser/memory/enterprise_memory_limit_pref_observer.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/memory/enterprise_memory_limit_pref_observer.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/memory_pressure_monitor.h" #include "build/build_config.h" #include "chrome/browser/resource_coordinator/utils.h"
diff --git a/chrome/browser/memory_details.cc b/chrome/browser/memory_details.cc index d071ef6..2565fae 100644 --- a/chrome/browser/memory_details.cc +++ b/chrome/browser/memory_details.cc
@@ -7,10 +7,10 @@ #include <algorithm> #include <set> -#include "base/bind.h" #include "base/containers/adapters.h" #include "base/containers/cxx20_erase.h" #include "base/file_version_info.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/memory_details_android.cc b/chrome/browser/memory_details_android.cc index e3f0f7c..c4fd124 100644 --- a/chrome/browser/memory_details_android.cc +++ b/chrome/browser/memory_details_android.cc
@@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/process/process_iterator.h" #include "base/strings/utf_string_conversions.h" #include "base/threading/scoped_blocking_call.h"
diff --git a/chrome/browser/memory_details_fuchsia.cc b/chrome/browser/memory_details_fuchsia.cc index d759f8e..b4cf1fa59 100644 --- a/chrome/browser/memory_details_fuchsia.cc +++ b/chrome/browser/memory_details_fuchsia.cc
@@ -6,7 +6,7 @@ #include <lib/zx/process.h> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/process/process_handle.h" #include "chrome/grit/chromium_strings.h" #include "content/public/browser/browser_task_traits.h"
diff --git a/chrome/browser/memory_details_linux.cc b/chrome/browser/memory_details_linux.cc index 17b38feb..ca5ead2 100644 --- a/chrome/browser/memory_details_linux.cc +++ b/chrome/browser/memory_details_linux.cc
@@ -12,8 +12,8 @@ #include <memory> #include <set> -#include "base/bind.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/process/process_iterator.h" #include "base/process/process_metrics.h" #include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/memory_details_mac.cc b/chrome/browser/memory_details_mac.cc index 1f303d0aa..19f868c 100644 --- a/chrome/browser/memory_details_mac.cc +++ b/chrome/browser/memory_details_mac.cc
@@ -10,9 +10,9 @@ #include <set> #include <string> -#include "base/bind.h" #include "base/file_version_info.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/mac/foundation_util.h" #include "base/process/process_iterator.h" #include "base/strings/string_util.h"
diff --git a/chrome/browser/memory_details_win.cc b/chrome/browser/memory_details_win.cc index 8c16c2b5..48bce8f 100644 --- a/chrome/browser/memory_details_win.cc +++ b/chrome/browser/memory_details_win.cc
@@ -13,9 +13,9 @@ #include <memory> -#include "base/bind.h" #include "base/file_version_info.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/path_service.h" #include "base/strings/string_util.h"
diff --git a/chrome/browser/metrics/antivirus_metrics_provider_win.cc b/chrome/browser/metrics/antivirus_metrics_provider_win.cc index 6a9caf82..a1661d2f 100644 --- a/chrome/browser/metrics/antivirus_metrics_provider_win.cc +++ b/chrome/browser/metrics/antivirus_metrics_provider_win.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/metrics/antivirus_metrics_provider_win.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "chrome/browser/win/util_win_service.h" #include "chrome/common/channel_info.h" #include "components/version_info/channel.h"
diff --git a/chrome/browser/metrics/antivirus_metrics_provider_win.h b/chrome/browser/metrics/antivirus_metrics_provider_win.h index b7a03f16..a46cc08 100644 --- a/chrome/browser/metrics/antivirus_metrics_provider_win.h +++ b/chrome/browser/metrics/antivirus_metrics_provider_win.h
@@ -9,8 +9,8 @@ #include <vector> -#include "base/callback_forward.h" #include "base/feature_list.h" +#include "base/functional/callback_forward.h" #include "base/sequence_checker.h" #include "chrome/services/util_win/public/mojom/util_win.mojom.h" #include "mojo/public/cpp/bindings/remote.h"
diff --git a/chrome/browser/metrics/antivirus_metrics_provider_win_unittest.cc b/chrome/browser/metrics/antivirus_metrics_provider_win_unittest.cc index a7237cf..1309d0c 100644 --- a/chrome/browser/metrics/antivirus_metrics_provider_win_unittest.cc +++ b/chrome/browser/metrics/antivirus_metrics_provider_win_unittest.cc
@@ -7,7 +7,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/strings/sys_string_conversions.h" #include "base/test/scoped_feature_list.h"
diff --git a/chrome/browser/metrics/bluetooth_metrics_provider.cc b/chrome/browser/metrics/bluetooth_metrics_provider.cc index adf8494..5def549 100644 --- a/chrome/browser/metrics/bluetooth_metrics_provider.cc +++ b/chrome/browser/metrics/bluetooth_metrics_provider.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/metrics/bluetooth_metrics_provider.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "device/bluetooth/floss/floss_features.h"
diff --git a/chrome/browser/metrics/browser_activity_watcher.h b/chrome/browser/metrics/browser_activity_watcher.h index a208895..02d81286 100644 --- a/chrome/browser/metrics/browser_activity_watcher.h +++ b/chrome/browser/metrics/browser_activity_watcher.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_METRICS_BROWSER_ACTIVITY_WATCHER_H_ #define CHROME_BROWSER_METRICS_BROWSER_ACTIVITY_WATCHER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/ui/browser_list_observer.h" #include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
diff --git a/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc b/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc index 483ab82..a8597e7 100644 --- a/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc +++ b/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
@@ -10,10 +10,10 @@ #include <vector> #include "base/allocator/partition_alloc_support.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/cpu.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/sparse_histogram.h" #include "base/power_monitor/power_monitor_buildflags.h"
diff --git a/chrome/browser/metrics/chrome_metrics_service_client.cc b/chrome/browser/metrics/chrome_metrics_service_client.cc index c6728167..2b003f94 100644 --- a/chrome/browser/metrics/chrome_metrics_service_client.cc +++ b/chrome/browser/metrics/chrome_metrics_service_client.cc
@@ -13,12 +13,12 @@ #include <vector> #include "base/base64.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/check_op.h" #include "base/command_line.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/lazy_instance.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h"
diff --git a/chrome/browser/metrics/chrome_metrics_service_client.h b/chrome/browser/metrics/chrome_metrics_service_client.h index 17ea70a1..01717a1 100644 --- a/chrome/browser/metrics/chrome_metrics_service_client.h +++ b/chrome/browser/metrics/chrome_metrics_service_client.h
@@ -11,7 +11,7 @@ #include <queue> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/metrics/chrome_metrics_services_manager_client.cc b/chrome/browser/metrics/chrome_metrics_services_manager_client.cc index 4fc5a6b..2ed5019 100644 --- a/chrome/browser/metrics/chrome_metrics_services_manager_client.cc +++ b/chrome/browser/metrics/chrome_metrics_services_manager_client.cc
@@ -7,11 +7,11 @@ #include <map> #include <string> -#include "base/bind.h" #include "base/check_op.h" #include "base/command_line.h" #include "base/feature_list.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/path_service.h" #include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/metrics/chromeos_family_link_user_metrics_provider.cc b/chrome/browser/metrics/chromeos_family_link_user_metrics_provider.cc index 73c3b4ec..0bf7f0e 100644 --- a/chrome/browser/metrics/chromeos_family_link_user_metrics_provider.cc +++ b/chrome/browser/metrics/chromeos_family_link_user_metrics_provider.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/metrics/chromeos_family_link_user_metrics_provider.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/metrics/histogram_functions.h" #include "chrome/browser/ash/profiles/profile_helper.h"
diff --git a/chrome/browser/metrics/chromeos_family_link_user_metrics_provider_browsertest.cc b/chrome/browser/metrics/chromeos_family_link_user_metrics_provider_browsertest.cc index 47fcb53..34c2b3fb 100644 --- a/chrome/browser/metrics/chromeos_family_link_user_metrics_provider_browsertest.cc +++ b/chrome/browser/metrics/chromeos_family_link_user_metrics_provider_browsertest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/metrics/chromeos_family_link_user_metrics_provider.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h"
diff --git a/chrome/browser/metrics/chromeos_metrics_provider.cc b/chrome/browser/metrics/chromeos_metrics_provider.cc index c5f64520..470e9055 100644 --- a/chrome/browser/metrics/chromeos_metrics_provider.cc +++ b/chrome/browser/metrics/chromeos_metrics_provider.cc
@@ -13,10 +13,10 @@ #include "ash/constants/ash_features.h" #include "ash/constants/ash_pref_names.h" #include "base/barrier_closure.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/feature_list.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/hash/md5.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h"
diff --git a/chrome/browser/metrics/chromeos_system_profile_provider.cc b/chrome/browser/metrics/chromeos_system_profile_provider.cc index 97f6cb4..7adc680 100644 --- a/chrome/browser/metrics/chromeos_system_profile_provider.cc +++ b/chrome/browser/metrics/chromeos_system_profile_provider.cc
@@ -6,9 +6,9 @@ #include "ash/constants/ash_pref_names.h" #include "base/barrier_closure.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/task/thread_pool.h" #include "chrome/browser/ash/login/demo_mode/demo_session.h" #include "chrome/browser/ash/login/users/chrome_user_manager_util.h"
diff --git a/chrome/browser/metrics/chromeos_system_profile_provider_unittest.cc b/chrome/browser/metrics/chromeos_system_profile_provider_unittest.cc index 758acbe9..63d4d5c 100644 --- a/chrome/browser/metrics/chromeos_system_profile_provider_unittest.cc +++ b/chrome/browser/metrics/chromeos_system_profile_provider_unittest.cc
@@ -8,7 +8,7 @@ #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/run_loop.h" #include "base/test/scoped_feature_list.h"
diff --git a/chrome/browser/metrics/cros_healthd_metrics_provider.cc b/chrome/browser/metrics/cros_healthd_metrics_provider.cc index b06ca9fa..85ec4910 100644 --- a/chrome/browser/metrics/cros_healthd_metrics_provider.cc +++ b/chrome/browser/metrics/cros_healthd_metrics_provider.cc
@@ -7,8 +7,8 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/strings/string_util.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/metrics/cros_healthd_metrics_provider.h b/chrome/browser/metrics/cros_healthd_metrics_provider.h index 0d6e15a..e0874691 100644 --- a/chrome/browser/metrics/cros_healthd_metrics_provider.h +++ b/chrome/browser/metrics/cros_healthd_metrics_provider.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_METRICS_CROS_HEALTHD_METRICS_PROVIDER_H_ #define CHROME_BROWSER_METRICS_CROS_HEALTHD_METRICS_PROVIDER_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/gtest_prod_util.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h"
diff --git a/chrome/browser/metrics/cros_healthd_metrics_provider_unittest.cc b/chrome/browser/metrics/cros_healthd_metrics_provider_unittest.cc index 8df2503..f6c73d0 100644 --- a/chrome/browser/metrics/cros_healthd_metrics_provider_unittest.cc +++ b/chrome/browser/metrics/cros_healthd_metrics_provider_unittest.cc
@@ -8,7 +8,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/test/bind.h" #include "base/test/task_environment.h" #include "base/time/time.h"
diff --git a/chrome/browser/metrics/desktop_session_duration/audible_contents_tracker.h b/chrome/browser/metrics/desktop_session_duration/audible_contents_tracker.h index 8f5921f..d0ed583 100644 --- a/chrome/browser/metrics/desktop_session_duration/audible_contents_tracker.h +++ b/chrome/browser/metrics/desktop_session_duration/audible_contents_tracker.h
@@ -7,7 +7,7 @@ #include <set> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/ui/browser_list_observer.h" #include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
diff --git a/chrome/browser/metrics/desktop_session_duration/chrome_visibility_observer.cc b/chrome/browser/metrics/desktop_session_duration/chrome_visibility_observer.cc index bc5acdd..e836dd2 100644 --- a/chrome/browser/metrics/desktop_session_duration/chrome_visibility_observer.cc +++ b/chrome/browser/metrics/desktop_session_duration/chrome_visibility_observer.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/metrics/desktop_session_duration/chrome_visibility_observer.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/singleton.h" #include "base/strings/string_number_conversions.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.cc b/chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.cc index f95f298..6eb14e9d 100644 --- a/chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.cc +++ b/chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/metrics/histogram_macros.h" #include "base/observer_list.h"
diff --git a/chrome/browser/metrics/desktop_session_duration/touch_mode_stats_tracker.cc b/chrome/browser/metrics/desktop_session_duration/touch_mode_stats_tracker.cc index d4bd209..45946ae 100644 --- a/chrome/browser/metrics/desktop_session_duration/touch_mode_stats_tracker.cc +++ b/chrome/browser/metrics/desktop_session_duration/touch_mode_stats_tracker.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/metrics/desktop_session_duration/touch_mode_stats_tracker.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/metrics/histogram_functions.h" #include "base/no_destructor.h"
diff --git a/chrome/browser/metrics/extensions_metrics_provider_unittest.cc b/chrome/browser/metrics/extensions_metrics_provider_unittest.cc index 2593340..77628a4 100644 --- a/chrome/browser/metrics/extensions_metrics_provider_unittest.cc +++ b/chrome/browser/metrics/extensions_metrics_provider_unittest.cc
@@ -9,9 +9,9 @@ #include <memory> #include <string> -#include "base/bind.h" #include "base/containers/contains.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/test/task_environment.h" #include "base/time/time.h"
diff --git a/chrome/browser/metrics/first_web_contents_profiler.cc b/chrome/browser/metrics/first_web_contents_profiler.cc index d2cc963..97fba42 100644 --- a/chrome/browser/metrics/first_web_contents_profiler.cc +++ b/chrome/browser/metrics/first_web_contents_profiler.cc
@@ -7,8 +7,8 @@ #include <memory> #include <string> -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/metrics/histogram_functions.h" #include "base/time/time.h"
diff --git a/chrome/browser/metrics/google_update_metrics_provider_win.h b/chrome/browser/metrics/google_update_metrics_provider_win.h index 6b204d5..0d9c61c 100644 --- a/chrome/browser/metrics/google_update_metrics_provider_win.h +++ b/chrome/browser/metrics/google_update_metrics_provider_win.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_METRICS_GOOGLE_UPDATE_METRICS_PROVIDER_WIN_H_ #define CHROME_BROWSER_METRICS_GOOGLE_UPDATE_METRICS_PROVIDER_WIN_H_ -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h" #include "chrome/installer/util/google_update_settings.h"
diff --git a/chrome/browser/metrics/incognito_observer.h b/chrome/browser/metrics/incognito_observer.h index 329b26f..9420d6b 100644 --- a/chrome/browser/metrics/incognito_observer.h +++ b/chrome/browser/metrics/incognito_observer.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_METRICS_INCOGNITO_OBSERVER_H_ #define CHROME_BROWSER_METRICS_INCOGNITO_OBSERVER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" // Encapsulates platform-specific functionality for observing events that may // cause "is incognito active?" state to change. The class takes a closure that
diff --git a/chrome/browser/metrics/incognito_observer_android.cc b/chrome/browser/metrics/incognito_observer_android.cc index 3f90422..b1b9b2ff 100644 --- a/chrome/browser/metrics/incognito_observer_android.cc +++ b/chrome/browser/metrics/incognito_observer_android.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 "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/metrics/incognito_observer.h" #include "chrome/browser/ui/android/tab_model/tab_model_list.h" #include "chrome/browser/ui/android/tab_model/tab_model_list_observer.h"
diff --git a/chrome/browser/metrics/incognito_observer_desktop.cc b/chrome/browser/metrics/incognito_observer_desktop.cc index 4059dcf..0c6294c5 100644 --- a/chrome/browser/metrics/incognito_observer_desktop.cc +++ b/chrome/browser/metrics/incognito_observer_desktop.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 "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/metrics/incognito_observer.h" #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/browser_list_observer.h"
diff --git a/chrome/browser/metrics/lacros_metrics_provider.cc b/chrome/browser/metrics/lacros_metrics_provider.cc index 11b3eb3..54b54cb86 100644 --- a/chrome/browser/metrics/lacros_metrics_provider.cc +++ b/chrome/browser/metrics/lacros_metrics_provider.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/metrics/lacros_metrics_provider.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h" #include "chrome/browser/metrics/enrollment_status.h"
diff --git a/chrome/browser/metrics/metrics_memory_details.h b/chrome/browser/metrics/metrics_memory_details.h index 3455ad9..03b161e 100644 --- a/chrome/browser/metrics/metrics_memory_details.h +++ b/chrome/browser/metrics/metrics_memory_details.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_METRICS_METRICS_MEMORY_DETAILS_H_ #define CHROME_BROWSER_METRICS_METRICS_MEMORY_DETAILS_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "build/build_config.h" #include "chrome/browser/memory_details.h"
diff --git a/chrome/browser/metrics/metrics_reporting_state.cc b/chrome/browser/metrics/metrics_reporting_state.cc index e345d21..5d20a809 100644 --- a/chrome/browser/metrics/metrics_reporting_state.cc +++ b/chrome/browser/metrics/metrics_reporting_state.cc
@@ -4,9 +4,9 @@ #include "chrome/browser/metrics/metrics_reporting_state.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/metrics/histogram_macros.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/metrics/metrics_reporting_state.h b/chrome/browser/metrics/metrics_reporting_state.h index 6b3ae5c..b486801 100644 --- a/chrome/browser/metrics/metrics_reporting_state.h +++ b/chrome/browser/metrics/metrics_reporting_state.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_METRICS_METRICS_REPORTING_STATE_H_ #define CHROME_BROWSER_METRICS_METRICS_REPORTING_STATE_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" using OnMetricsReportingCallbackType = base::OnceCallback<void(bool)>;
diff --git a/chrome/browser/metrics/metrics_reporting_state_browsertest.cc b/chrome/browser/metrics/metrics_reporting_state_browsertest.cc index a9c34084..345af57b 100644 --- a/chrome/browser/metrics/metrics_reporting_state_browsertest.cc +++ b/chrome/browser/metrics/metrics_reporting_state_browsertest.cc
@@ -7,8 +7,8 @@ #include <memory> #include <string> -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/json/json_file_value_serializer.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h"
diff --git a/chrome/browser/metrics/network_quality_estimator_provider_impl.cc b/chrome/browser/metrics/network_quality_estimator_provider_impl.cc index 2309b5eb..32105429 100644 --- a/chrome/browser/metrics/network_quality_estimator_provider_impl.cc +++ b/chrome/browser/metrics/network_quality_estimator_provider_impl.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/metrics/network_quality_estimator_provider_impl.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/sequenced_task_runner.h" #include "base/task/single_thread_task_runner.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 b10b71c..2ca942d 100644 --- a/chrome/browser/metrics/oom/out_of_memory_reporter_unittest.cc +++ b/chrome/browser/metrics/oom/out_of_memory_reporter_unittest.cc
@@ -9,11 +9,11 @@ #include <utility> #include "base/at_exit.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/files/file_util.h" #include "base/files/scoped_file.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/path_service.h" #include "base/process/kill.h"
diff --git a/chrome/browser/metrics/perf/metric_collector.cc b/chrome/browser/metrics/perf/metric_collector.cc index 21152e9..b3ca944 100644 --- a/chrome/browser/metrics/perf/metric_collector.cc +++ b/chrome/browser/metrics/perf/metric_collector.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "base/rand_util.h" #include "base/system/sys_info.h"
diff --git a/chrome/browser/metrics/perf/metric_provider.cc b/chrome/browser/metrics/perf/metric_provider.cc index 9aa4742..141b7d9 100644 --- a/chrome/browser/metrics/perf/metric_provider.cc +++ b/chrome/browser/metrics/perf/metric_provider.cc
@@ -5,8 +5,8 @@ #include "chrome/browser/metrics/perf/metric_provider.h" #include "ash/constants/ash_features.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/histogram_functions.h" #include "base/task/thread_pool.h" #include "chrome/browser/ash/profiles/profile_helper.h"
diff --git a/chrome/browser/metrics/perf/metric_provider.h b/chrome/browser/metrics/perf/metric_provider.h index f3e4eb4..d157612 100644 --- a/chrome/browser/metrics/perf/metric_provider.h +++ b/chrome/browser/metrics/perf/metric_provider.h
@@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/ptr_util.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/metrics/perf/metric_collector.h"
diff --git a/chrome/browser/metrics/perf/perf_events_collector.cc b/chrome/browser/metrics/perf/perf_events_collector.cc index d17a54c4..14b5ca5 100644 --- a/chrome/browser/metrics/perf/perf_events_collector.cc +++ b/chrome/browser/metrics/perf/perf_events_collector.cc
@@ -6,9 +6,9 @@ #include <utility> -#include "base/bind.h" #include "base/feature_list.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "base/rand_util.h" #include "base/ranges/algorithm.h"
diff --git a/chrome/browser/metrics/perf/perf_output.cc b/chrome/browser/metrics/perf/perf_output.cc index 0021cf5..04f3f258 100644 --- a/chrome/browser/metrics/perf/perf_output.cc +++ b/chrome/browser/metrics/perf/perf_output.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/metrics/perf/perf_output.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/task/thread_pool.h" #include "chromeos/ash/components/dbus/debug_daemon/debug_daemon_client.h" #include "dbus/bus.h"
diff --git a/chrome/browser/metrics/perf/profile_provider_chromeos.cc b/chrome/browser/metrics/perf/profile_provider_chromeos.cc index 42b04cad..1859f0b 100644 --- a/chrome/browser/metrics/perf/profile_provider_chromeos.cc +++ b/chrome/browser/metrics/perf/profile_provider_chromeos.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/metrics/perf/profile_provider_chromeos.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/metrics/perf/metric_provider.h"
diff --git a/chrome/browser/metrics/perf/profile_provider_unittest_main.cc b/chrome/browser/metrics/perf/profile_provider_unittest_main.cc index b57a1824..12c0eeb 100644 --- a/chrome/browser/metrics/perf/profile_provider_unittest_main.cc +++ b/chrome/browser/metrics/perf/profile_provider_unittest_main.cc
@@ -6,9 +6,9 @@ #include <tuple> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/field_trial.h" #include "base/metrics/statistics_recorder.h" #include "base/run_loop.h"
diff --git a/chrome/browser/metrics/power/battery_discharge_reporter.cc b/chrome/browser/metrics/power/battery_discharge_reporter.cc index 0ef495c..65a5f9b 100644 --- a/chrome/browser/metrics/power/battery_discharge_reporter.cc +++ b/chrome/browser/metrics/power/battery_discharge_reporter.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "chrome/browser/metrics/power/power_metrics.h" #include "chrome/browser/metrics/power/process_metrics_recorder_util.h"
diff --git a/chrome/browser/metrics/power/power_metrics_provider_mac.mm b/chrome/browser/metrics/power/power_metrics_provider_mac.mm index f0ad1b2..02a289c 100644 --- a/chrome/browser/metrics/power/power_metrics_provider_mac.mm +++ b/chrome/browser/metrics/power/power_metrics_provider_mac.mm
@@ -9,7 +9,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h"
diff --git a/chrome/browser/metrics/power/power_metrics_reporter.cc b/chrome/browser/metrics/power/power_metrics_reporter.cc index 79f70a5..ec90920 100644 --- a/chrome/browser/metrics/power/power_metrics_reporter.cc +++ b/chrome/browser/metrics/power/power_metrics_reporter.cc
@@ -6,7 +6,7 @@ #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "base/strings/strcat.h" #include "base/strings/string_util.h"
diff --git a/chrome/browser/metrics/power/process_monitor.cc b/chrome/browser/metrics/power/process_monitor.cc index 9ea5d9a..5453abd 100644 --- a/chrome/browser/metrics/power/process_monitor.cc +++ b/chrome/browser/metrics/power/process_monitor.cc
@@ -8,7 +8,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/metrics/histogram_functions.h" #include "base/observer_list.h"
diff --git a/chrome/browser/metrics/process_memory_metrics_emitter.cc b/chrome/browser/metrics/process_memory_metrics_emitter.cc index 93d6123..4ce00b3 100644 --- a/chrome/browser/metrics/process_memory_metrics_emitter.cc +++ b/chrome/browser/metrics/process_memory_metrics_emitter.cc
@@ -10,10 +10,10 @@ #include "base/allocator/buildflags.h" #include "base/allocator/partition_allocator/partition_alloc_buildflags.h" -#include "base/bind.h" #include "base/compiler_specific.h" #include "base/containers/flat_map.h" #include "base/containers/flat_set.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h" #include "base/process/process_metrics.h"
diff --git a/chrome/browser/metrics/process_memory_metrics_emitter.h b/chrome/browser/metrics/process_memory_metrics_emitter.h index 7d403c5..0fc5259 100644 --- a/chrome/browser/metrics/process_memory_metrics_emitter.h +++ b/chrome/browser/metrics/process_memory_metrics_emitter.h
@@ -8,8 +8,8 @@ #include <memory> #include <vector> -#include "base/callback.h" #include "base/containers/flat_map.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "base/process/process_handle.h" #include "base/sequence_checker.h"
diff --git a/chrome/browser/metrics/structured/lacros_structured_metrics_recorder_browsertest.cc b/chrome/browser/metrics/structured/lacros_structured_metrics_recorder_browsertest.cc index ed88174..797959d 100644 --- a/chrome/browser/metrics/structured/lacros_structured_metrics_recorder_browsertest.cc +++ b/chrome/browser/metrics/structured/lacros_structured_metrics_recorder_browsertest.cc
@@ -7,7 +7,7 @@ #include <memory> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/test/bind.h" #include "base/test/scoped_run_loop_timeout.h"
diff --git a/chrome/browser/metrics/tab_stats/tab_stats_tracker.cc b/chrome/browser/metrics/tab_stats/tab_stats_tracker.cc index 23d64fa2..6ec7e22f 100644 --- a/chrome/browser/metrics/tab_stats/tab_stats_tracker.cc +++ b/chrome/browser/metrics/tab_stats/tab_stats_tracker.cc
@@ -8,8 +8,8 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h"
diff --git a/chrome/browser/metrics/ukm_background_recorder_service.cc b/chrome/browser/metrics/ukm_background_recorder_service.cc index f944fa7..eae52986 100644 --- a/chrome/browser/metrics/ukm_background_recorder_service.cc +++ b/chrome/browser/metrics/ukm_background_recorder_service.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/metrics/ukm_background_recorder_service.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "chrome/browser/history/history_service_factory.h" #include "chrome/browser/profiles/profile.h" #include "components/history/core/browser/history_service.h"
diff --git a/chrome/browser/metrics/ukm_background_recorder_service.h b/chrome/browser/metrics/ukm_background_recorder_service.h index 2e1a212f..a24ff05 100644 --- a/chrome/browser/metrics/ukm_background_recorder_service.h +++ b/chrome/browser/metrics/ukm_background_recorder_service.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_METRICS_UKM_BACKGROUND_RECORDER_SERVICE_H_ #define CHROME_BROWSER_METRICS_UKM_BACKGROUND_RECORDER_SERVICE_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/singleton.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/metrics/ukm_browsertest.cc b/chrome/browser/metrics/ukm_browsertest.cc index 407862e..c20a555 100644 --- a/chrome/browser/metrics/ukm_browsertest.cc +++ b/chrome/browser/metrics/ukm_browsertest.cc
@@ -5,8 +5,8 @@ #include <memory> #include <string> -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/strings/string_util.h"
diff --git a/chrome/browser/metrics/variations/variations_http_headers_browsertest.cc b/chrome/browser/metrics/variations/variations_http_headers_browsertest.cc index 5f82d5b..3e5a7fe 100644 --- a/chrome/browser/metrics/variations/variations_http_headers_browsertest.cc +++ b/chrome/browser/metrics/variations/variations_http_headers_browsertest.cc
@@ -7,8 +7,8 @@ #include <map> #include <memory> -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/path_service.h" #include "base/run_loop.h" #include "base/strings/escape.h"
diff --git a/chrome/browser/mouse_events_interactive_uitest.cc b/chrome/browser/mouse_events_interactive_uitest.cc index 3db580b5..f3d4e567 100644 --- a/chrome/browser/mouse_events_interactive_uitest.cc +++ b/chrome/browser/mouse_events_interactive_uitest.cc
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/callback_helpers.h" #include "base/files/file_path.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h"
diff --git a/chrome/browser/nacl_host/nacl_browser_delegate_impl.cc b/chrome/browser/nacl_host/nacl_browser_delegate_impl.cc index 6f0c3ec..14f55f19 100644 --- a/chrome/browser/nacl_host/nacl_browser_delegate_impl.cc +++ b/chrome/browser/nacl_host/nacl_browser_delegate_impl.cc
@@ -8,8 +8,8 @@ #include <vector> -#include "base/bind.h" #include "base/cxx17_backports.h" +#include "base/functional/bind.h" #include "base/path_service.h" #include "base/strings/string_split.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/nacl_host/test/gdb_debug_stub_browsertest.cc b/chrome/browser/nacl_host/test/gdb_debug_stub_browsertest.cc index 1c3663c..814ec52 100644 --- a/chrome/browser/nacl_host/test/gdb_debug_stub_browsertest.cc +++ b/chrome/browser/nacl_host/test/gdb_debug_stub_browsertest.cc
@@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/bind.h" #include "base/command_line.h" #include "base/environment.h" +#include "base/functional/bind.h" #include "base/path_service.h" #include "base/process/kill.h" #include "base/process/launch.h"
diff --git a/chrome/browser/navigation_predictor/anchor_element_preloader.cc b/chrome/browser/navigation_predictor/anchor_element_preloader.cc index 4aaddcb..cadaff7 100644 --- a/chrome/browser/navigation_predictor/anchor_element_preloader.cc +++ b/chrome/browser/navigation_predictor/anchor_element_preloader.cc
@@ -3,7 +3,7 @@ // found in the LICENSE file. #include "chrome/browser/navigation_predictor/anchor_element_preloader.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/metrics/histogram_functions.h" #include "chrome/browser/predictors/loading_predictor.h" #include "chrome/browser/predictors/loading_predictor_factory.h"
diff --git a/chrome/browser/navigation_predictor/navigation_predictor_preconnect_client.cc b/chrome/browser/navigation_predictor/navigation_predictor_preconnect_client.cc index 8185d64..30b59a4 100644 --- a/chrome/browser/navigation_predictor/navigation_predictor_preconnect_client.cc +++ b/chrome/browser/navigation_predictor/navigation_predictor_preconnect_client.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/metrics/field_trial_params.h" #include "base/metrics/histogram_macros.h" #include "base/time/time.h"
diff --git a/chrome/browser/navigation_predictor/search_engine_preconnector.cc b/chrome/browser/navigation_predictor/search_engine_preconnector.cc index 75bfedf3..61bf6a6 100644 --- a/chrome/browser/navigation_predictor/search_engine_preconnector.cc +++ b/chrome/browser/navigation_predictor/search_engine_preconnector.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/navigation_predictor/search_engine_preconnector.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/field_trial_params.h" #include "base/metrics/histogram_functions.h" #include "base/time/time.h"
diff --git a/chrome/browser/nearby_sharing/bluetooth_advertising_interval_client.cc b/chrome/browser/nearby_sharing/bluetooth_advertising_interval_client.cc index ec063fe..f6a77a8 100644 --- a/chrome/browser/nearby_sharing/bluetooth_advertising_interval_client.cc +++ b/chrome/browser/nearby_sharing/bluetooth_advertising_interval_client.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/time/time.h" #include "chrome/browser/nearby_sharing/logging/logging.h" #include "device/bluetooth/bluetooth_adapter.h"
diff --git a/chrome/browser/nearby_sharing/bluetooth_advertising_interval_client.h b/chrome/browser/nearby_sharing/bluetooth_advertising_interval_client.h index 9a7fe805..172df9a9 100644 --- a/chrome/browser/nearby_sharing/bluetooth_advertising_interval_client.h +++ b/chrome/browser/nearby_sharing/bluetooth_advertising_interval_client.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_NEARBY_SHARING_BLUETOOTH_ADVERTISING_INTERVAL_CLIENT_H_ #define CHROME_BROWSER_NEARBY_SHARING_BLUETOOTH_ADVERTISING_INTERVAL_CLIENT_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "device/bluetooth/bluetooth_advertisement.h"
diff --git a/chrome/browser/nearby_sharing/certificates/nearby_share_certificate_manager.h b/chrome/browser/nearby_sharing/certificates/nearby_share_certificate_manager.h index d60cace1..0e5aae5 100644 --- a/chrome/browser/nearby_sharing/certificates/nearby_share_certificate_manager.h +++ b/chrome/browser/nearby_sharing/certificates/nearby_share_certificate_manager.h
@@ -7,8 +7,8 @@ #include <vector> -#include "base/callback.h" #include "base/containers/span.h" +#include "base/functional/callback.h" #include "base/observer_list.h" #include "base/observer_list_types.h" #include "chrome/browser/nearby_sharing/certificates/nearby_share_decrypted_public_certificate.h"
diff --git a/chrome/browser/nearby_sharing/certificates/nearby_share_certificate_manager_impl.cc b/chrome/browser/nearby_sharing/certificates/nearby_share_certificate_manager_impl.cc index 3c92397..849e0dd4 100644 --- a/chrome/browser/nearby_sharing/certificates/nearby_share_certificate_manager_impl.cc +++ b/chrome/browser/nearby_sharing/certificates/nearby_share_certificate_manager_impl.cc
@@ -7,10 +7,10 @@ #include <array> #include <string> -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" #include "base/containers/flat_map.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/ptr_util.h" #include "base/metrics/histogram_functions.h" #include "base/notreached.h"
diff --git a/chrome/browser/nearby_sharing/certificates/nearby_share_certificate_storage.h b/chrome/browser/nearby_sharing/certificates/nearby_share_certificate_storage.h index 15e4f52b..0b6f685d 100644 --- a/chrome/browser/nearby_sharing/certificates/nearby_share_certificate_storage.h +++ b/chrome/browser/nearby_sharing/certificates/nearby_share_certificate_storage.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_NEARBY_SHARING_CERTIFICATES_NEARBY_SHARE_CERTIFICATE_STORAGE_H_ #define CHROME_BROWSER_NEARBY_SHARING_CERTIFICATES_NEARBY_SHARE_CERTIFICATE_STORAGE_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/time/time.h" #include "chrome/browser/nearby_sharing/certificates/nearby_share_private_certificate.h" #include "chrome/browser/nearby_sharing/proto/rpc_resources.pb.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 51f6fa0..b478b585 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
@@ -6,7 +6,7 @@ #include <string> #include "base/base64url.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/json/values_util.h" #include "base/run_loop.h" #include "base/task/sequenced_task_runner.h"
diff --git a/chrome/browser/nearby_sharing/client/fake_nearby_share_client.h b/chrome/browser/nearby_sharing/client/fake_nearby_share_client.h index 663fd00..baafd63 100644 --- a/chrome/browser/nearby_sharing/client/fake_nearby_share_client.h +++ b/chrome/browser/nearby_sharing/client/fake_nearby_share_client.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/nearby_sharing/client/nearby_share_client.h" #include "chrome/browser/nearby_sharing/proto/certificate_rpc.pb.h" #include "chrome/browser/nearby_sharing/proto/contact_rpc.pb.h"
diff --git a/chrome/browser/nearby_sharing/client/nearby_share_api_call_flow.h b/chrome/browser/nearby_sharing/client/nearby_share_api_call_flow.h index d36d383..a5074fe1 100644 --- a/chrome/browser/nearby_sharing/client/nearby_share_api_call_flow.h +++ b/chrome/browser/nearby_sharing/client/nearby_share_api_call_flow.h
@@ -9,7 +9,7 @@ #include <utility> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "chrome/browser/nearby_sharing/common/nearby_share_http_result.h" #include "net/traffic_annotation/network_traffic_annotation.h"
diff --git a/chrome/browser/nearby_sharing/client/nearby_share_api_call_flow_impl.h b/chrome/browser/nearby_sharing/client/nearby_share_api_call_flow_impl.h index fa75137..2ee4382 100644 --- a/chrome/browser/nearby_sharing/client/nearby_share_api_call_flow_impl.h +++ b/chrome/browser/nearby_sharing/client/nearby_share_api_call_flow_impl.h
@@ -10,7 +10,7 @@ #include <utility> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/nearby_sharing/client/nearby_share_api_call_flow.h" #include "google_apis/gaia/oauth2_api_call_flow.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/chrome/browser/nearby_sharing/client/nearby_share_api_call_flow_impl_unittest.cc b/chrome/browser/nearby_sharing/client/nearby_share_api_call_flow_impl_unittest.cc index bc4fdcf..8383191 100644 --- a/chrome/browser/nearby_sharing/client/nearby_share_api_call_flow_impl_unittest.cc +++ b/chrome/browser/nearby_sharing/client/nearby_share_api_call_flow_impl_unittest.cc
@@ -7,7 +7,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/no_destructor.h" #include "base/test/task_environment.h" #include "chrome/browser/nearby_sharing/client/nearby_share_api_call_flow_impl.h"
diff --git a/chrome/browser/nearby_sharing/client/nearby_share_client.h b/chrome/browser/nearby_sharing/client/nearby_share_client.h index 003ae84..3f1820d 100644 --- a/chrome/browser/nearby_sharing/client/nearby_share_client.h +++ b/chrome/browser/nearby_sharing/client/nearby_share_client.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "chrome/browser/nearby_sharing/common/nearby_share_http_result.h" namespace nearbyshare {
diff --git a/chrome/browser/nearby_sharing/client/nearby_share_client_impl.cc b/chrome/browser/nearby_sharing/client/nearby_share_client_impl.cc index 5b6c059f..bf0a845 100644 --- a/chrome/browser/nearby_sharing/client/nearby_share_client_impl.cc +++ b/chrome/browser/nearby_sharing/client/nearby_share_client_impl.cc
@@ -7,8 +7,8 @@ #include <memory> #include "base/base64url.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/strings/string_number_conversions.h" #include "chrome/browser/nearby_sharing/client/nearby_share_api_call_flow_impl.h"
diff --git a/chrome/browser/nearby_sharing/client/nearby_share_client_impl.h b/chrome/browser/nearby_sharing/client/nearby_share_client_impl.h index 3b00d91a..430274ea 100644 --- a/chrome/browser/nearby_sharing/client/nearby_share_client_impl.h +++ b/chrome/browser/nearby_sharing/client/nearby_share_client_impl.h
@@ -10,7 +10,7 @@ #include <utility> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/nearby_sharing/client/nearby_share_api_call_flow.h" #include "chrome/browser/nearby_sharing/client/nearby_share_client.h"
diff --git a/chrome/browser/nearby_sharing/client/nearby_share_client_impl_unittest.cc b/chrome/browser/nearby_sharing/client/nearby_share_client_impl_unittest.cc index e74c5f81..fbb5803c 100644 --- a/chrome/browser/nearby_sharing/client/nearby_share_client_impl_unittest.cc +++ b/chrome/browser/nearby_sharing/client/nearby_share_client_impl_unittest.cc
@@ -6,8 +6,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/strings/string_number_conversions.h" #include "base/test/gtest_util.h"
diff --git a/chrome/browser/nearby_sharing/contacts/fake_nearby_share_contact_downloader.h b/chrome/browser/nearby_sharing/contacts/fake_nearby_share_contact_downloader.h index 93ea22ac..5df6c83c 100644 --- a/chrome/browser/nearby_sharing/contacts/fake_nearby_share_contact_downloader.h +++ b/chrome/browser/nearby_sharing/contacts/fake_nearby_share_contact_downloader.h
@@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/time/time.h" #include "chrome/browser/nearby_sharing/contacts/nearby_share_contact_downloader.h" #include "chrome/browser/nearby_sharing/contacts/nearby_share_contact_downloader_impl.h"
diff --git a/chrome/browser/nearby_sharing/contacts/nearby_share_contact_downloader.h b/chrome/browser/nearby_sharing/contacts/nearby_share_contact_downloader.h index 4c404e4..34afa11 100644 --- a/chrome/browser/nearby_sharing/contacts/nearby_share_contact_downloader.h +++ b/chrome/browser/nearby_sharing/contacts/nearby_share_contact_downloader.h
@@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/nearby_sharing/proto/rpc_resources.pb.h" // Downloads the user's contact list from the server. NOTE: An instance should
diff --git a/chrome/browser/nearby_sharing/contacts/nearby_share_contact_manager.h b/chrome/browser/nearby_sharing/contacts/nearby_share_contact_manager.h index 6c959a49..42fd712 100644 --- a/chrome/browser/nearby_sharing/contacts/nearby_share_contact_manager.h +++ b/chrome/browser/nearby_sharing/contacts/nearby_share_contact_manager.h
@@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/observer_list.h" #include "base/observer_list_types.h" #include "chrome/browser/nearby_sharing/proto/rpc_resources.pb.h"
diff --git a/chrome/browser/nearby_sharing/contacts/nearby_share_contact_manager_impl.h b/chrome/browser/nearby_sharing/contacts/nearby_share_contact_manager_impl.h index 6df57799..a97c099 100644 --- a/chrome/browser/nearby_sharing/contacts/nearby_share_contact_manager_impl.h +++ b/chrome/browser/nearby_sharing/contacts/nearby_share_contact_manager_impl.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/nearby_sharing/contacts/nearby_share_contact_manager.h" #include "chrome/browser/nearby_sharing/proto/rpc_resources.pb.h" #include "mojo/public/cpp/bindings/pending_receiver.h"
diff --git a/chrome/browser/nearby_sharing/fake_nearby_connections_manager.h b/chrome/browser/nearby_sharing/fake_nearby_connections_manager.h index 3c751e9e2..2cb2f0e9 100644 --- a/chrome/browser/nearby_sharing/fake_nearby_connections_manager.h +++ b/chrome/browser/nearby_sharing/fake_nearby_connections_manager.h
@@ -11,7 +11,7 @@ #include <utility> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/nearby_sharing/public/cpp/nearby_connections_manager.h" #include "chromeos/ash/services/nearby/public/mojom/nearby_connections.mojom.h"
diff --git a/chrome/browser/nearby_sharing/fast_initiation/fast_initiation_advertiser.cc b/chrome/browser/nearby_sharing/fast_initiation/fast_initiation_advertiser.cc index 764d8aef..bec2a69 100644 --- a/chrome/browser/nearby_sharing/fast_initiation/fast_initiation_advertiser.cc +++ b/chrome/browser/nearby_sharing/fast_initiation/fast_initiation_advertiser.cc
@@ -6,7 +6,7 @@ #include <string> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "chrome/browser/nearby_sharing/fast_initiation/constants.h"
diff --git a/chrome/browser/nearby_sharing/fast_initiation/fast_initiation_advertiser_unittest.cc b/chrome/browser/nearby_sharing/fast_initiation/fast_initiation_advertiser_unittest.cc index 474f3bac..89df726d 100644 --- a/chrome/browser/nearby_sharing/fast_initiation/fast_initiation_advertiser_unittest.cc +++ b/chrome/browser/nearby_sharing/fast_initiation/fast_initiation_advertiser_unittest.cc
@@ -8,7 +8,7 @@ #include <utility> #include <vector> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/test/bind.h" #include "base/time/time.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 9fb7172..a348bb36e 100644 --- a/chrome/browser/nearby_sharing/fast_initiation/fast_initiation_scanner.h +++ b/chrome/browser/nearby_sharing/fast_initiation/fast_initiation_scanner.h
@@ -8,8 +8,8 @@ #include <memory> #include <string> -#include "base/callback.h" #include "base/containers/flat_set.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h"
diff --git a/chrome/browser/nearby_sharing/firewall_hole/nearby_connections_firewall_hole_factory.cc b/chrome/browser/nearby_sharing/firewall_hole/nearby_connections_firewall_hole_factory.cc index b7ca219..f453f4e 100644 --- a/chrome/browser/nearby_sharing/firewall_hole/nearby_connections_firewall_hole_factory.cc +++ b/chrome/browser/nearby_sharing/firewall_hole/nearby_connections_firewall_hole_factory.cc
@@ -7,7 +7,7 @@ #include "chrome/browser/nearby_sharing/firewall_hole/nearby_connections_firewall_hole_factory.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "chrome/browser/nearby_sharing/firewall_hole/nearby_connections_firewall_hole.h" #include "chromeos/ash/components/network/firewall_hole.h"
diff --git a/chrome/browser/nearby_sharing/firewall_hole/nearby_connections_firewall_hole_factory_unittest.cc b/chrome/browser/nearby_sharing/firewall_hole/nearby_connections_firewall_hole_factory_unittest.cc index 5381e075..a035cc0b 100644 --- a/chrome/browser/nearby_sharing/firewall_hole/nearby_connections_firewall_hole_factory_unittest.cc +++ b/chrome/browser/nearby_sharing/firewall_hole/nearby_connections_firewall_hole_factory_unittest.cc
@@ -7,7 +7,7 @@ #include <memory> #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/test/task_environment.h" #include "chromeos/ash/services/nearby/public/cpp/tcp_server_socket_port.h"
diff --git a/chrome/browser/nearby_sharing/incoming_frames_reader.h b/chrome/browser/nearby_sharing/incoming_frames_reader.h index 041ec85..e93286f 100644 --- a/chrome/browser/nearby_sharing/incoming_frames_reader.h +++ b/chrome/browser/nearby_sharing/incoming_frames_reader.h
@@ -8,8 +8,8 @@ #include <map> #include <vector> -#include "base/callback_forward.h" #include "base/cancelable_callback.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h" #include "base/time/time.h"
diff --git a/chrome/browser/nearby_sharing/instantmessaging/receive_messages_express.cc b/chrome/browser/nearby_sharing/instantmessaging/receive_messages_express.cc index c855de9..8990cfa 100644 --- a/chrome/browser/nearby_sharing/instantmessaging/receive_messages_express.cc +++ b/chrome/browser/nearby_sharing/instantmessaging/receive_messages_express.cc
@@ -6,8 +6,8 @@ #include <sstream> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/metrics/histogram_functions.h" #include "base/strings/stringprintf.h" #include "chrome/browser/nearby_sharing/common/nearby_share_http_result.h"
diff --git a/chrome/browser/nearby_sharing/instantmessaging/receive_messages_express.h b/chrome/browser/nearby_sharing/instantmessaging/receive_messages_express.h index eba1a73..46aa76a 100644 --- a/chrome/browser/nearby_sharing/instantmessaging/receive_messages_express.h +++ b/chrome/browser/nearby_sharing/instantmessaging/receive_messages_express.h
@@ -7,7 +7,7 @@ #include <cstdint> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h"
diff --git a/chrome/browser/nearby_sharing/instantmessaging/send_message_express.h b/chrome/browser/nearby_sharing/instantmessaging/send_message_express.h index 2703da9..c7b5b60 100644 --- a/chrome/browser/nearby_sharing/instantmessaging/send_message_express.h +++ b/chrome/browser/nearby_sharing/instantmessaging/send_message_express.h
@@ -9,7 +9,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/nearby_sharing/instantmessaging/token_fetcher.h"
diff --git a/chrome/browser/nearby_sharing/instantmessaging/stream_parser.h b/chrome/browser/nearby_sharing/instantmessaging/stream_parser.h index e9277cc..65baff67 100644 --- a/chrome/browser/nearby_sharing/instantmessaging/stream_parser.h +++ b/chrome/browser/nearby_sharing/instantmessaging/stream_parser.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/strings/string_piece.h" #include "chrome/browser/nearby_sharing/instantmessaging/proto/instantmessaging.pb.h"
diff --git a/chrome/browser/nearby_sharing/instantmessaging/stream_parser_unittest.cc b/chrome/browser/nearby_sharing/instantmessaging/stream_parser_unittest.cc index e3784b9..900a209 100644 --- a/chrome/browser/nearby_sharing/instantmessaging/stream_parser_unittest.cc +++ b/chrome/browser/nearby_sharing/instantmessaging/stream_parser_unittest.cc
@@ -7,8 +7,8 @@ #include <string> #include <vector> -#include "base/bind.h" #include "base/cxx17_backports.h" +#include "base/functional/bind.h" #include "chrome/browser/nearby_sharing/instantmessaging/proto/instantmessaging.pb.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/nearby_sharing/instantmessaging/token_fetcher.h b/chrome/browser/nearby_sharing/instantmessaging/token_fetcher.h index 2cfc968a..bbea78c9 100644 --- a/chrome/browser/nearby_sharing/instantmessaging/token_fetcher.h +++ b/chrome/browser/nearby_sharing/instantmessaging/token_fetcher.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "components/signin/public/identity_manager/access_token_info.h" #include "components/signin/public/identity_manager/identity_manager.h"
diff --git a/chrome/browser/nearby_sharing/local_device_data/nearby_share_device_data_updater.h b/chrome/browser/nearby_sharing/local_device_data/nearby_share_device_data_updater.h index 3258582..0c37f369 100644 --- a/chrome/browser/nearby_sharing/local_device_data/nearby_share_device_data_updater.h +++ b/chrome/browser/nearby_sharing/local_device_data/nearby_share_device_data_updater.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/callback.h" #include "base/containers/queue.h" +#include "base/functional/callback.h" #include "chrome/browser/nearby_sharing/proto/device_rpc.pb.h" #include "chrome/browser/nearby_sharing/proto/rpc_resources.pb.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/chrome/browser/nearby_sharing/local_device_data/nearby_share_local_device_data_manager.h b/chrome/browser/nearby_sharing/local_device_data/nearby_share_local_device_data_manager.h index 870d537..e6ce8f1 100644 --- a/chrome/browser/nearby_sharing/local_device_data/nearby_share_local_device_data_manager.h +++ b/chrome/browser/nearby_sharing/local_device_data/nearby_share_local_device_data_manager.h
@@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/observer_list.h" #include "base/observer_list_types.h" #include "chrome/browser/nearby_sharing/proto/rpc_resources.pb.h"
diff --git a/chrome/browser/nearby_sharing/local_device_data/nearby_share_local_device_data_manager_impl.cc b/chrome/browser/nearby_sharing/local_device_data/nearby_share_local_device_data_manager_impl.cc index 4d4792c4..01251a3 100644 --- a/chrome/browser/nearby_sharing/local_device_data/nearby_share_local_device_data_manager_impl.cc +++ b/chrome/browser/nearby_sharing/local_device_data/nearby_share_local_device_data_manager_impl.cc
@@ -7,8 +7,8 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/notreached.h" #include "base/rand_util.h"
diff --git a/chrome/browser/nearby_sharing/local_device_data/nearby_share_local_device_data_manager_impl.h b/chrome/browser/nearby_sharing/local_device_data/nearby_share_local_device_data_manager_impl.h index c33a8c6..cbc3c28 100644 --- a/chrome/browser/nearby_sharing/local_device_data/nearby_share_local_device_data_manager_impl.h +++ b/chrome/browser/nearby_sharing/local_device_data/nearby_share_local_device_data_manager_impl.h
@@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/nearby_sharing/local_device_data/nearby_share_local_device_data_manager.h" #include "chrome/browser/nearby_sharing/proto/device_rpc.pb.h" #include "chrome/browser/nearby_sharing/proto/rpc_resources.pb.h"
diff --git a/chrome/browser/nearby_sharing/nearby_confirmation_manager.cc b/chrome/browser/nearby_sharing/nearby_confirmation_manager.cc index 25815ee1..b2bff98e 100644 --- a/chrome/browser/nearby_sharing/nearby_confirmation_manager.cc +++ b/chrome/browser/nearby_sharing/nearby_confirmation_manager.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/nearby_sharing/nearby_confirmation_manager.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/nearby_sharing/nearby_sharing_service.h" #include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/nearby_sharing/nearby_connections_manager_impl.cc b/chrome/browser/nearby_sharing/nearby_connections_manager_impl.cc index 737c1eed..155e87e 100644 --- a/chrome/browser/nearby_sharing/nearby_connections_manager_impl.cc +++ b/chrome/browser/nearby_sharing/nearby_connections_manager_impl.cc
@@ -4,9 +4,9 @@ #include "chrome/browser/nearby_sharing/nearby_connections_manager_impl.h" -#include "base/callback_helpers.h" #include "base/containers/contains.h" #include "base/files/file_util.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/histogram_functions.h" #include "base/strings/string_number_conversions.h" #include "base/unguessable_token.h"
diff --git a/chrome/browser/nearby_sharing/nearby_connections_manager_impl_unittest.cc b/chrome/browser/nearby_sharing/nearby_connections_manager_impl_unittest.cc index 4d356c37..ddac898 100644 --- a/chrome/browser/nearby_sharing/nearby_connections_manager_impl_unittest.cc +++ b/chrome/browser/nearby_sharing/nearby_connections_manager_impl_unittest.cc
@@ -7,8 +7,8 @@ #include <algorithm> #include <memory> -#include "base/callback_helpers.h" #include "base/files/file_util.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/test/bind.h" #include "base/test/mock_callback.h"
diff --git a/chrome/browser/nearby_sharing/nearby_file_handler.h b/chrome/browser/nearby_sharing/nearby_file_handler.h index a82dcd0..ecfe93d 100644 --- a/chrome/browser/nearby_sharing/nearby_file_handler.h +++ b/chrome/browser/nearby_sharing/nearby_file_handler.h
@@ -8,9 +8,9 @@ #include <stdint.h> #include <vector> -#include "base/callback.h" #include "base/files/file.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/task/sequenced_task_runner.h" #include "chromeos/ash/services/nearby/public/mojom/nearby_connections_types.mojom-forward.h"
diff --git a/chrome/browser/nearby_sharing/nearby_notification_handler.cc b/chrome/browser/nearby_sharing/nearby_notification_handler.cc index 4b879a28..1e128e31 100644 --- a/chrome/browser/nearby_sharing/nearby_notification_handler.cc +++ b/chrome/browser/nearby_sharing/nearby_notification_handler.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/notreached.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/nearby_sharing/nearby_notification_handler.h b/chrome/browser/nearby_sharing/nearby_notification_handler.h index 76f59b0..9e4ee33 100644 --- a/chrome/browser/nearby_sharing/nearby_notification_handler.h +++ b/chrome/browser/nearby_sharing/nearby_notification_handler.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "chrome/browser/notifications/notification_handler.h" #include "third_party/abseil-cpp/absl/types/optional.h" #include "url/gurl.h"
diff --git a/chrome/browser/nearby_sharing/nearby_notification_manager.cc b/chrome/browser/nearby_sharing/nearby_notification_manager.cc index b77c32c..30fb34d 100644 --- a/chrome/browser/nearby_sharing/nearby_notification_manager.cc +++ b/chrome/browser/nearby_sharing/nearby_notification_manager.cc
@@ -8,8 +8,8 @@ #include "ash/constants/notifier_catalogs.h" #include "ash/public/cpp/notification_utils.h" -#include "base/callback_helpers.h" #include "base/files/file_util.h" +#include "base/functional/callback_helpers.h" #include "base/notreached.h" #include "base/strings/strcat.h" #include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/nearby_sharing/nearby_per_session_discovery_manager.cc b/chrome/browser/nearby_sharing/nearby_per_session_discovery_manager.cc index 49b9530..48339b2 100644 --- a/chrome/browser/nearby_sharing/nearby_per_session_discovery_manager.cc +++ b/chrome/browser/nearby_sharing/nearby_per_session_discovery_manager.cc
@@ -6,8 +6,8 @@ #include <string> -#include "base/callback_helpers.h" #include "base/containers/contains.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/histogram_functions.h" #include "base/ranges/algorithm.h" #include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/nearby_sharing/nearby_per_session_discovery_manager_unittest.cc b/chrome/browser/nearby_sharing/nearby_per_session_discovery_manager_unittest.cc index d84da8d..fd88837 100644 --- a/chrome/browser/nearby_sharing/nearby_per_session_discovery_manager_unittest.cc +++ b/chrome/browser/nearby_sharing/nearby_per_session_discovery_manager_unittest.cc
@@ -6,7 +6,7 @@ #include <string> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/strings/string_number_conversions.h" #include "base/test/mock_callback.h"
diff --git a/chrome/browser/nearby_sharing/nearby_receive_manager.cc b/chrome/browser/nearby_sharing/nearby_receive_manager.cc index a18e1af..8e865ac 100644 --- a/chrome/browser/nearby_sharing/nearby_receive_manager.cc +++ b/chrome/browser/nearby_sharing/nearby_receive_manager.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/nearby_sharing/nearby_receive_manager.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "chrome/browser/nearby_sharing/logging/logging.h" NearbyReceiveManager::NearbyReceiveManager(
diff --git a/chrome/browser/nearby_sharing/nearby_sharing_service.h b/chrome/browser/nearby_sharing/nearby_sharing_service.h index 09bd867f..4f1a3c0 100644 --- a/chrome/browser/nearby_sharing/nearby_sharing_service.h +++ b/chrome/browser/nearby_sharing/nearby_sharing_service.h
@@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/nearby_sharing/nearby_share_settings.h" #include "chrome/browser/nearby_sharing/share_target_discovered_callback.h" #include "chrome/browser/nearby_sharing/transfer_update_callback.h"
diff --git a/chrome/browser/nearby_sharing/nearby_sharing_service_impl.cc b/chrome/browser/nearby_sharing/nearby_sharing_service_impl.cc index 922fbea7..4412d80 100644 --- a/chrome/browser/nearby_sharing/nearby_sharing_service_impl.cc +++ b/chrome/browser/nearby_sharing/nearby_sharing_service_impl.cc
@@ -9,9 +9,9 @@ #include "ash/public/cpp/new_window_delegate.h" #include "ash/public/cpp/session/session_controller.h" #include "base/barrier_closure.h" -#include "base/bind.h" #include "base/containers/contains.h" #include "base/files/file.h" +#include "base/functional/bind.h" #include "base/hash/hash.h" #include "base/logging.h" #include "base/metrics/histogram_functions.h"
diff --git a/chrome/browser/nearby_sharing/nearby_sharing_service_impl.h b/chrome/browser/nearby_sharing/nearby_sharing_service_impl.h index e2449c5..ad04d51 100644 --- a/chrome/browser/nearby_sharing/nearby_sharing_service_impl.h +++ b/chrome/browser/nearby_sharing/nearby_sharing_service_impl.h
@@ -12,10 +12,10 @@ #include <vector> #include "ash/public/cpp/session/session_observer.h" -#include "base/callback_helpers.h" #include "base/cancelable_callback.h" #include "base/containers/flat_map.h" #include "base/containers/flat_set.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h"
diff --git a/chrome/browser/nearby_sharing/nearby_sharing_service_impl_unittest.cc b/chrome/browser/nearby_sharing/nearby_sharing_service_impl_unittest.cc index bfbcd372..28c301e2 100644 --- a/chrome/browser/nearby_sharing/nearby_sharing_service_impl_unittest.cc +++ b/chrome/browser/nearby_sharing/nearby_sharing_service_impl_unittest.cc
@@ -9,11 +9,11 @@ #include <utility> #include "base/barrier_closure.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/containers/span.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/ptr_util.h" #include "base/memory/weak_ptr.h" #include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/nearby_sharing/network_traversal_ice_config_fetcher.cc b/chrome/browser/nearby_sharing/network_traversal_ice_config_fetcher.cc index 786ca46..345caf18 100644 --- a/chrome/browser/nearby_sharing/network_traversal_ice_config_fetcher.cc +++ b/chrome/browser/nearby_sharing/network_traversal_ice_config_fetcher.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/nearby_sharing/network_traversal_ice_config_fetcher.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/json/json_reader.h" #include "base/strings/strcat.h" #include "chrome/services/sharing/public/cpp/sharing_webrtc_metrics.h"
diff --git a/chrome/browser/nearby_sharing/network_traversal_ice_config_fetcher.h b/chrome/browser/nearby_sharing/network_traversal_ice_config_fetcher.h index c6620d8..cca1642 100644 --- a/chrome/browser/nearby_sharing/network_traversal_ice_config_fetcher.h +++ b/chrome/browser/nearby_sharing/network_traversal_ice_config_fetcher.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_NEARBY_SHARING_NETWORK_TRAVERSAL_ICE_CONFIG_FETCHER_H_ #define CHROME_BROWSER_NEARBY_SHARING_NETWORK_TRAVERSAL_ICE_CONFIG_FETCHER_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/scoped_refptr.h" #include "chromeos/ash/services/nearby/public/mojom/webrtc.mojom.h" #include "url/gurl.h"
diff --git a/chrome/browser/nearby_sharing/paired_key_verification_runner.cc b/chrome/browser/nearby_sharing/paired_key_verification_runner.cc index b571e28..8073b44 100644 --- a/chrome/browser/nearby_sharing/paired_key_verification_runner.cc +++ b/chrome/browser/nearby_sharing/paired_key_verification_runner.cc
@@ -7,7 +7,7 @@ #include <iomanip> #include <iostream> -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/nearby_sharing/certificates/common.h" #include "chrome/browser/nearby_sharing/certificates/constants.h" #include "chrome/browser/nearby_sharing/logging/logging.h"
diff --git a/chrome/browser/nearby_sharing/paired_key_verification_runner.h b/chrome/browser/nearby_sharing/paired_key_verification_runner.h index 059c3d6..b0f232c 100644 --- a/chrome/browser/nearby_sharing/paired_key_verification_runner.h +++ b/chrome/browser/nearby_sharing/paired_key_verification_runner.h
@@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h" #include "chrome/browser/nearby_sharing/certificates/nearby_share_certificate_manager.h"
diff --git a/chrome/browser/nearby_sharing/paired_key_verification_runner_unittest.cc b/chrome/browser/nearby_sharing/paired_key_verification_runner_unittest.cc index 6fcf53e..83977d3 100644 --- a/chrome/browser/nearby_sharing/paired_key_verification_runner_unittest.cc +++ b/chrome/browser/nearby_sharing/paired_key_verification_runner_unittest.cc
@@ -7,8 +7,8 @@ #include <stdint.h> #include <vector> -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/test/bind.h" #include "base/time/time.h"
diff --git a/chrome/browser/nearby_sharing/payload_tracker.cc b/chrome/browser/nearby_sharing/payload_tracker.cc index 0dae3f6..1ce71c0 100644 --- a/chrome/browser/nearby_sharing/payload_tracker.cc +++ b/chrome/browser/nearby_sharing/payload_tracker.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/nearby_sharing/payload_tracker.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/nearby_sharing/common/nearby_share_features.h" #include "chrome/browser/nearby_sharing/constants.h" #include "chrome/browser/nearby_sharing/logging/logging.h"
diff --git a/chrome/browser/nearby_sharing/payload_tracker.h b/chrome/browser/nearby_sharing/payload_tracker.h index b184aaa..be1b58e 100644 --- a/chrome/browser/nearby_sharing/payload_tracker.h +++ b/chrome/browser/nearby_sharing/payload_tracker.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_NEARBY_SHARING_PAYLOAD_TRACKER_H_ #define CHROME_BROWSER_NEARBY_SHARING_PAYLOAD_TRACKER_H_ -#include "base/callback_forward.h" #include "base/containers/flat_map.h" +#include "base/functional/callback_forward.h" #include "base/time/time.h" #include "chrome/browser/nearby_sharing/attachment_info.h" #include "chrome/browser/nearby_sharing/public/cpp/nearby_connections_manager.h"
diff --git a/chrome/browser/nearby_sharing/public/cpp/nearby_connection.h b/chrome/browser/nearby_sharing/public/cpp/nearby_connection.h index 2f3da51..8832ebc 100644 --- a/chrome/browser/nearby_sharing/public/cpp/nearby_connection.h +++ b/chrome/browser/nearby_sharing/public/cpp/nearby_connection.h
@@ -8,7 +8,7 @@ #include <stdint.h> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "third_party/abseil-cpp/absl/types/optional.h" // A socket-like wrapper around Nearby Connections that allows for asynchronous
diff --git a/chrome/browser/nearby_sharing/public/cpp/nearby_connections_manager.h b/chrome/browser/nearby_sharing/public/cpp/nearby_connections_manager.h index 45cecab8..a29b63b 100644 --- a/chrome/browser/nearby_sharing/public/cpp/nearby_connections_manager.h +++ b/chrome/browser/nearby_sharing/public/cpp/nearby_connections_manager.h
@@ -9,8 +9,8 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/nearby_sharing/common/nearby_share_enums.h" #include "chrome/browser/nearby_sharing/public/cpp/nearby_connection.h"
diff --git a/chrome/browser/nearby_sharing/scheduling/nearby_share_expiration_scheduler.h b/chrome/browser/nearby_sharing/scheduling/nearby_share_expiration_scheduler.h index e1ea8e1..3a367d1 100644 --- a/chrome/browser/nearby_sharing/scheduling/nearby_share_expiration_scheduler.h +++ b/chrome/browser/nearby_sharing/scheduling/nearby_share_expiration_scheduler.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/time/time.h" #include "chrome/browser/nearby_sharing/scheduling/nearby_share_scheduler_base.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/chrome/browser/nearby_sharing/scheduling/nearby_share_expiration_scheduler_unittest.cc b/chrome/browser/nearby_sharing/scheduling/nearby_share_expiration_scheduler_unittest.cc index d0aa1bf..67e3c2f6 100644 --- a/chrome/browser/nearby_sharing/scheduling/nearby_share_expiration_scheduler_unittest.cc +++ b/chrome/browser/nearby_sharing/scheduling/nearby_share_expiration_scheduler_unittest.cc
@@ -4,8 +4,8 @@ #include <memory> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/test/task_environment.h" #include "base/time/clock.h" #include "base/time/time.h"
diff --git a/chrome/browser/nearby_sharing/scheduling/nearby_share_on_demand_scheduler_unittest.cc b/chrome/browser/nearby_sharing/scheduling/nearby_share_on_demand_scheduler_unittest.cc index 1ea2dcb..c9ac6e8 100644 --- a/chrome/browser/nearby_sharing/scheduling/nearby_share_on_demand_scheduler_unittest.cc +++ b/chrome/browser/nearby_sharing/scheduling/nearby_share_on_demand_scheduler_unittest.cc
@@ -4,7 +4,7 @@ #include <memory> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/test/task_environment.h" #include "chrome/browser/nearby_sharing/scheduling/nearby_share_on_demand_scheduler.h" #include "components/prefs/pref_registry_simple.h"
diff --git a/chrome/browser/nearby_sharing/scheduling/nearby_share_periodic_scheduler_unittest.cc b/chrome/browser/nearby_sharing/scheduling/nearby_share_periodic_scheduler_unittest.cc index 5aa0284..aff0476 100644 --- a/chrome/browser/nearby_sharing/scheduling/nearby_share_periodic_scheduler_unittest.cc +++ b/chrome/browser/nearby_sharing/scheduling/nearby_share_periodic_scheduler_unittest.cc
@@ -4,7 +4,7 @@ #include <memory> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/test/task_environment.h" #include "base/time/clock.h" #include "chrome/browser/nearby_sharing/scheduling/nearby_share_periodic_scheduler.h"
diff --git a/chrome/browser/nearby_sharing/scheduling/nearby_share_scheduler.h b/chrome/browser/nearby_sharing/scheduling/nearby_share_scheduler.h index 019618a..3c50e4b 100644 --- a/chrome/browser/nearby_sharing/scheduling/nearby_share_scheduler.h +++ b/chrome/browser/nearby_sharing/scheduling/nearby_share_scheduler.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_NEARBY_SHARING_SCHEDULING_NEARBY_SHARE_SCHEDULER_H_ #define CHROME_BROWSER_NEARBY_SHARING_SCHEDULING_NEARBY_SHARE_SCHEDULER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/time/time.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/chrome/browser/nearby_sharing/scheduling/nearby_share_scheduler_base_unittest.cc b/chrome/browser/nearby_sharing/scheduling/nearby_share_scheduler_base_unittest.cc index 7fce5e1..a6bb2d5 100644 --- a/chrome/browser/nearby_sharing/scheduling/nearby_share_scheduler_base_unittest.cc +++ b/chrome/browser/nearby_sharing/scheduling/nearby_share_scheduler_base_unittest.cc
@@ -6,7 +6,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/test/task_environment.h" #include "base/time/clock.h" #include "base/time/time.h"
diff --git a/chrome/browser/nearby_sharing/sharesheet/nearby_share_action_unittest.cc b/chrome/browser/nearby_sharing/sharesheet/nearby_share_action_unittest.cc index 7f1fec0..e4efc5d 100644 --- a/chrome/browser/nearby_sharing/sharesheet/nearby_share_action_unittest.cc +++ b/chrome/browser/nearby_sharing/sharesheet/nearby_share_action_unittest.cc
@@ -8,9 +8,9 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/files/file_path.h" #include "base/files/safe_base_name.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/file_manager/fileapi_util.h" #include "chrome/browser/ash/file_manager/path_util.h" #include "chrome/browser/nearby_sharing/file_attachment.h"
diff --git a/chrome/browser/nearby_sharing/tachyon_ice_config_fetcher.cc b/chrome/browser/nearby_sharing/tachyon_ice_config_fetcher.cc index e97ed652..3aaa630 100644 --- a/chrome/browser/nearby_sharing/tachyon_ice_config_fetcher.cc +++ b/chrome/browser/nearby_sharing/tachyon_ice_config_fetcher.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/nearby_sharing/tachyon_ice_config_fetcher.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/nearby_sharing/tachyon_ice_config_fetcher.h b/chrome/browser/nearby_sharing/tachyon_ice_config_fetcher.h index 53d7690..dd6e2a3 100644 --- a/chrome/browser/nearby_sharing/tachyon_ice_config_fetcher.h +++ b/chrome/browser/nearby_sharing/tachyon_ice_config_fetcher.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_NEARBY_SHARING_TACHYON_ICE_CONFIG_FETCHER_H_ #define CHROME_BROWSER_NEARBY_SHARING_TACHYON_ICE_CONFIG_FETCHER_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h"
diff --git a/chrome/browser/nearby_sharing/tcp_socket/nearby_connections_tcp_socket_factory.cc b/chrome/browser/nearby_sharing/tcp_socket/nearby_connections_tcp_socket_factory.cc index b9b9db1..f0cc283 100644 --- a/chrome/browser/nearby_sharing/tcp_socket/nearby_connections_tcp_socket_factory.cc +++ b/chrome/browser/nearby_sharing/tcp_socket/nearby_connections_tcp_socket_factory.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/nearby_sharing/tcp_socket/nearby_connections_tcp_socket_factory.h" -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "chromeos/ash/services/nearby/public/cpp/tcp_server_socket_port.h" #include "net/base/ip_address.h"
diff --git a/chrome/browser/nearby_sharing/tcp_socket/nearby_connections_tcp_socket_factory.h b/chrome/browser/nearby_sharing/tcp_socket/nearby_connections_tcp_socket_factory.h index 4e65548..f7b7589 100644 --- a/chrome/browser/nearby_sharing/tcp_socket/nearby_connections_tcp_socket_factory.h +++ b/chrome/browser/nearby_sharing/tcp_socket/nearby_connections_tcp_socket_factory.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_NEARBY_SHARING_TCP_SOCKET_NEARBY_CONNECTIONS_TCP_SOCKET_FACTORY_H_ #define CHROME_BROWSER_NEARBY_SHARING_TCP_SOCKET_NEARBY_CONNECTIONS_TCP_SOCKET_FACTORY_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h" #include "base/time/time.h"
diff --git a/chrome/browser/nearby_sharing/tcp_socket/nearby_connections_tcp_socket_factory_unittest.cc b/chrome/browser/nearby_sharing/tcp_socket/nearby_connections_tcp_socket_factory_unittest.cc index bacb874..c4f44589 100644 --- a/chrome/browser/nearby_sharing/tcp_socket/nearby_connections_tcp_socket_factory_unittest.cc +++ b/chrome/browser/nearby_sharing/tcp_socket/nearby_connections_tcp_socket_factory_unittest.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/test/bind.h" #include "base/test/task_environment.h"
diff --git a/chrome/browser/nearby_sharing/webrtc_signaling_messenger.cc b/chrome/browser/nearby_sharing/webrtc_signaling_messenger.cc index 80a1d44..655ff0c 100644 --- a/chrome/browser/nearby_sharing/webrtc_signaling_messenger.cc +++ b/chrome/browser/nearby_sharing/webrtc_signaling_messenger.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/nearby_sharing/webrtc_signaling_messenger.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/token.h" #include "chrome/browser/nearby_sharing/instantmessaging/proto/instantmessaging.pb.h" #include "chrome/browser/nearby_sharing/logging/logging.h"
diff --git a/chrome/browser/nearby_sharing/webrtc_signaling_messenger.h b/chrome/browser/nearby_sharing/webrtc_signaling_messenger.h index 82d9d29a..fe3bf79 100644 --- a/chrome/browser/nearby_sharing/webrtc_signaling_messenger.h +++ b/chrome/browser/nearby_sharing/webrtc_signaling_messenger.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/nearby_sharing/instantmessaging/receive_messages_express.h" #include "chrome/browser/nearby_sharing/instantmessaging/send_message_express.h" #include "chrome/browser/nearby_sharing/instantmessaging/token_fetcher.h"
diff --git a/chrome/browser/net/android_network_service_browsertest.cc b/chrome/browser/net/android_network_service_browsertest.cc index a723f680..887fc02 100644 --- a/chrome/browser/net/android_network_service_browsertest.cc +++ b/chrome/browser/net/android_network_service_browsertest.cc
@@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/bind.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/metrics/statistics_recorder.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/test_file_util.h"
diff --git a/chrome/browser/net/chrome_mojo_proxy_resolver_factory.cc b/chrome/browser/net/chrome_mojo_proxy_resolver_factory.cc index 739da23e..4798275 100644 --- a/chrome/browser/net/chrome_mojo_proxy_resolver_factory.cc +++ b/chrome/browser/net/chrome_mojo_proxy_resolver_factory.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/no_destructor.h" #include "base/task/single_thread_task_runner.h" #include "base/threading/thread_task_runner_handle.h"
diff --git a/chrome/browser/net/chrome_report_sender.cc b/chrome/browser/net/chrome_report_sender.cc index d4a070e..44c6864 100644 --- a/chrome/browser/net/chrome_report_sender.cc +++ b/chrome/browser/net/chrome_report_sender.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/net/chrome_report_sender.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "net/url_request/report_sender.h" #include "services/network/public/cpp/resource_request.h" #include "services/network/public/cpp/shared_url_loader_factory.h"
diff --git a/chrome/browser/net/chrome_report_sender.h b/chrome/browser/net/chrome_report_sender.h index 41c8e794..f11aa26 100644 --- a/chrome/browser/net/chrome_report_sender.h +++ b/chrome/browser/net/chrome_report_sender.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_NET_CHROME_REPORT_SENDER_H_ #define CHROME_BROWSER_NET_CHROME_REPORT_SENDER_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/ref_counted.h" #include "base/strings/string_piece.h" #include "net/traffic_annotation/network_traffic_annotation.h"
diff --git a/chrome/browser/net/chrome_report_sender_unittest.cc b/chrome/browser/net/chrome_report_sender_unittest.cc index 96e1483c..36b6ba90 100644 --- a/chrome/browser/net/chrome_report_sender_unittest.cc +++ b/chrome/browser/net/chrome_report_sender_unittest.cc
@@ -6,7 +6,7 @@ #include <vector> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/memory/scoped_refptr.h" #include "content/public/test/browser_task_environment.h" #include "net/base/load_flags.h"
diff --git a/chrome/browser/net/cookie_policy_browsertest.cc b/chrome/browser/net/cookie_policy_browsertest.cc index e1728ce..99268b2e 100644 --- a/chrome/browser/net/cookie_policy_browsertest.cc +++ b/chrome/browser/net/cookie_policy_browsertest.cc
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/path_service.h" #include "base/strings/escape.h" #include "base/strings/strcat.h"
diff --git a/chrome/browser/net/dns_probe_browsertest.cc b/chrome/browser/net/dns_probe_browsertest.cc index 210abd42..0c1687d 100644 --- a/chrome/browser/net/dns_probe_browsertest.cc +++ b/chrome/browser/net/dns_probe_browsertest.cc
@@ -5,8 +5,8 @@ #include <memory> #include <set> -#include "base/bind.h" #include "base/enterprise_util.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/path_service.h" #include "base/run_loop.h"
diff --git a/chrome/browser/net/dns_probe_runner.cc b/chrome/browser/net/dns_probe_runner.cc index a384946f..ad45f49 100644 --- a/chrome/browser/net/dns_probe_runner.cc +++ b/chrome/browser/net/dns_probe_runner.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "mojo/public/cpp/bindings/message.h" #include "net/base/address_list.h" #include "net/base/host_port_pair.h"
diff --git a/chrome/browser/net/dns_probe_runner.h b/chrome/browser/net/dns_probe_runner.h index 133a42c..3af71ea7 100644 --- a/chrome/browser/net/dns_probe_runner.h +++ b/chrome/browser/net/dns_probe_runner.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_NET_DNS_PROBE_RUNNER_H_ #define CHROME_BROWSER_NET_DNS_PROBE_RUNNER_H_ -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/sequence_checker.h" #include "mojo/public/cpp/bindings/receiver.h" #include "mojo/public/cpp/bindings/remote.h"
diff --git a/chrome/browser/net/dns_probe_runner_unittest.cc b/chrome/browser/net/dns_probe_runner_unittest.cc index bc8db56..9afc109c 100644 --- a/chrome/browser/net/dns_probe_runner_unittest.cc +++ b/chrome/browser/net/dns_probe_runner_unittest.cc
@@ -7,7 +7,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/weak_ptr.h" #include "base/run_loop.h" #include "chrome/browser/net/dns_probe_test_util.h"
diff --git a/chrome/browser/net/dns_probe_service.h b/chrome/browser/net/dns_probe_service.h index 3e9d817..6237234 100644 --- a/chrome/browser/net/dns_probe_service.h +++ b/chrome/browser/net/dns_probe_service.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_NET_DNS_PROBE_SERVICE_H_ #define CHROME_BROWSER_NET_DNS_PROBE_SERVICE_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "components/error_page/common/net_error_info.h" #include "components/keyed_service/core/keyed_service.h" #include "net/dns/public/dns_config_overrides.h"
diff --git a/chrome/browser/net/dns_probe_service_factory.cc b/chrome/browser/net/dns_probe_service_factory.cc index 2be7e09..64497ff 100644 --- a/chrome/browser/net/dns_probe_service_factory.cc +++ b/chrome/browser/net/dns_probe_service_factory.cc
@@ -9,7 +9,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/metrics/histogram_macros.h" #include "base/sequence_checker.h"
diff --git a/chrome/browser/net/dns_probe_service_factory_unittest.cc b/chrome/browser/net/dns_probe_service_factory_unittest.cc index 930cd4f..4bb21b9 100644 --- a/chrome/browser/net/dns_probe_service_factory_unittest.cc +++ b/chrome/browser/net/dns_probe_service_factory_unittest.cc
@@ -8,8 +8,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" #include "base/memory/weak_ptr.h" #include "base/run_loop.h" #include "base/test/simple_test_tick_clock.h"
diff --git a/chrome/browser/net/errorpage_browsertest.cc b/chrome/browser/net/errorpage_browsertest.cc index 2d67c48..390cfd9 100644 --- a/chrome/browser/net/errorpage_browsertest.cc +++ b/chrome/browser/net/errorpage_browsertest.cc
@@ -6,12 +6,12 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check_op.h" #include "base/command_line.h" #include "base/feature_list.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/memory/weak_ptr.h" #include "base/path_service.h"
diff --git a/chrome/browser/net/file_downloader.cc b/chrome/browser/net/file_downloader.cc index 6a98698..cc93eeb 100644 --- a/chrome/browser/net/file_downloader.cc +++ b/chrome/browser/net/file_downloader.cc
@@ -4,9 +4,9 @@ #include "chrome/browser/net/file_downloader.h" -#include "base/bind.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/net/file_downloader.h b/chrome/browser/net/file_downloader.h index c43b535..942ed38f 100644 --- a/chrome/browser/net/file_downloader.h +++ b/chrome/browser/net/file_downloader.h
@@ -7,8 +7,8 @@ #include <memory> -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "net/traffic_annotation/network_traffic_annotation.h"
diff --git a/chrome/browser/net/file_downloader_unittest.cc b/chrome/browser/net/file_downloader_unittest.cc index 9d045ac..7be9c6f 100644 --- a/chrome/browser/net/file_downloader_unittest.cc +++ b/chrome/browser/net/file_downloader_unittest.cc
@@ -4,10 +4,10 @@ #include "chrome/browser/net/file_downloader.h" -#include "base/bind.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/test/task_environment.h" #include "base/threading/thread_task_runner_handle.h" #include "content/public/test/test_utils.h"
diff --git a/chrome/browser/net/load_timing_browsertest.cc b/chrome/browser/net/load_timing_browsertest.cc index 7d65155..d05baec 100644 --- a/chrome/browser/net/load_timing_browsertest.cc +++ b/chrome/browser/net/load_timing_browsertest.cc
@@ -5,8 +5,8 @@ #include <memory> #include <string> -#include "base/bind.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/strings/stringprintf.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/net/net_error_diagnostics_dialog_win.cc b/chrome/browser/net/net_error_diagnostics_dialog_win.cc index 6c78085..c22bf5d 100644 --- a/chrome/browser/net/net_error_diagnostics_dialog_win.cc +++ b/chrome/browser/net/net_error_diagnostics_dialog_win.cc
@@ -12,10 +12,10 @@ #include <memory> #include <string> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/memory/weak_ptr.h" #include "base/native_library.h"
diff --git a/chrome/browser/net/net_error_tab_helper.cc b/chrome/browser/net/net_error_tab_helper.cc index ebe6f0d..264cdd8 100644 --- a/chrome/browser/net/net_error_tab_helper.cc +++ b/chrome/browser/net/net_error_tab_helper.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/net/net_error_tab_helper.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "chrome/browser/net/dns_probe_service.h" #include "chrome/browser/net/dns_probe_service_factory.h"
diff --git a/chrome/browser/net/net_error_tab_helper.h b/chrome/browser/net/net_error_tab_helper.h index 5751ba61..28c133d 100644 --- a/chrome/browser/net/net_error_tab_helper.h +++ b/chrome/browser/net/net_error_tab_helper.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/net/dns_probe_service.h" #include "chrome/common/net/net_error_page_support.mojom.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 6fec877..57efe667 100644 --- a/chrome/browser/net/netinfo_network_quality_estimator_holdback_browsertest.cc +++ b/chrome/browser/net/netinfo_network_quality_estimator_holdback_browsertest.cc
@@ -6,8 +6,8 @@ #include "base/metrics/field_trial_param_associator.h" -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/notreached.h" #include "base/run_loop.h" #include "base/test/scoped_feature_list.h"
diff --git a/chrome/browser/net/network_connection_tracker_browsertest.cc b/chrome/browser/net/network_connection_tracker_browsertest.cc index 2409221f..b827975d 100644 --- a/chrome/browser/net/network_connection_tracker_browsertest.cc +++ b/chrome/browser/net/network_connection_tracker_browsertest.cc
@@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/bind.h" #include "base/check_op.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/sequence_checker.h"
diff --git a/chrome/browser/net/network_context_configuration_browsertest.cc b/chrome/browser/net/network_context_configuration_browsertest.cc index a8e581a..6bbe7d1 100644 --- a/chrome/browser/net/network_context_configuration_browsertest.cc +++ b/chrome/browser/net/network_context_configuration_browsertest.cc
@@ -7,11 +7,11 @@ #include <unordered_set> #include <vector> -#include "base/bind.h" #include "base/command_line.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/guid.h" #include "base/location.h" #include "base/memory/raw_ptr.h"
diff --git a/chrome/browser/net/network_quality_estimator_prefs_browsertest.cc b/chrome/browser/net/network_quality_estimator_prefs_browsertest.cc index de7f5895..0a9c372 100644 --- a/chrome/browser/net/network_quality_estimator_prefs_browsertest.cc +++ b/chrome/browser/net/network_quality_estimator_prefs_browsertest.cc
@@ -5,11 +5,11 @@ #include <memory> #include <string> -#include "base/bind.h" #include "base/check_op.h" #include "base/command_line.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/path_service.h" #include "base/process/memory.h"
diff --git a/chrome/browser/net/network_quality_tracker_browsertest.cc b/chrome/browser/net/network_quality_tracker_browsertest.cc index df4bb671..512be29 100644 --- a/chrome/browser/net/network_quality_tracker_browsertest.cc +++ b/chrome/browser/net/network_quality_tracker_browsertest.cc
@@ -4,8 +4,8 @@ #include <memory> -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/task/deferred_sequenced_task_runner.h"
diff --git a/chrome/browser/net/nss_context_chromeos_browsertest.cc b/chrome/browser/net/nss_context_chromeos_browsertest.cc index a686d365..1f6acab 100644 --- a/chrome/browser/net/nss_context_chromeos_browsertest.cc +++ b/chrome/browser/net/nss_context_chromeos_browsertest.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "build/build_config.h" #include "chrome/browser/ash/login/login_manager_test.h"
diff --git a/chrome/browser/net/nss_service.cc b/chrome/browser/net/nss_service.cc index bb67767f..c388ff46 100644 --- a/chrome/browser/net/nss_service.cc +++ b/chrome/browser/net/nss_service.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/task/bind_post_task.h" #include "base/task/sequenced_task_runner.h" #include "content/public/browser/browser_task_traits.h"
diff --git a/chrome/browser/net/nss_service.h b/chrome/browser/net/nss_service.h index 0229059b..4d7cd125 100644 --- a/chrome/browser/net/nss_service.h +++ b/chrome/browser/net/nss_service.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "build/buildflag.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/net/nss_service_chromeos.cc b/chrome/browser/net/nss_service_chromeos.cc index 5ce26c4..c1d19ba3 100644 --- a/chrome/browser/net/nss_service_chromeos.cc +++ b/chrome/browser/net/nss_service_chromeos.cc
@@ -7,11 +7,11 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/callback_list.h" #include "base/check.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/memory/weak_ptr.h" #include "base/supports_user_data.h"
diff --git a/chrome/browser/net/nss_service_linux.cc b/chrome/browser/net/nss_service_linux.cc index 85579a49..b17dc250 100644 --- a/chrome/browser/net/nss_service_linux.cc +++ b/chrome/browser/net/nss_service_linux.cc
@@ -6,9 +6,9 @@ #include <pk11pub.h> -#include "base/bind.h" -#include "base/callback.h" #include "base/check.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/no_destructor.h" #include "build/chromeos_buildflags.h" #include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/net/private_network_access_browsertest.cc b/chrome/browser/net/private_network_access_browsertest.cc index 7e523b0..ab7766627 100644 --- a/chrome/browser/net/private_network_access_browsertest.cc +++ b/chrome/browser/net/private_network_access_browsertest.cc
@@ -5,8 +5,8 @@ #include <map> #include <string> -#include "base/bind.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/strings/string_piece.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h"
diff --git a/chrome/browser/net/profile_network_context_service.cc b/chrome/browser/net/profile_network_context_service.cc index 182aea8..59b2924 100644 --- a/chrome/browser/net/profile_network_context_service.cc +++ b/chrome/browser/net/profile_network_context_service.cc
@@ -6,13 +6,13 @@ #include <string> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check_op.h" #include "base/command_line.h" #include "base/feature_list.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/field_trial.h" #include "base/metrics/field_trial_params.h" #include "base/metrics/histogram_macros.h"
diff --git a/chrome/browser/net/profile_network_context_service.h b/chrome/browser/net/profile_network_context_service.h index 18e39251..05e8e53b1 100644 --- a/chrome/browser/net/profile_network_context_service.h +++ b/chrome/browser/net/profile_network_context_service.h
@@ -9,8 +9,8 @@ #include <string> #include <utility> -#include "base/callback_forward.h" #include "base/files/file_path.h" +#include "base/functional/callback_forward.h" #include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h"
diff --git a/chrome/browser/net/profile_network_context_service_browsertest.cc b/chrome/browser/net/profile_network_context_service_browsertest.cc index 8105b83..e198b35 100644 --- a/chrome/browser/net/profile_network_context_service_browsertest.cc +++ b/chrome/browser/net/profile_network_context_service_browsertest.cc
@@ -7,12 +7,12 @@ #include <string> #include <vector> -#include "base/bind.h" #include "base/check_op.h" #include "base/containers/contains.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/strings/strcat.h" #include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/net/proxy_browsertest.cc b/chrome/browser/net/proxy_browsertest.cc index 5319238..a06498a 100644 --- a/chrome/browser/net/proxy_browsertest.cc +++ b/chrome/browser/net/proxy_browsertest.cc
@@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/bind.h" #include "base/command_line.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/run_loop.h" #include "base/strings/string_util.h"
diff --git a/chrome/browser/net/stub_resolver_config_reader.cc b/chrome/browser/net/stub_resolver_config_reader.cc index 10878b7..14db5800 100644 --- a/chrome/browser/net/stub_resolver_config_reader.cc +++ b/chrome/browser/net/stub_resolver_config_reader.cc
@@ -9,10 +9,10 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" #include "base/check.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/metrics/field_trial_params.h" #include "base/metrics/histogram_macros.h"
diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/browser/net/system_network_context_manager.cc index f5f26dc..3f6fcfb 100644 --- a/chrome/browser/net/system_network_context_manager.cc +++ b/chrome/browser/net/system_network_context_manager.cc
@@ -9,10 +9,10 @@ #include <utility> #include "base/auto_reset.h" -#include "base/bind.h" #include "base/build_time.h" #include "base/command_line.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/raw_ptr.h" #include "base/metrics/histogram_functions.h"
diff --git a/chrome/browser/net/trial_comparison_cert_verifier_controller.cc b/chrome/browser/net/trial_comparison_cert_verifier_controller.cc index b62faf4..5e68554e 100644 --- a/chrome/browser/net/trial_comparison_cert_verifier_controller.cc +++ b/chrome/browser/net/trial_comparison_cert_verifier_controller.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/metrics/field_trial_params.h" #include "base/metrics/histogram_macros.h"
diff --git a/chrome/browser/net/websocket_browsertest.cc b/chrome/browser/net/websocket_browsertest.cc index 6281c792..f1d1f4f 100644 --- a/chrome/browser/net/websocket_browsertest.cc +++ b/chrome/browser/net/websocket_browsertest.cc
@@ -9,9 +9,9 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" #include "base/check_op.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/notreached.h" #include "base/path_service.h" #include "base/run_loop.h"
diff --git a/chrome/browser/net_benchmarking.cc b/chrome/browser/net_benchmarking.cc index e150f7fc..94c1aa5f 100644 --- a/chrome/browser/net_benchmarking.cc +++ b/chrome/browser/net_benchmarking.cc
@@ -7,9 +7,9 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/time/time.h" #include "chrome/browser/predictors/loading_predictor.h" #include "chrome/common/chrome_switches.h"
diff --git a/chrome/browser/new_tab_page/chrome_colors/chrome_colors_service.h b/chrome/browser/new_tab_page/chrome_colors/chrome_colors_service.h index b8bddf34..93aed30 100644 --- a/chrome/browser/new_tab_page/chrome_colors/chrome_colors_service.h +++ b/chrome/browser/new_tab_page/chrome_colors/chrome_colors_service.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_NEW_TAB_PAGE_CHROME_COLORS_CHROME_COLORS_SERVICE_H_ #define CHROME_BROWSER_NEW_TAB_PAGE_CHROME_COLORS_CHROME_COLORS_SERVICE_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/themes/theme_service.h" #include "components/keyed_service/core/keyed_service.h"
diff --git a/chrome/browser/new_tab_page/modules/feed/feed_handler.cc b/chrome/browser/new_tab_page/modules/feed/feed_handler.cc index 8304ae4..a0fdf9c 100644 --- a/chrome/browser/new_tab_page/modules/feed/feed_handler.cc +++ b/chrome/browser/new_tab_page/modules/feed/feed_handler.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/new_tab_page/modules/feed/feed_handler.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/signin/identity_manager_factory.h" #include "chrome/browser/ui/browser_finder.h"
diff --git a/chrome/browser/new_tab_page/modules/feed/feed_handler_unittest.cc b/chrome/browser/new_tab_page/modules/feed/feed_handler_unittest.cc index 797b6b9..7aa7f2b 100644 --- a/chrome/browser/new_tab_page/modules/feed/feed_handler_unittest.cc +++ b/chrome/browser/new_tab_page/modules/feed/feed_handler_unittest.cc
@@ -7,7 +7,7 @@ #include <memory> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/strings/strcat.h"
diff --git a/chrome/browser/new_tab_page/modules/recipes/recipes_service.h b/chrome/browser/new_tab_page/modules/recipes/recipes_service.h index 31f4575..4b8ce017 100644 --- a/chrome/browser/new_tab_page/modules/recipes/recipes_service.h +++ b/chrome/browser/new_tab_page/modules/recipes/recipes_service.h
@@ -8,7 +8,7 @@ #include <list> #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/new_tab_page/new_tab_page_interactive_uitest.cc b/chrome/browser/new_tab_page/new_tab_page_interactive_uitest.cc index e519f3740..b35aad6 100644 --- a/chrome/browser/new_tab_page/new_tab_page_interactive_uitest.cc +++ b/chrome/browser/new_tab_page/new_tab_page_interactive_uitest.cc
@@ -8,8 +8,8 @@ #include <set> #include <utility> -#include "base/callback.h" #include "base/containers/span.h" +#include "base/functional/callback.h" #include "base/json/json_reader.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h"
diff --git a/chrome/browser/new_tab_page/one_google_bar/one_google_bar_loader.h b/chrome/browser/new_tab_page/one_google_bar/one_google_bar_loader.h index 66b3068..e8745209 100644 --- a/chrome/browser/new_tab_page/one_google_bar/one_google_bar_loader.h +++ b/chrome/browser/new_tab_page/one_google_bar/one_google_bar_loader.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_NEW_TAB_PAGE_ONE_GOOGLE_BAR_ONE_GOOGLE_BAR_LOADER_H_ #define CHROME_BROWSER_NEW_TAB_PAGE_ONE_GOOGLE_BAR_ONE_GOOGLE_BAR_LOADER_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "third_party/abseil-cpp/absl/types/optional.h" class GURL;
diff --git a/chrome/browser/new_tab_page/one_google_bar/one_google_bar_loader_impl.cc b/chrome/browser/new_tab_page/one_google_bar/one_google_bar_loader_impl.cc index d31f73e..84fe9a4 100644 --- a/chrome/browser/new_tab_page/one_google_bar/one_google_bar_loader_impl.cc +++ b/chrome/browser/new_tab_page/one_google_bar/one_google_bar_loader_impl.cc
@@ -7,9 +7,9 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/json/json_writer.h" #include "base/strings/string_util.h" #include "base/values.h"
diff --git a/chrome/browser/new_tab_page/one_google_bar/one_google_bar_service.cc b/chrome/browser/new_tab_page/one_google_bar/one_google_bar_service.cc index 2d0bbee..14b58531 100644 --- a/chrome/browser/new_tab_page/one_google_bar/one_google_bar_service.cc +++ b/chrome/browser/new_tab_page/one_google_bar/one_google_bar_service.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/observer_list.h" #include "chrome/browser/new_tab_page/one_google_bar/one_google_bar_loader.h"
diff --git a/chrome/browser/new_tab_page/promos/promo_service.cc b/chrome/browser/new_tab_page/promos/promo_service.cc index 6e55aac..f46d3da 100644 --- a/chrome/browser/new_tab_page/promos/promo_service.cc +++ b/chrome/browser/new_tab_page/promos/promo_service.cc
@@ -6,9 +6,9 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/json/json_string_value_serializer.h" #include "base/metrics/field_trial_params.h" #include "base/metrics/histogram_macros.h"
diff --git a/chrome/browser/notifications/arc_application_notifier_controller.cc b/chrome/browser/notifications/arc_application_notifier_controller.cc index b156015..a0eef725 100644 --- a/chrome/browser/notifications/arc_application_notifier_controller.cc +++ b/chrome/browser/notifications/arc_application_notifier_controller.cc
@@ -7,7 +7,7 @@ #include <set> #include "ash/public/cpp/notifier_metadata.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/threading/sequenced_task_runner_handle.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/notifications/chrome_ash_message_center_client_unittest.cc b/chrome/browser/notifications/chrome_ash_message_center_client_unittest.cc index c18e6f3..0df1c23 100644 --- a/chrome/browser/notifications/chrome_ash_message_center_client_unittest.cc +++ b/chrome/browser/notifications/chrome_ash_message_center_client_unittest.cc
@@ -10,8 +10,8 @@ #include "ash/public/cpp/notifier_metadata.h" #include "ash/public/cpp/notifier_settings_observer.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h" #include "chrome/browser/ash/login/users/fake_chrome_user_manager.h"
diff --git a/chrome/browser/notifications/displayed_notifications_dispatch_callback.h b/chrome/browser/notifications/displayed_notifications_dispatch_callback.h index 7238f66a..705bfa1 100644 --- a/chrome/browser/notifications/displayed_notifications_dispatch_callback.h +++ b/chrome/browser/notifications/displayed_notifications_dispatch_callback.h
@@ -8,7 +8,7 @@ #include <set> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" // Callback used by the bridge and all the downstream classes that propagate // the callback to get displayed notifications.
diff --git a/chrome/browser/notifications/mac_notification_provider_factory.cc b/chrome/browser/notifications/mac_notification_provider_factory.cc index 91962b0c..f3ddb03 100644 --- a/chrome/browser/notifications/mac_notification_provider_factory.cc +++ b/chrome/browser/notifications/mac_notification_provider_factory.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "chrome/browser/child_process_host_flags.h"
diff --git a/chrome/browser/notifications/muted_notification_handler.cc b/chrome/browser/notifications/muted_notification_handler.cc index 6719748..71c14a5 100644 --- a/chrome/browser/notifications/muted_notification_handler.cc +++ b/chrome/browser/notifications/muted_notification_handler.cc
@@ -6,9 +6,9 @@ #include <utility> -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/feature_list.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/notreached.h" #include "chrome/browser/browser_features.h" #include "chrome/browser/notifications/notification_display_service.h"
diff --git a/chrome/browser/notifications/muted_notification_handler.h b/chrome/browser/notifications/muted_notification_handler.h index b4b5205..6f074d3 100644 --- a/chrome/browser/notifications/muted_notification_handler.h +++ b/chrome/browser/notifications/muted_notification_handler.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/notifications/notification_handler.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/chrome/browser/notifications/muted_notification_handler_unittest.cc b/chrome/browser/notifications/muted_notification_handler_unittest.cc index c9089e3..5df59177 100644 --- a/chrome/browser/notifications/muted_notification_handler_unittest.cc +++ b/chrome/browser/notifications/muted_notification_handler_unittest.cc
@@ -6,7 +6,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/test/mock_callback.h" #include "base/test/scoped_feature_list.h" #include "chrome/browser/browser_features.h"
diff --git a/chrome/browser/notifications/non_persistent_notification_handler.cc b/chrome/browser/notifications/non_persistent_notification_handler.cc index e7936d82..fea0159 100644 --- a/chrome/browser/notifications/non_persistent_notification_handler.cc +++ b/chrome/browser/notifications/non_persistent_notification_handler.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/notifications/non_persistent_notification_handler.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "build/build_config.h" #include "chrome/browser/notifications/notification_common.h" #include "chrome/browser/notifications/notification_permission_context.h"
diff --git a/chrome/browser/notifications/notification_channels_provider_android.cc b/chrome/browser/notifications/notification_channels_provider_android.cc index 64776a8..5a3ac45 100644 --- a/chrome/browser/notifications/notification_channels_provider_android.cc +++ b/chrome/browser/notifications/notification_channels_provider_android.cc
@@ -9,9 +9,9 @@ #include "base/android/build_info.h" #include "base/android/jni_android.h" #include "base/android/jni_string.h" -#include "base/bind.h" #include "base/check_op.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/notreached.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h"
diff --git a/chrome/browser/notifications/notification_dispatcher_mac.h b/chrome/browser/notifications/notification_dispatcher_mac.h index 00e8db84..2bf5f648 100644 --- a/chrome/browser/notifications/notification_dispatcher_mac.h +++ b/chrome/browser/notifications/notification_dispatcher_mac.h
@@ -8,8 +8,8 @@ #include <string> #include <tuple> -#include "base/callback_forward.h" #include "base/containers/flat_set.h" +#include "base/functional/callback_forward.h" #include "chrome/browser/notifications/displayed_notifications_dispatch_callback.h" #include "chrome/browser/notifications/notification_handler.h" #include "chrome/services/mac_notifications/public/mojom/mac_notifications.mojom.h"
diff --git a/chrome/browser/notifications/notification_dispatcher_mojo.cc b/chrome/browser/notifications/notification_dispatcher_mojo.cc index ae9f06cc..edc2af6 100644 --- a/chrome/browser/notifications/notification_dispatcher_mojo.cc +++ b/chrome/browser/notifications/notification_dispatcher_mojo.cc
@@ -8,11 +8,11 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/cancelable_callback.h" #include "base/containers/flat_set.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/histogram_functions.h" #include "base/sequence_checker.h" #include "base/time/time.h"
diff --git a/chrome/browser/notifications/notification_dispatcher_mojo.h b/chrome/browser/notifications/notification_dispatcher_mojo.h index 3e153a7..58b7d57f 100644 --- a/chrome/browser/notifications/notification_dispatcher_mojo.h +++ b/chrome/browser/notifications/notification_dispatcher_mojo.h
@@ -9,9 +9,9 @@ #include <string> #include <tuple> -#include "base/callback_forward.h" #include "base/cancelable_callback.h" #include "base/containers/flat_set.h" +#include "base/functional/callback_forward.h" #include "base/time/time.h" #include "chrome/browser/notifications/displayed_notifications_dispatch_callback.h" #include "chrome/browser/notifications/notification_dispatcher_mac.h"
diff --git a/chrome/browser/notifications/notification_dispatcher_mojo_unittest.cc b/chrome/browser/notifications/notification_dispatcher_mojo_unittest.cc index 9ba872c8..79e27b3 100644 --- a/chrome/browser/notifications/notification_dispatcher_mojo_unittest.cc +++ b/chrome/browser/notifications/notification_dispatcher_mojo_unittest.cc
@@ -6,9 +6,9 @@ #include <memory> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/process/process_handle.h" #include "base/test/gmock_callback_support.h"
diff --git a/chrome/browser/notifications/notification_display_queue.h b/chrome/browser/notifications/notification_display_queue.h index ce744aac..23c41ea 100644 --- a/chrome/browser/notifications/notification_display_queue.h +++ b/chrome/browser/notifications/notification_display_queue.h
@@ -10,7 +10,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/scoped_multi_source_observation.h" #include "chrome/browser/notifications/notification_blocker.h"
diff --git a/chrome/browser/notifications/notification_display_service.h b/chrome/browser/notifications/notification_display_service.h index 9b0e22d8..86d557efa 100644 --- a/chrome/browser/notifications/notification_display_service.h +++ b/chrome/browser/notifications/notification_display_service.h
@@ -10,7 +10,7 @@ #include <set> #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/observer_list_types.h" #include "chrome/browser/notifications/notification_common.h" #include "chrome/browser/notifications/notification_handler.h"
diff --git a/chrome/browser/notifications/notification_display_service_impl.cc b/chrome/browser/notifications/notification_display_service_impl.cc index 5649e52..8997ebf 100644 --- a/chrome/browser/notifications/notification_display_service_impl.cc +++ b/chrome/browser/notifications/notification_display_service_impl.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/metrics/histogram_functions.h" #include "base/observer_list.h"
diff --git a/chrome/browser/notifications/notification_display_service_impl.h b/chrome/browser/notifications/notification_display_service_impl.h index f88cf1f..f9a95fa 100644 --- a/chrome/browser/notifications/notification_display_service_impl.h +++ b/chrome/browser/notifications/notification_display_service_impl.h
@@ -8,8 +8,8 @@ #include <memory> #include <string> -#include "base/callback.h" #include "base/containers/queue.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h"
diff --git a/chrome/browser/notifications/notification_display_service_impl_unittest.cc b/chrome/browser/notifications/notification_display_service_impl_unittest.cc index 13aa4f5..d344661 100644 --- a/chrome/browser/notifications/notification_display_service_impl_unittest.cc +++ b/chrome/browser/notifications/notification_display_service_impl_unittest.cc
@@ -7,7 +7,7 @@ #include <string> #include <vector> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/run_loop.h"
diff --git a/chrome/browser/notifications/notification_display_service_tester.cc b/chrome/browser/notifications/notification_display_service_tester.cc index a4a8fe8..3333114 100644 --- a/chrome/browser/notifications/notification_display_service_tester.cc +++ b/chrome/browser/notifications/notification_display_service_tester.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/notifications/notification_display_service_tester.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/notifications/notification_display_service.h" #include "chrome/browser/notifications/notification_display_service_factory.h" #include "chrome/browser/notifications/stub_notification_display_service.h"
diff --git a/chrome/browser/notifications/notification_display_service_tester.h b/chrome/browser/notifications/notification_display_service_tester.h index dd9f5e5..0f520d1 100644 --- a/chrome/browser/notifications/notification_display_service_tester.h +++ b/chrome/browser/notifications/notification_display_service_tester.h
@@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/notifications/notification_common.h" #include "chrome/browser/notifications/stub_notification_display_service.h"
diff --git a/chrome/browser/notifications/notification_handler.cc b/chrome/browser/notifications/notification_handler.cc index 5d6ca73..c16764a 100644 --- a/chrome/browser/notifications/notification_handler.cc +++ b/chrome/browser/notifications/notification_handler.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/notifications/notification_handler.h" -#include "base/callback.h" +#include "base/functional/callback.h" NotificationHandler::~NotificationHandler() = default;
diff --git a/chrome/browser/notifications/notification_handler.h b/chrome/browser/notifications/notification_handler.h index a28357e4..6700f693 100644 --- a/chrome/browser/notifications/notification_handler.h +++ b/chrome/browser/notifications/notification_handler.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "third_party/abseil-cpp/absl/types/optional.h" class GURL;
diff --git a/chrome/browser/notifications/notification_interactive_uitest.cc b/chrome/browser/notifications/notification_interactive_uitest.cc index 8b7441dd..4714e72 100644 --- a/chrome/browser/notifications/notification_interactive_uitest.cc +++ b/chrome/browser/notifications/notification_interactive_uitest.cc
@@ -4,10 +4,10 @@ #include <string> -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "base/strings/utf_string_conversions.h" #include "base/test/simple_test_clock.h"
diff --git a/chrome/browser/notifications/notification_permission_context.cc b/chrome/browser/notifications/notification_permission_context.cc index 305a9940..87b2e09 100644 --- a/chrome/browser/notifications/notification_permission_context.cc +++ b/chrome/browser/notifications/notification_permission_context.cc
@@ -4,9 +4,9 @@ #include "chrome/browser/notifications/notification_permission_context.h" -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/rand_util.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/notifications/notification_permission_context_unittest.cc b/chrome/browser/notifications/notification_permission_context_unittest.cc index 6f8fb7a..0169f207 100644 --- a/chrome/browser/notifications/notification_permission_context_unittest.cc +++ b/chrome/browser/notifications/notification_permission_context_unittest.cc
@@ -7,8 +7,8 @@ #include <memory> #include <string> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/gtest_prod_util.h" #include "base/memory/scoped_refptr.h" #include "base/test/scoped_mock_time_message_loop_task_runner.h"
diff --git a/chrome/browser/notifications/notification_platform_bridge.h b/chrome/browser/notifications/notification_platform_bridge.h index 2c1e158..286723d 100644 --- a/chrome/browser/notifications/notification_platform_bridge.h +++ b/chrome/browser/notifications/notification_platform_bridge.h
@@ -9,8 +9,8 @@ #include <set> #include <string> -#include "base/callback_forward.h" #include "base/files/file_path.h" +#include "base/functional/callback_forward.h" #include "chrome/browser/notifications/displayed_notifications_dispatch_callback.h" #include "chrome/browser/notifications/notification_common.h" #include "chrome/browser/notifications/notification_handler.h"
diff --git a/chrome/browser/notifications/notification_platform_bridge_android.cc b/chrome/browser/notifications/notification_platform_bridge_android.cc index cd1197a..2d21d53 100644 --- a/chrome/browser/notifications/notification_platform_bridge_android.cc +++ b/chrome/browser/notifications/notification_platform_bridge_android.cc
@@ -10,10 +10,10 @@ #include "base/android/jni_array.h" #include "base/android/jni_string.h" -#include "base/bind.h" #include "base/check.h" #include "base/command_line.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/notreached.h" #include "base/strings/utf_string_conversions.h" #include "chrome/android/chrome_jni_headers/ActionInfo_jni.h"
diff --git a/chrome/browser/notifications/notification_platform_bridge_chromeos_unittest.cc b/chrome/browser/notifications/notification_platform_bridge_chromeos_unittest.cc index e7d2dc5..5410990 100644 --- a/chrome/browser/notifications/notification_platform_bridge_chromeos_unittest.cc +++ b/chrome/browser/notifications/notification_platform_bridge_chromeos_unittest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/notifications/notification_platform_bridge_chromeos.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/notifications/notification_handler.h" #include "chrome/test/base/testing_profile.h" #include "content/public/test/browser_task_environment.h"
diff --git a/chrome/browser/notifications/notification_platform_bridge_delegator.cc b/chrome/browser/notifications/notification_platform_bridge_delegator.cc index 6e556aa4..094bb61 100644 --- a/chrome/browser/notifications/notification_platform_bridge_delegator.cc +++ b/chrome/browser/notifications/notification_platform_bridge_delegator.cc
@@ -9,8 +9,8 @@ #include <vector> #include "base/barrier_closure.h" -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "build/build_config.h" #include "build/buildflag.h"
diff --git a/chrome/browser/notifications/notification_platform_bridge_delegator.h b/chrome/browser/notifications/notification_platform_bridge_delegator.h index 0af12c4..6efaba5 100644 --- a/chrome/browser/notifications/notification_platform_bridge_delegator.h +++ b/chrome/browser/notifications/notification_platform_bridge_delegator.h
@@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/notifications/displayed_notifications_dispatch_callback.h" #include "chrome/browser/notifications/notification_common.h"
diff --git a/chrome/browser/notifications/notification_platform_bridge_linux.cc b/chrome/browser/notifications/notification_platform_bridge_linux.cc index c9e7dd7..3ca9fab 100644 --- a/chrome/browser/notifications/notification_platform_bridge_linux.cc +++ b/chrome/browser/notifications/notification_platform_bridge_linux.cc
@@ -14,7 +14,6 @@ #include <vector> #include "base/barrier_closure.h" -#include "base/bind.h" #include "base/callback_list.h" #include "base/containers/contains.h" #include "base/cxx17_backports.h" @@ -22,6 +21,7 @@ #include "base/files/file_path.h" #include "base/files/file_path_watcher.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/i18n/number_formatting.h" #include "base/logging.h" #include "base/memory/ptr_util.h"
diff --git a/chrome/browser/notifications/notification_platform_bridge_linux.h b/chrome/browser/notifications/notification_platform_bridge_linux.h index c7d2dc5..eca987342 100644 --- a/chrome/browser/notifications/notification_platform_bridge_linux.h +++ b/chrome/browser/notifications/notification_platform_bridge_linux.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/ref_counted.h" #include "chrome/browser/notifications/notification_platform_bridge.h"
diff --git a/chrome/browser/notifications/notification_platform_bridge_linux_unittest.cc b/chrome/browser/notifications/notification_platform_bridge_linux_unittest.cc index 0102ef41..605330146 100644 --- a/chrome/browser/notifications/notification_platform_bridge_linux_unittest.cc +++ b/chrome/browser/notifications/notification_platform_bridge_linux_unittest.cc
@@ -9,9 +9,9 @@ #include <memory> #include <vector> -#include "base/bind.h" -#include "base/callback.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/i18n/number_formatting.h" #include "base/memory/ptr_util.h" #include "base/memory/ref_counted.h"
diff --git a/chrome/browser/notifications/notification_platform_bridge_mac.cc b/chrome/browser/notifications/notification_platform_bridge_mac.cc index eeb8d332..481edbf 100644 --- a/chrome/browser/notifications/notification_platform_bridge_mac.cc +++ b/chrome/browser/notifications/notification_platform_bridge_mac.cc
@@ -7,9 +7,9 @@ #include <utility> #include "base/barrier_closure.h" -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "chrome/browser/notifications/mac_notification_provider_factory.h" #include "chrome/browser/notifications/notification_common.h" #include "chrome/browser/notifications/notification_dispatcher_mojo.h"
diff --git a/chrome/browser/notifications/notification_platform_bridge_mac_unittest.cc b/chrome/browser/notifications/notification_platform_bridge_mac_unittest.cc index 3da0768..c69c681 100644 --- a/chrome/browser/notifications/notification_platform_bridge_mac_unittest.cc +++ b/chrome/browser/notifications/notification_platform_bridge_mac_unittest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/notifications/notification_platform_bridge_mac.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/i18n/number_formatting.h" #include "base/mac/mac_util.h" #include "base/memory/raw_ptr.h"
diff --git a/chrome/browser/notifications/notification_platform_bridge_message_center.cc b/chrome/browser/notifications/notification_platform_bridge_message_center.cc index 6db685c..126ae4d 100644 --- a/chrome/browser/notifications/notification_platform_bridge_message_center.cc +++ b/chrome/browser/notifications/notification_platform_bridge_message_center.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/notifications/notification_platform_bridge_message_center.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/no_destructor.h"
diff --git a/chrome/browser/notifications/notification_platform_bridge_win.cc b/chrome/browser/notifications/notification_platform_bridge_win.cc index abccfdb..246e0373 100644 --- a/chrome/browser/notifications/notification_platform_bridge_win.cc +++ b/chrome/browser/notifications/notification_platform_bridge_win.cc
@@ -10,10 +10,10 @@ #include <objbase.h> #include <wrl/event.h> -#include "base/bind.h" #include "base/command_line.h" #include "base/feature_list.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/hash/hash.h" #include "base/logging.h" #include "base/metrics/histogram_functions.h"
diff --git a/chrome/browser/notifications/notification_platform_bridge_win_interactive_uitest.cc b/chrome/browser/notifications/notification_platform_bridge_win_interactive_uitest.cc index e7730a07c..791ddae 100644 --- a/chrome/browser/notifications/notification_platform_bridge_win_interactive_uitest.cc +++ b/chrome/browser/notifications/notification_platform_bridge_win_interactive_uitest.cc
@@ -10,10 +10,10 @@ #include <string> #include <vector> -#include "base/bind.h" #include "base/command_line.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/metrics/statistics_recorder.h" #include "base/path_service.h" #include "base/run_loop.h"
diff --git a/chrome/browser/notifications/notification_test_util.h b/chrome/browser/notifications/notification_test_util.h index b9ddf8c..bdf3a28 100644 --- a/chrome/browser/notifications/notification_test_util.h +++ b/chrome/browser/notifications/notification_test_util.h
@@ -10,7 +10,7 @@ #include <utility> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "build/build_config.h" #include "chrome/browser/notifications/notification_ui_manager.h"
diff --git a/chrome/browser/notifications/notifier_state_tracker.cc b/chrome/browser/notifications/notifier_state_tracker.cc index 751d0ed..4914dcad 100644 --- a/chrome/browser/notifications/notifier_state_tracker.cc +++ b/chrome/browser/notifications/notifier_state_tracker.cc
@@ -9,8 +9,8 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/values.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/notifications/persistent_notification_handler.cc b/chrome/browser/notifications/persistent_notification_handler.cc index 0254f8ed..147171a 100644 --- a/chrome/browser/notifications/persistent_notification_handler.cc +++ b/chrome/browser/notifications/persistent_notification_handler.cc
@@ -4,9 +4,9 @@ #include "chrome/browser/notifications/persistent_notification_handler.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/check_op.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/metrics/histogram_macros.h" #include "chrome/browser/notifications/metrics/notification_metrics_logger.h" #include "chrome/browser/notifications/metrics/notification_metrics_logger_factory.h"
diff --git a/chrome/browser/notifications/persistent_notification_handler_unittest.cc b/chrome/browser/notifications/persistent_notification_handler_unittest.cc index 82bd912..2485fee 100644 --- a/chrome/browser/notifications/persistent_notification_handler_unittest.cc +++ b/chrome/browser/notifications/persistent_notification_handler_unittest.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "chrome/browser/history/history_service_factory.h"
diff --git a/chrome/browser/notifications/platform_notification_service_impl.cc b/chrome/browser/notifications/platform_notification_service_impl.cc index a3bc7c2..8072ae6 100644 --- a/chrome/browser/notifications/platform_notification_service_impl.cc +++ b/chrome/browser/notifications/platform_notification_service_impl.cc
@@ -9,8 +9,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "base/strings/utf_string_conversions.h" #include "base/time/time.h"
diff --git a/chrome/browser/notifications/platform_notification_service_unittest.cc b/chrome/browser/notifications/platform_notification_service_unittest.cc index 6cc69d9..b68b7d1b 100644 --- a/chrome/browser/notifications/platform_notification_service_unittest.cc +++ b/chrome/browser/notifications/platform_notification_service_unittest.cc
@@ -7,9 +7,9 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/strings/utf_string_conversions.h" #include "base/test/bind.h"
diff --git a/chrome/browser/notifications/pwa_notifier_controller.cc b/chrome/browser/notifications/pwa_notifier_controller.cc index 2a07638..16ba228f 100644 --- a/chrome/browser/notifications/pwa_notifier_controller.cc +++ b/chrome/browser/notifications/pwa_notifier_controller.cc
@@ -5,7 +5,7 @@ #include "chrome/browser/notifications/pwa_notifier_controller.h" #include "ash/public/cpp/notifier_metadata.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/threading/sequenced_task_runner_handle.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/notifications/scheduler/internal/background_task_coordinator.h b/chrome/browser/notifications/scheduler/internal/background_task_coordinator.h index 34606f1..02e240f2 100644 --- a/chrome/browser/notifications/scheduler/internal/background_task_coordinator.h +++ b/chrome/browser/notifications/scheduler/internal/background_task_coordinator.h
@@ -9,7 +9,7 @@ #include <memory> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/notifications/scheduler/public/notification_scheduler_types.h" namespace base {
diff --git a/chrome/browser/notifications/scheduler/internal/background_task_coordinator_unittest.cc b/chrome/browser/notifications/scheduler/internal/background_task_coordinator_unittest.cc index 544a46f..d0b0295e 100644 --- a/chrome/browser/notifications/scheduler/internal/background_task_coordinator_unittest.cc +++ b/chrome/browser/notifications/scheduler/internal/background_task_coordinator_unittest.cc
@@ -10,7 +10,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/test/task_environment.h" #include "chrome/browser/notifications/scheduler/internal/notification_entry.h"
diff --git a/chrome/browser/notifications/scheduler/internal/collection_store.h b/chrome/browser/notifications/scheduler/internal/collection_store.h index 3931e18..7bb2ae4 100644 --- a/chrome/browser/notifications/scheduler/internal/collection_store.h +++ b/chrome/browser/notifications/scheduler/internal/collection_store.h
@@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" namespace notifications {
diff --git a/chrome/browser/notifications/scheduler/internal/display_decider.h b/chrome/browser/notifications/scheduler/internal/display_decider.h index db39860..b352d7b 100644 --- a/chrome/browser/notifications/scheduler/internal/display_decider.h +++ b/chrome/browser/notifications/scheduler/internal/display_decider.h
@@ -12,7 +12,7 @@ #include <utility> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/notifications/scheduler/public/notification_scheduler_types.h" namespace base {
diff --git a/chrome/browser/notifications/scheduler/internal/icon_converter.h b/chrome/browser/notifications/scheduler/internal/icon_converter.h index 4f7ce5d..7226497 100644 --- a/chrome/browser/notifications/scheduler/internal/icon_converter.h +++ b/chrome/browser/notifications/scheduler/internal/icon_converter.h
@@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/notifications/scheduler/internal/icon_converter_result.h" #include "third_party/skia/include/core/SkBitmap.h"
diff --git a/chrome/browser/notifications/scheduler/internal/icon_converter_unittest.cc b/chrome/browser/notifications/scheduler/internal/icon_converter_unittest.cc index d964bcb..696b3ad 100644 --- a/chrome/browser/notifications/scheduler/internal/icon_converter_unittest.cc +++ b/chrome/browser/notifications/scheduler/internal/icon_converter_unittest.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 "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/test/task_environment.h" #include "chrome/browser/notifications/scheduler/internal/png_icon_converter_impl.h"
diff --git a/chrome/browser/notifications/scheduler/internal/icon_store.h b/chrome/browser/notifications/scheduler/internal/icon_store.h index 589fb96a..89c9609 100644 --- a/chrome/browser/notifications/scheduler/internal/icon_store.h +++ b/chrome/browser/notifications/scheduler/internal/icon_store.h
@@ -10,8 +10,8 @@ #include <string> #include <vector> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/notifications/proto/icon.pb.h" #include "chrome/browser/notifications/scheduler/internal/icon_converter.h"
diff --git a/chrome/browser/notifications/scheduler/internal/icon_store_unittest.cc b/chrome/browser/notifications/scheduler/internal/icon_store_unittest.cc index 4a18cf7..c4724a40 100644 --- a/chrome/browser/notifications/scheduler/internal/icon_store_unittest.cc +++ b/chrome/browser/notifications/scheduler/internal/icon_store_unittest.cc
@@ -10,7 +10,7 @@ #include <utility> #include <vector> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/guid.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h"
diff --git a/chrome/browser/notifications/scheduler/internal/impression_history_tracker.cc b/chrome/browser/notifications/scheduler/internal/impression_history_tracker.cc index 4c24876..63a180e 100644 --- a/chrome/browser/notifications/scheduler/internal/impression_history_tracker.cc +++ b/chrome/browser/notifications/scheduler/internal/impression_history_tracker.cc
@@ -6,11 +6,11 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check_op.h" #include "base/containers/contains.h" #include "base/cxx17_backports.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/notreached.h" #include "chrome/browser/notifications/scheduler/internal/scheduler_utils.h" #include "chrome/browser/notifications/scheduler/internal/stats.h"
diff --git a/chrome/browser/notifications/scheduler/internal/impression_history_tracker.h b/chrome/browser/notifications/scheduler/internal/impression_history_tracker.h index 23e0a62..516ddb1 100644 --- a/chrome/browser/notifications/scheduler/internal/impression_history_tracker.h +++ b/chrome/browser/notifications/scheduler/internal/impression_history_tracker.h
@@ -10,8 +10,8 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/containers/circular_deque.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/raw_ref.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/notifications/scheduler/internal/impression_history_tracker_unittest.cc b/chrome/browser/notifications/scheduler/internal/impression_history_tracker_unittest.cc index 98a6272..27c154c8 100644 --- a/chrome/browser/notifications/scheduler/internal/impression_history_tracker_unittest.cc +++ b/chrome/browser/notifications/scheduler/internal/impression_history_tracker_unittest.cc
@@ -6,7 +6,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/test/task_environment.h"
diff --git a/chrome/browser/notifications/scheduler/internal/impression_store.h b/chrome/browser/notifications/scheduler/internal/impression_store.h index a946264..8b3b7f8 100644 --- a/chrome/browser/notifications/scheduler/internal/impression_store.h +++ b/chrome/browser/notifications/scheduler/internal/impression_store.h
@@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/notifications/proto/client_state.pb.h" #include "chrome/browser/notifications/scheduler/internal/collection_store.h"
diff --git a/chrome/browser/notifications/scheduler/internal/init_aware_scheduler.cc b/chrome/browser/notifications/scheduler/internal/init_aware_scheduler.cc index 86d321a..d1915e7 100644 --- a/chrome/browser/notifications/scheduler/internal/init_aware_scheduler.cc +++ b/chrome/browser/notifications/scheduler/internal/init_aware_scheduler.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/notifications/scheduler/public/notification_params.h" namespace notifications {
diff --git a/chrome/browser/notifications/scheduler/internal/init_aware_scheduler.h b/chrome/browser/notifications/scheduler/internal/init_aware_scheduler.h index f8d92a87..37ef721 100644 --- a/chrome/browser/notifications/scheduler/internal/init_aware_scheduler.h +++ b/chrome/browser/notifications/scheduler/internal/init_aware_scheduler.h
@@ -8,7 +8,7 @@ #include <memory> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/notifications/scheduler/internal/notification_scheduler.h" #include "chrome/browser/notifications/scheduler/public/notification_scheduler_types.h"
diff --git a/chrome/browser/notifications/scheduler/internal/init_aware_scheduler_unittest.cc b/chrome/browser/notifications/scheduler/internal/init_aware_scheduler_unittest.cc index 18ced28..88c6c89 100644 --- a/chrome/browser/notifications/scheduler/internal/init_aware_scheduler_unittest.cc +++ b/chrome/browser/notifications/scheduler/internal/init_aware_scheduler_unittest.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/test/task_environment.h" #include "chrome/browser/notifications/scheduler/public/notification_params.h"
diff --git a/chrome/browser/notifications/scheduler/internal/notification_schedule_service_impl.cc b/chrome/browser/notifications/scheduler/internal/notification_schedule_service_impl.cc index 482f363d..71d0ca5 100644 --- a/chrome/browser/notifications/scheduler/internal/notification_schedule_service_impl.cc +++ b/chrome/browser/notifications/scheduler/internal/notification_schedule_service_impl.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/notreached.h" #include "chrome/browser/notifications/scheduler/internal/notification_scheduler.h" #include "chrome/browser/notifications/scheduler/internal/stats.h"
diff --git a/chrome/browser/notifications/scheduler/internal/notification_scheduler.cc b/chrome/browser/notifications/scheduler/internal/notification_scheduler.cc index cf33f8f..c6ab5b5 100644 --- a/chrome/browser/notifications/scheduler/internal/notification_scheduler.cc +++ b/chrome/browser/notifications/scheduler/internal/notification_scheduler.cc
@@ -9,8 +9,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/notifications/scheduler/internal/notification_scheduler.h b/chrome/browser/notifications/scheduler/internal/notification_scheduler.h index ea73fd9..a5f7c500 100644 --- a/chrome/browser/notifications/scheduler/internal/notification_scheduler.h +++ b/chrome/browser/notifications/scheduler/internal/notification_scheduler.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/notifications/scheduler/public/client_overview.h" #include "chrome/browser/notifications/scheduler/public/notification_background_task_scheduler.h" #include "chrome/browser/notifications/scheduler/public/user_action_handler.h"
diff --git a/chrome/browser/notifications/scheduler/internal/notification_scheduler_context.cc b/chrome/browser/notifications/scheduler/internal/notification_scheduler_context.cc index 3290b40f..edb8b3d 100644 --- a/chrome/browser/notifications/scheduler/internal/notification_scheduler_context.cc +++ b/chrome/browser/notifications/scheduler/internal/notification_scheduler_context.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/notifications/scheduler/internal/background_task_coordinator.h" #include "chrome/browser/notifications/scheduler/internal/display_decider.h" #include "chrome/browser/notifications/scheduler/internal/impression_history_tracker.h"
diff --git a/chrome/browser/notifications/scheduler/internal/notification_scheduler_unittest.cc b/chrome/browser/notifications/scheduler/internal/notification_scheduler_unittest.cc index 487462c..e93c805bf 100644 --- a/chrome/browser/notifications/scheduler/internal/notification_scheduler_unittest.cc +++ b/chrome/browser/notifications/scheduler/internal/notification_scheduler_unittest.cc
@@ -9,8 +9,8 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/strings/utf_string_conversions.h" #include "base/test/task_environment.h"
diff --git a/chrome/browser/notifications/scheduler/internal/notification_store.cc b/chrome/browser/notifications/scheduler/internal/notification_store.cc index b16d91c..ef20677 100644 --- a/chrome/browser/notifications/scheduler/internal/notification_store.cc +++ b/chrome/browser/notifications/scheduler/internal/notification_store.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/notifications/scheduler/internal/notification_store.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/notifications/scheduler/internal/proto_conversion.h" namespace leveldb_proto {
diff --git a/chrome/browser/notifications/scheduler/internal/notification_store_unittest.cc b/chrome/browser/notifications/scheduler/internal/notification_store_unittest.cc index 371081d..3dd7bca 100644 --- a/chrome/browser/notifications/scheduler/internal/notification_store_unittest.cc +++ b/chrome/browser/notifications/scheduler/internal/notification_store_unittest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/notifications/scheduler/internal/notification_store.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/strings/utf_string_conversions.h" #include "base/test/task_environment.h"
diff --git a/chrome/browser/notifications/scheduler/internal/png_icon_converter_impl.h b/chrome/browser/notifications/scheduler/internal/png_icon_converter_impl.h index 60b2b5c..392d855 100644 --- a/chrome/browser/notifications/scheduler/internal/png_icon_converter_impl.h +++ b/chrome/browser/notifications/scheduler/internal/png_icon_converter_impl.h
@@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/notifications/scheduler/internal/icon_converter.h" #include "third_party/skia/include/core/SkBitmap.h"
diff --git a/chrome/browser/notifications/scheduler/internal/scheduled_notification_manager.cc b/chrome/browser/notifications/scheduler/internal/scheduled_notification_manager.cc index ffbdd24..3ab4242 100644 --- a/chrome/browser/notifications/scheduler/internal/scheduled_notification_manager.cc +++ b/chrome/browser/notifications/scheduler/internal/scheduled_notification_manager.cc
@@ -10,9 +10,9 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/guid.h" #include "base/memory/raw_ref.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/notifications/scheduler/internal/scheduled_notification_manager.h b/chrome/browser/notifications/scheduler/internal/scheduled_notification_manager.h index 3b43ebd..ada843e 100644 --- a/chrome/browser/notifications/scheduler/internal/scheduled_notification_manager.h +++ b/chrome/browser/notifications/scheduler/internal/scheduled_notification_manager.h
@@ -10,7 +10,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/notifications/scheduler/internal/collection_store.h" #include "chrome/browser/notifications/scheduler/public/notification_scheduler_types.h" #include "third_party/skia/include/core/SkBitmap.h"
diff --git a/chrome/browser/notifications/scheduler/internal/scheduled_notification_manager_unittest.cc b/chrome/browser/notifications/scheduler/internal/scheduled_notification_manager_unittest.cc index 75cbddb..87a151a 100644 --- a/chrome/browser/notifications/scheduler/internal/scheduled_notification_manager_unittest.cc +++ b/chrome/browser/notifications/scheduler/internal/scheduled_notification_manager_unittest.cc
@@ -7,8 +7,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/guid.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h"
diff --git a/chrome/browser/notifications/scheduler/public/client_overview.h b/chrome/browser/notifications/scheduler/public/client_overview.h index 953c582a..a0e2dfdb8 100644 --- a/chrome/browser/notifications/scheduler/public/client_overview.h +++ b/chrome/browser/notifications/scheduler/public/client_overview.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_NOTIFICATIONS_SCHEDULER_PUBLIC_CLIENT_OVERVIEW_H_ #define CHROME_BROWSER_NOTIFICATIONS_SCHEDULER_PUBLIC_CLIENT_OVERVIEW_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/notifications/scheduler/public/impression_detail.h"
diff --git a/chrome/browser/notifications/scheduler/public/impression_detail.h b/chrome/browser/notifications/scheduler/public/impression_detail.h index 32f196a1..07a0727 100644 --- a/chrome/browser/notifications/scheduler/public/impression_detail.h +++ b/chrome/browser/notifications/scheduler/public/impression_detail.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_NOTIFICATIONS_SCHEDULER_PUBLIC_IMPRESSION_DETAIL_H_ #define CHROME_BROWSER_NOTIFICATIONS_SCHEDULER_PUBLIC_IMPRESSION_DETAIL_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/time/time.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/chrome/browser/notifications/scheduler/public/notification_background_task_scheduler.h b/chrome/browser/notifications/scheduler/public/notification_background_task_scheduler.h index 52fcbf36..bf243a3 100644 --- a/chrome/browser/notifications/scheduler/public/notification_background_task_scheduler.h +++ b/chrome/browser/notifications/scheduler/public/notification_background_task_scheduler.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_NOTIFICATIONS_SCHEDULER_PUBLIC_NOTIFICATION_BACKGROUND_TASK_SCHEDULER_H_ #define CHROME_BROWSER_NOTIFICATIONS_SCHEDULER_PUBLIC_NOTIFICATION_BACKGROUND_TASK_SCHEDULER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/time/time.h" #include "chrome/browser/notifications/scheduler/public/notification_scheduler_types.h"
diff --git a/chrome/browser/notifications/scheduler/public/notification_scheduler_client.h b/chrome/browser/notifications/scheduler/public/notification_scheduler_client.h index ad31d5ac..d2863d7 100644 --- a/chrome/browser/notifications/scheduler/public/notification_scheduler_client.h +++ b/chrome/browser/notifications/scheduler/public/notification_scheduler_client.h
@@ -10,7 +10,7 @@ #include <set> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/notifications/scheduler/public/notification_data.h" #include "chrome/browser/notifications/scheduler/public/notification_scheduler_types.h" #include "chrome/browser/notifications/scheduler/public/throttle_config.h"
diff --git a/chrome/browser/notifications/stub_notification_dispatcher_mac.cc b/chrome/browser/notifications/stub_notification_dispatcher_mac.cc index cf635edf..3e27eed 100644 --- a/chrome/browser/notifications/stub_notification_dispatcher_mac.cc +++ b/chrome/browser/notifications/stub_notification_dispatcher_mac.cc
@@ -10,8 +10,8 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/containers/flat_set.h" +#include "base/functional/callback.h" #include "chrome/browser/notifications/notification_platform_bridge_mac_utils.h" StubNotificationDispatcherMac::StubNotificationDispatcherMac() = default;
diff --git a/chrome/browser/notifications/stub_notification_display_service.cc b/chrome/browser/notifications/stub_notification_display_service.cc index 1432ec2..2c7e73a 100644 --- a/chrome/browser/notifications/stub_notification_display_service.cc +++ b/chrome/browser/notifications/stub_notification_display_service.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/notifications/stub_notification_display_service.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/ranges/algorithm.h" #include "base/run_loop.h" #include "chrome/browser/notifications/notification_handler.h"
diff --git a/chrome/browser/notifications/stub_notification_display_service.h b/chrome/browser/notifications/stub_notification_display_service.h index 4fb92dd20..cc2a6b2 100644 --- a/chrome/browser/notifications/stub_notification_display_service.h +++ b/chrome/browser/notifications/stub_notification_display_service.h
@@ -9,7 +9,7 @@ #include <utility> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/notifications/notification_common.h" #include "chrome/browser/notifications/notification_display_service_impl.h"
diff --git a/chrome/browser/notifications/web_page_notifier_controller.cc b/chrome/browser/notifications/web_page_notifier_controller.cc index bfa86eb..2e4b9f24 100644 --- a/chrome/browser/notifications/web_page_notifier_controller.cc +++ b/chrome/browser/notifications/web_page_notifier_controller.cc
@@ -7,7 +7,7 @@ #include <memory> #include "ash/public/cpp/notifier_metadata.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/strings/utf_string_conversions.h" #include "base/task/cancelable_task_tracker.h"
diff --git a/chrome/browser/notifications/web_page_notifier_controller_unittest.cc b/chrome/browser/notifications/web_page_notifier_controller_unittest.cc index 459764de..a06deb2 100644 --- a/chrome/browser/notifications/web_page_notifier_controller_unittest.cc +++ b/chrome/browser/notifications/web_page_notifier_controller_unittest.cc
@@ -5,7 +5,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h" #include "chrome/browser/favicon/favicon_service_factory.h" #include "chrome/browser/notifications/web_page_notifier_controller.h"
diff --git a/chrome/browser/notifications/win/fake_itoastnotifier.h b/chrome/browser/notifications/win/fake_itoastnotifier.h index b10404d..16f536a 100644 --- a/chrome/browser/notifications/win/fake_itoastnotifier.h +++ b/chrome/browser/notifications/win/fake_itoastnotifier.h
@@ -8,7 +8,7 @@ #include <windows.ui.notifications.h> #include <wrl/implements.h> -#include "base/callback.h" +#include "base/functional/callback.h" class NotificationLaunchId;
diff --git a/chrome/browser/ntp_tiles/chrome_most_visited_sites_factory.cc b/chrome/browser/ntp_tiles/chrome_most_visited_sites_factory.cc index c2cb53f7..d7e9db6c 100644 --- a/chrome/browser/ntp_tiles/chrome_most_visited_sites_factory.cc +++ b/chrome/browser/ntp_tiles/chrome_most_visited_sites_factory.cc
@@ -6,10 +6,10 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/check_deref.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/scoped_observation.h" #include "build/build_config.h"
diff --git a/chrome/browser/ntp_tiles/chrome_popular_sites_factory.cc b/chrome/browser/ntp_tiles/chrome_popular_sites_factory.cc index dbe49147..103fc73 100644 --- a/chrome/browser/ntp_tiles/chrome_popular_sites_factory.cc +++ b/chrome/browser/ntp_tiles/chrome_popular_sites_factory.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ntp_tiles/chrome_popular_sites_factory.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/search_engines/template_url_service_factory.h"
diff --git a/chrome/browser/offline_pages/android/auto_fetch_notifier.cc b/chrome/browser/offline_pages/android/auto_fetch_notifier.cc index 75037bf..62e282c 100644 --- a/chrome/browser/offline_pages/android/auto_fetch_notifier.cc +++ b/chrome/browser/offline_pages/android/auto_fetch_notifier.cc
@@ -7,7 +7,7 @@ #include "base/android/jni_android.h" #include "base/android/jni_string.h" #include "base/android/scoped_java_ref.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "chrome/android/chrome_jni_headers/AutoFetchNotifier_jni.h" #include "chrome/browser/offline_pages/android/offline_page_auto_fetcher_service.h"
diff --git a/chrome/browser/offline_pages/android/auto_fetch_page_load_watcher.cc b/chrome/browser/offline_pages/android/auto_fetch_page_load_watcher.cc index 7890200..b96bb30 100644 --- a/chrome/browser/offline_pages/android/auto_fetch_page_load_watcher.cc +++ b/chrome/browser/offline_pages/android/auto_fetch_page_load_watcher.cc
@@ -7,9 +7,9 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/android/tab_android.h"
diff --git a/chrome/browser/offline_pages/android/background_scheduler_bridge.cc b/chrome/browser/offline_pages/android/background_scheduler_bridge.cc index 6685e9bc..e5779ab1 100644 --- a/chrome/browser/offline_pages/android/background_scheduler_bridge.cc +++ b/chrome/browser/offline_pages/android/background_scheduler_bridge.cc
@@ -6,7 +6,7 @@ #include "base/android/callback_android.h" #include "base/android/scoped_java_ref.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/android/chrome_jni_headers/BackgroundSchedulerBridge_jni.h" #include "chrome/browser/offline_pages/android/offline_page_auto_fetcher_service_factory.h" #include "chrome/browser/offline_pages/offline_page_model_factory.h"
diff --git a/chrome/browser/offline_pages/android/downloads/offline_page_download_bridge.cc b/chrome/browser/offline_pages/android/downloads/offline_page_download_bridge.cc index e772807b..f81ebee 100644 --- a/chrome/browser/offline_pages/android/downloads/offline_page_download_bridge.cc +++ b/chrome/browser/offline_pages/android/downloads/offline_page_download_bridge.cc
@@ -10,8 +10,8 @@ #include <vector> #include "base/android/jni_string.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/guid.h" #include "base/logging.h" #include "base/memory/ptr_util.h"
diff --git a/chrome/browser/offline_pages/android/downloads/offline_page_infobar_delegate.h b/chrome/browser/offline_pages/android/downloads/offline_page_infobar_delegate.h index 296f2a3..41415be 100644 --- a/chrome/browser/offline_pages/android/downloads/offline_page_infobar_delegate.h +++ b/chrome/browser/offline_pages/android/downloads/offline_page_infobar_delegate.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_OFFLINE_PAGES_ANDROID_DOWNLOADS_OFFLINE_PAGE_INFOBAR_DELEGATE_H_ #define CHROME_BROWSER_OFFLINE_PAGES_ANDROID_DOWNLOADS_OFFLINE_PAGE_INFOBAR_DELEGATE_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/download/android/duplicate_download_infobar_delegate.h" #include "components/infobars/core/infobar_delegate.h" #include "url/gurl.h"
diff --git a/chrome/browser/offline_pages/android/downloads/offline_page_share_helper.cc b/chrome/browser/offline_pages/android/downloads/offline_page_share_helper.cc index 5ba50f9..da0ff8d 100644 --- a/chrome/browser/offline_pages/android/downloads/offline_page_share_helper.cc +++ b/chrome/browser/offline_pages/android/downloads/offline_page_share_helper.cc
@@ -8,8 +8,8 @@ #include <vector> #include "base/android/jni_string.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/task/single_thread_task_runner.h" #include "chrome/browser/download/android/download_controller_base.h" #include "chrome/browser/download/android/download_utils.h"
diff --git a/chrome/browser/offline_pages/android/downloads/offline_page_share_helper.h b/chrome/browser/offline_pages/android/downloads/offline_page_share_helper.h index d290235..e5cc0f9 100644 --- a/chrome/browser/offline_pages/android/downloads/offline_page_share_helper.h +++ b/chrome/browser/offline_pages/android/downloads/offline_page_share_helper.h
@@ -8,7 +8,7 @@ #include <memory> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "components/offline_items_collection/core/offline_item.h"
diff --git a/chrome/browser/offline_pages/android/evaluation/evaluation_test_scheduler.cc b/chrome/browser/offline_pages/android/evaluation/evaluation_test_scheduler.cc index fd4fa770..0253779e 100644 --- a/chrome/browser/offline_pages/android/evaluation/evaluation_test_scheduler.cc +++ b/chrome/browser/offline_pages/android/evaluation/evaluation_test_scheduler.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/offline_pages/android/evaluation/evaluation_test_scheduler.h" -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/task/single_thread_task_runner.h" #include "chrome/browser/offline_pages/request_coordinator_factory.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/offline_pages/android/evaluation/offline_page_evaluation_bridge.cc b/chrome/browser/offline_pages/android/evaluation/offline_page_evaluation_bridge.cc index 28f855d..4e58b51 100644 --- a/chrome/browser/offline_pages/android/evaluation/offline_page_evaluation_bridge.cc +++ b/chrome/browser/offline_pages/android/evaluation/offline_page_evaluation_bridge.cc
@@ -13,7 +13,7 @@ #include "base/android/jni_android.h" #include "base/android/jni_array.h" #include "base/android/jni_string.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "chrome/android/chrome_jni_headers/OfflinePageEvaluationBridge_jni.h"
diff --git a/chrome/browser/offline_pages/android/load_termination_listener_impl.cc b/chrome/browser/offline_pages/android/load_termination_listener_impl.cc index 2547dda4..2bac4f2 100644 --- a/chrome/browser/offline_pages/android/load_termination_listener_impl.cc +++ b/chrome/browser/offline_pages/android/load_termination_listener_impl.cc
@@ -5,7 +5,7 @@ #include "chrome/browser/offline_pages/android/load_termination_listener_impl.h" #include "base/android/application_status_listener.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/system/sys_info.h"
diff --git a/chrome/browser/offline_pages/android/offline_page_archive_publisher_impl.cc b/chrome/browser/offline_pages/android/offline_page_archive_publisher_impl.cc index 524249a..ecaf98b3 100644 --- a/chrome/browser/offline_pages/android/offline_page_archive_publisher_impl.cc +++ b/chrome/browser/offline_pages/android/offline_page_archive_publisher_impl.cc
@@ -12,8 +12,8 @@ #include "base/android/jni_array.h" #include "base/android/jni_string.h" #include "base/android/scoped_java_ref.h" -#include "base/bind.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "base/task/sequenced_task_runner.h" #include "chrome/android/chrome_jni_headers/OfflinePageArchivePublisherBridge_jni.h"
diff --git a/chrome/browser/offline_pages/android/offline_page_archive_publisher_impl_unittest.cc b/chrome/browser/offline_pages/android/offline_page_archive_publisher_impl_unittest.cc index f79eee2..a00d0ea6 100644 --- a/chrome/browser/offline_pages/android/offline_page_archive_publisher_impl_unittest.cc +++ b/chrome/browser/offline_pages/android/offline_page_archive_publisher_impl_unittest.cc
@@ -5,10 +5,10 @@ #include "chrome/browser/offline_pages/android/offline_page_archive_publisher_impl.h" #include "base/android/build_info.h" -#include "base/bind.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/memory/weak_ptr.h" #include "base/task/sequenced_task_runner.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/offline_pages/android/offline_page_auto_fetcher_service.cc b/chrome/browser/offline_pages/android/offline_page_auto_fetcher_service.cc index df97ad72..bd6c3e6c 100644 --- a/chrome/browser/offline_pages/android/offline_page_auto_fetcher_service.cc +++ b/chrome/browser/offline_pages/android/offline_page_auto_fetcher_service.cc
@@ -7,7 +7,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/strcat.h" #include "base/strings/string_number_conversions.h" #include "base/time/time.h"
diff --git a/chrome/browser/offline_pages/android/offline_page_auto_fetcher_service.h b/chrome/browser/offline_pages/android/offline_page_auto_fetcher_service.h index b4edaae6..7f3a4376 100644 --- a/chrome/browser/offline_pages/android/offline_page_auto_fetcher_service.h +++ b/chrome/browser/offline_pages/android/offline_page_auto_fetcher_service.h
@@ -11,7 +11,7 @@ #include <utility> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/offline_pages/android/auto_fetch_page_load_watcher.h"
diff --git a/chrome/browser/offline_pages/android/offline_page_auto_fetcher_service_unittest.cc b/chrome/browser/offline_pages/android/offline_page_auto_fetcher_service_unittest.cc index 889cfb13..d7e945d39 100644 --- a/chrome/browser/offline_pages/android/offline_page_auto_fetcher_service_unittest.cc +++ b/chrome/browser/offline_pages/android/offline_page_auto_fetcher_service_unittest.cc
@@ -6,8 +6,8 @@ #include <string> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/strings/utf_string_conversions.h" #include "base/test/bind.h" #include "base/test/mock_callback.h"
diff --git a/chrome/browser/offline_pages/android/offline_page_bridge.cc b/chrome/browser/offline_pages/android/offline_page_bridge.cc index 287a316..76d55c75 100644 --- a/chrome/browser/offline_pages/android/offline_page_bridge.cc +++ b/chrome/browser/offline_pages/android/offline_page_bridge.cc
@@ -14,8 +14,8 @@ #include "base/android/jni_android.h" #include "base/android/jni_array.h" #include "base/android/jni_string.h" -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h"
diff --git a/chrome/browser/offline_pages/android/offline_test_util_jni.cc b/chrome/browser/offline_pages/android/offline_test_util_jni.cc index f630896..80b271e 100644 --- a/chrome/browser/offline_pages/android/offline_test_util_jni.cc +++ b/chrome/browser/offline_pages/android/offline_test_util_jni.cc
@@ -9,8 +9,8 @@ #include "base/android/jni_array.h" #include "base/android/jni_string.h" #include "base/android/jni_utils.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/json/json_writer.h" #include "chrome/android/test_support_jni_headers/OfflineTestUtil_jni.h" #include "chrome/browser/android/profile_key_util.h"
diff --git a/chrome/browser/offline_pages/background_loader_offliner.cc b/chrome/browser/offline_pages/background_loader_offliner.cc index 5b909d8..996b9d83a 100644 --- a/chrome/browser/offline_pages/background_loader_offliner.cc +++ b/chrome/browser/offline_pages/background_loader_offliner.cc
@@ -9,7 +9,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/json/json_writer.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h"
diff --git a/chrome/browser/offline_pages/background_loader_offliner_unittest.cc b/chrome/browser/offline_pages/background_loader_offliner_unittest.cc index 73ca63c4..5c81579e 100644 --- a/chrome/browser/offline_pages/background_loader_offliner_unittest.cc +++ b/chrome/browser/offline_pages/background_loader_offliner_unittest.cc
@@ -8,8 +8,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/offline_pages/offline_page_bookmark_observer.cc b/chrome/browser/offline_pages/offline_page_bookmark_observer.cc index b4a54a6e..ad3383e1 100644 --- a/chrome/browser/offline_pages/offline_page_bookmark_observer.cc +++ b/chrome/browser/offline_pages/offline_page_bookmark_observer.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/offline_pages/offline_page_bookmark_observer.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/profiles/profile.h" #include "components/bookmarks/browser/bookmark_node.h" #include "components/offline_pages/core/client_namespace_constants.h"
diff --git a/chrome/browser/offline_pages/offline_page_mhtml_archiver.cc b/chrome/browser/offline_pages/offline_page_mhtml_archiver.cc index 3f80f79..46de6170 100644 --- a/chrome/browser/offline_pages/offline_page_mhtml_archiver.cc +++ b/chrome/browser/offline_pages/offline_page_mhtml_archiver.cc
@@ -7,10 +7,10 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/guid.h" #include "base/location.h" #include "base/logging.h"
diff --git a/chrome/browser/offline_pages/offline_page_mhtml_archiver.h b/chrome/browser/offline_pages/offline_page_mhtml_archiver.h index 42b405b..e212928 100644 --- a/chrome/browser/offline_pages/offline_page_mhtml_archiver.h +++ b/chrome/browser/offline_pages/offline_page_mhtml_archiver.h
@@ -10,7 +10,7 @@ #include <map> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h" #include "components/offline_pages/core/offline_page_archiver.h"
diff --git a/chrome/browser/offline_pages/offline_page_mhtml_archiver_unittest.cc b/chrome/browser/offline_pages/offline_page_mhtml_archiver_unittest.cc index 9b584223..7252ba9 100644 --- a/chrome/browser/offline_pages/offline_page_mhtml_archiver_unittest.cc +++ b/chrome/browser/offline_pages/offline_page_mhtml_archiver_unittest.cc
@@ -8,9 +8,9 @@ #include <memory> #include <string> -#include "base/bind.h" #include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/path_service.h"
diff --git a/chrome/browser/offline_pages/offline_page_request_handler.cc b/chrome/browser/offline_pages/offline_page_request_handler.cc index b7e936a..6311817 100644 --- a/chrome/browser/offline_pages/offline_page_request_handler.cc +++ b/chrome/browser/offline_pages/offline_page_request_handler.cc
@@ -6,10 +6,10 @@ #include <utility> -#include "base/bind.h" #include "base/check_op.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h" #include "base/notreached.h"
diff --git a/chrome/browser/offline_pages/offline_page_request_handler.h b/chrome/browser/offline_pages/offline_page_request_handler.h index 775f9586..41109f4 100644 --- a/chrome/browser/offline_pages/offline_page_request_handler.h +++ b/chrome/browser/offline_pages/offline_page_request_handler.h
@@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/offline_pages/offline_page_request_handler_unittest.cc b/chrome/browser/offline_pages/offline_page_request_handler_unittest.cc index e21ca34e..5872cb5 100644 --- a/chrome/browser/offline_pages/offline_page_request_handler_unittest.cc +++ b/chrome/browser/offline_pages/offline_page_request_handler_unittest.cc
@@ -7,10 +7,10 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/path_service.h"
diff --git a/chrome/browser/offline_pages/offline_page_tab_helper.cc b/chrome/browser/offline_pages/offline_page_tab_helper.cc index 7482cb9a..e6449d86 100644 --- a/chrome/browser/offline_pages/offline_page_tab_helper.cc +++ b/chrome/browser/offline_pages/offline_page_tab_helper.cc
@@ -6,9 +6,9 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/guid.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h"
diff --git a/chrome/browser/offline_pages/offline_page_tab_helper_unittest.cc b/chrome/browser/offline_pages/offline_page_tab_helper_unittest.cc index fd04fce..764c107 100644 --- a/chrome/browser/offline_pages/offline_page_tab_helper_unittest.cc +++ b/chrome/browser/offline_pages/offline_page_tab_helper_unittest.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/metrics/histogram_functions.h" #include "base/test/metrics/histogram_tester.h"
diff --git a/chrome/browser/offline_pages/offline_page_url_loader.cc b/chrome/browser/offline_pages/offline_page_url_loader.cc index 91d0850..21f1385 100644 --- a/chrome/browser/offline_pages/offline_page_url_loader.cc +++ b/chrome/browser/offline_pages/offline_page_url_loader.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/offline_pages/offline_page_url_loader.h" -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/notreached.h" #include "base/task/sequenced_task_runner.h"
diff --git a/chrome/browser/offline_pages/offline_page_url_loader_request_interceptor.cc b/chrome/browser/offline_pages/offline_page_url_loader_request_interceptor.cc index 1ee523b..5dc573ef 100644 --- a/chrome/browser/offline_pages/offline_page_url_loader_request_interceptor.cc +++ b/chrome/browser/offline_pages/offline_page_url_loader_request_interceptor.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/offline_pages/offline_page_url_loader_request_interceptor.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/offline_pages/offline_page_url_loader.h" #include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/offline_pages/offline_page_utils.cc b/chrome/browser/offline_pages/offline_page_utils.cc index 74a6d5c5..45ad44a9 100644 --- a/chrome/browser/offline_pages/offline_page_utils.cc +++ b/chrome/browser/offline_pages/offline_page_utils.cc
@@ -8,7 +8,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/metrics/histogram_macros.h" #include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/offline_pages/offline_page_utils.h b/chrome/browser/offline_pages/offline_page_utils.h index 8e686c2..cd42d1b 100644 --- a/chrome/browser/offline_pages/offline_page_utils.h +++ b/chrome/browser/offline_pages/offline_page_utils.h
@@ -9,8 +9,8 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/files/file_util.h" +#include "base/functional/callback.h" #include "components/offline_pages/core/offline_page_model.h" #include "components/offline_pages/core/offline_page_types.h" #include "url/gurl.h"
diff --git a/chrome/browser/offline_pages/offline_page_utils_unittest.cc b/chrome/browser/offline_pages/offline_page_utils_unittest.cc index 44b512e..ec9ff10 100644 --- a/chrome/browser/offline_pages/offline_page_utils_unittest.cc +++ b/chrome/browser/offline_pages/offline_page_utils_unittest.cc
@@ -8,12 +8,12 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" #include "base/files/file.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/offline_pages/prefetch/gcm_token.cc b/chrome/browser/offline_pages/prefetch/gcm_token.cc index 8576063..1dd78c4 100644 --- a/chrome/browser/offline_pages/prefetch/gcm_token.cc +++ b/chrome/browser/offline_pages/prefetch/gcm_token.cc
@@ -6,8 +6,8 @@ #include <map> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/threading/thread_task_runner_handle.h" #include "base/time/time.h"
diff --git a/chrome/browser/offline_pages/prefetch/gcm_token_unittest.cc b/chrome/browser/offline_pages/prefetch/gcm_token_unittest.cc index 3c0167d..9c8cb78e 100644 --- a/chrome/browser/offline_pages/prefetch/gcm_token_unittest.cc +++ b/chrome/browser/offline_pages/prefetch/gcm_token_unittest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/offline_pages/prefetch/gcm_token.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/test/scoped_feature_list.h"
diff --git a/chrome/browser/offline_pages/prefetch/offline_prefetch_download_client.cc b/chrome/browser/offline_pages/prefetch/offline_prefetch_download_client.cc index 6d95d218..e341d34 100644 --- a/chrome/browser/offline_pages/prefetch/offline_prefetch_download_client.cc +++ b/chrome/browser/offline_pages/prefetch/offline_prefetch_download_client.cc
@@ -9,7 +9,7 @@ #include <set> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/sequenced_task_runner.h" #include "chrome/browser/download/background_download_service_factory.h" #include "chrome/browser/offline_pages/prefetch/prefetch_service_factory.h"
diff --git a/chrome/browser/offline_pages/prefetch/prefetch_service_factory.cc b/chrome/browser/offline_pages/prefetch/prefetch_service_factory.cc index d1c2d7a..214d8ce2c 100644 --- a/chrome/browser/offline_pages/prefetch/prefetch_service_factory.cc +++ b/chrome/browser/offline_pages/prefetch/prefetch_service_factory.cc
@@ -8,8 +8,8 @@ #include <string> #include <utility> -#include "base/callback_helpers.h" #include "base/files/file_path.h" +#include "base/functional/callback_helpers.h" #include "base/memory/singleton.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/offline_pages/recent_tab_helper.cc b/chrome/browser/offline_pages/recent_tab_helper.cc index f32dad19..4fec7898 100644 --- a/chrome/browser/offline_pages/recent_tab_helper.cc +++ b/chrome/browser/offline_pages/recent_tab_helper.cc
@@ -7,8 +7,8 @@ #include <queue> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/metrics/histogram_macros.h" #include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/offline_pages/recent_tab_helper_unittest.cc b/chrome/browser/offline_pages/recent_tab_helper_unittest.cc index 4f72011..fca141d 100644 --- a/chrome/browser/offline_pages/recent_tab_helper_unittest.cc +++ b/chrome/browser/offline_pages/recent_tab_helper_unittest.cc
@@ -7,7 +7,7 @@ #include <memory> #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/strings/string_number_conversions.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/offline_pages/visuals_decoder_impl.cc b/chrome/browser/offline_pages/visuals_decoder_impl.cc index b96c0d6..87b8acd 100644 --- a/chrome/browser/offline_pages/visuals_decoder_impl.cc +++ b/chrome/browser/offline_pages/visuals_decoder_impl.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/offline_pages/visuals_decoder_impl.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "components/image_fetcher/core/image_decoder.h" #include "ui/gfx/geometry/rect.h" #include "ui/gfx/geometry/size.h"
diff --git a/chrome/browser/optimization_guide/hints_fetcher_browsertest.cc b/chrome/browser/optimization_guide/hints_fetcher_browsertest.cc index c73e40426..9dc5c38 100644 --- a/chrome/browser/optimization_guide/hints_fetcher_browsertest.cc +++ b/chrome/browser/optimization_guide/hints_fetcher_browsertest.cc
@@ -7,10 +7,10 @@ #include <string> #include <vector> -#include "base/bind.h" #include "base/command_line.h" #include "base/containers/flat_set.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/path_service.h" #include "base/run_loop.h" #include "base/strings/strcat.h"
diff --git a/chrome/browser/optimization_guide/optimization_guide_internals_ui.h b/chrome/browser/optimization_guide/optimization_guide_internals_ui.h index 7909eb9..8c23262 100644 --- a/chrome/browser/optimization_guide/optimization_guide_internals_ui.h +++ b/chrome/browser/optimization_guide/optimization_guide_internals_ui.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_OPTIMIZATION_GUIDE_OPTIMIZATION_GUIDE_INTERNALS_UI_H_ #define CHROME_BROWSER_OPTIMIZATION_GUIDE_OPTIMIZATION_GUIDE_INTERNALS_UI_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "components/optimization_guide/optimization_guide_internals/webui/optimization_guide_internals.mojom.h" #include "mojo/public/cpp/bindings/pending_receiver.h" #include "ui/base/webui/resource_path.h"
diff --git a/chrome/browser/optimization_guide/optimization_guide_keyed_service.cc b/chrome/browser/optimization_guide/optimization_guide_keyed_service.cc index 70bf6ac..903dd708 100644 --- a/chrome/browser/optimization_guide/optimization_guide_keyed_service.cc +++ b/chrome/browser/optimization_guide/optimization_guide_keyed_service.cc
@@ -4,9 +4,9 @@ #include "chrome/browser/optimization_guide/optimization_guide_keyed_service.h" -#include "base/callback_helpers.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h" #include "base/path_service.h"
diff --git a/chrome/browser/optimization_guide/page_content_annotations_service_browsertest.cc b/chrome/browser/optimization_guide/page_content_annotations_service_browsertest.cc index 10ecdc8b..c8c66f3 100644 --- a/chrome/browser/optimization_guide/page_content_annotations_service_browsertest.cc +++ b/chrome/browser/optimization_guide/page_content_annotations_service_browsertest.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 "base/callback.h" +#include "base/functional/callback.h" #include "base/path_service.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h"
diff --git a/chrome/browser/optimization_guide/page_text_observer_browsertest.cc b/chrome/browser/optimization_guide/page_text_observer_browsertest.cc index 1dde804d..e3e74da6 100644 --- a/chrome/browser/optimization_guide/page_text_observer_browsertest.cc +++ b/chrome/browser/optimization_guide/page_text_observer_browsertest.cc
@@ -6,9 +6,9 @@ #include <string> -#include "base/bind.h" -#include "base/callback.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/strings/strcat.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/optimization_guide/prediction/prediction_manager_browsertest.cc b/chrome/browser/optimization_guide/prediction/prediction_manager_browsertest.cc index bd70494b..072569f9 100644 --- a/chrome/browser/optimization_guide/prediction/prediction_manager_browsertest.cc +++ b/chrome/browser/optimization_guide/prediction/prediction_manager_browsertest.cc
@@ -5,8 +5,8 @@ #include <memory> #include "base/base64.h" -#include "base/callback_helpers.h" #include "base/files/file_util.h" +#include "base/functional/callback_helpers.h" #include "base/path_service.h" #include "base/run_loop.h" #include "base/strings/strcat.h"
diff --git a/chrome/browser/optimization_guide/prediction/prediction_model_download_client.cc b/chrome/browser/optimization_guide/prediction/prediction_model_download_client.cc index 4718c5f36..395c79b 100644 --- a/chrome/browser/optimization_guide/prediction/prediction_model_download_client.cc +++ b/chrome/browser/optimization_guide/prediction/prediction_model_download_client.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/optimization_guide/prediction/prediction_model_download_client.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros_local.h" #include "base/task/sequenced_task_runner.h" #include "chrome/browser/optimization_guide/optimization_guide_keyed_service.h"
diff --git a/chrome/browser/origin_trials/origin_trials_browsertest.cc b/chrome/browser/origin_trials/origin_trials_browsertest.cc index f13e5c3..07e3cd6a 100644 --- a/chrome/browser/origin_trials/origin_trials_browsertest.cc +++ b/chrome/browser/origin_trials/origin_trials_browsertest.cc
@@ -6,9 +6,9 @@ #include <string> #include <vector> -#include "base/bind.h" #include "base/containers/flat_map.h" #include "base/containers/flat_set.h" +#include "base/functional/bind.h" #include "base/strings/strcat.h" #include "base/test/scoped_feature_list.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
diff --git a/chrome/browser/os_crypt/app_bound_encryption_metrics_win.cc b/chrome/browser/os_crypt/app_bound_encryption_metrics_win.cc index c1c3f77..3d67124 100644 --- a/chrome/browser/os_crypt/app_bound_encryption_metrics_win.cc +++ b/chrome/browser/os_crypt/app_bound_encryption_metrics_win.cc
@@ -7,7 +7,7 @@ #include <string> #include "base/base64.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h"
diff --git a/chrome/browser/page_info/about_this_site_tab_helper.cc b/chrome/browser/page_info/about_this_site_tab_helper.cc index ffc9076..6c11445 100644 --- a/chrome/browser/page_info/about_this_site_tab_helper.cc +++ b/chrome/browser/page_info/about_this_site_tab_helper.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/page_info/about_this_site_tab_helper.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/metrics/histogram_functions.h" #include "build/buildflag.h" #include "chrome/browser/page_info/page_info_features.h"
diff --git a/chrome/browser/page_load_metrics/observers/ad_metrics/ads_page_load_metrics_observer_browsertest.cc b/chrome/browser/page_load_metrics/observers/ad_metrics/ads_page_load_metrics_observer_browsertest.cc index a98d28d..57a7a0e 100644 --- a/chrome/browser/page_load_metrics/observers/ad_metrics/ads_page_load_metrics_observer_browsertest.cc +++ b/chrome/browser/page_load_metrics/observers/ad_metrics/ads_page_load_metrics_observer_browsertest.cc
@@ -6,8 +6,8 @@ #include <string> #include "build/chromeos_buildflags.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/strings/escape.h" #include "base/strings/strcat.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/page_load_metrics/observers/page_load_metrics_observer_test_harness.cc b/chrome/browser/page_load_metrics/observers/page_load_metrics_observer_test_harness.cc index 66d2177c..b507c74 100644 --- a/chrome/browser/page_load_metrics/observers/page_load_metrics_observer_test_harness.cc +++ b/chrome/browser/page_load_metrics/observers/page_load_metrics_observer_test_harness.cc
@@ -6,8 +6,8 @@ #include <string> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "components/ukm/content/source_url_recorder.h" #include "content/public/browser/web_contents.h" #include "third_party/blink/public/common/features.h"
diff --git a/chrome/browser/page_load_metrics/page_load_metrics_browsertest.cc b/chrome/browser/page_load_metrics/page_load_metrics_browsertest.cc index 565287c..dd81bce2 100644 --- a/chrome/browser/page_load_metrics/page_load_metrics_browsertest.cc +++ b/chrome/browser/page_load_metrics/page_load_metrics_browsertest.cc
@@ -10,10 +10,10 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/check_op.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/memory/weak_ptr.h" #include "base/path_service.h" #include "base/run_loop.h"
diff --git a/chrome/browser/page_load_metrics/page_load_metrics_initialize.cc b/chrome/browser/page_load_metrics/page_load_metrics_initialize.cc index df67be26..f507e3e 100644 --- a/chrome/browser/page_load_metrics/page_load_metrics_initialize.cc +++ b/chrome/browser/page_load_metrics/page_load_metrics_initialize.cc
@@ -8,7 +8,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/heavy_ad_intervention/heavy_ad_service_factory.h"
diff --git a/chrome/browser/paint_preview/paint_preview_browsertest.cc b/chrome/browser/paint_preview/paint_preview_browsertest.cc index 9ec3b41c..f2857ec2 100644 --- a/chrome/browser/paint_preview/paint_preview_browsertest.cc +++ b/chrome/browser/paint_preview/paint_preview_browsertest.cc
@@ -3,10 +3,10 @@ // found in the LICENSE file. #include "base/base64.h" -#include "base/bind.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" #include "base/unguessable_token.h"
diff --git a/chrome/browser/paint_preview/paint_preview_compositor_browsertest.cc b/chrome/browser/paint_preview/paint_preview_compositor_browsertest.cc index 7a397ad5..9f24fd7 100644 --- a/chrome/browser/paint_preview/paint_preview_compositor_browsertest.cc +++ b/chrome/browser/paint_preview/paint_preview_compositor_browsertest.cc
@@ -6,9 +6,9 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/test/gtest_util.h" #include "base/unguessable_token.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 6d8e10b..0fddc53 100644 --- a/chrome/browser/paint_preview/services/paint_preview_tab_service.cc +++ b/chrome/browser/paint_preview/services/paint_preview_tab_service.cc
@@ -7,7 +7,7 @@ #include <algorithm> #include <utility> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/memory_pressure_listener.h" #include "base/memory/memory_pressure_monitor.h" #include "base/metrics/histogram_functions.h"
diff --git a/chrome/browser/paint_preview/services/paint_preview_tab_service.h b/chrome/browser/paint_preview/services/paint_preview_tab_service.h index bb20250..cd428c38 100644 --- a/chrome/browser/paint_preview/services/paint_preview_tab_service.h +++ b/chrome/browser/paint_preview/services/paint_preview_tab_service.h
@@ -8,9 +8,9 @@ #include <memory> #include <vector> -#include "base/callback_forward.h" #include "base/containers/flat_set.h" #include "base/files/file_path.h" +#include "base/functional/callback_forward.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h"
diff --git a/chrome/browser/password_check/android/password_check_manager_unittest.cc b/chrome/browser/password_check/android/password_check_manager_unittest.cc index c32d4a1f..617c519 100644 --- a/chrome/browser/password_check/android/password_check_manager_unittest.cc +++ b/chrome/browser/password_check/android/password_check_manager_unittest.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/notreached.h"
diff --git a/chrome/browser/password_edit_dialog/android/password_edit_dialog_bridge.h b/chrome/browser/password_edit_dialog/android/password_edit_dialog_bridge.h index e7a6091..da3e890e 100644 --- a/chrome/browser/password_edit_dialog/android/password_edit_dialog_bridge.h +++ b/chrome/browser/password_edit_dialog/android/password_edit_dialog_bridge.h
@@ -10,7 +10,7 @@ #include "base/android/jni_android.h" #include "base/android/scoped_java_ref.h" -#include "base/callback.h" +#include "base/functional/callback.h" namespace content { class WebContents;
diff --git a/chrome/browser/password_entry_edit/android/credential_edit_bridge.h b/chrome/browser/password_entry_edit/android/credential_edit_bridge.h index b0c4d60..282e1a6c 100644 --- a/chrome/browser/password_entry_edit/android/credential_edit_bridge.h +++ b/chrome/browser/password_entry_edit/android/credential_edit_bridge.h
@@ -8,7 +8,7 @@ #include <jni.h> #include "base/android/scoped_java_ref.h" -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "components/password_manager/core/browser/ui/credential_ui_entry.h" #include "components/password_manager/core/browser/ui/insecure_credentials_manager.h"
diff --git a/chrome/browser/password_manager/account_password_store_factory.cc b/chrome/browser/password_manager/account_password_store_factory.cc index 0217acf..eedd023 100644 --- a/chrome/browser/password_manager/account_password_store_factory.cc +++ b/chrome/browser/password_manager/account_password_store_factory.cc
@@ -8,8 +8,8 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "build/build_config.h"
diff --git a/chrome/browser/password_manager/android/account_chooser_dialog_android_unittest.cc b/chrome/browser/password_manager/android/account_chooser_dialog_android_unittest.cc index 03b569d..3cdeaa0 100644 --- a/chrome/browser/password_manager/android/account_chooser_dialog_android_unittest.cc +++ b/chrome/browser/password_manager/android/account_chooser_dialog_android_unittest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/password_manager/android/account_chooser_dialog_android.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/scoped_refptr.h" #include "base/test/gmock_callback_support.h" #include "base/test/metrics/histogram_tester.h"
diff --git a/chrome/browser/password_manager/android/all_passwords_bottom_sheet_controller.h b/chrome/browser/password_manager/android/all_passwords_bottom_sheet_controller.h index 925afdf..c744a5e5 100644 --- a/chrome/browser/password_manager/android/all_passwords_bottom_sheet_controller.h +++ b/chrome/browser/password_manager/android/all_passwords_bottom_sheet_controller.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_PASSWORD_MANAGER_ANDROID_ALL_PASSWORDS_BOTTOM_SHEET_CONTROLLER_H_ #define CHROME_BROWSER_PASSWORD_MANAGER_ANDROID_ALL_PASSWORDS_BOTTOM_SHEET_CONTROLLER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/types/pass_key.h"
diff --git a/chrome/browser/password_manager/android/all_passwords_bottom_sheet_helper.h b/chrome/browser/password_manager/android/all_passwords_bottom_sheet_helper.h index 5062ae4..61a2ce55 100644 --- a/chrome/browser/password_manager/android/all_passwords_bottom_sheet_helper.h +++ b/chrome/browser/password_manager/android/all_passwords_bottom_sheet_helper.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_PASSWORD_MANAGER_ANDROID_ALL_PASSWORDS_BOTTOM_SHEET_HELPER_H_ #define CHROME_BROWSER_PASSWORD_MANAGER_ANDROID_ALL_PASSWORDS_BOTTOM_SHEET_HELPER_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "components/autofill/core/common/mojom/autofill_types.mojom-shared.h" #include "components/password_manager/core/browser/password_store_consumer.h"
diff --git a/chrome/browser/password_manager/android/fake_password_manager_lifecycle_helper.h b/chrome/browser/password_manager/android/fake_password_manager_lifecycle_helper.h index 9e03bc8..a396ec9 100644 --- a/chrome/browser/password_manager/android/fake_password_manager_lifecycle_helper.h +++ b/chrome/browser/password_manager/android/fake_password_manager_lifecycle_helper.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_PASSWORD_MANAGER_ANDROID_FAKE_PASSWORD_MANAGER_LIFECYCLE_HELPER_H_ #define CHROME_BROWSER_PASSWORD_MANAGER_ANDROID_FAKE_PASSWORD_MANAGER_LIFECYCLE_HELPER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/password_manager/android/password_manager_lifecycle_helper.h" namespace password_manager {
diff --git a/chrome/browser/password_manager/android/password_accessory_controller_impl.cc b/chrome/browser/password_manager/android/password_accessory_controller_impl.cc index e82c6c5..92822d3 100644 --- a/chrome/browser/password_manager/android/password_accessory_controller_impl.cc +++ b/chrome/browser/password_manager/android/password_accessory_controller_impl.cc
@@ -8,11 +8,11 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/containers/span.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/memory/scoped_refptr.h" #include "base/metrics/histogram_macros.h"
diff --git a/chrome/browser/password_manager/android/password_accessory_controller_impl_unittest.cc b/chrome/browser/password_manager/android/password_accessory_controller_impl_unittest.cc index a34205b..25fd1c34 100644 --- a/chrome/browser/password_manager/android/password_accessory_controller_impl_unittest.cc +++ b/chrome/browser/password_manager/android/password_accessory_controller_impl_unittest.cc
@@ -10,8 +10,8 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h"
diff --git a/chrome/browser/password_manager/android/password_generation_controller_impl.cc b/chrome/browser/password_manager/android/password_generation_controller_impl.cc index 593a68df..1715d56 100644 --- a/chrome/browser/password_manager/android/password_generation_controller_impl.cc +++ b/chrome/browser/password_manager/android/password_generation_controller_impl.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/ptr_util.h" #include "base/metrics/histogram_macros.h" #include "base/trace_event/trace_event.h"
diff --git a/chrome/browser/password_manager/android/password_generation_controller_impl_unittest.cc b/chrome/browser/password_manager/android/password_generation_controller_impl_unittest.cc index 8e630c2..0fbaf35 100644 --- a/chrome/browser/password_manager/android/password_generation_controller_impl_unittest.cc +++ b/chrome/browser/password_manager/android/password_generation_controller_impl_unittest.cc
@@ -6,7 +6,7 @@ #include <map> #include <utility> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/strings/utf_string_conversions.h" #include "base/test/metrics/histogram_tester.h"
diff --git a/chrome/browser/password_manager/android/password_manager_lifecycle_helper.h b/chrome/browser/password_manager/android/password_manager_lifecycle_helper.h index 516ce4c8..147dcd3c 100644 --- a/chrome/browser/password_manager/android/password_manager_lifecycle_helper.h +++ b/chrome/browser/password_manager/android/password_manager_lifecycle_helper.h
@@ -6,7 +6,7 @@ #define CHROME_BROWSER_PASSWORD_MANAGER_ANDROID_PASSWORD_MANAGER_LIFECYCLE_HELPER_H_ #include "base/android/scoped_java_ref.h" -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" // The interface is implemented by JNI helper classes that forward Android // lifecycle events for use in the password manager.
diff --git a/chrome/browser/password_manager/android/password_manager_settings_service_android_impl.cc b/chrome/browser/password_manager/android/password_manager_settings_service_android_impl.cc index 055886f..c20ca87 100644 --- a/chrome/browser/password_manager/android/password_manager_settings_service_android_impl.cc +++ b/chrome/browser/password_manager/android/password_manager_settings_service_android_impl.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/password_manager/android/password_manager_settings_service_android_impl.h" -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/metrics/histogram_functions.h" #include "chrome/browser/password_manager/android/password_manager_lifecycle_helper_impl.h"
diff --git a/chrome/browser/password_manager/android/password_store_android_backend.cc b/chrome/browser/password_manager/android/password_store_android_backend.cc index a359d7f9..d6e9155d 100644 --- a/chrome/browser/password_manager/android/password_store_android_backend.cc +++ b/chrome/browser/password_manager/android/password_store_android_backend.cc
@@ -12,8 +12,8 @@ #include <vector> #include "base/barrier_callback.h" -#include "base/callback.h" #include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/memory/weak_ptr.h" #include "base/metrics/histogram_functions.h"
diff --git a/chrome/browser/password_manager/android/password_store_android_backend_unittest.cc b/chrome/browser/password_manager/android/password_store_android_backend_unittest.cc index 5fde7af..cb2196ab 100644 --- a/chrome/browser/password_manager/android/password_store_android_backend_unittest.cc +++ b/chrome/browser/password_manager/android/password_store_android_backend_unittest.cc
@@ -8,8 +8,7 @@ #include <vector> #include "base/android/scoped_java_ref.h" -#include "base/callback_forward.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_forward.h" #include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/strings/strcat.h"
diff --git a/chrome/browser/password_manager/android/password_store_bridge.cc b/chrome/browser/password_manager/android/password_store_bridge.cc index af15b3b..35296a2 100644 --- a/chrome/browser/password_manager/android/password_store_bridge.cc +++ b/chrome/browser/password_manager/android/password_store_bridge.cc
@@ -8,7 +8,7 @@ #include "base/android/jni_android.h" #include "base/android/jni_string.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "chrome/browser/password_manager/android/jni_headers/PasswordStoreBridge_jni.h" #include "chrome/browser/password_manager/android/jni_headers/PasswordStoreCredential_jni.h" #include "components/password_manager/core/browser/form_parsing/form_parser.h"
diff --git a/chrome/browser/password_manager/android/password_sync_controller_delegate_android.h b/chrome/browser/password_manager/android/password_sync_controller_delegate_android.h index cb345df..017fc8a1 100644 --- a/chrome/browser/password_manager/android/password_sync_controller_delegate_android.h +++ b/chrome/browser/password_manager/android/password_sync_controller_delegate_android.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "base/scoped_observation.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 14ea73c4..d2485be 100644 --- a/chrome/browser/password_manager/android/password_ui_view_android.cc +++ b/chrome/browser/password_manager/android/password_ui_view_android.cc
@@ -13,12 +13,12 @@ #include "base/android/jni_string.h" #include "base/android/jni_weak_ref.h" #include "base/android/scoped_java_ref.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/cxx20_erase.h" #include "base/files/file.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/field_trial.h" #include "base/metrics/user_metrics.h" #include "base/metrics/user_metrics_action.h"
diff --git a/chrome/browser/password_manager/android/save_update_password_message_delegate.cc b/chrome/browser/password_manager/android/save_update_password_message_delegate.cc index ea4f225..43f6140 100644 --- a/chrome/browser/password_manager/android/save_update_password_message_delegate.cc +++ b/chrome/browser/password_manager/android/save_update_password_message_delegate.cc
@@ -5,10 +5,10 @@ #include "chrome/browser/password_manager/android/save_update_password_message_delegate.h" #include <utility> -#include "base/callback.h" #include "base/check.h" #include "base/feature_list.h" #include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/android/android_theme_resources.h" #include "chrome/browser/android/resource_mapper.h"
diff --git a/chrome/browser/password_manager/android/save_update_password_message_delegate.h b/chrome/browser/password_manager/android/save_update_password_message_delegate.h index 6b2e3b3..42294cff 100644 --- a/chrome/browser/password_manager/android/save_update_password_message_delegate.h +++ b/chrome/browser/password_manager/android/save_update_password_message_delegate.h
@@ -7,8 +7,8 @@ #include <memory> -#include "base/callback.h" -#include "base/callback_forward.h" +#include "base/functional/callback.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/password_edit_dialog/android/password_edit_dialog_bridge.h" #include "chrome/browser/ui/passwords/manage_passwords_state.h"
diff --git a/chrome/browser/password_manager/chrome_password_manager_client.cc b/chrome/browser/password_manager/chrome_password_manager_client.cc index f4fb124..5d8487f 100644 --- a/chrome/browser/password_manager/chrome_password_manager_client.cc +++ b/chrome/browser/password_manager/chrome_password_manager_client.cc
@@ -8,10 +8,10 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h"
diff --git a/chrome/browser/password_manager/chrome_password_manager_client_unittest.cc b/chrome/browser/password_manager/chrome_password_manager_client_unittest.cc index 3132a27..95a6971 100644 --- a/chrome/browser/password_manager/chrome_password_manager_client_unittest.cc +++ b/chrome/browser/password_manager/chrome_password_manager_client_unittest.cc
@@ -9,8 +9,8 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/ranges/algorithm.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/password_manager/chrome_webauthn_credentials_delegate.h b/chrome/browser/password_manager/chrome_webauthn_credentials_delegate.h index af8e9bb..2730b764 100644 --- a/chrome/browser/password_manager/chrome_webauthn_credentials_delegate.h +++ b/chrome/browser/password_manager/chrome_webauthn_credentials_delegate.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_PASSWORD_MANAGER_CHROME_WEBAUTHN_CREDENTIALS_DELEGATE_H_ #define CHROME_BROWSER_PASSWORD_MANAGER_CHROME_WEBAUTHN_CREDENTIALS_DELEGATE_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "components/password_manager/core/browser/webauthn_credentials_delegate.h"
diff --git a/chrome/browser/password_manager/chrome_webauthn_credentials_delegate_unittest.cc b/chrome/browser/password_manager/chrome_webauthn_credentials_delegate_unittest.cc index 763d8a3..e3e12b3 100644 --- a/chrome/browser/password_manager/chrome_webauthn_credentials_delegate_unittest.cc +++ b/chrome/browser/password_manager/chrome_webauthn_credentials_delegate_unittest.cc
@@ -9,7 +9,7 @@ #include <vector> #include "base/base64.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/password_manager/multi_profile_credentials_filter_unittest.cc b/chrome/browser/password_manager/multi_profile_credentials_filter_unittest.cc index 65993c2..585650c 100644 --- a/chrome/browser/password_manager/multi_profile_credentials_filter_unittest.cc +++ b/chrome/browser/password_manager/multi_profile_credentials_filter_unittest.cc
@@ -6,9 +6,9 @@ #include <string> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile_attributes_entry.h"
diff --git a/chrome/browser/password_manager/password_manager_browsertest.cc b/chrome/browser/password_manager/password_manager_browsertest.cc index f00136f..ac11ae8 100644 --- a/chrome/browser/password_manager/password_manager_browsertest.cc +++ b/chrome/browser/password_manager/password_manager_browsertest.cc
@@ -5,11 +5,11 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/command_line.h" #include "base/containers/contains.h" #include "base/feature_list.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/metrics/histogram_samples.h"
diff --git a/chrome/browser/password_manager/password_manager_interactive_uitest.cc b/chrome/browser/password_manager/password_manager_interactive_uitest.cc index 0b1fff7..eb282df 100644 --- a/chrome/browser/password_manager/password_manager_interactive_uitest.cc +++ b/chrome/browser/password_manager/password_manager_interactive_uitest.cc
@@ -4,7 +4,7 @@ #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/password_manager/password_manager_test_base.cc b/chrome/browser/password_manager/password_manager_test_base.cc index b34902ef..4192c49 100644 --- a/chrome/browser/password_manager/password_manager_test_base.cc +++ b/chrome/browser/password_manager/password_manager_test_base.cc
@@ -9,7 +9,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h"
diff --git a/chrome/browser/password_manager/password_store_factory.cc b/chrome/browser/password_manager/password_store_factory.cc index ed84adb..22c6c21 100644 --- a/chrome/browser/password_manager/password_store_factory.cc +++ b/chrome/browser/password_manager/password_store_factory.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/password_manager/password_store_utils.cc b/chrome/browser/password_manager/password_store_utils.cc index d0c188e..6bd200b1 100644 --- a/chrome/browser/password_manager/password_store_utils.cc +++ b/chrome/browser/password_manager/password_store_utils.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/password_manager/password_store_utils.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/task/sequenced_task_runner.h" #include "chrome/browser/password_manager/account_password_store_factory.h"
diff --git a/chrome/browser/payments/android/payment_app_service_bridge_unittest.cc b/chrome/browser/payments/android/payment_app_service_bridge_unittest.cc index 9c15e988..10c6880 100644 --- a/chrome/browser/payments/android/payment_app_service_bridge_unittest.cc +++ b/chrome/browser/payments/android/payment_app_service_bridge_unittest.cc
@@ -5,7 +5,7 @@ #include <memory> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/payments/android/service_worker_payment_app_bridge.cc b/chrome/browser/payments/android/service_worker_payment_app_bridge.cc index 694ea76..79ad002 100644 --- a/chrome/browser/payments/android/service_worker_payment_app_bridge.cc +++ b/chrome/browser/payments/android/service_worker_payment_app_bridge.cc
@@ -10,7 +10,7 @@ #include "base/android/jni_array.h" #include "base/android/jni_string.h" #include "base/android/scoped_java_ref.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/numerics/safe_conversions.h" #include "chrome/browser/payments/android/jni_headers/ServiceWorkerPaymentAppBridge_jni.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/payments/iframe_csp_browsertest.cc b/chrome/browser/payments/iframe_csp_browsertest.cc index 764ed47..51255546 100644 --- a/chrome/browser/payments/iframe_csp_browsertest.cc +++ b/chrome/browser/payments/iframe_csp_browsertest.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 "base/bind.h" +#include "base/functional/bind.h" #include "base/test/scoped_feature_list.h" #include "chrome/test/payments/payment_request_platform_browsertest_base.h" #include "content/public/browser/render_frame_host.h"
diff --git a/chrome/browser/payments/manifest_verifier_browsertest.cc b/chrome/browser/payments/manifest_verifier_browsertest.cc index e078b6a..aefcd63 100644 --- a/chrome/browser/payments/manifest_verifier_browsertest.cc +++ b/chrome/browser/payments/manifest_verifier_browsertest.cc
@@ -7,7 +7,7 @@ #include <stdint.h> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h"
diff --git a/chrome/browser/payments/payment_handler_install_failed_browsertest.cc b/chrome/browser/payments/payment_handler_install_failed_browsertest.cc index e386a0e..2ab3316 100644 --- a/chrome/browser/payments/payment_handler_install_failed_browsertest.cc +++ b/chrome/browser/payments/payment_handler_install_failed_browsertest.cc
@@ -4,7 +4,7 @@ #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/test/metrics/histogram_tester.h" #include "chrome/test/payments/payment_request_platform_browsertest_base.h"
diff --git a/chrome/browser/payments/payment_handler_permission_context_unittest.cc b/chrome/browser/payments/payment_handler_permission_context_unittest.cc index f8fb6db..6dfb30f8 100644 --- a/chrome/browser/payments/payment_handler_permission_context_unittest.cc +++ b/chrome/browser/payments/payment_handler_permission_context_unittest.cc
@@ -6,7 +6,7 @@ #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "build/build_config.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h" #include "chrome/test/base/chrome_render_view_host_test_harness.h"
diff --git a/chrome/browser/payments/payment_manifest_parser_browsertest.cc b/chrome/browser/payments/payment_manifest_parser_browsertest.cc index f17abe7..0560d77 100644 --- a/chrome/browser/payments/payment_manifest_parser_browsertest.cc +++ b/chrome/browser/payments/payment_manifest_parser_browsertest.cc
@@ -7,8 +7,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/json/json_writer.h" #include "base/run_loop.h" #include "chrome/test/base/in_process_browser_test.h"
diff --git a/chrome/browser/payments/service_worker_payment_app_finder_browsertest.cc b/chrome/browser/payments/service_worker_payment_app_finder_browsertest.cc index 0e85f62..93ced94b 100644 --- a/chrome/browser/payments/service_worker_payment_app_finder_browsertest.cc +++ b/chrome/browser/payments/service_worker_payment_app_finder_browsertest.cc
@@ -7,9 +7,9 @@ #include <algorithm> #include <utility> -#include "base/bind.h" #include "base/command_line.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/test/scoped_feature_list.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/pdf/pdf_extension_test.cc b/chrome/browser/pdf/pdf_extension_test.cc index 34659569..ef28ba2 100644 --- a/chrome/browser/pdf/pdf_extension_test.cc +++ b/chrome/browser/pdf/pdf_extension_test.cc
@@ -10,12 +10,12 @@ #include <vector> #include "base/base_paths.h" -#include "base/bind.h" #include "base/containers/contains.h" #include "base/containers/flat_set.h" #include "base/feature_list.h" #include "base/files/file_enumerator.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/hash/hash.h" #include "base/logging.h" #include "base/memory/raw_ptr.h"
diff --git a/chrome/browser/pdf/pdf_extension_test_util.cc b/chrome/browser/pdf/pdf_extension_test_util.cc index c1a697c..fcc30a3f 100644 --- a/chrome/browser/pdf/pdf_extension_test_util.cc +++ b/chrome/browser/pdf/pdf_extension_test_util.cc
@@ -6,8 +6,8 @@ #include <stddef.h> -#include "base/bind.h" #include "base/containers/flat_set.h" +#include "base/functional/bind.h" #include "base/test/bind.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tabs/tab_strip_model.h"
diff --git a/chrome/browser/pdf/pdf_frame_util.cc b/chrome/browser/pdf/pdf_frame_util.cc index a2851b22..0534526 100644 --- a/chrome/browser/pdf/pdf_frame_util.cc +++ b/chrome/browser/pdf/pdf_frame_util.cc
@@ -6,8 +6,8 @@ #include <functional> -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "chrome/common/pdf_util.h" #include "content/public/browser/render_frame_host.h" #include "content/public/browser/render_process_host.h"
diff --git a/chrome/browser/performance_manager/browser_child_process_watcher.cc b/chrome/browser/performance_manager/browser_child_process_watcher.cc index 039e7ac..18917e96 100644 --- a/chrome/browser/performance_manager/browser_child_process_watcher.cc +++ b/chrome/browser/performance_manager/browser_child_process_watcher.cc
@@ -8,8 +8,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/process/process.h" #include "components/performance_manager/graph/process_node_impl.h" #include "components/performance_manager/performance_manager_impl.h"
diff --git a/chrome/browser/performance_manager/chrome_browser_main_extra_parts_performance_manager.cc b/chrome/browser/performance_manager/chrome_browser_main_extra_parts_performance_manager.cc index 4da66701..4d578fc5 100644 --- a/chrome/browser/performance_manager/chrome_browser_main_extra_parts_performance_manager.cc +++ b/chrome/browser/performance_manager/chrome_browser_main_extra_parts_performance_manager.cc
@@ -6,7 +6,6 @@ #include <memory> -#include "base/bind.h" #include "base/feature_list.h" #include "base/functional/bind.h" #include "base/power_monitor/power_monitor_buildflags.h"
diff --git a/chrome/browser/performance_manager/decorators/helpers/page_live_state_decorator_helper_unittest.cc b/chrome/browser/performance_manager/decorators/helpers/page_live_state_decorator_helper_unittest.cc index ca63b7d..ce63d8c 100644 --- a/chrome/browser/performance_manager/decorators/helpers/page_live_state_decorator_helper_unittest.cc +++ b/chrome/browser/performance_manager/decorators/helpers/page_live_state_decorator_helper_unittest.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/performance_manager/decorators/helpers/page_live_state_decorator_helper.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.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/performance_manager/frame_node_impl_browsertest.cc b/chrome/browser/performance_manager/frame_node_impl_browsertest.cc index 5aa1de6..028cc6d0 100644 --- a/chrome/browser/performance_manager/frame_node_impl_browsertest.cc +++ b/chrome/browser/performance_manager/frame_node_impl_browsertest.cc
@@ -4,7 +4,7 @@ #include "components/performance_manager/graph/frame_node_impl.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/ptr_util.h" #include "base/run_loop.h" #include "base/test/bind.h"
diff --git a/chrome/browser/performance_manager/mechanisms/page_discarder.cc b/chrome/browser/performance_manager/mechanisms/page_discarder.cc index f5a27393..2dedbc4 100644 --- a/chrome/browser/performance_manager/mechanisms/page_discarder.cc +++ b/chrome/browser/performance_manager/mechanisms/page_discarder.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/performance_manager/mechanisms/page_discarder.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/task_traits.h" #include "build/build_config.h" #include "chrome/browser/resource_coordinator/lifecycle_unit_state.mojom.h"
diff --git a/chrome/browser/performance_manager/mechanisms/page_discarder.h b/chrome/browser/performance_manager/mechanisms/page_discarder.h index 53da0754..f64c8c8 100644 --- a/chrome/browser/performance_manager/mechanisms/page_discarder.h +++ b/chrome/browser/performance_manager/mechanisms/page_discarder.h
@@ -7,7 +7,7 @@ #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" namespace performance_manager {
diff --git a/chrome/browser/performance_manager/mechanisms/page_freezer.cc b/chrome/browser/performance_manager/mechanisms/page_freezer.cc index 5bc10e50..99c813b 100644 --- a/chrome/browser/performance_manager/mechanisms/page_freezer.cc +++ b/chrome/browser/performance_manager/mechanisms/page_freezer.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/performance_manager/mechanisms/page_freezer.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/task_traits.h" #include "chrome/browser/profiles/profile.h" #include "components/content_settings/core/common/content_settings_types.h"
diff --git a/chrome/browser/performance_manager/mechanisms/userspace_swap_chromeos.cc b/chrome/browser/performance_manager/mechanisms/userspace_swap_chromeos.cc index 43834e4..77a8c9b 100644 --- a/chrome/browser/performance_manager/mechanisms/userspace_swap_chromeos.cc +++ b/chrome/browser/performance_manager/mechanisms/userspace_swap_chromeos.cc
@@ -6,9 +6,9 @@ #include <memory> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/files/scoped_file.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/page_size.h" #include "base/posix/safe_strerror.h" #include "base/threading/scoped_blocking_call.h"
diff --git a/chrome/browser/performance_manager/mechanisms/working_set_trimmer_chromeos.cc b/chrome/browser/performance_manager/mechanisms/working_set_trimmer_chromeos.cc index f394625..65e9bf39 100644 --- a/chrome/browser/performance_manager/mechanisms/working_set_trimmer_chromeos.cc +++ b/chrome/browser/performance_manager/mechanisms/working_set_trimmer_chromeos.cc
@@ -7,9 +7,9 @@ #include <utility> #include "ash/components/arc/memory/arc_memory_bridge.h" -#include "base/bind.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/ptr_util.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/performance_manager/mechanisms/working_set_trimmer_chromeos.h b/chrome/browser/performance_manager/mechanisms/working_set_trimmer_chromeos.h index 93b6c0c3..fe87ab5a 100644 --- a/chrome/browser/performance_manager/mechanisms/working_set_trimmer_chromeos.h +++ b/chrome/browser/performance_manager/mechanisms/working_set_trimmer_chromeos.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_PERFORMANCE_MANAGER_MECHANISMS_WORKING_SET_TRIMMER_CHROMEOS_H_ #define CHROME_BROWSER_PERFORMANCE_MANAGER_MECHANISMS_WORKING_SET_TRIMMER_CHROMEOS_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "base/no_destructor.h" #include "base/process/process_handle.h"
diff --git a/chrome/browser/performance_manager/metrics/memory_pressure_metrics.cc b/chrome/browser/performance_manager/metrics/memory_pressure_metrics.cc index a8cad7a..6f3f510 100644 --- a/chrome/browser/performance_manager/metrics/memory_pressure_metrics.cc +++ b/chrome/browser/performance_manager/metrics/memory_pressure_metrics.cc
@@ -5,7 +5,7 @@ #include <stdint.h> #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "base/process/process_metrics.h" #include "chrome/browser/performance_manager/metrics/memory_pressure_metrics.h"
diff --git a/chrome/browser/performance_manager/metrics/page_timeline_monitor_unittest.cc b/chrome/browser/performance_manager/metrics/page_timeline_monitor_unittest.cc index 2e3d0b68..f318af9 100644 --- a/chrome/browser/performance_manager/metrics/page_timeline_monitor_unittest.cc +++ b/chrome/browser/performance_manager/metrics/page_timeline_monitor_unittest.cc
@@ -5,7 +5,7 @@ #include "chrome/browser/performance_manager/metrics/page_timeline_monitor.h" #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "build/build_config.h" #include "components/performance_manager/public/decorators/page_live_state_decorator.h"
diff --git a/chrome/browser/performance_manager/persistence/site_data/site_data_cache_facade.cc b/chrome/browser/performance_manager/persistence/site_data/site_data_cache_facade.cc index 8e5beea..b5b9cfb 100644 --- a/chrome/browser/performance_manager/persistence/site_data/site_data_cache_facade.cc +++ b/chrome/browser/performance_manager/persistence/site_data/site_data_cache_facade.cc
@@ -8,7 +8,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/types/pass_key.h" #include "chrome/browser/history/history_service_factory.h"
diff --git a/chrome/browser/performance_manager/persistence/site_data/site_data_cache_facade.h b/chrome/browser/performance_manager/persistence/site_data/site_data_cache_facade.h index 89d210d0..7f7d4e0 100644 --- a/chrome/browser/performance_manager/persistence/site_data/site_data_cache_facade.h +++ b/chrome/browser/performance_manager/persistence/site_data/site_data_cache_facade.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_PERFORMANCE_MANAGER_PERSISTENCE_SITE_DATA_SITE_DATA_CACHE_FACADE_H_ #define CHROME_BROWSER_PERFORMANCE_MANAGER_PERSISTENCE_SITE_DATA_SITE_DATA_CACHE_FACADE_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/scoped_observation.h" #include "components/history/core/browser/history_service.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 b7ec488f..b7162d1 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
@@ -11,7 +11,7 @@ #include <vector> #include "base/auto_reset.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/ptr_util.h" #include "base/memory/weak_ptr.h" #include "base/run_loop.h"
diff --git a/chrome/browser/performance_manager/persistence/site_data/unittest_utils.cc b/chrome/browser/performance_manager/persistence/site_data/unittest_utils.cc index 42f376a..88cd71c 100644 --- a/chrome/browser/performance_manager/persistence/site_data/unittest_utils.cc +++ b/chrome/browser/performance_manager/persistence/site_data/unittest_utils.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" namespace performance_manager { namespace testing {
diff --git a/chrome/browser/performance_manager/policies/bfcache_policy_browsertest.cc b/chrome/browser/performance_manager/policies/bfcache_policy_browsertest.cc index f5792d6..fe1c590f 100644 --- a/chrome/browser/performance_manager/policies/bfcache_policy_browsertest.cc +++ b/chrome/browser/performance_manager/policies/bfcache_policy_browsertest.cc
@@ -5,7 +5,7 @@ #include <memory> #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/memory_pressure_listener.h" #include "base/test/scoped_feature_list.h" #include "build/build_config.h"
diff --git a/chrome/browser/performance_manager/policies/page_discarding_helper.h b/chrome/browser/performance_manager/policies/page_discarding_helper.h index a4aa33c..e795b525 100644 --- a/chrome/browser/performance_manager/policies/page_discarding_helper.h +++ b/chrome/browser/performance_manager/policies/page_discarding_helper.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_PERFORMANCE_MANAGER_POLICIES_PAGE_DISCARDING_HELPER_H_ #define CHROME_BROWSER_PERFORMANCE_MANAGER_POLICIES_PAGE_DISCARDING_HELPER_H_ -#include "base/callback_forward.h" #include "base/containers/flat_map.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h"
diff --git a/chrome/browser/performance_manager/policies/page_freezing_policy.cc b/chrome/browser/performance_manager/policies/page_freezing_policy.cc index d0908a1..b1be41c 100644 --- a/chrome/browser/performance_manager/policies/page_freezing_policy.cc +++ b/chrome/browser/performance_manager/policies/page_freezing_policy.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/time/time.h" #include "chrome/browser/performance_manager/mechanisms/page_freezer.h" #include "components/performance_manager/freezing/freezing_vote_aggregator.h"
diff --git a/chrome/browser/performance_manager/policies/working_set_trimmer_policy_arcvm.cc b/chrome/browser/performance_manager/policies/working_set_trimmer_policy_arcvm.cc index 4c6962fd..73d9d57 100644 --- a/chrome/browser/performance_manager/policies/working_set_trimmer_policy_arcvm.cc +++ b/chrome/browser/performance_manager/policies/working_set_trimmer_policy_arcvm.cc
@@ -8,7 +8,7 @@ #include "ash/components/arc/arc_util.h" #include "ash/components/arc/session/arc_service_manager.h" #include "ash/public/cpp/app_types_util.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/ptr_util.h" #include "base/memory/singleton.h"
diff --git a/chrome/browser/performance_manager/policies/working_set_trimmer_policy_chromeos.cc b/chrome/browser/performance_manager/policies/working_set_trimmer_policy_chromeos.cc index 3cd7d69..188dd0d 100644 --- a/chrome/browser/performance_manager/policies/working_set_trimmer_policy_chromeos.cc +++ b/chrome/browser/performance_manager/policies/working_set_trimmer_policy_chromeos.cc
@@ -5,7 +5,7 @@ #include "chrome/browser/performance_manager/policies/working_set_trimmer_policy_chromeos.h" #include "ash/components/arc/arc_util.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/metrics/histogram_functions.h" #include "base/rand_util.h"
diff --git a/chrome/browser/permissions/adaptive_quiet_notification_permission_ui_enabler.cc b/chrome/browser/permissions/adaptive_quiet_notification_permission_ui_enabler.cc index 23147129..45d845e7 100644 --- a/chrome/browser/permissions/adaptive_quiet_notification_permission_ui_enabler.cc +++ b/chrome/browser/permissions/adaptive_quiet_notification_permission_ui_enabler.cc
@@ -10,9 +10,9 @@ #include <vector> #include "base/auto_reset.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/adapters.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/json/values_util.h" #include "base/metrics/histogram_functions.h" #include "base/time/time.h"
diff --git a/chrome/browser/permissions/adaptive_quiet_notification_permission_ui_enabler.h b/chrome/browser/permissions/adaptive_quiet_notification_permission_ui_enabler.h index 9ee38ecf..e890198b 100644 --- a/chrome/browser/permissions/adaptive_quiet_notification_permission_ui_enabler.h +++ b/chrome/browser/permissions/adaptive_quiet_notification_permission_ui_enabler.h
@@ -6,7 +6,7 @@ #define CHROME_BROWSER_PERMISSIONS_ADAPTIVE_QUIET_NOTIFICATION_PERMISSION_UI_ENABLER_H_ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/singleton.h" #include "chrome/browser/profiles/profile_keyed_service_factory.h"
diff --git a/chrome/browser/permissions/attestation_permission_request.cc b/chrome/browser/permissions/attestation_permission_request.cc index f67f8d60..d50070d5 100644 --- a/chrome/browser/permissions/attestation_permission_request.cc +++ b/chrome/browser/permissions/attestation_permission_request.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/permissions/attestation_permission_request.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/app/vector_icons/vector_icons.h" #include "chrome/grit/generated_resources.h" #include "components/permissions/permission_request.h"
diff --git a/chrome/browser/permissions/attestation_permission_request.h b/chrome/browser/permissions/attestation_permission_request.h index 30e727c3..e0d005a 100644 --- a/chrome/browser/permissions/attestation_permission_request.h +++ b/chrome/browser/permissions/attestation_permission_request.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_PERMISSIONS_ATTESTATION_PERMISSION_REQUEST_H_ #define CHROME_BROWSER_PERMISSIONS_ATTESTATION_PERMISSION_REQUEST_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" namespace permissions { class PermissionRequest;
diff --git a/chrome/browser/permissions/chrome_permission_request_manager_unittest.cc b/chrome/browser/permissions/chrome_permission_request_manager_unittest.cc index b2e4ad3..c0920e4 100644 --- a/chrome/browser/permissions/chrome_permission_request_manager_unittest.cc +++ b/chrome/browser/permissions/chrome_permission_request_manager_unittest.cc
@@ -5,8 +5,8 @@ #include <stddef.h> #include <string> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/json/values_util.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h"
diff --git a/chrome/browser/permissions/chrome_permissions_client.cc b/chrome/browser/permissions/chrome_permissions_client.cc index 20b7cd4..faa6ee8 100644 --- a/chrome/browser/permissions/chrome_permissions_client.cc +++ b/chrome/browser/permissions/chrome_permissions_client.cc
@@ -6,9 +6,9 @@ #include <vector> -#include "base/callback_helpers.h" #include "base/containers/contains.h" #include "base/feature_list.h" +#include "base/functional/callback_helpers.h" #include "base/no_destructor.h" #include "base/strings/string_util.h" #include "base/time/time.h"
diff --git a/chrome/browser/permissions/contextual_notification_permission_ui_selector.cc b/chrome/browser/permissions/contextual_notification_permission_ui_selector.cc index 96aeef9e5..8c0407e8 100644 --- a/chrome/browser/permissions/contextual_notification_permission_ui_selector.cc +++ b/chrome/browser/permissions/contextual_notification_permission_ui_selector.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/metrics/histogram_functions.h" #include "base/notreached.h"
diff --git a/chrome/browser/permissions/contextual_notification_permission_ui_selector.h b/chrome/browser/permissions/contextual_notification_permission_ui_selector.h index c7c33eb5..4b84113 100644 --- a/chrome/browser/permissions/contextual_notification_permission_ui_selector.h +++ b/chrome/browser/permissions/contextual_notification_permission_ui_selector.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_PERMISSIONS_CONTEXTUAL_NOTIFICATION_PERMISSION_UI_SELECTOR_H_ #define CHROME_BROWSER_PERMISSIONS_CONTEXTUAL_NOTIFICATION_PERMISSION_UI_SELECTOR_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/permissions/crowd_deny_preload_data.h" #include "chrome/browser/permissions/crowd_deny_safe_browsing_request.h" #include "components/permissions/permission_ui_selector.h"
diff --git a/chrome/browser/permissions/crowd_deny_preload_data.cc b/chrome/browser/permissions/crowd_deny_preload_data.cc index f670bc01..9a764e8 100644 --- a/chrome/browser/permissions/crowd_deny_preload_data.cc +++ b/chrome/browser/permissions/crowd_deny_preload_data.cc
@@ -7,9 +7,9 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/no_destructor.h" #include "base/task/sequenced_task_runner.h"
diff --git a/chrome/browser/permissions/crowd_deny_preload_data.h b/chrome/browser/permissions/crowd_deny_preload_data.h index 35a0224..939caf00 100644 --- a/chrome/browser/permissions/crowd_deny_preload_data.h +++ b/chrome/browser/permissions/crowd_deny_preload_data.h
@@ -9,8 +9,8 @@ #include <queue> #include <utility> -#include "base/callback.h" #include "base/containers/flat_map.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/version.h"
diff --git a/chrome/browser/permissions/crowd_deny_safe_browsing_request.cc b/chrome/browser/permissions/crowd_deny_safe_browsing_request.cc index 41fed79..b60b0f2 100644 --- a/chrome/browser/permissions/crowd_deny_safe_browsing_request.cc +++ b/chrome/browser/permissions/crowd_deny_safe_browsing_request.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/metrics/histogram_functions.h" #include "base/task/sequenced_task_runner.h"
diff --git a/chrome/browser/permissions/crowd_deny_safe_browsing_request.h b/chrome/browser/permissions/crowd_deny_safe_browsing_request.h index 4d9e540..a142723 100644 --- a/chrome/browser/permissions/crowd_deny_safe_browsing_request.h +++ b/chrome/browser/permissions/crowd_deny_safe_browsing_request.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h"
diff --git a/chrome/browser/permissions/notification_blocked_message_delegate_android.h b/chrome/browser/permissions/notification_blocked_message_delegate_android.h index f6fad31..59efbf74 100644 --- a/chrome/browser/permissions/notification_blocked_message_delegate_android.h +++ b/chrome/browser/permissions/notification_blocked_message_delegate_android.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/permissions/notification_blocked_dialog_controller_android.h" #include "components/content_settings/core/common/content_settings_types.h"
diff --git a/chrome/browser/permissions/permission_context_base_permissions_policy_unittest.cc b/chrome/browser/permissions/permission_context_base_permissions_policy_unittest.cc index 5f709a2..f6139b4 100644 --- a/chrome/browser/permissions/permission_context_base_permissions_policy_unittest.cc +++ b/chrome/browser/permissions/permission_context_base_permissions_policy_unittest.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 "base/bind.h" +#include "base/functional/bind.h" #include "build/build_config.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h" #include "chrome/browser/notifications/notification_permission_context.h"
diff --git a/chrome/browser/permissions/permission_delegation_browsertest.cc b/chrome/browser/permissions/permission_delegation_browsertest.cc index 6c555f3..6c11362 100644 --- a/chrome/browser/permissions/permission_delegation_browsertest.cc +++ b/chrome/browser/permissions/permission_delegation_browsertest.cc
@@ -4,8 +4,8 @@ #include <memory> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/test/base/in_process_browser_test.h"
diff --git a/chrome/browser/permissions/permission_infobar_delegate_android.h b/chrome/browser/permissions/permission_infobar_delegate_android.h index 5ffc8f8..22448a5 100644 --- a/chrome/browser/permissions/permission_infobar_delegate_android.h +++ b/chrome/browser/permissions/permission_infobar_delegate_android.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/permissions/quiet_permission_prompt_model_android.h" #include "components/content_settings/core/common/content_settings_types.h"
diff --git a/chrome/browser/permissions/permission_manager_browsertest.cc b/chrome/browser/permissions/permission_manager_browsertest.cc index 4f91bf1c..47c024c 100644 --- a/chrome/browser/permissions/permission_manager_browsertest.cc +++ b/chrome/browser/permissions/permission_manager_browsertest.cc
@@ -4,7 +4,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "build/build_config.h"
diff --git a/chrome/browser/permissions/permission_request_manager_browsertest.cc b/chrome/browser/permissions/permission_request_manager_browsertest.cc index 9c9a71e..dbbff9a7 100644 --- a/chrome/browser/permissions/permission_request_manager_browsertest.cc +++ b/chrome/browser/permissions/permission_request_manager_browsertest.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/metrics/field_trial.h" #include "base/run_loop.h" #include "base/test/mock_callback.h"
diff --git a/chrome/browser/permissions/permission_revocation_request.h b/chrome/browser/permissions/permission_revocation_request.h index 50746942..853d52c7 100644 --- a/chrome/browser/permissions/permission_revocation_request.h +++ b/chrome/browser/permissions/permission_revocation_request.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_PERMISSIONS_PERMISSION_REVOCATION_REQUEST_H_ #define CHROME_BROWSER_PERMISSIONS_PERMISSION_REVOCATION_REQUEST_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h"
diff --git a/chrome/browser/permissions/permission_update_infobar_delegate_android.h b/chrome/browser/permissions/permission_update_infobar_delegate_android.h index 8ea4d06..f35552bc 100644 --- a/chrome/browser/permissions/permission_update_infobar_delegate_android.h +++ b/chrome/browser/permissions/permission_update_infobar_delegate_android.h
@@ -9,7 +9,7 @@ #include <vector> #include "base/android/scoped_java_ref.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/permissions/permission_update_requester_android.h" #include "components/content_settings/core/common/content_settings_types.h" #include "components/infobars/core/confirm_infobar_delegate.h"
diff --git a/chrome/browser/permissions/permission_update_message_controller_android.h b/chrome/browser/permissions/permission_update_message_controller_android.h index b4e0c8c..39588c2 100644 --- a/chrome/browser/permissions/permission_update_message_controller_android.h +++ b/chrome/browser/permissions/permission_update_message_controller_android.h
@@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/permissions/permission_update_message_delegate_android.h" #include "components/content_settings/core/common/content_settings_types.h" #include "content/public/browser/web_contents_user_data.h"
diff --git a/chrome/browser/permissions/permission_update_message_delegate_android.h b/chrome/browser/permissions/permission_update_message_delegate_android.h index 929d5718..89c346c 100644 --- a/chrome/browser/permissions/permission_update_message_delegate_android.h +++ b/chrome/browser/permissions/permission_update_message_delegate_android.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/permissions/permission_update_requester_android.h" #include "components/content_settings/core/common/content_settings_types.h" #include "components/messages/android/message_enums.h"
diff --git a/chrome/browser/permissions/permission_update_requester_android.h b/chrome/browser/permissions/permission_update_requester_android.h index c17f687..41c0c35 100644 --- a/chrome/browser/permissions/permission_update_requester_android.h +++ b/chrome/browser/permissions/permission_update_requester_android.h
@@ -8,7 +8,7 @@ #include <vector> #include "base/android/scoped_java_ref.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "components/content_settings/core/common/content_settings_types.h" #include "ui/android/window_android.h"
diff --git a/chrome/browser/permissions/prediction_based_permission_ui_selector.h b/chrome/browser/permissions/prediction_based_permission_ui_selector.h index f6c8c8f..3e4f2dad 100644 --- a/chrome/browser/permissions/prediction_based_permission_ui_selector.h +++ b/chrome/browser/permissions/prediction_based_permission_ui_selector.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "components/permissions/permission_actions_history.h" #include "components/permissions/permission_ui_selector.h"
diff --git a/chrome/browser/permissions/prediction_service_request.cc b/chrome/browser/permissions/prediction_service_request.cc index 6528a20c..36fc23a 100644 --- a/chrome/browser/permissions/prediction_service_request.cc +++ b/chrome/browser/permissions/prediction_service_request.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "components/permissions/prediction_service/prediction_service.h" PredictionServiceRequest::PredictionServiceRequest(
diff --git a/chrome/browser/permissions/pref_notification_permission_ui_selector.cc b/chrome/browser/permissions/pref_notification_permission_ui_selector.cc index 2d4d3279..47069aa 100644 --- a/chrome/browser/permissions/pref_notification_permission_ui_selector.cc +++ b/chrome/browser/permissions/pref_notification_permission_ui_selector.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_features.h" #include "components/content_settings/core/common/pref_names.h"
diff --git a/chrome/browser/persisted_state_db/persisted_state_db.cc b/chrome/browser/persisted_state_db/persisted_state_db.cc index 9d68730..d178f75d 100644 --- a/chrome/browser/persisted_state_db/persisted_state_db.cc +++ b/chrome/browser/persisted_state_db/persisted_state_db.cc
@@ -8,8 +8,8 @@ #include "base/android/jni_android.h" #include "base/android/jni_array.h" #include "base/android/jni_string.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "chrome/browser/persisted_state_db/session_proto_db_factory.h" #include "chrome/browser/tab/jni_headers/LevelDBPersistedDataStorage_jni.h" #include "components/commerce/core/proto/persisted_state_db_content.pb.h"
diff --git a/chrome/browser/picture_in_picture/document_picture_in_picture_window_controller_browsertest.cc b/chrome/browser/picture_in_picture/document_picture_in_picture_window_controller_browsertest.cc index 191a3c4..2876a46 100644 --- a/chrome/browser/picture_in_picture/document_picture_in_picture_window_controller_browsertest.cc +++ b/chrome/browser/picture_in_picture/document_picture_in_picture_window_controller_browsertest.cc
@@ -5,8 +5,8 @@ #include "content/public/browser/document_picture_in_picture_window_controller.h" #include "base/barrier_closure.h" -#include "base/bind.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/path_service.h" #include "base/scoped_observation.h"
diff --git a/chrome/browser/picture_in_picture/video_picture_in_picture_window_controller_browsertest.cc b/chrome/browser/picture_in_picture/video_picture_in_picture_window_controller_browsertest.cc index 303a8eee..f6b7396 100644 --- a/chrome/browser/picture_in_picture/video_picture_in_picture_window_controller_browsertest.cc +++ b/chrome/browser/picture_in_picture/video_picture_in_picture_window_controller_browsertest.cc
@@ -5,8 +5,8 @@ #include "content/public/browser/picture_in_picture_window_controller.h" #include "base/barrier_closure.h" -#include "base/bind.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/path_service.h" #include "base/scoped_observation.h"
diff --git a/chrome/browser/platform_keys/extension_key_permissions_service.cc b/chrome/browser/platform_keys/extension_key_permissions_service.cc index 2626cf4..c2f8216 100644 --- a/chrome/browser/platform_keys/extension_key_permissions_service.cc +++ b/chrome/browser/platform_keys/extension_key_permissions_service.cc
@@ -12,8 +12,8 @@ #include <vector> #include "base/base64.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/values.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/platform_keys/extension_key_permissions_service.h b/chrome/browser/platform_keys/extension_key_permissions_service.h index 5b51023..7a2af956 100644 --- a/chrome/browser/platform_keys/extension_key_permissions_service.h +++ b/chrome/browser/platform_keys/extension_key_permissions_service.h
@@ -11,7 +11,7 @@ #include <string> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/values.h"
diff --git a/chrome/browser/platform_keys/extension_key_permissions_service_factory.h b/chrome/browser/platform_keys/extension_key_permissions_service_factory.h index 8f450c2..c2294d58 100644 --- a/chrome/browser/platform_keys/extension_key_permissions_service_factory.h +++ b/chrome/browser/platform_keys/extension_key_permissions_service_factory.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "extensions/common/extension_id.h" namespace content {
diff --git a/chrome/browser/platform_keys/extension_platform_keys_service.cc b/chrome/browser/platform_keys/extension_platform_keys_service.cc index 8e9885f..ffeac51 100644 --- a/chrome/browser/platform_keys/extension_platform_keys_service.cc +++ b/chrome/browser/platform_keys/extension_platform_keys_service.cc
@@ -11,10 +11,10 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/values.h"
diff --git a/chrome/browser/platform_keys/extension_platform_keys_service.h b/chrome/browser/platform_keys/extension_platform_keys_service.h index afa7bac..b452384 100644 --- a/chrome/browser/platform_keys/extension_platform_keys_service.h +++ b/chrome/browser/platform_keys/extension_platform_keys_service.h
@@ -11,8 +11,8 @@ #include <string> #include <vector> -#include "base/callback_forward.h" #include "base/containers/queue.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ash/platform_keys/key_permissions/key_permissions_service.h"
diff --git a/chrome/browser/platform_keys/extension_platform_keys_service_factory.cc b/chrome/browser/platform_keys/extension_platform_keys_service_factory.cc index 989e2f6..369ece9 100644 --- a/chrome/browser/platform_keys/extension_platform_keys_service_factory.cc +++ b/chrome/browser/platform_keys/extension_platform_keys_service_factory.cc
@@ -7,9 +7,9 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/check.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "base/memory/singleton.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/platform_keys/platform_keys.cc b/chrome/browser/platform_keys/platform_keys.cc index ab0209ee..5032b32 100644 --- a/chrome/browser/platform_keys/platform_keys.cc +++ b/chrome/browser/platform_keys/platform_keys.cc
@@ -12,8 +12,8 @@ #include <utility> #include <vector> -#include "base/callback.h" #include "base/check_op.h" +#include "base/functional/callback.h" #include "base/notreached.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/platform_keys/platform_keys.h b/chrome/browser/platform_keys/platform_keys.h index 7d7e4e7..92070b5 100644 --- a/chrome/browser/platform_keys/platform_keys.h +++ b/chrome/browser/platform_keys/platform_keys.h
@@ -11,7 +11,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/values.h" #include "chromeos/crosapi/mojom/keystore_error.mojom.h" #include "net/cert/x509_certificate.h"
diff --git a/chrome/browser/platform_util.cc b/chrome/browser/platform_util.cc index 8798760..457f58c 100644 --- a/chrome/browser/platform_util.cc +++ b/chrome/browser/platform_util.cc
@@ -4,10 +4,10 @@ #include "chrome/browser/platform_util.h" -#include "base/bind.h" #include "base/check_op.h" #include "base/files/file.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/task/thread_pool.h" #include "build/chromeos_buildflags.h" #include "chrome/browser/platform_util_internal.h"
diff --git a/chrome/browser/platform_util.h b/chrome/browser/platform_util.h index 694d7b3c..0c42ace 100644 --- a/chrome/browser/platform_util.h +++ b/chrome/browser/platform_util.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_PLATFORM_UTIL_H_ #define CHROME_BROWSER_PLATFORM_UTIL_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h" #include "chrome/common/buildflags.h"
diff --git a/chrome/browser/platform_util_ash.cc b/chrome/browser/platform_util_ash.cc index a7579d6..736cb300 100644 --- a/chrome/browser/platform_util_ash.cc +++ b/chrome/browser/platform_util_ash.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/platform_util.h" -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/file_manager/open_util.h" #include "chrome/browser/ash/guest_os/guest_os_external_protocol_handler.h" #include "chrome/browser/platform_util_internal.h"
diff --git a/chrome/browser/platform_util_lacros.cc b/chrome/browser/platform_util_lacros.cc index 9613ff9e..f3f57e6 100644 --- a/chrome/browser/platform_util_lacros.cc +++ b/chrome/browser/platform_util_lacros.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/platform_util.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/notreached.h" #include "chrome/browser/platform_util_internal.h"
diff --git a/chrome/browser/platform_util_linux.cc b/chrome/browser/platform_util_linux.cc index fd78b0b..ea47cf09 100644 --- a/chrome/browser/platform_util_linux.cc +++ b/chrome/browser/platform_util_linux.cc
@@ -9,10 +9,10 @@ #include <string> #include <vector> -#include "base/bind.h" -#include "base/callback.h" #include "base/callback_list.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/memory/raw_ptr.h" #include "base/no_destructor.h" @@ -25,7 +25,11 @@ #include "chrome/browser/lifetime/termination_notification.h" #include "chrome/browser/platform_util_internal.h" #include "chrome/browser/profiles/profile.h" -#include "components/dbus/thread_linux/dbus_thread_linux.h" +// This file gets pulled in in Chromecast builds, which causes "gn check" to +// complain as Chromecast doesn't use (or depend on) //components/dbus. +// TODO(crbug.com/1215474): Eliminate //chrome being visible in the GN structure +// on Chromecast and remove the nogncheck below. +#include "components/dbus/thread_linux/dbus_thread_linux.h" // nogncheck #include "content/public/browser/browser_thread.h" #include "dbus/bus.h" #include "dbus/message.h"
diff --git a/chrome/browser/platform_util_mac.mm b/chrome/browser/platform_util_mac.mm index 66762c5..64e04dad 100644 --- a/chrome/browser/platform_util_mac.mm +++ b/chrome/browser/platform_util_mac.mm
@@ -6,9 +6,9 @@ #import <Cocoa/Cocoa.h> -#include "base/bind.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/mac/foundation_util.h" #include "base/mac/mac_logging.h"
diff --git a/chrome/browser/platform_util_unittest.cc b/chrome/browser/platform_util_unittest.cc index 9c1cd57..2451b60 100644 --- a/chrome/browser/platform_util_unittest.cc +++ b/chrome/browser/platform_util_unittest.cc
@@ -6,10 +6,10 @@ #include <memory> -#include "base/bind.h" -#include "base/callback.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/run_loop.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/platform_util_win.cc b/chrome/browser/platform_util_win.cc index 3098749..80b0dc0 100644 --- a/chrome/browser/platform_util_win.cc +++ b/chrome/browser/platform_util_win.cc
@@ -14,9 +14,9 @@ #include <wrl/client.h> #include "base/base_paths.h" -#include "base/bind.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/path_service.h" #include "base/strings/string_util.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 3d2e547..e66180dc 100644 --- a/chrome/browser/plugins/chrome_content_browser_client_plugins_part.cc +++ b/chrome/browser/plugins/chrome_content_browser_client_plugins_part.cc
@@ -9,8 +9,8 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/no_destructor.h" #include "base/notreached.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/plugins/chrome_plugin_service_filter.cc b/chrome/browser/plugins/chrome_plugin_service_filter.cc index c7ba9c7..6277a9d 100644 --- a/chrome/browser/plugins/chrome_plugin_service_filter.cc +++ b/chrome/browser/plugins/chrome_plugin_service_filter.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h" #include "chrome/browser/plugins/plugin_prefs.h"
diff --git a/chrome/browser/plugins/pdf_iframe_navigation_throttle_browsertest.cc b/chrome/browser/plugins/pdf_iframe_navigation_throttle_browsertest.cc index b0e5d2f..5f10996 100644 --- a/chrome/browser/plugins/pdf_iframe_navigation_throttle_browsertest.cc +++ b/chrome/browser/plugins/pdf_iframe_navigation_throttle_browsertest.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 "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/strings/escape.h" #include "base/test/bind.h"
diff --git a/chrome/browser/plugins/pdf_iframe_navigation_throttle_unittest.cc b/chrome/browser/plugins/pdf_iframe_navigation_throttle_unittest.cc index f31adf0..54c70860 100644 --- a/chrome/browser/plugins/pdf_iframe_navigation_throttle_unittest.cc +++ b/chrome/browser/plugins/pdf_iframe_navigation_throttle_unittest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/plugins/pdf_iframe_navigation_throttle.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/plugins/plugin_info_host_impl.cc b/chrome/browser/plugins/plugin_info_host_impl.cc index 7ceb1d7b..30dc8e64 100644 --- a/chrome/browser/plugins/plugin_info_host_impl.cc +++ b/chrome/browser/plugins/plugin_info_host_impl.cc
@@ -10,8 +10,8 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/containers/cxx20_erase.h" +#include "base/functional/bind.h" #include "base/memory/singleton.h" #include "base/strings/utf_string_conversions.h" #include "build/branding_buildflags.h"
diff --git a/chrome/browser/plugins/plugin_info_host_impl_unittest.cc b/chrome/browser/plugins/plugin_info_host_impl_unittest.cc index 1bee4dd..846d65f 100644 --- a/chrome/browser/plugins/plugin_info_host_impl_unittest.cc +++ b/chrome/browser/plugins/plugin_info_host_impl_unittest.cc
@@ -7,8 +7,8 @@ #include <map> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/plugins/plugin_observer.cc b/chrome/browser/plugins/plugin_observer.cc index c785264..420d64ed 100644 --- a/chrome/browser/plugins/plugin_observer.cc +++ b/chrome/browser/plugins/plugin_observer.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/metrics/histogram_macros.h" #include "build/build_config.h"
diff --git a/chrome/browser/plugins/plugin_prefs.cc b/chrome/browser/plugins/plugin_prefs.cc index f671e12..05e6ec1 100644 --- a/chrome/browser/plugins/plugin_prefs.cc +++ b/chrome/browser/plugins/plugin_prefs.cc
@@ -8,8 +8,8 @@ #include <string> -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/path_service.h" #include "base/strings/string_util.h"
diff --git a/chrome/browser/plugins/plugin_response_interceptor_url_loader_throttle.cc b/chrome/browser/plugins/plugin_response_interceptor_url_loader_throttle.cc index 597112a..71b016bd 100644 --- a/chrome/browser/plugins/plugin_response_interceptor_url_loader_throttle.cc +++ b/chrome/browser/plugins/plugin_response_interceptor_url_loader_throttle.cc
@@ -7,8 +7,8 @@ #include <tuple> #include <utility> -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/guid.h" #include "chrome/browser/extensions/api/streams_private/streams_private_api.h" #include "chrome/browser/plugins/plugin_utils.h"
diff --git a/chrome/browser/plugins/plugin_response_interceptor_url_loader_throttle_browsertest.cc b/chrome/browser/plugins/plugin_response_interceptor_url_loader_throttle_browsertest.cc index 9491825..18d28df8 100644 --- a/chrome/browser/plugins/plugin_response_interceptor_url_loader_throttle_browsertest.cc +++ b/chrome/browser/plugins/plugin_response_interceptor_url_loader_throttle_browsertest.cc
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/path_service.h" #include "base/run_loop.h" #include "chrome/browser/extensions/extension_apitest.h"
diff --git a/chrome/browser/policy/browser_dm_token_storage_android_unittest.cc b/chrome/browser/policy/browser_dm_token_storage_android_unittest.cc index f3ec2bd..27c418c 100644 --- a/chrome/browser/policy/browser_dm_token_storage_android_unittest.cc +++ b/chrome/browser/policy/browser_dm_token_storage_android_unittest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/policy/browser_dm_token_storage_android.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/run_loop.h" #include "chrome/browser/policy/android/cloud_management_shared_preferences.h"
diff --git a/chrome/browser/policy/browser_dm_token_storage_linux.cc b/chrome/browser/policy/browser_dm_token_storage_linux.cc index 17220142..0a83636 100644 --- a/chrome/browser/policy/browser_dm_token_storage_linux.cc +++ b/chrome/browser/policy/browser_dm_token_storage_linux.cc
@@ -7,11 +7,11 @@ #include <string> #include "base/base64url.h" -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/files/file_util.h" #include "base/files/important_file_writer.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/hash/sha1.h" #include "base/logging.h" #include "base/path_service.h"
diff --git a/chrome/browser/policy/browser_dm_token_storage_linux_unittest.cc b/chrome/browser/policy/browser_dm_token_storage_linux_unittest.cc index 54a88b2..4f0d0d7d 100644 --- a/chrome/browser/policy/browser_dm_token_storage_linux_unittest.cc +++ b/chrome/browser/policy/browser_dm_token_storage_linux_unittest.cc
@@ -7,9 +7,9 @@ #include <iostream> #include <memory> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/path_service.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/policy/browser_dm_token_storage_mac.mm b/chrome/browser/policy/browser_dm_token_storage_mac.mm index 857e6da..c4aedd3 100644 --- a/chrome/browser/policy/browser_dm_token_storage_mac.mm +++ b/chrome/browser/policy/browser_dm_token_storage_mac.mm
@@ -7,11 +7,11 @@ #include <string> #include "base/base64url.h" -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/files/file_util.h" #include "base/files/important_file_writer.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/hash/sha1.h" #include "base/mac/foundation_util.h" #include "base/mac/mac_util.h"
diff --git a/chrome/browser/policy/browser_dm_token_storage_mac_unittest.cc b/chrome/browser/policy/browser_dm_token_storage_mac_unittest.cc index 5c28ce2..574c335b 100644 --- a/chrome/browser/policy/browser_dm_token_storage_mac_unittest.cc +++ b/chrome/browser/policy/browser_dm_token_storage_mac_unittest.cc
@@ -8,9 +8,9 @@ #include <memory> #include "base/base64url.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/hash/sha1.h" #include "base/mac/foundation_util.h" #include "base/path_service.h"
diff --git a/chrome/browser/policy/browser_dm_token_storage_win.cc b/chrome/browser/policy/browser_dm_token_storage_win.cc index abe5baaf..4ef3428e 100644 --- a/chrome/browser/policy/browser_dm_token_storage_win.cc +++ b/chrome/browser/policy/browser_dm_token_storage_win.cc
@@ -21,9 +21,9 @@ #include <vector> #include "base/base64.h" -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/strings/string_piece.h" #include "base/strings/string_util.h"
diff --git a/chrome/browser/policy/cbcm_invalidations_initializer_unittest.cc b/chrome/browser/policy/cbcm_invalidations_initializer_unittest.cc index ff62154..7acd983 100644 --- a/chrome/browser/policy/cbcm_invalidations_initializer_unittest.cc +++ b/chrome/browser/policy/cbcm_invalidations_initializer_unittest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/policy/cbcm_invalidations_initializer.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/json/json_writer.h" #include "base/values.h" #include "chrome/browser/device_identity/device_oauth2_token_service.h"
diff --git a/chrome/browser/policy/chrome_browser_cloud_management_controller_android.cc b/chrome/browser/policy/chrome_browser_cloud_management_controller_android.cc index dd16c385..44bd31b 100644 --- a/chrome/browser/policy/chrome_browser_cloud_management_controller_android.cc +++ b/chrome/browser/policy/chrome_browser_cloud_management_controller_android.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/enterprise/reporting/reporting_delegate_factory_android.h" #include "chrome/browser/net/system_network_context_manager.h"
diff --git a/chrome/browser/policy/chrome_browser_cloud_management_register_watcher.cc b/chrome/browser/policy/chrome_browser_cloud_management_register_watcher.cc index fde65bde..638cc72 100644 --- a/chrome/browser/policy/chrome_browser_cloud_management_register_watcher.cc +++ b/chrome/browser/policy/chrome_browser_cloud_management_register_watcher.cc
@@ -6,9 +6,9 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/histogram_macros.h" #include "base/syslog_logging.h" #include "chrome/grit/chromium_strings.h"
diff --git a/chrome/browser/policy/chrome_browser_cloud_management_register_watcher.h b/chrome/browser/policy/chrome_browser_cloud_management_register_watcher.h index b1cd1abc..6e75c58 100644 --- a/chrome/browser/policy/chrome_browser_cloud_management_register_watcher.h +++ b/chrome/browser/policy/chrome_browser_cloud_management_register_watcher.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h"
diff --git a/chrome/browser/policy/chrome_browser_cloud_management_register_watcher_unittest.cc b/chrome/browser/policy/chrome_browser_cloud_management_register_watcher_unittest.cc index 2076b57..8a20ed83 100644 --- a/chrome/browser/policy/chrome_browser_cloud_management_register_watcher_unittest.cc +++ b/chrome/browser/policy/chrome_browser_cloud_management_register_watcher_unittest.cc
@@ -7,7 +7,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/task/single_thread_task_runner.h" #include "base/test/metrics/histogram_tester.h"
diff --git a/chrome/browser/policy/chrome_browser_policy_connector.cc b/chrome/browser/policy/chrome_browser_policy_connector.cc index 2b5bf99..4616605 100644 --- a/chrome/browser/policy/chrome_browser_policy_connector.cc +++ b/chrome/browser/policy/chrome_browser_policy_connector.cc
@@ -8,10 +8,10 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/check_is_test.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/path_service.h" #include "base/task/thread_pool.h" #include "build/branding_buildflags.h"
diff --git a/chrome/browser/policy/chrome_extension_policy_migrator_unittest.cc b/chrome/browser/policy/chrome_extension_policy_migrator_unittest.cc index 6ab594c..6de26b9 100644 --- a/chrome/browser/policy/chrome_extension_policy_migrator_unittest.cc +++ b/chrome/browser/policy/chrome_extension_policy_migrator_unittest.cc
@@ -6,8 +6,8 @@ #include <string> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "extensions/common/hashed_extension_id.h"
diff --git a/chrome/browser/policy/client_data_delegate_android.cc b/chrome/browser/policy/client_data_delegate_android.cc index 4aebe63..966da3d 100644 --- a/chrome/browser/policy/client_data_delegate_android.cc +++ b/chrome/browser/policy/client_data_delegate_android.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/system/sys_info.h" #include "chrome/browser/policy/android/cloud_management_android_connection.h" #include "components/policy/core/common/cloud/cloud_policy_util.h"
diff --git a/chrome/browser/policy/client_data_delegate_android_unittest.cc b/chrome/browser/policy/client_data_delegate_android_unittest.cc index 47b20a3..c31501e6 100644 --- a/chrome/browser/policy/client_data_delegate_android_unittest.cc +++ b/chrome/browser/policy/client_data_delegate_android_unittest.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/system/sys_info.h" #include "base/test/task_environment.h" #include "components/policy/core/common/cloud/cloud_policy_util.h"
diff --git a/chrome/browser/policy/client_data_delegate_desktop.cc b/chrome/browser/policy/client_data_delegate_desktop.cc index 5b3dd2b7..97182aa 100644 --- a/chrome/browser/policy/client_data_delegate_desktop.cc +++ b/chrome/browser/policy/client_data_delegate_desktop.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/callback.h" +#include "base/functional/callback.h" #include "components/policy/core/common/cloud/cloud_policy_util.h" #include "components/policy/proto/device_management_backend.pb.h"
diff --git a/chrome/browser/policy/client_data_delegate_desktop_unittest.cc b/chrome/browser/policy/client_data_delegate_desktop_unittest.cc index 84ceabed..9b9fdb7 100644 --- a/chrome/browser/policy/client_data_delegate_desktop_unittest.cc +++ b/chrome/browser/policy/client_data_delegate_desktop_unittest.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/test/task_environment.h" #include "build/build_config.h" #include "components/policy/core/common/cloud/cloud_policy_util.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 11cf1f3..a065321 100644 --- a/chrome/browser/policy/cloud/chrome_browser_cloud_management_browsertest.cc +++ b/chrome/browser/policy/cloud/chrome_browser_cloud_management_browsertest.cc
@@ -8,10 +8,10 @@ #include <tuple> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/path_service.h" #include "base/run_loop.h"
diff --git a/chrome/browser/policy/cloud/cloud_policy_browsertest.cc b/chrome/browser/policy/cloud/cloud_policy_browsertest.cc index 530e434..89f90f01 100644 --- a/chrome/browser/policy/cloud/cloud_policy_browsertest.cc +++ b/chrome/browser/policy/cloud/cloud_policy_browsertest.cc
@@ -4,9 +4,9 @@ #include <memory> -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/run_loop.h" #include "base/threading/thread_restrictions.h" #include "build/build_config.h"
diff --git a/chrome/browser/policy/cloud/cloud_policy_invalidator.cc b/chrome/browser/policy/cloud/cloud_policy_invalidator.cc index 858bee35..8d53aae 100644 --- a/chrome/browser/policy/cloud/cloud_policy_invalidator.cc +++ b/chrome/browser/policy/cloud/cloud_policy_invalidator.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/hash/hash.h" #include "base/location.h" #include "base/metrics/histogram_functions.h"
diff --git a/chrome/browser/policy/cloud/cloud_policy_invalidator.h b/chrome/browser/policy/cloud/cloud_policy_invalidator.h index 58da6e62..23df0ad 100644 --- a/chrome/browser/policy/cloud/cloud_policy_invalidator.h +++ b/chrome/browser/policy/cloud/cloud_policy_invalidator.h
@@ -10,7 +10,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/policy/cloud/cloud_policy_invalidator_unittest.cc b/chrome/browser/policy/cloud/cloud_policy_invalidator_unittest.cc index ea18b208..d464c04 100644 --- a/chrome/browser/policy/cloud/cloud_policy_invalidator_unittest.cc +++ b/chrome/browser/policy/cloud/cloud_policy_invalidator_unittest.cc
@@ -9,7 +9,7 @@ #include <memory> #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/metrics/histogram_macros.h"
diff --git a/chrome/browser/policy/cloud/device_management_service_browsertest.cc b/chrome/browser/policy/cloud/device_management_service_browsertest.cc index 88c5a413..417be16 100644 --- a/chrome/browser/policy/cloud/device_management_service_browsertest.cc +++ b/chrome/browser/policy/cloud/device_management_service_browsertest.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "build/build_config.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/policy/cloud/user_cloud_policy_invalidator.cc b/chrome/browser/policy/cloud/user_cloud_policy_invalidator.cc index 6488948..a788f2f 100644 --- a/chrome/browser/policy/cloud/user_cloud_policy_invalidator.cc +++ b/chrome/browser/policy/cloud/user_cloud_policy_invalidator.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/single_thread_task_runner.h" #include "base/time/default_clock.h" #include "build/build_config.h"
diff --git a/chrome/browser/policy/cloud/user_policy_signin_service.cc b/chrome/browser/policy/cloud/user_policy_signin_service.cc index 20f8e9f08..386f025 100644 --- a/chrome/browser/policy/cloud/user_policy_signin_service.cc +++ b/chrome/browser/policy/cloud/user_policy_signin_service.cc
@@ -7,9 +7,9 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/enterprise/util/managed_browser_utils.h"
diff --git a/chrome/browser/policy/cloud/user_policy_signin_service_browsertest.cc b/chrome/browser/policy/cloud/user_policy_signin_service_browsertest.cc index 159d8d65..b2638cf 100644 --- a/chrome/browser/policy/cloud/user_policy_signin_service_browsertest.cc +++ b/chrome/browser/policy/cloud/user_policy_signin_service_browsertest.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/values.h" #include "build/build_config.h"
diff --git a/chrome/browser/policy/cloud/user_policy_signin_service_mobile.cc b/chrome/browser/policy/cloud/user_policy_signin_service_mobile.cc index e1316f8..74018e14 100644 --- a/chrome/browser/policy/cloud/user_policy_signin_service_mobile.cc +++ b/chrome/browser/policy/cloud/user_policy_signin_service_mobile.cc
@@ -6,9 +6,9 @@ #include <memory> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/logging.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/policy/cloud/user_policy_signin_service_unittest.cc b/chrome/browser/policy/cloud/user_policy_signin_service_unittest.cc index 6046a85..3959556 100644 --- a/chrome/browser/policy/cloud/user_policy_signin_service_unittest.cc +++ b/chrome/browser/policy/cloud/user_policy_signin_service_unittest.cc
@@ -5,8 +5,8 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/policy/configuration_policy_handler_list_factory.cc b/chrome/browser/policy/configuration_policy_handler_list_factory.cc index b403c692..e26bbd5 100644 --- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc +++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
@@ -11,8 +11,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/values.h" #include "build/branding_buildflags.h"
diff --git a/chrome/browser/policy/device_account_initializer.cc b/chrome/browser/policy/device_account_initializer.cc index 4308854..219e0841 100644 --- a/chrome/browser/policy/device_account_initializer.cc +++ b/chrome/browser/policy/device_account_initializer.cc
@@ -7,9 +7,9 @@ #include <utility> #include "base/base64.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/guid.h" #include "base/location.h" #include "base/logging.h"
diff --git a/chrome/browser/policy/extension_force_install_mixin.cc b/chrome/browser/policy/extension_force_install_mixin.cc index 889f4b7..ae994d18 100644 --- a/chrome/browser/policy/extension_force_install_mixin.cc +++ b/chrome/browser/policy/extension_force_install_mixin.cc
@@ -11,13 +11,13 @@ #include <string> #include <vector> -#include "base/bind.h" #include "base/check.h" #include "base/check_op.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/important_file_writer.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/notreached.h"
diff --git a/chrome/browser/policy/extension_policy_browsertest.cc b/chrome/browser/policy/extension_policy_browsertest.cc index 9abf23d..c4170593 100644 --- a/chrome/browser/policy/extension_policy_browsertest.cc +++ b/chrome/browser/policy/extension_policy_browsertest.cc
@@ -4,9 +4,9 @@ #include <memory> -#include "base/callback_helpers.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/path_service.h" #include "base/run_loop.h"
diff --git a/chrome/browser/policy/messaging_layer/public/report_client.cc b/chrome/browser/policy/messaging_layer/public/report_client.cc index f3e293f..31b5447 100644 --- a/chrome/browser/policy/messaging_layer/public/report_client.cc +++ b/chrome/browser/policy/messaging_layer/public/report_client.cc
@@ -7,9 +7,9 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/ptr_util.h" #include "base/memory/scoped_refptr.h" #include "base/memory/singleton.h"
diff --git a/chrome/browser/policy/messaging_layer/public/report_client.h b/chrome/browser/policy/messaging_layer/public/report_client.h index 1d15718e..00cbc4a 100644 --- a/chrome/browser/policy/messaging_layer/public/report_client.h +++ b/chrome/browser/policy/messaging_layer/public/report_client.h
@@ -8,7 +8,7 @@ #include <memory> #include <utility> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/singleton.h" #include "chrome/browser/policy/messaging_layer/upload/upload_provider.h" #include "components/reporting/client/report_queue_configuration.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 1dd89e9..fe65127 100644 --- a/chrome/browser/policy/messaging_layer/public/report_client_unittest.cc +++ b/chrome/browser/policy/messaging_layer/public/report_client_unittest.cc
@@ -9,8 +9,8 @@ #include <string> #include "base/base64.h" -#include "base/bind.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/memory/singleton.h" #include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/policy/messaging_layer/upload/dm_server_upload_service_unittest.cc b/chrome/browser/policy/messaging_layer/upload/dm_server_upload_service_unittest.cc index e52f6e8..a957d6531 100644 --- a/chrome/browser/policy/messaging_layer/upload/dm_server_upload_service_unittest.cc +++ b/chrome/browser/policy/messaging_layer/upload/dm_server_upload_service_unittest.cc
@@ -9,7 +9,7 @@ #include <utility> #include <vector> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/strings/strcat.h" #include "base/strings/string_number_conversions.h" #include "base/task/task_runner.h"
diff --git a/chrome/browser/policy/messaging_layer/upload/network_condition_service.cc b/chrome/browser/policy/messaging_layer/upload/network_condition_service.cc index 7ae11e5..1e5dbdb 100644 --- a/chrome/browser/policy/messaging_layer/upload/network_condition_service.cc +++ b/chrome/browser/policy/messaging_layer/upload/network_condition_service.cc
@@ -6,7 +6,7 @@ #include <cstddef> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/sequenced_task_runner.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/policy/messaging_layer/upload/record_handler_impl.cc b/chrome/browser/policy/messaging_layer/upload/record_handler_impl.cc index 34b254b..a4d4b06 100644 --- a/chrome/browser/policy/messaging_layer/upload/record_handler_impl.cc +++ b/chrome/browser/policy/messaging_layer/upload/record_handler_impl.cc
@@ -7,9 +7,9 @@ #include <utility> #include "base/base64.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/containers/queue.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/json/json_reader.h" #include "base/memory/raw_ptr.h" #include "base/strings/strcat.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 1d6c050..a37dfd9 100644 --- a/chrome/browser/policy/messaging_layer/upload/record_handler_impl.h +++ b/chrome/browser/policy/messaging_layer/upload/record_handler_impl.h
@@ -7,7 +7,7 @@ #include <utility> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_runner.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 71f258a..a884d1bb 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
@@ -7,7 +7,7 @@ #include <tuple> #include "base/base64.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/json/json_writer.h" #include "base/strings/strcat.h" #include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/policy/messaging_layer/upload/record_upload_request_builder.cc b/chrome/browser/policy/messaging_layer/upload/record_upload_request_builder.cc index f3ab161b..02c4aba 100644 --- a/chrome/browser/policy/messaging_layer/upload/record_upload_request_builder.cc +++ b/chrome/browser/policy/messaging_layer/upload/record_upload_request_builder.cc
@@ -8,9 +8,9 @@ #include <utility> #include "base/base64.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/containers/queue.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/json/json_reader.h" #include "base/notreached.h" #include "base/strings/strcat.h"
diff --git a/chrome/browser/policy/messaging_layer/upload/testing_network_condition_service.cc b/chrome/browser/policy/messaging_layer/upload/testing_network_condition_service.cc index 520a0012..8e61c3b 100644 --- a/chrome/browser/policy/messaging_layer/upload/testing_network_condition_service.cc +++ b/chrome/browser/policy/messaging_layer/upload/testing_network_condition_service.cc
@@ -6,7 +6,7 @@ #include <cstddef> -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/policy/messaging_layer/upload/network_condition_service.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/policy/messaging_layer/upload/upload_client_unittest.cc b/chrome/browser/policy/messaging_layer/upload/upload_client_unittest.cc index 238f084..01c95631 100644 --- a/chrome/browser/policy/messaging_layer/upload/upload_client_unittest.cc +++ b/chrome/browser/policy/messaging_layer/upload/upload_client_unittest.cc
@@ -6,8 +6,8 @@ #include <tuple> -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/json/json_writer.h" #include "base/strings/stringprintf.h" #include "base/test/task_environment.h"
diff --git a/chrome/browser/policy/messaging_layer/util/dm_token_retriever_provider.cc b/chrome/browser/policy/messaging_layer/util/dm_token_retriever_provider.cc index fcc2644..69ae27fc 100644 --- a/chrome/browser/policy/messaging_layer/util/dm_token_retriever_provider.cc +++ b/chrome/browser/policy/messaging_layer/util/dm_token_retriever_provider.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/no_destructor.h" #include "chrome/browser/policy/messaging_layer/util/user_dm_token_retriever.h" #include "components/reporting/client/dm_token_retriever.h"
diff --git a/chrome/browser/policy/messaging_layer/util/dm_token_retriever_provider.h b/chrome/browser/policy/messaging_layer/util/dm_token_retriever_provider.h index 7a9b453..2a14d70 100644 --- a/chrome/browser/policy/messaging_layer/util/dm_token_retriever_provider.h +++ b/chrome/browser/policy/messaging_layer/util/dm_token_retriever_provider.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "components/reporting/client/dm_token_retriever.h" #include "components/reporting/client/report_queue_configuration.h"
diff --git a/chrome/browser/policy/messaging_layer/util/manual_test_heartbeat_event.cc b/chrome/browser/policy/messaging_layer/util/manual_test_heartbeat_event.cc index 2fcec9b..4cc12fe1 100644 --- a/chrome/browser/policy/messaging_layer/util/manual_test_heartbeat_event.cc +++ b/chrome/browser/policy/messaging_layer/util/manual_test_heartbeat_event.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/policy/messaging_layer/util/manual_test_heartbeat_event.h" -#include "base/callback.h" #include "base/feature_list.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/policy/messaging_layer/util/report_queue_manual_test_context.cc b/chrome/browser/policy/messaging_layer/util/report_queue_manual_test_context.cc index 441953d..3180953 100644 --- a/chrome/browser/policy/messaging_layer/util/report_queue_manual_test_context.cc +++ b/chrome/browser/policy/messaging_layer/util/report_queue_manual_test_context.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/policy/messaging_layer/util/report_queue_manual_test_context.h" -#include "base/callback.h" #include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/no_destructor.h" #include "base/sequence_checker.h" #include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/policy/messaging_layer/util/report_queue_manual_test_context.h b/chrome/browser/policy/messaging_layer/util/report_queue_manual_test_context.h index 570b353..95a4fa41 100644 --- a/chrome/browser/policy/messaging_layer/util/report_queue_manual_test_context.h +++ b/chrome/browser/policy/messaging_layer/util/report_queue_manual_test_context.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_POLICY_MESSAGING_LAYER_UTIL_REPORT_QUEUE_MANUAL_TEST_CONTEXT_H_ #define CHROME_BROWSER_POLICY_MESSAGING_LAYER_UTIL_REPORT_QUEUE_MANUAL_TEST_CONTEXT_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/sequence_checker.h" #include "base/task/sequenced_task_runner.h" #include "base/thread_annotations.h"
diff --git a/chrome/browser/policy/messaging_layer/util/report_queue_manual_test_context_unittest.cc b/chrome/browser/policy/messaging_layer/util/report_queue_manual_test_context_unittest.cc index 8a14ab3b..1322f17 100644 --- a/chrome/browser/policy/messaging_layer/util/report_queue_manual_test_context_unittest.cc +++ b/chrome/browser/policy/messaging_layer/util/report_queue_manual_test_context_unittest.cc
@@ -4,7 +4,6 @@ #include "chrome/browser/policy/messaging_layer/util/report_queue_manual_test_context.h" -#include "base/bind.h" #include "base/functional/bind.h" #include "base/memory/scoped_refptr.h" #include "base/task/sequenced_task_runner.h"
diff --git a/chrome/browser/policy/messaging_layer/util/reporting_server_connector.cc b/chrome/browser/policy/messaging_layer/util/reporting_server_connector.cc index 002bc57..76874f3 100644 --- a/chrome/browser/policy/messaging_layer/util/reporting_server_connector.cc +++ b/chrome/browser/policy/messaging_layer/util/reporting_server_connector.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/json/json_writer.h" #include "base/logging.h" #include "base/memory/raw_ptr.h"
diff --git a/chrome/browser/policy/messaging_layer/util/reporting_server_connector.h b/chrome/browser/policy/messaging_layer/util/reporting_server_connector.h index db62c4e..8e48b83 100644 --- a/chrome/browser/policy/messaging_layer/util/reporting_server_connector.h +++ b/chrome/browser/policy/messaging_layer/util/reporting_server_connector.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_POLICY_MESSAGING_LAYER_UTIL_REPORTING_SERVER_CONNECTOR_H_ #define CHROME_BROWSER_POLICY_MESSAGING_LAYER_UTIL_REPORTING_SERVER_CONNECTOR_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/singleton.h" #include "base/timer/timer.h"
diff --git a/chrome/browser/policy/messaging_layer/util/reporting_server_connector_unittest.cc b/chrome/browser/policy/messaging_layer/util/reporting_server_connector_unittest.cc index 1d15a0b5..b6ecdad 100644 --- a/chrome/browser/policy/messaging_layer/util/reporting_server_connector_unittest.cc +++ b/chrome/browser/policy/messaging_layer/util/reporting_server_connector_unittest.cc
@@ -8,7 +8,7 @@ #include <cstddef> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/thread_pool.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/policy/messaging_layer/util/reporting_server_connector_test_util.h"
diff --git a/chrome/browser/policy/messaging_layer/util/user_dm_token_retriever.cc b/chrome/browser/policy/messaging_layer/util/user_dm_token_retriever.cc index fb6eaa2..08db741 100644 --- a/chrome/browser/policy/messaging_layer/util/user_dm_token_retriever.cc +++ b/chrome/browser/policy/messaging_layer/util/user_dm_token_retriever.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/ptr_util.h" #include "base/task/thread_pool.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/policy/messaging_layer/util/user_dm_token_retriever.h b/chrome/browser/policy/messaging_layer/util/user_dm_token_retriever.h index 5d61d71..25b82a34 100644 --- a/chrome/browser/policy/messaging_layer/util/user_dm_token_retriever.h +++ b/chrome/browser/policy/messaging_layer/util/user_dm_token_retriever.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/profiles/profile.h" #include "components/policy/core/common/cloud/dm_token.h" #include "components/reporting/client/dm_token_retriever.h"
diff --git a/chrome/browser/policy/messaging_layer/util/user_dm_token_retriever_unittest.cc b/chrome/browser/policy/messaging_layer/util/user_dm_token_retriever_unittest.cc index d23d5ba..25c62f3 100644 --- a/chrome/browser/policy/messaging_layer/util/user_dm_token_retriever_unittest.cc +++ b/chrome/browser/policy/messaging_layer/util/user_dm_token_retriever_unittest.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/test/task_environment.h" #include "chrome/browser/policy/dm_token_utils.h"
diff --git a/chrome/browser/policy/networking/device_network_configuration_updater_ash.cc b/chrome/browser/policy/networking/device_network_configuration_updater_ash.cc index cfa41b25..4997bc29 100644 --- a/chrome/browser/policy/networking/device_network_configuration_updater_ash.cc +++ b/chrome/browser/policy/networking/device_network_configuration_updater_ash.cc
@@ -6,11 +6,11 @@ #include "ash/constants/ash_features.h" #include "ash/constants/ash_switches.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/containers/flat_map.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "chrome/browser/ash/policy/core/browser_policy_connector_ash.h" #include "chrome/browser/ash/settings/cros_settings.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/policy/networking/network_configuration_updater.cc b/chrome/browser/policy/networking/network_configuration_updater.cc index 0a657c9..44f3103 100644 --- a/chrome/browser/policy/networking/network_configuration_updater.cc +++ b/chrome/browser/policy/networking/network_configuration_updater.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/policy/networking/network_configuration_updater.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/values.h" #include "chromeos/components/onc/onc_utils.h"
diff --git a/chrome/browser/policy/networking/network_configuration_updater_ash_unittest.cc b/chrome/browser/policy/networking/network_configuration_updater_ash_unittest.cc index 059c628c..df538097 100644 --- a/chrome/browser/policy/networking/network_configuration_updater_ash_unittest.cc +++ b/chrome/browser/policy/networking/network_configuration_updater_ash_unittest.cc
@@ -7,10 +7,10 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/values.h" #include "chrome/browser/ash/login/session/user_session_manager.h"
diff --git a/chrome/browser/policy/networking/policy_cert_service.cc b/chrome/browser/policy/networking/policy_cert_service.cc index f653355..d6a1172 100644 --- a/chrome/browser/policy/networking/policy_cert_service.cc +++ b/chrome/browser/policy/networking/policy_cert_service.cc
@@ -4,9 +4,9 @@ #include "chrome/browser/policy/networking/policy_cert_service.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/memory/ptr_util.h" #include "chrome/browser/extensions/extension_util.h"
diff --git a/chrome/browser/policy/networking/user_network_configuration_updater_ash.cc b/chrome/browser/policy/networking/user_network_configuration_updater_ash.cc index 69a8810..fe381f7 100644 --- a/chrome/browser/policy/networking/user_network_configuration_updater_ash.cc +++ b/chrome/browser/policy/networking/user_network_configuration_updater_ash.cc
@@ -6,9 +6,9 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check_op.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/task/bind_post_task.h" #include "base/task/sequenced_task_runner.h" #include "base/values.h"
diff --git a/chrome/browser/policy/policy_network_browsertest.cc b/chrome/browser/policy/policy_network_browsertest.cc index 6df8c20..22c1c5a 100644 --- a/chrome/browser/policy/policy_network_browsertest.cc +++ b/chrome/browser/policy/policy_network_browsertest.cc
@@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/bind.h" #include "base/command_line.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/run_loop.h"
diff --git a/chrome/browser/policy/policy_test_utils.cc b/chrome/browser/policy/policy_test_utils.cc index 903c42f..60f0e8a 100644 --- a/chrome/browser/policy/policy_test_utils.cc +++ b/chrome/browser/policy/policy_test_utils.cc
@@ -7,10 +7,10 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/callback_list.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/path_service.h" #include "base/strings/utf_string_conversions.h" #include "base/task/current_thread.h"
diff --git a/chrome/browser/policy/profile_policy_connector.cc b/chrome/browser/policy/profile_policy_connector.cc index 4160c3d..e0a17b3 100644 --- a/chrome/browser/policy/profile_policy_connector.cc +++ b/chrome/browser/policy/profile_policy_connector.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/task/sequenced_task_runner.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/policy/status_provider/ash_lacros_policy_stack_bridge.cc b/chrome/browser/policy/status_provider/ash_lacros_policy_stack_bridge.cc index 9526b7b4..d68df462 100644 --- a/chrome/browser/policy/status_provider/ash_lacros_policy_stack_bridge.cc +++ b/chrome/browser/policy/status_provider/ash_lacros_policy_stack_bridge.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/values.h" #include "chrome/browser/policy/status_provider/status_provider_util.h" #include "chromeos/crosapi/mojom/policy_service.mojom.h"
diff --git a/chrome/browser/policy/status_provider/updater_status_and_value_provider.cc b/chrome/browser/policy/status_provider/updater_status_and_value_provider.cc index caead90..6e338882 100644 --- a/chrome/browser/policy/status_provider/updater_status_and_value_provider.cc +++ b/chrome/browser/policy/status_provider/updater_status_and_value_provider.cc
@@ -10,7 +10,7 @@ #include <algorithm> #include <utility> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/sequence_checker.h" #include "base/strings/utf_string_conversions.h" #include "base/task/task_traits.h"
diff --git a/chrome/browser/policy/test/network_time_policy_browsertest.cc b/chrome/browser/policy/test/network_time_policy_browsertest.cc index 91c0402e5..dfd3145 100644 --- a/chrome/browser/policy/test/network_time_policy_browsertest.cc +++ b/chrome/browser/policy/test/network_time_policy_browsertest.cc
@@ -6,7 +6,7 @@ #include <memory> #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/test/scoped_feature_list.h" #include "base/values.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/policy/test/policy_certs_browsertest.cc b/chrome/browser/policy/test/policy_certs_browsertest.cc index 81e7af8..9faf9bd 100644 --- a/chrome/browser/policy/test/policy_certs_browsertest.cc +++ b/chrome/browser/policy/test/policy_certs_browsertest.cc
@@ -5,10 +5,10 @@ #include <memory> #include <string> -#include "base/bind.h" #include "base/command_line.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/json/json_writer.h" #include "base/memory/raw_ptr.h" #include "base/path_service.h"
diff --git a/chrome/browser/policy/test/renderer_app_container_enabled_win_browsertest.cc b/chrome/browser/policy/test/renderer_app_container_enabled_win_browsertest.cc index 082c8bf..8f9a9f0 100644 --- a/chrome/browser/policy/test/renderer_app_container_enabled_win_browsertest.cc +++ b/chrome/browser/policy/test/renderer_app_container_enabled_win_browsertest.cc
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/callback.h" #include "base/feature_list.h" +#include "base/functional/callback.h" #include "base/numerics/safe_conversions.h" #include "base/run_loop.h" #include "base/strings/string_util.h"
diff --git a/chrome/browser/policy/test/url_blocklist_policy_browsertest.cc b/chrome/browser/policy/test/url_blocklist_policy_browsertest.cc index 1872a09..af7ea9a 100644 --- a/chrome/browser/policy/test/url_blocklist_policy_browsertest.cc +++ b/chrome/browser/policy/test/url_blocklist_policy_browsertest.cc
@@ -4,8 +4,8 @@ #include <string> -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "build/build_config.h"
diff --git a/chrome/browser/policy/test/web_rtc_event_log_collection_allowed_policy_browsertest.cc b/chrome/browser/policy/test/web_rtc_event_log_collection_allowed_policy_browsertest.cc index 3cdc7fc..38bd8b81 100644 --- a/chrome/browser/policy/test/web_rtc_event_log_collection_allowed_policy_browsertest.cc +++ b/chrome/browser/policy/test/web_rtc_event_log_collection_allowed_policy_browsertest.cc
@@ -4,7 +4,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/run_loop.h" #include "base/values.h" #include "chrome/browser/media/webrtc/webrtc_event_log_manager.h"
diff --git a/chrome/browser/policy/value_provider/chrome_policies_value_provider.cc b/chrome/browser/policy/value_provider/chrome_policies_value_provider.cc index ca5d16c..66a5fe612 100644 --- a/chrome/browser/policy/value_provider/chrome_policies_value_provider.cc +++ b/chrome/browser/policy/value_provider/chrome_policies_value_provider.cc
@@ -8,7 +8,7 @@ #include <memory> #include <utility> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/scoped_refptr.h" #include "base/values.h" #include "chrome/browser/policy/chrome_policy_conversions_client.h"
diff --git a/chrome/browser/portal/portal_browsertest.cc b/chrome/browser/portal/portal_browsertest.cc index 2b0c7869..e9b22752 100644 --- a/chrome/browser/portal/portal_browsertest.cc +++ b/chrome/browser/portal/portal_browsertest.cc
@@ -6,9 +6,9 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/containers/contains.h" #include "base/containers/flat_set.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/strings/utf_string_conversions.h" #include "base/test/scoped_feature_list.h"
diff --git a/chrome/browser/predictors/autocomplete_action_predictor.cc b/chrome/browser/predictors/autocomplete_action_predictor.cc index f451db9..2d26663 100644 --- a/chrome/browser/predictors/autocomplete_action_predictor.cc +++ b/chrome/browser/predictors/autocomplete_action_predictor.cc
@@ -9,8 +9,8 @@ #include <queue> -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/guid.h" #include "base/i18n/case_conversion.h" #include "base/metrics/histogram_functions.h"
diff --git a/chrome/browser/predictors/loading_predictor_browsertest.cc b/chrome/browser/predictors/loading_predictor_browsertest.cc index 04c6d55d..e80885f 100644 --- a/chrome/browser/predictors/loading_predictor_browsertest.cc +++ b/chrome/browser/predictors/loading_predictor_browsertest.cc
@@ -9,10 +9,10 @@ #include <vector> #include "base/base64.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/containers/contains.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/strings/escape.h"
diff --git a/chrome/browser/predictors/preconnect_manager.cc b/chrome/browser/predictors/preconnect_manager.cc index de39505..f33181c 100644 --- a/chrome/browser/predictors/preconnect_manager.cc +++ b/chrome/browser/predictors/preconnect_manager.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" #include "base/containers/adapters.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "base/trace_event/trace_event.h" #include "chrome/browser/predictors/resource_prefetch_predictor.h"
diff --git a/chrome/browser/predictors/predictor_database.cc b/chrome/browser/predictors/predictor_database.cc index efd356f..f16c8ed 100644 --- a/chrome/browser/predictors/predictor_database.cc +++ b/chrome/browser/predictors/predictor_database.cc
@@ -7,10 +7,10 @@ #include <cstdint> #include <memory> -#include "base/bind.h" #include "base/check.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/task/sequenced_task_runner.h" #include "chrome/browser/predictors/autocomplete_action_predictor_table.h" #include "chrome/browser/predictors/loading_predictor_config.h"
diff --git a/chrome/browser/predictors/predictor_database_factory.cc b/chrome/browser/predictors/predictor_database_factory.cc index 7781986..f014a68 100644 --- a/chrome/browser/predictors/predictor_database_factory.cc +++ b/chrome/browser/predictors/predictor_database_factory.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.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.cc b/chrome/browser/predictors/prefetch_manager.cc index c7e45b1..916b343 100644 --- a/chrome/browser/predictors/prefetch_manager.cc +++ b/chrome/browser/predictors/prefetch_manager.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/metrics/histogram_macros.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/predictors/proxy_lookup_client_impl.cc b/chrome/browser/predictors/proxy_lookup_client_impl.cc index 885df54698..2b9b8aa 100644 --- a/chrome/browser/predictors/proxy_lookup_client_impl.cc +++ b/chrome/browser/predictors/proxy_lookup_client_impl.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "base/task/common/task_annotator.h" #include "content/public/browser/browser_task_traits.h"
diff --git a/chrome/browser/predictors/proxy_lookup_client_impl.h b/chrome/browser/predictors/proxy_lookup_client_impl.h index bcbd2225..cc7ec848 100644 --- a/chrome/browser/predictors/proxy_lookup_client_impl.h +++ b/chrome/browser/predictors/proxy_lookup_client_impl.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_PREDICTORS_PROXY_LOOKUP_CLIENT_IMPL_H_ #define CHROME_BROWSER_PREDICTORS_PROXY_LOOKUP_CLIENT_IMPL_H_ -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/time/time.h" #include "mojo/public/cpp/bindings/receiver.h" #include "services/network/public/mojom/proxy_lookup_client.mojom.h"
diff --git a/chrome/browser/predictors/resolve_host_client_impl.cc b/chrome/browser/predictors/resolve_host_client_impl.cc index ed5a62d..f5b22d88 100644 --- a/chrome/browser/predictors/resolve_host_client_impl.cc +++ b/chrome/browser/predictors/resolve_host_client_impl.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "base/task/common/task_annotator.h" #include "content/public/browser/browser_task_traits.h"
diff --git a/chrome/browser/predictors/resolve_host_client_impl.h b/chrome/browser/predictors/resolve_host_client_impl.h index abd65074..09d41fb 100644 --- a/chrome/browser/predictors/resolve_host_client_impl.h +++ b/chrome/browser/predictors/resolve_host_client_impl.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_PREDICTORS_RESOLVE_HOST_CLIENT_IMPL_H_ #define CHROME_BROWSER_PREDICTORS_RESOLVE_HOST_CLIENT_IMPL_H_ -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/time/time.h" #include "mojo/public/cpp/bindings/receiver.h" #include "net/base/address_list.h"
diff --git a/chrome/browser/predictors/resource_prefetch_predictor.cc b/chrome/browser/predictors/resource_prefetch_predictor.cc index 11bccf3..2fbb19d 100644 --- a/chrome/browser/predictors/resource_prefetch_predictor.cc +++ b/chrome/browser/predictors/resource_prefetch_predictor.cc
@@ -8,7 +8,7 @@ #include <set> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "base/rand_util.h" #include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/predictors/resource_prefetch_predictor_tables.cc b/chrome/browser/predictors/resource_prefetch_predictor_tables.cc index d057a19..0f7afb3 100644 --- a/chrome/browser/predictors/resource_prefetch_predictor_tables.cc +++ b/chrome/browser/predictors/resource_prefetch_predictor_tables.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "base/ranges/algorithm.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/predictors/resource_prefetch_predictor_tables_unittest.cc b/chrome/browser/predictors/resource_prefetch_predictor_tables_unittest.cc index 6b49510..1495a16 100644 --- a/chrome/browser/predictors/resource_prefetch_predictor_tables_unittest.cc +++ b/chrome/browser/predictors/resource_prefetch_predictor_tables_unittest.cc
@@ -7,7 +7,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" #include "base/task/sequenced_task_runner.h"
diff --git a/chrome/browser/prefs/chrome_pref_service_factory.cc b/chrome/browser/prefs/chrome_pref_service_factory.cc index 5fddc629..4b2d16e 100644 --- a/chrome/browser/prefs/chrome_pref_service_factory.cc +++ b/chrome/browser/prefs/chrome_pref_service_factory.cc
@@ -10,10 +10,10 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/command_line.h" #include "base/compiler_specific.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/metrics/field_trial.h" #include "base/metrics/histogram_macros.h" #include "base/path_service.h"
diff --git a/chrome/browser/prefs/profile_pref_store_manager_unittest.cc b/chrome/browser/prefs/profile_pref_store_manager_unittest.cc index 7b6af64..72eb13e2 100644 --- a/chrome/browser/prefs/profile_pref_store_manager_unittest.cc +++ b/chrome/browser/prefs/profile_pref_store_manager_unittest.cc
@@ -10,12 +10,12 @@ #include <utility> #include <vector> -#include "base/callback.h" #include "base/compiler_specific.h" #include "base/containers/contains.h" #include "base/files/file_enumerator.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "base/run_loop.h" #include "base/strings/string_util.h"
diff --git a/chrome/browser/prefs/proxy_policy_unittest.cc b/chrome/browser/prefs/proxy_policy_unittest.cc index 5791336..c5b5c024 100644 --- a/chrome/browser/prefs/proxy_policy_unittest.cc +++ b/chrome/browser/prefs/proxy_policy_unittest.cc
@@ -5,9 +5,9 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "build/chromeos_buildflags.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/preloading/navigation_ablation_throttle.cc b/chrome/browser/preloading/navigation_ablation_throttle.cc index 4f9a4fa..a63badb 100644 --- a/chrome/browser/preloading/navigation_ablation_throttle.cc +++ b/chrome/browser/preloading/navigation_ablation_throttle.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/preloading/navigation_ablation_throttle.h" -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/metrics/field_trial_params.h" #include "base/metrics/histogram_functions.h" #include "base/time/time.h"
diff --git a/chrome/browser/preloading/prefetch/no_state_prefetch/no_state_prefetch_test_utils.cc b/chrome/browser/preloading/prefetch/no_state_prefetch/no_state_prefetch_test_utils.cc index 0063db43..fbce3b3 100644 --- a/chrome/browser/preloading/prefetch/no_state_prefetch/no_state_prefetch_test_utils.cc +++ b/chrome/browser/preloading/prefetch/no_state_prefetch/no_state_prefetch_test_utils.cc
@@ -10,9 +10,9 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/ptr_util.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/preloading/prefetch/no_state_prefetch/prerender_nostate_prefetch_browsertest.cc b/chrome/browser/preloading/prefetch/no_state_prefetch/prerender_nostate_prefetch_browsertest.cc index 1ed17054..53919aab 100644 --- a/chrome/browser/preloading/prefetch/no_state_prefetch/prerender_nostate_prefetch_browsertest.cc +++ b/chrome/browser/preloading/prefetch/no_state_prefetch/prerender_nostate_prefetch_browsertest.cc
@@ -4,10 +4,10 @@ #include <string> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/metrics/statistics_recorder.h"
diff --git a/chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_browsertest.cc b/chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_browsertest.cc index 8453b173a..6d2a2d93 100644 --- a/chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_browsertest.cc +++ b/chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_browsertest.cc
@@ -8,10 +8,10 @@ #include <string> #include "base/base_switches.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/containers/contains.h" #include "base/containers/unique_ptr_adapters.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/strings/string_split.h"
diff --git a/chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_canary_checker.cc b/chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_canary_checker.cc index cbdef46..cbfe7ba9 100644 --- a/chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_canary_checker.cc +++ b/chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_canary_checker.cc
@@ -9,8 +9,8 @@ #include <cmath> #include "base/base64.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/guid.h" #include "base/metrics/histogram.h" #include "base/metrics/histogram_functions.h"
diff --git a/chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_canary_checker.h b/chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_canary_checker.h index ecd2e8e..f8f5c0cc 100644 --- a/chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_canary_checker.h +++ b/chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_canary_checker.h
@@ -10,8 +10,8 @@ #include <memory> #include <string> -#include "base/callback.h" #include "base/containers/lru_cache.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_cookie_listener.cc b/chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_cookie_listener.cc index 9d469c68..ac74d78 100644 --- a/chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_cookie_listener.cc +++ b/chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_cookie_listener.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_cookie_listener.h" -#include "base/callback.h" #include "base/check.h" +#include "base/functional/callback.h" // static std::unique_ptr<PrefetchProxyCookieListener>
diff --git a/chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_cookie_listener.h b/chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_cookie_listener.h index 1062d10..b2077b0 100644 --- a/chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_cookie_listener.h +++ b/chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_cookie_listener.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "mojo/public/cpp/bindings/receiver.h" #include "services/network/public/mojom/cookie_manager.mojom.h" #include "url/gurl.h"
diff --git a/chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_from_string_url_loader.cc b/chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_from_string_url_loader.cc index 9e5248c..7b5764c 100644 --- a/chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_from_string_url_loader.cc +++ b/chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_from_string_url_loader.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_from_string_url_loader.h" -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/notreached.h" #include "base/task/sequenced_task_runner.h"
diff --git a/chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_network_context.cc b/chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_network_context.cc index e3da12d..f5c89d8 100644 --- a/chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_network_context.cc +++ b/chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_network_context.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_network_context.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/callback_helpers.h" #include "chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_network_context_client.h" #include "chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_proxy_configurator.h" #include "chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_service.h"
diff --git a/chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_origin_prober.cc b/chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_origin_prober.cc index 38032ae..c77ff18 100644 --- a/chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_origin_prober.cc +++ b/chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_origin_prober.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_origin_prober.h" -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/strings/string_util.h" #include "chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_canary_checker.h" #include "chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_dns_prober.h"
diff --git a/chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_origin_prober.h b/chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_origin_prober.h index d87c7c1..187df1f 100644 --- a/chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_origin_prober.h +++ b/chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_origin_prober.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_PRELOADING_PREFETCH_PREFETCH_PROXY_PREFETCH_PROXY_ORIGIN_PROBER_H_ #define CHROME_BROWSER_PRELOADING_PREFETCH_PREFETCH_PROXY_PREFETCH_PROXY_ORIGIN_PROBER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_probe_result.h"
diff --git a/chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_proxying_url_loader_factory.cc b/chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_proxying_url_loader_factory.cc index 96bb6b0..156b02b4 100644 --- a/chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_proxying_url_loader_factory.cc +++ b/chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_proxying_url_loader_factory.cc
@@ -5,8 +5,8 @@ #include "chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_proxying_url_loader_factory.h" #include "base/barrier_closure.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/scoped_refptr.h" #include "base/metrics/histogram.h" #include "base/metrics/histogram_functions.h"
diff --git a/chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_proxying_url_loader_factory.h b/chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_proxying_url_loader_factory.h index e48e2495..1eded1e 100644 --- a/chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_proxying_url_loader_factory.h +++ b/chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_proxying_url_loader_factory.h
@@ -9,8 +9,8 @@ #include <set> #include <vector> -#include "base/callback.h" #include "base/containers/unique_ptr_adapters.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_prefetch_status.h"
diff --git a/chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_service.cc b/chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_service.cc index b02f677..db81278 100644 --- a/chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_service.cc +++ b/chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_service.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_service.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_origin_decider.h" #include "chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_origin_prober.h" #include "chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_params.h"
diff --git a/chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_subresource_manager.h b/chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_subresource_manager.h index c03e714..cc62c9b 100644 --- a/chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_subresource_manager.h +++ b/chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_subresource_manager.h
@@ -8,8 +8,8 @@ #include <memory> #include <set> -#include "base/callback.h" #include "base/containers/unique_ptr_adapters.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_proxying_url_loader_factory.h"
diff --git a/chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_tab_helper.cc b/chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_tab_helper.cc index 8752718..480d51ed 100644 --- a/chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_tab_helper.cc +++ b/chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_tab_helper.cc
@@ -7,11 +7,11 @@ #include <string> #include "base/barrier_closure.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/containers/adapters.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/histogram.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h"
diff --git a/chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_tab_helper_unittest.cc b/chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_tab_helper_unittest.cc index 606b6a6..fb8b1651 100644 --- a/chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_tab_helper_unittest.cc +++ b/chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_tab_helper_unittest.cc
@@ -9,9 +9,9 @@ #include <vector> #include "base/barrier_closure.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/strings/string_util.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h"
diff --git a/chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_test_utils.h b/chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_test_utils.h index 2c0a3477..02b57ff 100644 --- a/chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_test_utils.h +++ b/chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_test_utils.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_url_loader_interceptor.cc b/chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_url_loader_interceptor.cc index 2413839..0cbbf93 100644 --- a/chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_url_loader_interceptor.cc +++ b/chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_url_loader_interceptor.cc
@@ -6,9 +6,9 @@ #include <memory> -#include "base/bind.h" -#include "base/callback.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/metrics/histogram_macros.h" #include "chrome/browser/preloading/prefetch/no_state_prefetch/no_state_prefetch_manager_factory.h" #include "chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_features.h"
diff --git a/chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_url_loader_interceptor.h b/chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_url_loader_interceptor.h index 612b59b..d5e88a3 100644 --- a/chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_url_loader_interceptor.h +++ b/chrome/browser/preloading/prefetch/prefetch_proxy/prefetch_proxy_url_loader_interceptor.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h" #include "base/time/time.h"
diff --git a/chrome/browser/preloading/prefetch/search_prefetch/cache_alias_search_prefetch_url_loader.cc b/chrome/browser/preloading/prefetch/search_prefetch/cache_alias_search_prefetch_url_loader.cc index 8939d51..3254b11 100644 --- a/chrome/browser/preloading/prefetch/search_prefetch/cache_alias_search_prefetch_url_loader.cc +++ b/chrome/browser/preloading/prefetch/search_prefetch/cache_alias_search_prefetch_url_loader.cc
@@ -7,7 +7,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/single_thread_task_runner.h" #include "chrome/browser/preloading/prefetch/search_prefetch/search_prefetch_service.h" #include "chrome/browser/preloading/prefetch/search_prefetch/search_prefetch_service_factory.h"
diff --git a/chrome/browser/preloading/prefetch/search_prefetch/search_prefetch_request.h b/chrome/browser/preloading/prefetch/search_prefetch/search_prefetch_request.h index 294d9ca..e31bb38 100644 --- a/chrome/browser/preloading/prefetch/search_prefetch/search_prefetch_request.h +++ b/chrome/browser/preloading/prefetch/search_prefetch/search_prefetch_request.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/state_transitions.h" #include "net/traffic_annotation/network_traffic_annotation.h" #include "services/network/public/cpp/resource_request.h"
diff --git a/chrome/browser/preloading/prefetch/search_prefetch/search_prefetch_service.cc b/chrome/browser/preloading/prefetch/search_prefetch/search_prefetch_service.cc index d942da8e..81bba1c 100644 --- a/chrome/browser/preloading/prefetch/search_prefetch/search_prefetch_service.cc +++ b/chrome/browser/preloading/prefetch/search_prefetch/search_prefetch_service.cc
@@ -7,8 +7,8 @@ #include <iterator> #include <memory> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/json/values_util.h" #include "base/location.h" #include "base/metrics/histogram_functions.h"
diff --git a/chrome/browser/preloading/prefetch/search_prefetch/search_prefetch_url_loader_interceptor.cc b/chrome/browser/preloading/prefetch/search_prefetch/search_prefetch_url_loader_interceptor.cc index aadc4cdd..c6c602c 100644 --- a/chrome/browser/preloading/prefetch/search_prefetch/search_prefetch_url_loader_interceptor.cc +++ b/chrome/browser/preloading/prefetch/search_prefetch/search_prefetch_url_loader_interceptor.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/preloading/prefetch/search_prefetch/field_trial_settings.h" #include "chrome/browser/preloading/prefetch/search_prefetch/search_prefetch_service.h" #include "chrome/browser/preloading/prefetch/search_prefetch/search_prefetch_service_factory.h"
diff --git a/chrome/browser/preloading/prefetch/search_prefetch/search_preload_unified_browsertest.cc b/chrome/browser/preloading/prefetch/search_prefetch/search_preload_unified_browsertest.cc index 3cb60cf..78f8d0d 100644 --- a/chrome/browser/preloading/prefetch/search_prefetch/search_preload_unified_browsertest.cc +++ b/chrome/browser/preloading/prefetch/search_prefetch/search_preload_unified_browsertest.cc
@@ -4,9 +4,9 @@ #include <string> -#include "base/bind.h" #include "base/containers/contains.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/path_service.h" #include "base/strings/string_number_conversions.h" #include "base/test/metrics/histogram_tester.h"
diff --git a/chrome/browser/preloading/prefetch/search_prefetch/streaming_search_prefetch_url_loader.cc b/chrome/browser/preloading/prefetch/search_prefetch/streaming_search_prefetch_url_loader.cc index f2e47bb..dfc064c 100644 --- a/chrome/browser/preloading/prefetch/search_prefetch/streaming_search_prefetch_url_loader.cc +++ b/chrome/browser/preloading/prefetch/search_prefetch/streaming_search_prefetch_url_loader.cc
@@ -7,7 +7,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h"
diff --git a/chrome/browser/preloading/prefetch/search_prefetch/streaming_search_prefetch_url_loader.h b/chrome/browser/preloading/prefetch/search_prefetch/streaming_search_prefetch_url_loader.h index 1504b57b..a9afeb8 100644 --- a/chrome/browser/preloading/prefetch/search_prefetch/streaming_search_prefetch_url_loader.h +++ b/chrome/browser/preloading/prefetch/search_prefetch/streaming_search_prefetch_url_loader.h
@@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/preloading/prefetch/zero_suggest_prefetch/zero_suggest_prefetch_tab_helper_browsertest.cc b/chrome/browser/preloading/prefetch/zero_suggest_prefetch/zero_suggest_prefetch_tab_helper_browsertest.cc index e589ce3..a83f33c 100644 --- a/chrome/browser/preloading/prefetch/zero_suggest_prefetch/zero_suggest_prefetch_tab_helper_browsertest.cc +++ b/chrome/browser/preloading/prefetch/zero_suggest_prefetch/zero_suggest_prefetch_tab_helper_browsertest.cc
@@ -4,7 +4,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/test/scoped_feature_list.h" #include "chrome/browser/preloading/prefetch/zero_suggest_prefetch/zero_suggest_prefetch_tab_helper.h"
diff --git a/chrome/browser/preloading/prerender/omnibox_prerender_browsertest.cc b/chrome/browser/preloading/prerender/omnibox_prerender_browsertest.cc index 2a30fd9..5a6e27b4 100644 --- a/chrome/browser/preloading/prerender/omnibox_prerender_browsertest.cc +++ b/chrome/browser/preloading/prerender/omnibox_prerender_browsertest.cc
@@ -4,8 +4,8 @@ #include <string> -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/path_service.h" #include "build/build_config.h"
diff --git a/chrome/browser/preloading/prerender/prerender_browsertest.cc b/chrome/browser/preloading/prerender/prerender_browsertest.cc index 3b66765..294f4af 100644 --- a/chrome/browser/preloading/prerender/prerender_browsertest.cc +++ b/chrome/browser/preloading/prerender/prerender_browsertest.cc
@@ -4,8 +4,8 @@ #include <string> -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/path_service.h" #include "base/test/metrics/histogram_tester.h" #include "build/build_config.h"
diff --git a/chrome/browser/preloading/prerender/prerender_omnibox_ui_browsertest.cc b/chrome/browser/preloading/prerender/prerender_omnibox_ui_browsertest.cc index 2b35343..5675c96 100644 --- a/chrome/browser/preloading/prerender/prerender_omnibox_ui_browsertest.cc +++ b/chrome/browser/preloading/prerender/prerender_omnibox_ui_browsertest.cc
@@ -4,9 +4,9 @@ #include <string> -#include "base/bind.h" #include "base/containers/adapters.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/path_service.h" #include "base/ranges/algorithm.h" #include "base/test/bind.h"
diff --git a/chrome/browser/printing/pdf_nup_converter_client.cc b/chrome/browser/printing/pdf_nup_converter_client.cc index af3b0b7..912cc72 100644 --- a/chrome/browser/printing/pdf_nup_converter_client.cc +++ b/chrome/browser/printing/pdf_nup_converter_client.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/printing/printing_service.h" #include "chrome/services/printing/public/mojom/pdf_nup_converter.mojom.h" #include "chrome/services/printing/public/mojom/printing_service.mojom.h"
diff --git a/chrome/browser/printing/pdf_nup_converter_client_browsertest.cc b/chrome/browser/printing/pdf_nup_converter_client_browsertest.cc index 0b11e0c..65ccbc6f 100644 --- a/chrome/browser/printing/pdf_nup_converter_client_browsertest.cc +++ b/chrome/browser/printing/pdf_nup_converter_client_browsertest.cc
@@ -4,8 +4,8 @@ #include <utility> -#include "base/bind.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/path_service.h" #include "base/run_loop.h" #include "base/threading/thread_restrictions.h"
diff --git a/chrome/browser/printing/pdf_to_emf_converter.cc b/chrome/browser/printing/pdf_to_emf_converter.cc index 857db45..47a4a45 100644 --- a/chrome/browser/printing/pdf_to_emf_converter.cc +++ b/chrome/browser/printing/pdf_to_emf_converter.cc
@@ -12,9 +12,9 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" #include "base/containers/queue.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/memory/ref_counted_delete_on_sequence.h" #include "base/metrics/histogram_macros.h"
diff --git a/chrome/browser/printing/pdf_to_emf_converter.h b/chrome/browser/printing/pdf_to_emf_converter.h index 6d535729..eb23ae1 100644 --- a/chrome/browser/printing/pdf_to_emf_converter.h +++ b/chrome/browser/printing/pdf_to_emf_converter.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/ref_counted_memory.h" namespace printing {
diff --git a/chrome/browser/printing/pdf_to_emf_converter_browsertest.cc b/chrome/browser/printing/pdf_to_emf_converter_browsertest.cc index 40bd90b..12921e8 100644 --- a/chrome/browser/printing/pdf_to_emf_converter_browsertest.cc +++ b/chrome/browser/printing/pdf_to_emf_converter_browsertest.cc
@@ -9,9 +9,9 @@ #include <limits> -#include "base/bind.h" #include "base/containers/span.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/hash/sha1.h" #include "base/memory/ref_counted_memory.h" #include "base/path_service.h"
diff --git a/chrome/browser/printing/print_backend_browsertest.cc b/chrome/browser/printing/print_backend_browsertest.cc index b4f828b..d707bce 100644 --- a/chrome/browser/printing/print_backend_browsertest.cc +++ b/chrome/browser/printing/print_backend_browsertest.cc
@@ -9,12 +9,12 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/check_op.h" #include "base/containers/span.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/path_service.h" #include "base/run_loop.h"
diff --git a/chrome/browser/printing/print_backend_service_manager.cc b/chrome/browser/printing/print_backend_service_manager.cc index 8ab30328..272d678b 100644 --- a/chrome/browser/printing/print_backend_service_manager.cc +++ b/chrome/browser/printing/print_backend_service_manager.cc
@@ -8,10 +8,10 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/containers/contains.h" #include "base/containers/flat_map.h" #include "base/containers/flat_set.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/scoped_refptr.h" #include "base/metrics/histogram_functions.h"
diff --git a/chrome/browser/printing/print_browsertest.cc b/chrome/browser/printing/print_browsertest.cc index d02a7ad..0b0a9158 100644 --- a/chrome/browser/printing/print_browsertest.cc +++ b/chrome/browser/printing/print_browsertest.cc
@@ -7,11 +7,11 @@ #include <vector> #include "base/auto_reset.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check_op.h" #include "base/containers/contains.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/path_service.h" #include "base/ranges/algorithm.h"
diff --git a/chrome/browser/printing/print_error_dialog.cc b/chrome/browser/printing/print_error_dialog.cc index df1380e7..72a06e4 100644 --- a/chrome/browser/printing/print_error_dialog.cc +++ b/chrome/browser/printing/print_error_dialog.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/no_destructor.h" #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/browser_window.h"
diff --git a/chrome/browser/printing/print_job.cc b/chrome/browser/printing/print_job.cc index 796c7f0..e1ddd8f 100644 --- a/chrome/browser/printing/print_job.cc +++ b/chrome/browser/printing/print_job.cc
@@ -7,8 +7,8 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/observer_list.h" #include "base/run_loop.h"
diff --git a/chrome/browser/printing/print_job.h b/chrome/browser/printing/print_job.h index 39ee9039..c00686ce8 100644 --- a/chrome/browser/printing/print_job.h +++ b/chrome/browser/printing/print_job.h
@@ -8,7 +8,7 @@ #include <memory> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/gtest_prod_util.h" #include "base/memory/ref_counted.h" #include "base/observer_list.h"
diff --git a/chrome/browser/printing/print_job_manager.cc b/chrome/browser/printing/print_job_manager.cc index f917f42..bc34b1ee 100644 --- a/chrome/browser/printing/print_job_manager.cc +++ b/chrome/browser/printing/print_job_manager.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/printing/print_job_manager.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/time/time.h" #include "build/build_config.h" #include "chrome/browser/printing/print_job.h"
diff --git a/chrome/browser/printing/print_job_utils_lacros.cc b/chrome/browser/printing/print_job_utils_lacros.cc index 1028177..fbcbff6 100644 --- a/chrome/browser/printing/print_job_utils_lacros.cc +++ b/chrome/browser/printing/print_job_utils_lacros.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/printing/print_job_utils_lacros.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/printing/print_job.h" #include "chrome/grit/generated_resources.h"
diff --git a/chrome/browser/printing/print_job_worker.cc b/chrome/browser/printing/print_job_worker.cc index e2f3ae2..d09a2aab 100644 --- a/chrome/browser/printing/print_job_worker.cc +++ b/chrome/browser/printing/print_job_worker.cc
@@ -8,10 +8,10 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/numerics/safe_conversions.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/printing/print_preview_dialog_controller.h b/chrome/browser/printing/print_preview_dialog_controller.h index f7867d4..58bdc57 100644 --- a/chrome/browser/printing/print_preview_dialog_controller.h +++ b/chrome/browser/printing/print_preview_dialog_controller.h
@@ -7,7 +7,7 @@ #include <map> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "chrome/browser/tab_contents/web_contents_collection.h"
diff --git a/chrome/browser/printing/print_preview_dialog_controller_browsertest.cc b/chrome/browser/printing/print_preview_dialog_controller_browsertest.cc index 10320cf1..3a73e66 100644 --- a/chrome/browser/printing/print_preview_dialog_controller_browsertest.cc +++ b/chrome/browser/printing/print_preview_dialog_controller_browsertest.cc
@@ -6,10 +6,10 @@ #include <memory> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h"
diff --git a/chrome/browser/printing/print_view_manager.cc b/chrome/browser/printing/print_view_manager.cc index 5d30286..237e496 100644 --- a/chrome/browser/printing/print_view_manager.cc +++ b/chrome/browser/printing/print_view_manager.cc
@@ -8,8 +8,8 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/lazy_instance.h" #include "base/observer_list.h" #include "build/build_config.h"
diff --git a/chrome/browser/printing/print_view_manager_base.cc b/chrome/browser/printing/print_view_manager_base.cc index 017e421..34d6001 100644 --- a/chrome/browser/printing/print_view_manager_base.cc +++ b/chrome/browser/printing/print_view_manager_base.cc
@@ -8,7 +8,7 @@ #include <utility> #include "base/auto_reset.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/read_only_shared_memory_region.h" #include "base/memory/ref_counted_memory.h"
diff --git a/chrome/browser/printing/print_view_manager_base.h b/chrome/browser/printing/print_view_manager_base.h index 25d4150..e2823c4 100644 --- a/chrome/browser/printing/print_view_manager_base.h +++ b/chrome/browser/printing/print_view_manager_base.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/read_only_shared_memory_region.h" #include "base/memory/scoped_refptr.h"
diff --git a/chrome/browser/printing/print_view_manager_basic.cc b/chrome/browser/printing/print_view_manager_basic.cc index f32d842..b1aabb5 100644 --- a/chrome/browser/printing/print_view_manager_basic.cc +++ b/chrome/browser/printing/print_view_manager_basic.cc
@@ -7,7 +7,7 @@ #include "build/build_config.h" #if BUILDFLAG(IS_ANDROID) -#include "base/bind.h" +#include "base/functional/bind.h" #include "printing/printing_context_android.h" #endif
diff --git a/chrome/browser/printing/print_view_manager_unittest.cc b/chrome/browser/printing/print_view_manager_unittest.cc index b67a5df8..dcfe64f 100644 --- a/chrome/browser/printing/print_view_manager_unittest.cc +++ b/chrome/browser/printing/print_view_manager_unittest.cc
@@ -6,8 +6,8 @@ #include <utility> #include "base/auto_reset.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/notreached.h" #include "base/run_loop.h" #include "base/test/bind.h"
diff --git a/chrome/browser/printing/printer_manager_dialog_linux.cc b/chrome/browser/printing/printer_manager_dialog_linux.cc index 764c39df..c97d2045 100644 --- a/chrome/browser/printing/printer_manager_dialog_linux.cc +++ b/chrome/browser/printing/printer_manager_dialog_linux.cc
@@ -6,10 +6,10 @@ #include <memory> -#include "base/bind.h" #include "base/containers/span.h" #include "base/environment.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/nix/xdg_util.h" #include "base/process/kill.h"
diff --git a/chrome/browser/printing/printer_manager_dialog_win.cc b/chrome/browser/printing/printer_manager_dialog_win.cc index 9ba4067..edbe5af4 100644 --- a/chrome/browser/printing/printer_manager_dialog_win.cc +++ b/chrome/browser/printing/printer_manager_dialog_win.cc
@@ -7,8 +7,8 @@ #include <windows.h> #include <shellapi.h> -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/path_service.h" #include "base/task/thread_pool.h" #include "base/threading/thread.h"
diff --git a/chrome/browser/printing/printer_query.cc b/chrome/browser/printing/printer_query.cc index b9f35e43..d01d616 100644 --- a/chrome/browser/printing/printer_query.cc +++ b/chrome/browser/printing/printer_query.cc
@@ -7,8 +7,8 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/threading/thread_restrictions.h" #include "base/values.h"
diff --git a/chrome/browser/printing/printer_query.h b/chrome/browser/printing/printer_query.h index 43e1ad51..9afb999d 100644 --- a/chrome/browser/printing/printer_query.h +++ b/chrome/browser/printing/printer_query.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/values.h" #include "build/build_config.h" #include "content/public/browser/global_routing_id.h"
diff --git a/chrome/browser/printing/printer_query_oop.h b/chrome/browser/printing/printer_query_oop.h index 03007f09..a3f0d213b 100644 --- a/chrome/browser/printing/printer_query_oop.h +++ b/chrome/browser/printing/printer_query_oop.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/values.h" #include "build/build_config.h" #include "chrome/browser/printing/printer_query.h"
diff --git a/chrome/browser/printing/printer_xml_parser_impl.cc b/chrome/browser/printing/printer_xml_parser_impl.cc index de0efa8b..973259b 100644 --- a/chrome/browser/printing/printer_xml_parser_impl.cc +++ b/chrome/browser/printing/printer_xml_parser_impl.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/values.h" #include "chrome/services/printing/public/mojom/printer_xml_parser.mojom.h" #include "mojo/public/cpp/bindings/pending_receiver.h"
diff --git a/chrome/browser/printing/pwg_raster_converter.cc b/chrome/browser/printing/pwg_raster_converter.cc index a56eb96..fc6b580 100644 --- a/chrome/browser/printing/pwg_raster_converter.cc +++ b/chrome/browser/printing/pwg_raster_converter.cc
@@ -8,11 +8,11 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/cancelable_callback.h" #include "base/check_op.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/histogram_macros.h" #include "base/notreached.h" #include "chrome/browser/printing/printing_service.h"
diff --git a/chrome/browser/printing/pwg_raster_converter.h b/chrome/browser/printing/pwg_raster_converter.h index 7aa8188..1b72ef7 100644 --- a/chrome/browser/printing/pwg_raster_converter.h +++ b/chrome/browser/printing/pwg_raster_converter.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/read_only_shared_memory_region.h" #include "base/memory/ref_counted_memory.h" #include "printing/pdf_render_settings.h"
diff --git a/chrome/browser/printing/pwg_raster_converter_browsertest.cc b/chrome/browser/printing/pwg_raster_converter_browsertest.cc index d2b4c49f..353fc35 100644 --- a/chrome/browser/printing/pwg_raster_converter_browsertest.cc +++ b/chrome/browser/printing/pwg_raster_converter_browsertest.cc
@@ -4,8 +4,8 @@ #include "chrome/test/base/in_process_browser_test.h" -#include "base/bind.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/hash/sha1.h" #include "base/memory/ref_counted_memory.h" #include "base/path_service.h"
diff --git a/chrome/browser/printing/test_print_job.cc b/chrome/browser/printing/test_print_job.cc index 88afc20..fd462690 100644 --- a/chrome/browser/printing/test_print_job.cc +++ b/chrome/browser/printing/test_print_job.cc
@@ -4,7 +4,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted_memory.h" #include "build/build_config.h" #include "chrome/browser/printing/print_job_worker.h"
diff --git a/chrome/browser/printing/test_print_job.h b/chrome/browser/printing/test_print_job.h index 26195554..5cfdf7b 100644 --- a/chrome/browser/printing/test_print_job.h +++ b/chrome/browser/printing/test_print_job.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "build/build_config.h" #include "chrome/browser/printing/print_job.h" #include "printing/print_settings.h"
diff --git a/chrome/browser/printing/test_print_view_manager_for_request_preview.cc b/chrome/browser/printing/test_print_view_manager_for_request_preview.cc index 763fe79..3d9e163 100644 --- a/chrome/browser/printing/test_print_view_manager_for_request_preview.cc +++ b/chrome/browser/printing/test_print_view_manager_for_request_preview.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/task/single_thread_task_runner.h" #include "chrome/browser/printing/print_view_manager.h" #include "components/printing/common/print.mojom.h"
diff --git a/chrome/browser/printing/test_print_view_manager_for_request_preview.h b/chrome/browser/printing/test_print_view_manager_for_request_preview.h index a3926c38..c6ff0f5c 100644 --- a/chrome/browser/printing/test_print_view_manager_for_request_preview.h +++ b/chrome/browser/printing/test_print_view_manager_for_request_preview.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_PRINTING_TEST_PRINT_VIEW_MANAGER_FOR_REQUEST_PREVIEW_H_ #define CHROME_BROWSER_PRINTING_TEST_PRINT_VIEW_MANAGER_FOR_REQUEST_PREVIEW_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "chrome/browser/printing/print_view_manager.h" #include "components/printing/common/print.mojom.h"
diff --git a/chrome/browser/privacy/secure_dns_bridge.cc b/chrome/browser/privacy/secure_dns_bridge.cc index c900e56..864ac9c 100644 --- a/chrome/browser/privacy/secure_dns_bridge.cc +++ b/chrome/browser/privacy/secure_dns_bridge.cc
@@ -12,8 +12,8 @@ #include "base/android/jni_array.h" #include "base/android/jni_string.h" #include "base/android/scoped_java_ref.h" -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "base/synchronization/waitable_event.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/privacy_budget/privacy_budget_reid_score_estimator.cc b/chrome/browser/privacy_budget/privacy_budget_reid_score_estimator.cc index 1deb802..a19f9109 100644 --- a/chrome/browser/privacy_budget/privacy_budget_reid_score_estimator.cc +++ b/chrome/browser/privacy_budget/privacy_budget_reid_score_estimator.cc
@@ -4,9 +4,9 @@ #include "chrome/browser/privacy_budget/privacy_budget_reid_score_estimator.h" -#include "base/bind.h" #include "base/containers/contains.h" #include "base/containers/flat_map.h" +#include "base/functional/bind.h" #include "base/rand_util.h" #include "base/task/sequenced_task_runner.h" #include "chrome/browser/privacy_budget/privacy_budget_prefs.h"
diff --git a/chrome/browser/process_resource_usage.cc b/chrome/browser/process_resource_usage.cc index 62ce4f72..2d2a0aa 100644 --- a/chrome/browser/process_resource_usage.cc +++ b/chrome/browser/process_resource_usage.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/task/single_thread_task_runner.h" #include "content/public/common/resource_usage_reporter_type_converters.h"
diff --git a/chrome/browser/process_resource_usage.h b/chrome/browser/process_resource_usage.h index 1db80d9..f9dc7c6 100644 --- a/chrome/browser/process_resource_usage.h +++ b/chrome/browser/process_resource_usage.h
@@ -7,8 +7,8 @@ #include <stddef.h> -#include "base/callback.h" #include "base/containers/circular_deque.h" +#include "base/functional/callback.h" #include "base/threading/thread_checker.h" #include "content/public/common/resource_usage_reporter.mojom.h" #include "mojo/public/cpp/bindings/pending_remote.h"
diff --git a/chrome/browser/process_singleton.h b/chrome/browser/process_singleton.h index 2db06b7..b05c0157e 100644 --- a/chrome/browser/process_singleton.h +++ b/chrome/browser/process_singleton.h
@@ -12,10 +12,10 @@ #include "base/win/windows_types.h" #endif // BUILDFLAG(IS_WIN) -#include "base/callback.h" #include "base/check.h" #include "base/command_line.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "base/process/process.h" #include "ui/gfx/native_widget_types.h"
diff --git a/chrome/browser/process_singleton_browsertest.cc b/chrome/browser/process_singleton_browsertest.cc index ef0ba3b..26dbfcd 100644 --- a/chrome/browser/process_singleton_browsertest.cc +++ b/chrome/browser/process_singleton_browsertest.cc
@@ -14,10 +14,10 @@ #include <memory> -#include "base/bind.h" #include "base/command_line.h" #include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/ref_counted.h" #include "base/path_service.h"
diff --git a/chrome/browser/process_singleton_modal_dialog_lock.cc b/chrome/browser/process_singleton_modal_dialog_lock.cc index e3aaef1..3951891 100644 --- a/chrome/browser/process_singleton_modal_dialog_lock.cc +++ b/chrome/browser/process_singleton_modal_dialog_lock.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" ProcessSingletonModalDialogLock::ProcessSingletonModalDialogLock( const ProcessSingleton::NotificationCallback& original_callback)
diff --git a/chrome/browser/process_singleton_modal_dialog_lock.h b/chrome/browser/process_singleton_modal_dialog_lock.h index 829b80f..62e4a1f8 100644 --- a/chrome/browser/process_singleton_modal_dialog_lock.h +++ b/chrome/browser/process_singleton_modal_dialog_lock.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_PROCESS_SINGLETON_MODAL_DIALOG_LOCK_H_ #define CHROME_BROWSER_PROCESS_SINGLETON_MODAL_DIALOG_LOCK_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/process_singleton.h" namespace base {
diff --git a/chrome/browser/process_singleton_posix.cc b/chrome/browser/process_singleton_posix.cc index 7b3c6db8..e9ba010 100644 --- a/chrome/browser/process_singleton_posix.cc +++ b/chrome/browser/process_singleton_posix.cc
@@ -57,12 +57,12 @@ #include <type_traits> #include "base/base_paths.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/containers/unique_ptr_adapters.h" #include "base/files/file_descriptor_watcher_posix.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/memory/raw_ptr.h"
diff --git a/chrome/browser/process_singleton_posix_unittest.cc b/chrome/browser/process_singleton_posix_unittest.cc index 36d8174..86446c6 100644 --- a/chrome/browser/process_singleton_posix_unittest.cc +++ b/chrome/browser/process_singleton_posix_unittest.cc
@@ -17,11 +17,11 @@ #include <string> #include <vector> -#include "base/bind.h" #include "base/command_line.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/posix/eintr_wrapper.h"
diff --git a/chrome/browser/process_singleton_startup_lock.cc b/chrome/browser/process_singleton_startup_lock.cc index 92ab058..3798398d 100644 --- a/chrome/browser/process_singleton_startup_lock.cc +++ b/chrome/browser/process_singleton_startup_lock.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/process_singleton_startup_lock.h" -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" ProcessSingletonStartupLock::ProcessSingletonStartupLock( const ProcessSingleton::NotificationCallback& original_callback)
diff --git a/chrome/browser/process_singleton_win.cc b/chrome/browser/process_singleton_win.cc index f89f926..046764b 100644 --- a/chrome/browser/process_singleton_win.cc +++ b/chrome/browser/process_singleton_win.cc
@@ -9,10 +9,10 @@ #include <stddef.h> #include "base/base_paths.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/debug/activity_tracker.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h"
diff --git a/chrome/browser/process_singleton_win_unittest.cc b/chrome/browser/process_singleton_win_unittest.cc index ceeff0f..c6c303ba 100644 --- a/chrome/browser/process_singleton_win_unittest.cc +++ b/chrome/browser/process_singleton_win_unittest.cc
@@ -9,12 +9,12 @@ #include <memory> #include <string> -#include "base/bind.h" #include "base/check.h" #include "base/command_line.h" #include "base/compiler_specific.h" #include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/notreached.h" #include "base/process/launch.h" #include "base/process/process.h"
diff --git a/chrome/browser/profile_resetter/brandcode_config_fetcher.cc b/chrome/browser/profile_resetter/brandcode_config_fetcher.cc index 83af17dc..536fe62 100644 --- a/chrome/browser/profile_resetter/brandcode_config_fetcher.cc +++ b/chrome/browser/profile_resetter/brandcode_config_fetcher.cc
@@ -9,8 +9,8 @@ #include <memory> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profile_resetter/brandcoded_default_settings.h"
diff --git a/chrome/browser/profile_resetter/brandcode_config_fetcher.h b/chrome/browser/profile_resetter/brandcode_config_fetcher.h index 7a57307..ced7975 100644 --- a/chrome/browser/profile_resetter/brandcode_config_fetcher.h +++ b/chrome/browser/profile_resetter/brandcode_config_fetcher.h
@@ -9,7 +9,7 @@ #include <string> #include <utility> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/timer/timer.h" #include "services/data_decoder/public/cpp/data_decoder.h"
diff --git a/chrome/browser/profile_resetter/profile_resetter.cc b/chrome/browser/profile_resetter/profile_resetter.cc index 0e0aba7..c1465d19 100644 --- a/chrome/browser/profile_resetter/profile_resetter.cc +++ b/chrome/browser/profile_resetter/profile_resetter.cc
@@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/synchronization/atomic_flag.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/profile_resetter/profile_resetter.h b/chrome/browser/profile_resetter/profile_resetter.h index fcdd5e96..a0c7186 100644 --- a/chrome/browser/profile_resetter/profile_resetter.h +++ b/chrome/browser/profile_resetter/profile_resetter.h
@@ -12,8 +12,8 @@ #include <utility> #include <vector> -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h"
diff --git a/chrome/browser/profile_resetter/profile_resetter_browsertest.cc b/chrome/browser/profile_resetter/profile_resetter_browsertest.cc index 2d7544ad..4f3fa5d 100644 --- a/chrome/browser/profile_resetter/profile_resetter_browsertest.cc +++ b/chrome/browser/profile_resetter/profile_resetter_browsertest.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/profile_resetter/profile_resetter_test_base.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/profile_resetter/profile_resetter_test_base.cc b/chrome/browser/profile_resetter/profile_resetter_test_base.cc index dd06caf..cc231ec 100644 --- a/chrome/browser/profile_resetter/profile_resetter_test_base.cc +++ b/chrome/browser/profile_resetter/profile_resetter_test_base.cc
@@ -7,8 +7,8 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "chrome/browser/profile_resetter/brandcoded_default_settings.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/search_engines/ui_thread_search_terms_data.h"
diff --git a/chrome/browser/profile_resetter/profile_resetter_unittest.cc b/chrome/browser/profile_resetter/profile_resetter_unittest.cc index dc03af0..dc027211 100644 --- a/chrome/browser/profile_resetter/profile_resetter_unittest.cc +++ b/chrome/browser/profile_resetter/profile_resetter_unittest.cc
@@ -12,8 +12,8 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/profile_resetter/reset_report_uploader.cc b/chrome/browser/profile_resetter/reset_report_uploader.cc index 65e0ce7..aae06fa1 100644 --- a/chrome/browser/profile_resetter/reset_report_uploader.cc +++ b/chrome/browser/profile_resetter/reset_report_uploader.cc
@@ -4,8 +4,8 @@ #include <string> -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/strings/escape.h" #include "chrome/browser/profile_resetter/profile_reset_report.pb.h" #include "chrome/browser/profile_resetter/reset_report_uploader.h"
diff --git a/chrome/browser/profile_resetter/resettable_settings_snapshot.cc b/chrome/browser/profile_resetter/resettable_settings_snapshot.cc index 3bad7f9..d221283a 100644 --- a/chrome/browser/profile_resetter/resettable_settings_snapshot.cc +++ b/chrome/browser/profile_resetter/resettable_settings_snapshot.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/guid.h" #include "base/hash/md5.h" #include "base/stl_util.h"
diff --git a/chrome/browser/profiles/android/profile_manager_utils.cc b/chrome/browser/profiles/android/profile_manager_utils.cc index cf608c5..931e812 100644 --- a/chrome/browser/profiles/android/profile_manager_utils.cc +++ b/chrome/browser/profiles/android/profile_manager_utils.cc
@@ -5,7 +5,7 @@ #include <vector> #include "base/android/jni_android.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/ranges/algorithm.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/android/jni_headers/ProfileManagerUtils_jni.h"
diff --git a/chrome/browser/profiles/android/profile_resolver.cc b/chrome/browser/profiles/android/profile_resolver.cc index f0727b5..69c019e 100644 --- a/chrome/browser/profiles/android/profile_resolver.cc +++ b/chrome/browser/profiles/android/profile_resolver.cc
@@ -8,10 +8,10 @@ #include "base/android/jni_android.h" #include "base/android/jni_string.h" #include "base/android/scoped_java_ref.h" -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/path_service.h" #include "chrome/browser/android/profile_key_startup_accessor.h" #include "chrome/browser/android/proto/profile_token.pb.h"
diff --git a/chrome/browser/profiles/android/profile_resolver.h b/chrome/browser/profiles/android/profile_resolver.h index ea40cb9..3e98c363 100644 --- a/chrome/browser/profiles/android/profile_resolver.h +++ b/chrome/browser/profiles/android/profile_resolver.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" class Profile; class ProfileKey;
diff --git a/chrome/browser/profiles/avatar_menu.cc b/chrome/browser/profiles/avatar_menu.cc index d844285..51303b2 100644 --- a/chrome/browser/profiles/avatar_menu.cc +++ b/chrome/browser/profiles/avatar_menu.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/profiles/avatar_menu.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/i18n/case_conversion.h" #include "base/metrics/field_trial.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/profiles/delete_profile_helper.cc b/chrome/browser/profiles/delete_profile_helper.cc index e1a3228..ce481ef 100644 --- a/chrome/browser/profiles/delete_profile_helper.cc +++ b/chrome/browser/profiles/delete_profile_helper.cc
@@ -4,11 +4,11 @@ #include "chrome/browser/profiles/delete_profile_helper.h" -#include "base/bind.h" #include "base/check.h" #include "base/feature_list.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/functional/callback.h" #include "base/json/values_util.h" #include "base/logging.h"
diff --git a/chrome/browser/profiles/gaia_info_update_service_unittest.cc b/chrome/browser/profiles/gaia_info_update_service_unittest.cc index b53d26d8..25e95b0c 100644 --- a/chrome/browser/profiles/gaia_info_update_service_unittest.cc +++ b/chrome/browser/profiles/gaia_info_update_service_unittest.cc
@@ -9,7 +9,7 @@ #include <memory> #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/strings/utf_string_conversions.h" #include "base/test/metrics/histogram_tester.h"
diff --git a/chrome/browser/profiles/host_zoom_map_browsertest.cc b/chrome/browser/profiles/host_zoom_map_browsertest.cc index fd3b2e71..42e17ffb 100644 --- a/chrome/browser/profiles/host_zoom_map_browsertest.cc +++ b/chrome/browser/profiles/host_zoom_map_browsertest.cc
@@ -8,11 +8,11 @@ #include <string> #include <vector> -#include "base/bind.h" #include "base/command_line.h" #include "base/containers/contains.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted.h" #include "base/path_service.h" #include "base/run_loop.h"
diff --git a/chrome/browser/profiles/off_the_record_profile_impl.cc b/chrome/browser/profiles/off_the_record_profile_impl.cc index 0d09e30..f16a213f 100644 --- a/chrome/browser/profiles/off_the_record_profile_impl.cc +++ b/chrome/browser/profiles/off_the_record_profile_impl.cc
@@ -7,10 +7,10 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/command_line.h" #include "base/compiler_specific.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/user_metrics.h" #include "base/metrics/user_metrics_action.h"
diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc index c03407ffd..d035eb9f2 100644 --- a/chrome/browser/profiles/profile.cc +++ b/chrome/browser/profiles/profile.cc
@@ -6,8 +6,8 @@ #include <string> -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/guid.h" #include "base/memory/raw_ptr.h" #include "base/observer_list.h"
diff --git a/chrome/browser/profiles/profile_attributes_storage.cc b/chrome/browser/profiles/profile_attributes_storage.cc index 871d62d..3921fb2 100644 --- a/chrome/browser/profiles/profile_attributes_storage.cc +++ b/chrome/browser/profiles/profile_attributes_storage.cc
@@ -7,11 +7,11 @@ #include <unordered_set> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/check.h" #include "base/containers/contains.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/i18n/number_formatting.h" #include "base/i18n/string_compare.h" #include "base/logging.h"
diff --git a/chrome/browser/profiles/profile_attributes_storage.h b/chrome/browser/profiles/profile_attributes_storage.h index 3a5f03c7..18e58de 100644 --- a/chrome/browser/profiles/profile_attributes_storage.h +++ b/chrome/browser/profiles/profile_attributes_storage.h
@@ -12,8 +12,8 @@ #include <unordered_map> #include <vector> -#include "base/callback_forward.h" #include "base/files/file_path.h" +#include "base/functional/callback_forward.h" #include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/profiles/profile_attributes_storage_unittest.cc b/chrome/browser/profiles/profile_attributes_storage_unittest.cc index a5a5610..58d4226 100644 --- a/chrome/browser/profiles/profile_attributes_storage_unittest.cc +++ b/chrome/browser/profiles/profile_attributes_storage_unittest.cc
@@ -7,9 +7,9 @@ #include <string> #include <unordered_set> -#include "base/bind.h" #include "base/files/file_util.h" #include "base/format_macros.h" +#include "base/functional/bind.h" #include "base/scoped_observation.h" #include "base/strings/strcat.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/profiles/profile_avatar_downloader.cc b/chrome/browser/profiles/profile_avatar_downloader.cc index dde02cc..4ef3697 100644 --- a/chrome/browser/profiles/profile_avatar_downloader.cc +++ b/chrome/browser/profiles/profile_avatar_downloader.cc
@@ -7,8 +7,8 @@ #include <memory> #include <string> -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/net/system_network_context_manager.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/profiles/profile_avatar_downloader.h b/chrome/browser/profiles/profile_avatar_downloader.h index 1adc332..e18c4223 100644 --- a/chrome/browser/profiles/profile_avatar_downloader.h +++ b/chrome/browser/profiles/profile_avatar_downloader.h
@@ -6,8 +6,8 @@ #include <stddef.h> -#include "base/callback_forward.h" #include "base/files/file_path.h" +#include "base/functional/callback_forward.h" #include "chrome/browser/bitmap_fetcher/bitmap_fetcher.h" namespace gfx {
diff --git a/chrome/browser/profiles/profile_browsertest.cc b/chrome/browser/profiles/profile_browsertest.cc index 1c5fc49..cf02932e 100644 --- a/chrome/browser/profiles/profile_browsertest.cc +++ b/chrome/browser/profiles/profile_browsertest.cc
@@ -9,13 +9,13 @@ #include <memory> -#include "base/bind.h" #include "base/check.h" #include "base/command_line.h" #include "base/containers/contains.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/json/json_reader.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h"
diff --git a/chrome/browser/profiles/profile_browsertest_android.cc b/chrome/browser/profiles/profile_browsertest_android.cc index a04c22c6..65e189c 100644 --- a/chrome/browser/profiles/profile_browsertest_android.cc +++ b/chrome/browser/profiles/profile_browsertest_android.cc
@@ -8,12 +8,12 @@ #include <memory> -#include "base/bind.h" #include "base/check_op.h" #include "base/command_line.h" #include "base/files/file_path.h" #include "base/files/file_path_watcher.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/profiles/profile_destroyer.cc b/chrome/browser/profiles/profile_destroyer.cc index 869cc0a..1d4a734c 100644 --- a/chrome/browser/profiles/profile_destroyer.cc +++ b/chrome/browser/profiles/profile_destroyer.cc
@@ -8,8 +8,8 @@ #include <sstream> #include <utility> -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/metrics/histogram_macros.h" #include "base/no_destructor.h"
diff --git a/chrome/browser/profiles/profile_downloader.cc b/chrome/browser/profiles/profile_downloader.cc index 9dd29df6..d7f5a3b 100644 --- a/chrome/browser/profiles/profile_downloader.cc +++ b/chrome/browser/profiles/profile_downloader.cc
@@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/json/json_reader.h" #include "base/logging.h" #include "base/strings/string_split.h"
diff --git a/chrome/browser/profiles/profile_downloader_unittest.cc b/chrome/browser/profiles/profile_downloader_unittest.cc index cd0287e..f0337f49 100644 --- a/chrome/browser/profiles/profile_downloader_unittest.cc +++ b/chrome/browser/profiles/profile_downloader_unittest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/profiles/profile_downloader.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/test/task_environment.h"
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc index eaaaa027..c786f8a 100644 --- a/chrome/browser/profiles/profile_impl.cc +++ b/chrome/browser/profiles/profile_impl.cc
@@ -11,9 +11,6 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/compiler_specific.h" #include "base/containers/contains.h" @@ -21,6 +18,9 @@ #include "base/files/file.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/memory/ptr_util.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/profiles/profile_list_desktop_browsertest.cc b/chrome/browser/profiles/profile_list_desktop_browsertest.cc index 33e9e15..e28c9ed7 100644 --- a/chrome/browser/profiles/profile_list_desktop_browsertest.cc +++ b/chrome/browser/profiles/profile_list_desktop_browsertest.cc
@@ -4,8 +4,8 @@ #include <stddef.h> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc index 2819cfa..f90b9af 100644 --- a/chrome/browser/profiles/profile_manager.cc +++ b/chrome/browser/profiles/profile_manager.cc
@@ -14,15 +14,15 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/containers/contains.h" #include "base/feature_list.h" #include "base/files/file_enumerator.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/json/values_util.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h"
diff --git a/chrome/browser/profiles/profile_manager_browsertest.cc b/chrome/browser/profiles/profile_manager_browsertest.cc index c4f252d..4967a08 100644 --- a/chrome/browser/profiles/profile_manager_browsertest.cc +++ b/chrome/browser/profiles/profile_manager_browsertest.cc
@@ -5,12 +5,12 @@ #include <stddef.h> #include <string> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/files/file_path_watcher.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/ranges/algorithm.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/profiles/profile_manager_unittest.cc b/chrome/browser/profiles/profile_manager_unittest.cc index 6359d3be..4bc42aa 100644 --- a/chrome/browser/profiles/profile_manager_unittest.cc +++ b/chrome/browser/profiles/profile_manager_unittest.cc
@@ -7,12 +7,12 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h"
diff --git a/chrome/browser/profiles/profile_shortcut_manager.h b/chrome/browser/profiles/profile_shortcut_manager.h index 66b1d0c..02784c9 100644 --- a/chrome/browser/profiles/profile_shortcut_manager.h +++ b/chrome/browser/profiles/profile_shortcut_manager.h
@@ -8,8 +8,8 @@ #include <memory> #include <string> -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" class ProfileManager;
diff --git a/chrome/browser/profiles/profile_shortcut_manager_unittest_win.cc b/chrome/browser/profiles/profile_shortcut_manager_unittest_win.cc index 0204dc5..6ab1fbcba 100644 --- a/chrome/browser/profiles/profile_shortcut_manager_unittest_win.cc +++ b/chrome/browser/profiles/profile_shortcut_manager_unittest_win.cc
@@ -8,8 +8,8 @@ #include <string> #include "base/base_paths.h" -#include "base/bind.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/path_service.h"
diff --git a/chrome/browser/profiles/profile_shortcut_manager_win.cc b/chrome/browser/profiles/profile_shortcut_manager_win.cc index ac490ec8..79d188c 100644 --- a/chrome/browser/profiles/profile_shortcut_manager_win.cc +++ b/chrome/browser/profiles/profile_shortcut_manager_win.cc
@@ -12,11 +12,11 @@ #include <string> #include <vector> -#include "base/bind.h" #include "base/command_line.h" #include "base/containers/contains.h" #include "base/files/file_enumerator.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/path_service.h" #include "base/ranges/algorithm.h"
diff --git a/chrome/browser/profiles/profile_shortcut_manager_win.h b/chrome/browser/profiles/profile_shortcut_manager_win.h index 561c256..a6967cbd 100644 --- a/chrome/browser/profiles/profile_shortcut_manager_win.h +++ b/chrome/browser/profiles/profile_shortcut_manager_win.h
@@ -8,8 +8,8 @@ #include <set> #include <string> -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/profiles/profile_attributes_storage.h" #include "chrome/browser/profiles/profile_manager_observer.h"
diff --git a/chrome/browser/profiles/profile_statistics.cc b/chrome/browser/profiles/profile_statistics.cc index 3be9d71..90d88da5 100644 --- a/chrome/browser/profiles/profile_statistics.cc +++ b/chrome/browser/profiles/profile_statistics.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/profiles/profile_statistics.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h"
diff --git a/chrome/browser/profiles/profile_statistics_aggregator.cc b/chrome/browser/profiles/profile_statistics_aggregator.cc index 5994988..706fad1e 100644 --- a/chrome/browser/profiles/profile_statistics_aggregator.cc +++ b/chrome/browser/profiles/profile_statistics_aggregator.cc
@@ -6,7 +6,7 @@ #include <stddef.h> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/time/time.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/profiles/profile_statistics_aggregator.h b/chrome/browser/profiles/profile_statistics_aggregator.h index be2b90d..b4264c5 100644 --- a/chrome/browser/profiles/profile_statistics_aggregator.h +++ b/chrome/browser/profiles/profile_statistics_aggregator.h
@@ -8,8 +8,8 @@ #include <memory> #include <vector> -#include "base/callback_forward.h" #include "base/files/file_path.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/profiles/profile_statistics_common.h" #include "components/browsing_data/core/counters/browsing_data_counter.h"
diff --git a/chrome/browser/profiles/profile_statistics_browsertest.cc b/chrome/browser/profiles/profile_statistics_browsertest.cc index c9a51b1..2285285 100644 --- a/chrome/browser/profiles/profile_statistics_browsertest.cc +++ b/chrome/browser/profiles/profile_statistics_browsertest.cc
@@ -10,7 +10,7 @@ #include <string> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/ranges/algorithm.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/profiles/profile_statistics_common.h b/chrome/browser/profiles/profile_statistics_common.h index 99d5ee74..04cb6688 100644 --- a/chrome/browser/profiles/profile_statistics_common.h +++ b/chrome/browser/profiles/profile_statistics_common.h
@@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" namespace profiles { // Constants for the categories in ProfileCategoryStats.
diff --git a/chrome/browser/profiles/profile_statistics_unittest.cc b/chrome/browser/profiles/profile_statistics_unittest.cc index afbfca1..aa85bb9 100644 --- a/chrome/browser/profiles/profile_statistics_unittest.cc +++ b/chrome/browser/profiles/profile_statistics_unittest.cc
@@ -10,8 +10,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/bookmarks/chrome_bookmark_client.h"
diff --git a/chrome/browser/profiles/profile_window.cc b/chrome/browser/profiles/profile_window.cc index 84780dd7..7f74410 100644 --- a/chrome/browser/profiles/profile_window.cc +++ b/chrome/browser/profiles/profile_window.cc
@@ -6,10 +6,10 @@ #include <stddef.h> -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/metrics/user_metrics.h" #include "base/strings/escape.h"
diff --git a/chrome/browser/profiles/profile_window.h b/chrome/browser/profiles/profile_window.h index 0d15c62c..c5e3066 100644 --- a/chrome/browser/profiles/profile_window.h +++ b/chrome/browser/profiles/profile_window.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_PROFILES_PROFILE_WINDOW_H_ #define CHROME_BROWSER_PROFILES_PROFILE_WINDOW_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "build/build_config.h" #include "chrome/browser/ui/browser_list_observer.h"
diff --git a/chrome/browser/profiles/profile_window_browsertest.cc b/chrome/browser/profiles/profile_window_browsertest.cc index d2656ad..afdea65 100644 --- a/chrome/browser/profiles/profile_window_browsertest.cc +++ b/chrome/browser/profiles/profile_window_browsertest.cc
@@ -8,8 +8,8 @@ #include <stddef.h> #include <utility> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h"
diff --git a/chrome/browser/profiles/renderer_updater.cc b/chrome/browser/profiles/renderer_updater.cc index 69f3761..43082afa 100644 --- a/chrome/browser/profiles/renderer_updater.cc +++ b/chrome/browser/profiles/renderer_updater.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "build/chromeos_buildflags.h" #include "chrome/browser/content_settings/content_settings_manager_delegate.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
diff --git a/chrome/browser/profiles/reporting_util.cc b/chrome/browser/profiles/reporting_util.cc index b8fcb8cd..5c795ac 100644 --- a/chrome/browser/profiles/reporting_util.cc +++ b/chrome/browser/profiles/reporting_util.cc
@@ -7,7 +7,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/profiling_host/chrome_browser_main_extra_parts_profiling.cc b/chrome/browser/profiling_host/chrome_browser_main_extra_parts_profiling.cc index a25092b..358010e 100644 --- a/chrome/browser/profiling_host/chrome_browser_main_extra_parts_profiling.cc +++ b/chrome/browser/profiling_host/chrome_browser_main_extra_parts_profiling.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/profiling_host/chrome_browser_main_extra_parts_profiling.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "chrome/browser/profiling_host/chrome_client_connection_manager.h" #include "chrome/browser/profiling_host/profiling_process_host.h" #include "chrome/common/chrome_switches.h"
diff --git a/chrome/browser/profiling_host/profiling_process_host.cc b/chrome/browser/profiling_host/profiling_process_host.cc index 927d32a..de1ab9d 100644 --- a/chrome/browser/profiling_host/profiling_process_host.cc +++ b/chrome/browser/profiling_host/profiling_process_host.cc
@@ -9,9 +9,9 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ref_counted_memory.h" #include "base/metrics/field_trial_params.h" #include "base/metrics/histogram_macros.h"
diff --git a/chrome/browser/push_messaging/budget_database.cc b/chrome/browser/push_messaging/budget_database.cc index 1b15712..06a3bd9 100644 --- a/chrome/browser/push_messaging/budget_database.cc +++ b/chrome/browser/push_messaging/budget_database.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/push_messaging/budget_database.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/metrics/histogram_macros.h" #include "base/task/sequenced_task_runner.h"
diff --git a/chrome/browser/push_messaging/budget_database.h b/chrome/browser/push_messaging/budget_database.h index 9c0018f..ce2bbef3 100644 --- a/chrome/browser/push_messaging/budget_database.h +++ b/chrome/browser/push_messaging/budget_database.h
@@ -9,7 +9,7 @@ #include <map> #include <memory> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/push_messaging/budget_database_unittest.cc b/chrome/browser/push_messaging/budget_database_unittest.cc index e86403a..d9892f8 100644 --- a/chrome/browser/push_messaging/budget_database_unittest.cc +++ b/chrome/browser/push_messaging/budget_database_unittest.cc
@@ -7,7 +7,7 @@ #include <math.h> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/run_loop.h" #include "base/test/metrics/histogram_tester.h"
diff --git a/chrome/browser/push_messaging/push_messaging_browsertest.cc b/chrome/browser/push_messaging/push_messaging_browsertest.cc index fd3770ea..fbd50c1 100644 --- a/chrome/browser/push_messaging/push_messaging_browsertest.cc +++ b/chrome/browser/push_messaging/push_messaging_browsertest.cc
@@ -11,8 +11,8 @@ #include "base/barrier_closure.h" #include "base/base64url.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/push_messaging/push_messaging_notification_manager.cc b/chrome/browser/push_messaging/push_messaging_notification_manager.cc index 96446f5..d6e30a86 100644 --- a/chrome/browser/push_messaging/push_messaging_notification_manager.cc +++ b/chrome/browser/push_messaging/push_messaging_notification_manager.cc
@@ -9,9 +9,9 @@ #include <bitset> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/push_messaging/push_messaging_notification_manager.h b/chrome/browser/push_messaging/push_messaging_notification_manager.h index 71ff25c9..4b0995b6 100644 --- a/chrome/browser/push_messaging/push_messaging_notification_manager.h +++ b/chrome/browser/push_messaging/push_messaging_notification_manager.h
@@ -8,7 +8,7 @@ #include <stdint.h> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/push_messaging/push_messaging_notification_manager_unittest.cc b/chrome/browser/push_messaging/push_messaging_notification_manager_unittest.cc index d4eb468a..5bd6f5f 100644 --- a/chrome/browser/push_messaging/push_messaging_notification_manager_unittest.cc +++ b/chrome/browser/push_messaging/push_messaging_notification_manager_unittest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/push_messaging/push_messaging_notification_manager.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "build/chromeos_buildflags.h" #include "chrome/test/base/chrome_render_view_host_test_harness.h" #include "chrome/test/base/testing_profile.h"
diff --git a/chrome/browser/push_messaging/push_messaging_refresher.cc b/chrome/browser/push_messaging/push_messaging_refresher.cc index 77f444c..89d1b3c 100644 --- a/chrome/browser/push_messaging/push_messaging_refresher.cc +++ b/chrome/browser/push_messaging/push_messaging_refresher.cc
@@ -4,9 +4,9 @@ #include "chrome/browser/push_messaging/push_messaging_refresher.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/observer_list.h" #include "base/task/single_thread_task_runner.h" #include "chrome/browser/push_messaging/push_messaging_app_identifier.h"
diff --git a/chrome/browser/push_messaging/push_messaging_service_factory.cc b/chrome/browser/push_messaging/push_messaging_service_factory.cc index 670cd430..8fe81fb45 100644 --- a/chrome/browser/push_messaging/push_messaging_service_factory.cc +++ b/chrome/browser/push_messaging/push_messaging_service_factory.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "build/chromeos_buildflags.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
diff --git a/chrome/browser/push_messaging/push_messaging_service_impl.cc b/chrome/browser/push_messaging/push_messaging_service_impl.cc index fdbe2e2..ca825969 100644 --- a/chrome/browser/push_messaging/push_messaging_service_impl.cc +++ b/chrome/browser/push_messaging/push_messaging_service_impl.cc
@@ -10,10 +10,10 @@ #include "base/barrier_closure.h" #include "base/base64url.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h"
diff --git a/chrome/browser/push_messaging/push_messaging_service_impl.h b/chrome/browser/push_messaging/push_messaging_service_impl.h index c23aa908a9..524d792 100644 --- a/chrome/browser/push_messaging/push_messaging_service_impl.h +++ b/chrome/browser/push_messaging/push_messaging_service_impl.h
@@ -11,10 +11,10 @@ #include <utility> #include <vector> -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/callback_list.h" #include "base/containers/flat_map.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/push_messaging/push_messaging_service_unittest.cc b/chrome/browser/push_messaging/push_messaging_service_unittest.cc index 0170723..dcda27b83 100644 --- a/chrome/browser/push_messaging/push_messaging_service_unittest.cc +++ b/chrome/browser/push_messaging/push_messaging_service_unittest.cc
@@ -7,8 +7,8 @@ #include <string> #include <vector> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h"
diff --git a/chrome/browser/reading_list/android/reading_list_notification_service.h b/chrome/browser/reading_list/android/reading_list_notification_service.h index 19daab3..178e4a29 100644 --- a/chrome/browser/reading_list/android/reading_list_notification_service.h +++ b/chrome/browser/reading_list/android/reading_list_notification_service.h
@@ -8,7 +8,7 @@ #include <memory> #include <queue> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/time/clock.h"
diff --git a/chrome/browser/recovery/recovery_install_global_error.cc b/chrome/browser/recovery/recovery_install_global_error.cc index 97d3e29..d710c7c 100644 --- a/chrome/browser/recovery/recovery_install_global_error.cc +++ b/chrome/browser/recovery/recovery_install_global_error.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/recovery/recovery_install_global_error.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/app/vector_icons/vector_icons.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/referrer_policy_browsertest.cc b/chrome/browser/referrer_policy_browsertest.cc index 81ffab1..15745a18 100644 --- a/chrome/browser/referrer_policy_browsertest.cc +++ b/chrome/browser/referrer_policy_browsertest.cc
@@ -4,8 +4,8 @@ #include <memory> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/renderer_context_menu/accessibility_labels_menu_observer.cc b/chrome/browser/renderer_context_menu/accessibility_labels_menu_observer.cc index 8858ea1b..1c74130b 100644 --- a/chrome/browser/renderer_context_menu/accessibility_labels_menu_observer.cc +++ b/chrome/browser/renderer_context_menu/accessibility_labels_menu_observer.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "base/strings/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h"
diff --git a/chrome/browser/renderer_context_menu/context_menu_content_type_factory.cc b/chrome/browser/renderer_context_menu/context_menu_content_type_factory.cc index f4c3c79..a77efda 100644 --- a/chrome/browser/renderer_context_menu/context_menu_content_type_factory.cc +++ b/chrome/browser/renderer_context_menu/context_menu_content_type_factory.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "build/chromeos_buildflags.h" #include "chrome/common/url_constants.h"
diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu.cc b/chrome/browser/renderer_context_menu/render_view_context_menu.cc index d162fd1..f9461f9 100644 --- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc +++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc
@@ -12,11 +12,11 @@ #include <utility> #include "ash/components/arc/arc_features.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" #include "base/containers/contains.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/metrics/field_trial.h" #include "base/metrics/histogram_functions.h"
diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu.h b/chrome/browser/renderer_context_menu/render_view_context_menu.h index 101d39c..3c8fe2b 100644 --- a/chrome/browser/renderer_context_menu/render_view_context_menu.h +++ b/chrome/browser/renderer_context_menu/render_view_context_menu.h
@@ -10,8 +10,8 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/scoped_observation.h" #include "build/branding_buildflags.h"
diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu_browsertest.cc b/chrome/browser/renderer_context_menu/render_view_context_menu_browsertest.cc index e0757aac..bab3617 100644 --- a/chrome/browser/renderer_context_menu/render_view_context_menu_browsertest.cc +++ b/chrome/browser/renderer_context_menu/render_view_context_menu_browsertest.cc
@@ -11,10 +11,10 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/run_loop.h"
diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu_browsertest_util.cc b/chrome/browser/renderer_context_menu/render_view_context_menu_browsertest_util.cc index dee2233e..ddc69939 100644 --- a/chrome/browser/renderer_context_menu/render_view_context_menu_browsertest_util.cc +++ b/chrome/browser/renderer_context_menu/render_view_context_menu_browsertest_util.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/renderer_context_menu/render_view_context_menu_browsertest_util.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu_unittest.cc b/chrome/browser/renderer_context_menu/render_view_context_menu_unittest.cc index b36703e..03212df 100644 --- a/chrome/browser/renderer_context_menu/render_view_context_menu_unittest.cc +++ b/chrome/browser/renderer_context_menu/render_view_context_menu_unittest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/renderer_context_menu/render_view_context_menu.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/renderer_context_menu/spelling_menu_observer.cc b/chrome/browser/renderer_context_menu/spelling_menu_observer.cc index 842934e..1098a3c 100644 --- a/chrome/browser/renderer_context_menu/spelling_menu_observer.cc +++ b/chrome/browser/renderer_context_menu/spelling_menu_observer.cc
@@ -7,8 +7,8 @@ #include <utility> #include "base/barrier_closure.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/i18n/case_conversion.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h"
diff --git a/chrome/browser/renderer_host/chrome_extension_message_filter.cc b/chrome/browser/renderer_host/chrome_extension_message_filter.cc index e091ddc..5a06ee2 100644 --- a/chrome/browser/renderer_host/chrome_extension_message_filter.cc +++ b/chrome/browser/renderer_host/chrome_extension_message_filter.cc
@@ -6,11 +6,11 @@ #include <stdint.h> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check_op.h" #include "base/containers/adapters.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/notreached.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/renderer_host/chrome_render_widget_host_view_mac_history_swiper_browsertest.mm b/chrome/browser/renderer_host/chrome_render_widget_host_view_mac_history_swiper_browsertest.mm index 695e066e..09d4da3 100644 --- a/chrome/browser/renderer_host/chrome_render_widget_host_view_mac_history_swiper_browsertest.mm +++ b/chrome/browser/renderer_host/chrome_render_widget_host_view_mac_history_swiper_browsertest.mm
@@ -4,8 +4,8 @@ #include <Cocoa/Cocoa.h> -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/mac/scoped_nsobject.h" #include "base/notreached.h" #include "base/run_loop.h"
diff --git a/chrome/browser/renderer_host/render_process_host_chrome_browsertest.cc b/chrome/browser/renderer_host/render_process_host_chrome_browsertest.cc index a62294a..d3fb1a9 100644 --- a/chrome/browser/renderer_host/render_process_host_chrome_browsertest.cc +++ b/chrome/browser/renderer_host/render_process_host_chrome_browsertest.cc
@@ -3,8 +3,8 @@ // found in the LICENSE file. #include "base/base_switches.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/path_service.h" #include "base/process/process.h"
diff --git a/chrome/browser/reputation/local_heuristics.cc b/chrome/browser/reputation/local_heuristics.cc index 48846b2a..44f2142 100644 --- a/chrome/browser/reputation/local_heuristics.cc +++ b/chrome/browser/reputation/local_heuristics.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/reputation/local_heuristics.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/metrics/field_trial_params.h" #include "chrome/browser/lookalikes/lookalike_url_blocking_page.h" #include "chrome/browser/lookalikes/lookalike_url_navigation_throttle.h"
diff --git a/chrome/browser/reputation/reputation_service.h b/chrome/browser/reputation/reputation_service.h index 210c42e..4708c556 100644 --- a/chrome/browser/reputation/reputation_service.h +++ b/chrome/browser/reputation/reputation_service.h
@@ -8,7 +8,7 @@ #include <set> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/reputation/safety_tip_ui.h"
diff --git a/chrome/browser/reputation/reputation_web_contents_observer.h b/chrome/browser/reputation/reputation_web_contents_observer.h index 71e7d4b..0c5f1366 100644 --- a/chrome/browser/reputation/reputation_web_contents_observer.h +++ b/chrome/browser/reputation/reputation_web_contents_observer.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_REPUTATION_REPUTATION_WEB_CONTENTS_OBSERVER_H_ #define CHROME_BROWSER_REPUTATION_REPUTATION_WEB_CONTENTS_OBSERVER_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "build/build_config.h" #include "chrome/browser/reputation/reputation_service.h"
diff --git a/chrome/browser/reputation/safety_tip_ui.h b/chrome/browser/reputation/safety_tip_ui.h index d3668d81..b3806e4 100644 --- a/chrome/browser/reputation/safety_tip_ui.h +++ b/chrome/browser/reputation/safety_tip_ui.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_REPUTATION_SAFETY_TIP_UI_H_ #define CHROME_BROWSER_REPUTATION_SAFETY_TIP_UI_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "build/build_config.h" #include "components/security_state/core/security_state.h"
diff --git a/chrome/browser/resource_coordinator/discard_before_unload_helper.cc b/chrome/browser/resource_coordinator/discard_before_unload_helper.cc index cca674c6..310570d 100644 --- a/chrome/browser/resource_coordinator/discard_before_unload_helper.cc +++ b/chrome/browser/resource_coordinator/discard_before_unload_helper.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/resource_coordinator/discard_before_unload_helper.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_observer.h"
diff --git a/chrome/browser/resource_coordinator/discard_before_unload_helper.h b/chrome/browser/resource_coordinator/discard_before_unload_helper.h index 1c3f4b6a..3181804 100644 --- a/chrome/browser/resource_coordinator/discard_before_unload_helper.h +++ b/chrome/browser/resource_coordinator/discard_before_unload_helper.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_RESOURCE_COORDINATOR_DISCARD_BEFORE_UNLOAD_HELPER_H_ #define CHROME_BROWSER_RESOURCE_COORDINATOR_DISCARD_BEFORE_UNLOAD_HELPER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" namespace content { class WebContents;
diff --git a/chrome/browser/resource_coordinator/discard_before_unload_helper_browsertest.cc b/chrome/browser/resource_coordinator/discard_before_unload_helper_browsertest.cc index c86cc4d7..c441013 100644 --- a/chrome/browser/resource_coordinator/discard_before_unload_helper_browsertest.cc +++ b/chrome/browser/resource_coordinator/discard_before_unload_helper_browsertest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/resource_coordinator/discard_before_unload_helper.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/test/bind.h" #include "chrome/browser/ui/browser.h"
diff --git a/chrome/browser/resource_coordinator/intervention_policy_database.cc b/chrome/browser/resource_coordinator/intervention_policy_database.cc index d9c34415..4b95bd6 100644 --- a/chrome/browser/resource_coordinator/intervention_policy_database.cc +++ b/chrome/browser/resource_coordinator/intervention_policy_database.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/resource_coordinator/intervention_policy_database.h" -#include "base/bind.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/task/thread_pool.h" #include "base/values.h"
diff --git a/chrome/browser/resource_coordinator/session_restore_policy.cc b/chrome/browser/resource_coordinator/session_restore_policy.cc index 7b9b058a8f..7a717f5 100644 --- a/chrome/browser/resource_coordinator/session_restore_policy.cc +++ b/chrome/browser/resource_coordinator/session_restore_policy.cc
@@ -9,9 +9,9 @@ #include <algorithm> #include <utility> -#include "base/bind.h" #include "base/containers/contains.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "base/no_destructor.h" #include "base/sequence_checker.h"
diff --git a/chrome/browser/resource_coordinator/session_restore_policy.h b/chrome/browser/resource_coordinator/session_restore_policy.h index 58d59586..c830c97 100644 --- a/chrome/browser/resource_coordinator/session_restore_policy.h +++ b/chrome/browser/resource_coordinator/session_restore_policy.h
@@ -7,9 +7,9 @@ #include <memory> -#include "base/callback.h" #include "base/cancelable_callback.h" #include "base/containers/flat_map.h" +#include "base/functional/callback.h" #include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/resource_coordinator/session_restore_policy_unittest.cc b/chrome/browser/resource_coordinator/session_restore_policy_unittest.cc index 59d08de..04aaffb 100644 --- a/chrome/browser/resource_coordinator/session_restore_policy_unittest.cc +++ b/chrome/browser/resource_coordinator/session_restore_policy_unittest.cc
@@ -7,7 +7,7 @@ #include <algorithm> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/rand_util.h"
diff --git a/chrome/browser/resource_coordinator/tab_helper_browsertest.cc b/chrome/browser/resource_coordinator/tab_helper_browsertest.cc index d33a8671..ad68990 100644 --- a/chrome/browser/resource_coordinator/tab_helper_browsertest.cc +++ b/chrome/browser/resource_coordinator/tab_helper_browsertest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/resource_coordinator/tab_helper.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/resource_coordinator/tab_load_tracker.h" #include "chrome/browser/resource_coordinator/tab_load_tracker_test_support.h" #include "chrome/browser/ui/browser.h"
diff --git a/chrome/browser/resource_coordinator/tab_lifecycle_unit.cc b/chrome/browser/resource_coordinator/tab_lifecycle_unit.cc index cf68995..c9495e1b 100644 --- a/chrome/browser/resource_coordinator/tab_lifecycle_unit.cc +++ b/chrome/browser/resource_coordinator/tab_lifecycle_unit.cc
@@ -7,8 +7,8 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/raw_ptr.h" #include "base/metrics/histogram_macros.h"
diff --git a/chrome/browser/resource_coordinator/tab_lifecycle_unit_source.cc b/chrome/browser/resource_coordinator/tab_lifecycle_unit_source.cc index 5cc7e122..30850a1 100644 --- a/chrome/browser/resource_coordinator/tab_lifecycle_unit_source.cc +++ b/chrome/browser/resource_coordinator/tab_lifecycle_unit_source.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/observer_list.h" #include "base/threading/thread_task_runner_handle.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/resource_coordinator/tab_lifecycle_unit_source_unittest.cc b/chrome/browser/resource_coordinator/tab_lifecycle_unit_source_unittest.cc index 51d91fa..5101335 100644 --- a/chrome/browser/resource_coordinator/tab_lifecycle_unit_source_unittest.cc +++ b/chrome/browser/resource_coordinator/tab_lifecycle_unit_source_unittest.cc
@@ -8,7 +8,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/test/bind.h" #include "base/test/task_environment.h"
diff --git a/chrome/browser/resource_coordinator/tab_lifecycle_unit_unittest.cc b/chrome/browser/resource_coordinator/tab_lifecycle_unit_unittest.cc index 72d30ff..9824514 100644 --- a/chrome/browser/resource_coordinator/tab_lifecycle_unit_unittest.cc +++ b/chrome/browser/resource_coordinator/tab_lifecycle_unit_unittest.cc
@@ -8,8 +8,8 @@ #include <string> #include "base/auto_reset.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/observer_list.h" #include "base/test/simple_test_tick_clock.h"
diff --git a/chrome/browser/resource_coordinator/tab_load_tracker.h b/chrome/browser/resource_coordinator/tab_load_tracker.h index d35bcc8..5db10fe3 100644 --- a/chrome/browser/resource_coordinator/tab_load_tracker.h +++ b/chrome/browser/resource_coordinator/tab_load_tracker.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_RESOURCE_COORDINATOR_TAB_LOAD_TRACKER_H_ #define CHROME_BROWSER_RESOURCE_COORDINATOR_TAB_LOAD_TRACKER_H_ -#include "base/callback.h" #include "base/containers/flat_map.h" +#include "base/functional/callback.h" #include "base/gtest_prod_util.h" #include "base/observer_list.h" #include "base/process/kill.h"
diff --git a/chrome/browser/resource_coordinator/tab_manager.cc b/chrome/browser/resource_coordinator/tab_manager.cc index 480e058d..d538ff0 100644 --- a/chrome/browser/resource_coordinator/tab_manager.cc +++ b/chrome/browser/resource_coordinator/tab_manager.cc
@@ -12,9 +12,9 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/memory_pressure_monitor.h" #include "base/memory/raw_ptr.h" #include "base/metrics/field_trial.h"
diff --git a/chrome/browser/resource_coordinator/tab_manager.h b/chrome/browser/resource_coordinator/tab_manager.h index b546ae05..d2b0593 100644 --- a/chrome/browser/resource_coordinator/tab_manager.h +++ b/chrome/browser/resource_coordinator/tab_manager.h
@@ -10,7 +10,7 @@ #include <memory> #include <vector> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/gtest_prod_util.h" #include "base/memory/memory_pressure_listener.h" #include "base/memory/raw_ptr.h"
diff --git a/chrome/browser/resource_coordinator/tab_manager_browsertest.cc b/chrome/browser/resource_coordinator/tab_manager_browsertest.cc index cadfc2f5..3d1edca 100644 --- a/chrome/browser/resource_coordinator/tab_manager_browsertest.cc +++ b/chrome/browser/resource_coordinator/tab_manager_browsertest.cc
@@ -3,11 +3,11 @@ // found in the LICENSE file. #include "base/base_switches.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" #include "base/containers/contains.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/memory_pressure_listener.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h"
diff --git a/chrome/browser/resource_coordinator/tab_manager_delegate_chromeos.cc b/chrome/browser/resource_coordinator/tab_manager_delegate_chromeos.cc index 8e6e8918..54ed5c8 100644 --- a/chrome/browser/resource_coordinator/tab_manager_delegate_chromeos.cc +++ b/chrome/browser/resource_coordinator/tab_manager_delegate_chromeos.cc
@@ -17,12 +17,12 @@ #include "ash/components/arc/session/arc_service_manager.h" #include "ash/public/cpp/app_types_util.h" #include "ash/shell.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/containers/adapters.h" #include "base/containers/cxx20_erase.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "base/process/memory.h" #include "base/process/process_handle.h" // kNullProcessHandle.
diff --git a/chrome/browser/resource_coordinator/tab_manager_delegate_chromeos.h b/chrome/browser/resource_coordinator/tab_manager_delegate_chromeos.h index 7c052ee..d719cb8 100644 --- a/chrome/browser/resource_coordinator/tab_manager_delegate_chromeos.h +++ b/chrome/browser/resource_coordinator/tab_manager_delegate_chromeos.h
@@ -11,9 +11,9 @@ #include <vector> #include "ash/components/arc/mojom/process.mojom.h" -#include "base/callback.h" #include "base/check.h" #include "base/containers/flat_map.h" +#include "base/functional/callback.h" #include "base/gtest_prod_util.h" #include "base/memory/weak_ptr.h" #include "base/process/process.h"
diff --git a/chrome/browser/resource_coordinator/tab_manager_delegate_chromeos_unittest.cc b/chrome/browser/resource_coordinator/tab_manager_delegate_chromeos_unittest.cc index 5935942..4542a89 100644 --- a/chrome/browser/resource_coordinator/tab_manager_delegate_chromeos_unittest.cc +++ b/chrome/browser/resource_coordinator/tab_manager_delegate_chromeos_unittest.cc
@@ -9,7 +9,7 @@ #include <utility> #include <vector> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/process/process_handle.h" #include "base/time/time.h" #include "chrome/browser/resource_coordinator/tab_manager_features.h"
diff --git a/chrome/browser/resource_coordinator/tab_manager_unittest.cc b/chrome/browser/resource_coordinator/tab_manager_unittest.cc index 8562bea4..0683332 100644 --- a/chrome/browser/resource_coordinator/tab_manager_unittest.cc +++ b/chrome/browser/resource_coordinator/tab_manager_unittest.cc
@@ -11,8 +11,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/metrics/field_trial.h"
diff --git a/chrome/browser/resources/chromeos/accessibility/accessibility_common/autoclick/autoclick_test.js b/chrome/browser/resources/chromeos/accessibility/accessibility_common/autoclick/autoclick_test.js index 443a02b..ffbce6c9 100644 --- a/chrome/browser/resources/chromeos/accessibility/accessibility_common/autoclick/autoclick_test.js +++ b/chrome/browser/resources/chromeos/accessibility/accessibility_common/autoclick/autoclick_test.js
@@ -44,8 +44,8 @@ GEN(` #include "ash/accessibility/accessibility_delegate.h" #include "ash/shell.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "chrome/browser/ash/accessibility/accessibility_manager.h" `); }
diff --git a/chrome/browser/resources/chromeos/accessibility/accessibility_common/dictation/dictation_test_base.js b/chrome/browser/resources/chromeos/accessibility/accessibility_common/dictation/dictation_test_base.js index 6e0c57de..5b73e4c 100644 --- a/chrome/browser/resources/chromeos/accessibility/accessibility_common/dictation/dictation_test_base.js +++ b/chrome/browser/resources/chromeos/accessibility/accessibility_common/dictation/dictation_test_base.js
@@ -121,8 +121,8 @@ GEN(` #include "ash/accessibility/accessibility_delegate.h" #include "ash/shell.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/command_line.h" #include "chrome/browser/ash/accessibility/accessibility_manager.h" #include "ui/accessibility/accessibility_features.h"
diff --git a/chrome/browser/resources/chromeos/accessibility/common/testing/e2e_test_base.js b/chrome/browser/resources/chromeos/accessibility/common/testing/e2e_test_base.js index 4003edd..84e93c14 100644 --- a/chrome/browser/resources/chromeos/accessibility/common/testing/e2e_test_base.js +++ b/chrome/browser/resources/chromeos/accessibility/common/testing/e2e_test_base.js
@@ -35,8 +35,8 @@ GEN(` #include "ash/accessibility/accessibility_delegate.h" #include "ash/shell.h" - #include "base/bind.h" - #include "base/callback.h" + #include "base/functional/bind.h" + #include "base/functional/callback.h" #include "base/containers/flat_set.h" #include "chrome/browser/ash/accessibility/accessibility_manager.h" #include "chrome/browser/ash/crosapi/browser_manager.h"
diff --git a/chrome/browser/resources/chromeos/accessibility/strings/accessibility_strings_pt-BR.xtb b/chrome/browser/resources/chromeos/accessibility/strings/accessibility_strings_pt-BR.xtb index a9b73bdc..ed9588a0 100644 --- a/chrome/browser/resources/chromeos/accessibility/strings/accessibility_strings_pt-BR.xtb +++ b/chrome/browser/resources/chromeos/accessibility/strings/accessibility_strings_pt-BR.xtb
@@ -115,7 +115,7 @@ <translation id="1653266918374749391">Cabeçalho de nível 3 anterior</translation> <translation id="1657616855184033958">Mostrar filtros de stream de eventos</translation> <translation id="1659072772017912254">Não marcado</translation> -<translation id="1666326070478924810">Configurações de Selecionar para ouvir</translation> +<translation id="1666326070478924810">Configurações do Selecionar para ouvir</translation> <translation id="1674262202423278359">Navegação no ChromeVox</translation> <translation id="16777221443363124">Barra de menu</translation> <translation id="1680732992526857724"><ph name="NAME" />, ativado</translation>
diff --git a/chrome/browser/resources/settings/chromeos/os_bluetooth_page/os_bluetooth_device_detail_subpage.ts b/chrome/browser/resources/settings/chromeos/os_bluetooth_page/os_bluetooth_device_detail_subpage.ts index c351a77..987747d 100644 --- a/chrome/browser/resources/settings/chromeos/os_bluetooth_page/os_bluetooth_device_detail_subpage.ts +++ b/chrome/browser/resources/settings/chromeos/os_bluetooth_page/os_bluetooth_device_detail_subpage.ts
@@ -32,6 +32,7 @@ import {Route, Router} from '../router.js'; import {getTemplate} from './os_bluetooth_device_detail_subpage.html.js'; +import {OsBluetoothDevicesSubpageBrowserProxy, OsBluetoothDevicesSubpageBrowserProxyImpl} from './os_bluetooth_devices_subpage_browser_proxy.js'; enum PageState { DISCONNECTED = 1, @@ -105,6 +106,7 @@ systemProperties: BluetoothSystemProperties; + private browserProxy_: OsBluetoothDevicesSubpageBrowserProxy; private deviceId_: string; private device_: PairedBluetoothDeviceProperties|null; private isDeviceConnected_: boolean; @@ -118,6 +120,8 @@ /** RouteOriginBehaviorInterface override */ this.route_ = routes.BLUETOOTH_DEVICE_DETAIL; + this.browserProxy_ = + OsBluetoothDevicesSubpageBrowserProxyImpl.getInstance(); } override ready(): void { @@ -150,6 +154,7 @@ this.deviceId_ = decodeURIComponent(deviceId); recordBluetoothUiSurfaceMetrics( BluetoothUiSurface.SETTINGS_DEVICE_DETAIL_SUBPAGE); + this.browserProxy_.showBluetoothRevampHatsSurvey(); } private onSystemPropertiesOrDeviceIdChanged_(): void {
diff --git a/chrome/browser/resources_integrity.cc b/chrome/browser/resources_integrity.cc index 73e3905..d4d829c 100644 --- a/chrome/browser/resources_integrity.cc +++ b/chrome/browser/resources_integrity.cc
@@ -12,8 +12,8 @@ #include <windows.h> #endif -#include "base/bind.h" #include "base/files/file.h" +#include "base/functional/bind.h" #include "base/memory/page_size.h" #include "base/metrics/histogram_functions.h" #include "base/path_service.h"
diff --git a/chrome/browser/resources_integrity.h b/chrome/browser/resources_integrity.h index a547c432..78a1e32c5a 100644 --- a/chrome/browser/resources_integrity.h +++ b/chrome/browser/resources_integrity.h
@@ -5,9 +5,9 @@ #ifndef CHROME_BROWSER_RESOURCES_INTEGRITY_H_ #define CHROME_BROWSER_RESOURCES_INTEGRITY_H_ -#include "base/callback.h" #include "base/containers/span.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "chrome/browser/buildflags.h" #include "crypto/sha2.h"
diff --git a/chrome/browser/resources_integrity_unittest.cc b/chrome/browser/resources_integrity_unittest.cc index 94801eb..6c5f0209 100644 --- a/chrome/browser/resources_integrity_unittest.cc +++ b/chrome/browser/resources_integrity_unittest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/resources_integrity.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/path_service.h" #include "base/task/sequenced_task_runner.h" #include "base/test/bind.h"
diff --git a/chrome/browser/rlz/chrome_rlz_tracker_delegate.cc b/chrome/browser/rlz/chrome_rlz_tracker_delegate.cc index be863f5..0e278257 100644 --- a/chrome/browser/rlz/chrome_rlz_tracker_delegate.cc +++ b/chrome/browser/rlz/chrome_rlz_tracker_delegate.cc
@@ -4,10 +4,10 @@ #include "chrome/browser/rlz/chrome_rlz_tracker_delegate.h" -#include "base/bind.h" #include "base/check.h" #include "base/command_line.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/notreached.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h"
diff --git a/chrome/browser/rlz/chrome_rlz_tracker_delegate.h b/chrome/browser/rlz/chrome_rlz_tracker_delegate.h index b80b8015..2395c6ab 100644 --- a/chrome/browser/rlz/chrome_rlz_tracker_delegate.h +++ b/chrome/browser/rlz/chrome_rlz_tracker_delegate.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_RLZ_CHROME_RLZ_TRACKER_DELEGATE_H_ #define CHROME_BROWSER_RLZ_CHROME_RLZ_TRACKER_DELEGATE_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "components/omnibox/browser/omnibox_event_global_tracker.h" #include "components/rlz/rlz_tracker_delegate.h" #include "content/public/browser/notification_observer.h"
diff --git a/chrome/browser/safe_browsing/advanced_protection_status_manager.cc b/chrome/browser/safe_browsing/advanced_protection_status_manager.cc index 7c5dd62a8..622e970 100644 --- a/chrome/browser/safe_browsing/advanced_protection_status_manager.cc +++ b/chrome/browser/safe_browsing/advanced_protection_status_manager.cc
@@ -4,9 +4,9 @@ #include "chrome/browser/safe_browsing/advanced_protection_status_manager.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/safe_browsing/advanced_protection_status_manager_factory.h"
diff --git a/chrome/browser/safe_browsing/android/password_reuse_controller_android.cc b/chrome/browser/safe_browsing/android/password_reuse_controller_android.cc index 80facfa..26ae853 100644 --- a/chrome/browser/safe_browsing/android/password_reuse_controller_android.cc +++ b/chrome/browser/safe_browsing/android/password_reuse_controller_android.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/ui/android/safe_browsing/password_reuse_dialog_view_android.h" #include "components/safe_browsing/core/browser/password_protection/metrics_util.h" #include "components/strings/grit/components_strings.h"
diff --git a/chrome/browser/safe_browsing/certificate_reporting_service.cc b/chrome/browser/safe_browsing/certificate_reporting_service.cc index 00586f8a..6dffbfd 100644 --- a/chrome/browser/safe_browsing/certificate_reporting_service.cc +++ b/chrome/browser/safe_browsing/certificate_reporting_service.cc
@@ -5,8 +5,8 @@ #include <memory> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h" #include "base/time/clock.h"
diff --git a/chrome/browser/safe_browsing/certificate_reporting_service_browsertest.cc b/chrome/browser/safe_browsing/certificate_reporting_service_browsertest.cc index 361e864..08c14ad 100644 --- a/chrome/browser/safe_browsing/certificate_reporting_service_browsertest.cc +++ b/chrome/browser/safe_browsing/certificate_reporting_service_browsertest.cc
@@ -6,9 +6,9 @@ #include <memory> -#include "base/bind.h" #include "base/command_line.h" #include "base/feature_list.h" +#include "base/functional/bind.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_factory.cc b/chrome/browser/safe_browsing/certificate_reporting_service_factory.cc index c4a3b131..5d4ed6f 100644 --- a/chrome/browser/safe_browsing/certificate_reporting_service_factory.cc +++ b/chrome/browser/safe_browsing/certificate_reporting_service_factory.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/safe_browsing/certificate_reporting_service_factory.h" -#include "base/callback_helpers.h" #include "base/feature_list.h" +#include "base/functional/callback_helpers.h" #include "base/time/default_clock.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile.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 1ffeb1ed..92306ebd 100644 --- a/chrome/browser/safe_browsing/certificate_reporting_service_test_utils.cc +++ b/chrome/browser/safe_browsing/certificate_reporting_service_test_utils.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/string_piece.h" #include "base/threading/thread_task_runner_handle.h" #include "components/encrypted_messages/encrypted_message.pb.h"
diff --git a/chrome/browser/safe_browsing/certificate_reporting_service_unittest.cc b/chrome/browser/safe_browsing/certificate_reporting_service_unittest.cc index 3c6de61..7b3b496 100644 --- a/chrome/browser/safe_browsing/certificate_reporting_service_unittest.cc +++ b/chrome/browser/safe_browsing/certificate_reporting_service_unittest.cc
@@ -8,8 +8,8 @@ #include <string> #include "base/atomic_sequence_num.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h" #include "base/test/metrics/histogram_tester.h"
diff --git a/chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_controller_impl_win.cc b/chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_controller_impl_win.cc index 91f254c..a2a9e8a 100644 --- a/chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_controller_impl_win.cc +++ b/chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_controller_impl_win.cc
@@ -11,10 +11,10 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/logging.h" #include "base/metrics/histogram_macros.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 7b01db8..be3dfb3 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
@@ -9,9 +9,9 @@ #include <tuple> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_controller_win.h b/chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_controller_win.h index 88d048d4..ef1d882 100644 --- a/chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_controller_win.h +++ b/chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_controller_win.h
@@ -8,7 +8,7 @@ #include <set> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/observer_list_types.h" #include "chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_scanner_results_win.h" #include "chrome/browser/safe_browsing/chrome_cleaner/sw_reporter_invocation_win.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 02354b61..fbf0d1e 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
@@ -7,12 +7,12 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/guid.h" #include "base/location.h" #include "base/memory/raw_ptr.h"
diff --git a/chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_fetcher_win.h b/chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_fetcher_win.h index 261c593..cea6406 100644 --- a/chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_fetcher_win.h +++ b/chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_fetcher_win.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_SAFE_BROWSING_CHROME_CLEANER_CHROME_CLEANER_FETCHER_WIN_H_ #define CHROME_BROWSER_SAFE_BROWSING_CHROME_CLEANER_CHROME_CLEANER_FETCHER_WIN_H_ -#include "base/callback.h" +#include "base/functional/callback.h" class PrefService;
diff --git a/chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_fetcher_win_unittest.cc b/chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_fetcher_win_unittest.cc index c775d486..55047877 100644 --- a/chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_fetcher_win_unittest.cc +++ b/chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_fetcher_win_unittest.cc
@@ -5,11 +5,11 @@ #include "chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_fetcher_win.h" #include "base/base_paths.h" -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/run_loop.h" #include "base/test/task_environment.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 4c94d68f..1c1c6bd 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
@@ -9,9 +9,9 @@ #include <utility> #include "base/base_paths.h" -#include "base/bind.h" #include "base/feature_list.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/metrics/histogram_functions.h" #include "base/path_service.h"
diff --git a/chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_runner_win.h b/chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_runner_win.h index a531bf9..094b4a8 100644 --- a/chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_runner_win.h +++ b/chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_runner_win.h
@@ -7,8 +7,8 @@ #include <limits> -#include "base/callback.h" #include "base/command_line.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_refptr.h" #include "base/process/process.h"
diff --git a/chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_runner_win_unittest.cc b/chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_runner_win_unittest.cc index 2de08b2..62c7d504 100644 --- a/chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_runner_win_unittest.cc +++ b/chrome/browser/safe_browsing/chrome_cleaner/chrome_cleaner_runner_win_unittest.cc
@@ -8,8 +8,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/process/launch.h" #include "base/process/process.h" #include "base/run_loop.h"
diff --git a/chrome/browser/safe_browsing/chrome_cleaner/chrome_prompt_actions_win.h b/chrome/browser/safe_browsing/chrome_cleaner/chrome_prompt_actions_win.h index 2befd250..a5cac07b 100644 --- a/chrome/browser/safe_browsing/chrome_cleaner/chrome_prompt_actions_win.h +++ b/chrome/browser/safe_browsing/chrome_cleaner/chrome_prompt_actions_win.h
@@ -8,8 +8,8 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "components/chrome_cleaner/public/proto/chrome_prompt.pb.h" #include "third_party/abseil-cpp/absl/types/optional.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 9d4f26d..14bffd8 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
@@ -11,11 +11,11 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/metrics/sparse_histogram.h" #include "base/strings/strcat.h"
diff --git a/chrome/browser/safe_browsing/chrome_cleaner/chrome_prompt_channel_win.h b/chrome/browser/safe_browsing/chrome_cleaner/chrome_prompt_channel_win.h index a8390eb..b89cd3d4 100644 --- a/chrome/browser/safe_browsing/chrome_cleaner/chrome_prompt_channel_win.h +++ b/chrome/browser/safe_browsing/chrome_cleaner/chrome_prompt_channel_win.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "base/process/launch.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 62a0e22..16b0cb0d 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
@@ -12,9 +12,9 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/process/launch.h" #include "base/process/process.h"
diff --git a/chrome/browser/safe_browsing/chrome_cleaner/mock_chrome_cleaner_process_win.cc b/chrome/browser/safe_browsing/chrome_cleaner/mock_chrome_cleaner_process_win.cc index bdc6951..beba622c 100644 --- a/chrome/browser/safe_browsing/chrome_cleaner/mock_chrome_cleaner_process_win.cc +++ b/chrome/browser/safe_browsing/chrome_cleaner/mock_chrome_cleaner_process_win.cc
@@ -12,11 +12,11 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/memory/scoped_refptr.h" #include "base/message_loop/message_pump_type.h"
diff --git a/chrome/browser/safe_browsing/chrome_cleaner/reporter_runner_browsertest_win.cc b/chrome/browser/safe_browsing/chrome_cleaner/reporter_runner_browsertest_win.cc index 8519577..676742a7 100644 --- a/chrome/browser/safe_browsing/chrome_cleaner/reporter_runner_browsertest_win.cc +++ b/chrome/browser/safe_browsing/chrome_cleaner/reporter_runner_browsertest_win.cc
@@ -10,12 +10,12 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/check.h" #include "base/containers/contains.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/notreached.h" #include "base/process/launch.h" #include "base/process/process.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 f28c2ee..ccfbe140 100644 --- a/chrome/browser/safe_browsing/chrome_cleaner/reporter_runner_win.cc +++ b/chrome/browser/safe_browsing/chrome_cleaner/reporter_runner_win.cc
@@ -12,12 +12,12 @@ #include <tuple> #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/field_trial.h" #include "base/process/launch.h" #include "base/process/process.h"
diff --git a/chrome/browser/safe_browsing/chrome_cleaner/settings_resetter_browsertest_win.cc b/chrome/browser/safe_browsing/chrome_cleaner/settings_resetter_browsertest_win.cc index 54a0521..8d497f8 100644 --- a/chrome/browser/safe_browsing/chrome_cleaner/settings_resetter_browsertest_win.cc +++ b/chrome/browser/safe_browsing/chrome_cleaner/settings_resetter_browsertest_win.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/test/test_reg_util_win.h"
diff --git a/chrome/browser/safe_browsing/chrome_cleaner/settings_resetter_win.cc b/chrome/browser/safe_browsing/chrome_cleaner/settings_resetter_win.cc index d9d2d8d..183ca9a4 100644 --- a/chrome/browser/safe_browsing/chrome_cleaner/settings_resetter_win.cc +++ b/chrome/browser/safe_browsing/chrome_cleaner/settings_resetter_win.cc
@@ -10,8 +10,8 @@ #include <vector> #include "base/barrier_closure.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ref_counted.h" #include "base/metrics/histogram_macros.h" #include "base/ranges/algorithm.h"
diff --git a/chrome/browser/safe_browsing/chrome_cleaner/settings_resetter_win.h b/chrome/browser/safe_browsing/chrome_cleaner/settings_resetter_win.h index aea2e8f..a29c8f1 100644 --- a/chrome/browser/safe_browsing/chrome_cleaner/settings_resetter_win.h +++ b/chrome/browser/safe_browsing/chrome_cleaner/settings_resetter_win.h
@@ -8,7 +8,7 @@ #include <memory> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/safe_browsing/settings_reset_prompt/default_settings_fetcher.h" class Profile;
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 83ef5be..5b97c83 100644 --- a/chrome/browser/safe_browsing/chrome_enterprise_url_lookup_service.cc +++ b/chrome/browser/safe_browsing/chrome_enterprise_url_lookup_service.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/safe_browsing/chrome_enterprise_url_lookup_service.h" -#include "base/callback.h" +#include "base/functional/callback.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/chrome_enterprise_url_lookup_service_unittest.cc b/chrome/browser/safe_browsing/chrome_enterprise_url_lookup_service_unittest.cc index a16cb451..e5a38b4 100644 --- a/chrome/browser/safe_browsing/chrome_enterprise_url_lookup_service_unittest.cc +++ b/chrome/browser/safe_browsing/chrome_enterprise_url_lookup_service_unittest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/safe_browsing/chrome_enterprise_url_lookup_service.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/mock_callback.h" #include "chrome/browser/enterprise/connectors/connectors_service.h"
diff --git a/chrome/browser/safe_browsing/chrome_password_protection_service.cc b/chrome/browser/safe_browsing/chrome_password_protection_service.cc index 09738e50..19f9e60 100644 --- a/chrome/browser/safe_browsing/chrome_password_protection_service.cc +++ b/chrome/browser/safe_browsing/chrome_password_protection_service.cc
@@ -7,8 +7,8 @@ #include <memory> #include <string> -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h" #include "base/metrics/user_metrics.h"
diff --git a/chrome/browser/safe_browsing/chrome_password_protection_service.h b/chrome/browser/safe_browsing/chrome_password_protection_service.h index ef83c75..2dccf64b 100644 --- a/chrome/browser/safe_browsing/chrome_password_protection_service.h +++ b/chrome/browser/safe_browsing/chrome_password_protection_service.h
@@ -7,8 +7,8 @@ #include <map> -#include "base/callback_forward.h" #include "base/callback_list.h" +#include "base/functional/callback_forward.h" #include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" #include "base/observer_list.h"
diff --git a/chrome/browser/safe_browsing/chrome_password_protection_service_browsertest.cc b/chrome/browser/safe_browsing/chrome_password_protection_service_browsertest.cc index f53c6df..ae6b392 100644 --- a/chrome/browser/safe_browsing/chrome_password_protection_service_browsertest.cc +++ b/chrome/browser/safe_browsing/chrome_password_protection_service_browsertest.cc
@@ -3,8 +3,8 @@ // found in the LICENSE file. #include "chrome/browser/safe_browsing/chrome_password_protection_service.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" #include "base/test/metrics/histogram_tester.h"
diff --git a/chrome/browser/safe_browsing/chrome_password_protection_service_sync_browsertest.cc b/chrome/browser/safe_browsing/chrome_password_protection_service_sync_browsertest.cc index 1d98e2b..549ceec 100644 --- a/chrome/browser/safe_browsing/chrome_password_protection_service_sync_browsertest.cc +++ b/chrome/browser/safe_browsing/chrome_password_protection_service_sync_browsertest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/safe_browsing/chrome_password_protection_service.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" #include "base/test/metrics/histogram_tester.h"
diff --git a/chrome/browser/safe_browsing/chrome_password_protection_service_unittest.cc b/chrome/browser/safe_browsing/chrome_password_protection_service_unittest.cc index 78bce993..2c2c8d6 100644 --- a/chrome/browser/safe_browsing/chrome_password_protection_service_unittest.cc +++ b/chrome/browser/safe_browsing/chrome_password_protection_service_unittest.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/safe_browsing/chrome_ping_manager_unittest.cc b/chrome/browser/safe_browsing/chrome_ping_manager_unittest.cc index fcbb4cf9..181d6fa 100644 --- a/chrome/browser/safe_browsing/chrome_ping_manager_unittest.cc +++ b/chrome/browser/safe_browsing/chrome_ping_manager_unittest.cc
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/test/bind.h"
diff --git a/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc b/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc index fcfa60d..33b7ebc0 100644 --- a/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc +++ b/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc
@@ -9,9 +9,9 @@ #include <tuple> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/read_only_shared_memory_region.h" #include "base/memory/ref_counted.h" #include "base/run_loop.h"
diff --git a/chrome/browser/safe_browsing/client_side_detection_service_unittest.cc b/chrome/browser/safe_browsing/client_side_detection_service_unittest.cc index 6c9605f..6d7a759 100644 --- a/chrome/browser/safe_browsing/client_side_detection_service_unittest.cc +++ b/chrome/browser/safe_browsing/client_side_detection_service_unittest.cc
@@ -11,8 +11,8 @@ #include <memory> #include <string> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/metrics/field_trial.h" #include "base/run_loop.h" #include "base/strings/string_number_conversions.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 114b2577..b37edbe 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
@@ -7,7 +7,7 @@ #include <memory> #include "base/base64.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/histogram_functions.h" #include "base/task/single_thread_task_runner.h" #include "base/time/time.h"
diff --git a/chrome/browser/safe_browsing/cloud_content_scanning/binary_fcm_service.h b/chrome/browser/safe_browsing/cloud_content_scanning/binary_fcm_service.h index 43772c7..e91b831 100644 --- a/chrome/browser/safe_browsing/cloud_content_scanning/binary_fcm_service.h +++ b/chrome/browser/safe_browsing/cloud_content_scanning/binary_fcm_service.h
@@ -7,8 +7,8 @@ #include <deque> -#include "base/callback_forward.h" #include "base/containers/flat_map.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h"
diff --git a/chrome/browser/safe_browsing/cloud_content_scanning/binary_fcm_service_unittest.cc b/chrome/browser/safe_browsing/cloud_content_scanning/binary_fcm_service_unittest.cc index bb76442..3c2f5c6 100644 --- a/chrome/browser/safe_browsing/cloud_content_scanning/binary_fcm_service_unittest.cc +++ b/chrome/browser/safe_browsing/cloud_content_scanning/binary_fcm_service_unittest.cc
@@ -10,7 +10,7 @@ #include <utility> #include "base/base64.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/notreached.h" #include "base/run_loop.h" #include "base/test/bind.h"
diff --git a/chrome/browser/safe_browsing/cloud_content_scanning/cloud_binary_upload_service_unittest.cc b/chrome/browser/safe_browsing/cloud_content_scanning/cloud_binary_upload_service_unittest.cc index 269ba2f3f..24dd531 100644 --- a/chrome/browser/safe_browsing/cloud_content_scanning/cloud_binary_upload_service_unittest.cc +++ b/chrome/browser/safe_browsing/cloud_content_scanning/cloud_binary_upload_service_unittest.cc
@@ -8,10 +8,10 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/test/bind.h" #include "base/test/scoped_command_line.h"
diff --git a/chrome/browser/safe_browsing/cloud_content_scanning/deep_scanning_browsertest_base.cc b/chrome/browser/safe_browsing/cloud_content_scanning/deep_scanning_browsertest_base.cc index 3a82719..bce2cec 100644 --- a/chrome/browser/safe_browsing/cloud_content_scanning/deep_scanning_browsertest_base.cc +++ b/chrome/browser/safe_browsing/cloud_content_scanning/deep_scanning_browsertest_base.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/safe_browsing/cloud_content_scanning/deep_scanning_browsertest_base.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/enterprise/connectors/analysis/content_analysis_dialog.h" #include "chrome/browser/enterprise/connectors/analysis/fake_content_analysis_delegate.h"
diff --git a/chrome/browser/safe_browsing/cloud_content_scanning/deep_scanning_test_utils.h b/chrome/browser/safe_browsing/cloud_content_scanning/deep_scanning_test_utils.h index f56dce1..3dc1175b 100644 --- a/chrome/browser/safe_browsing/cloud_content_scanning/deep_scanning_test_utils.h +++ b/chrome/browser/safe_browsing/cloud_content_scanning/deep_scanning_test_utils.h
@@ -8,8 +8,8 @@ #include <set> #include <string> -#include "base/callback.h" #include "base/containers/flat_map.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/values.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/safe_browsing/cloud_content_scanning/file_analysis_request_unittest.cc b/chrome/browser/safe_browsing/cloud_content_scanning/file_analysis_request_unittest.cc index 2a7cf62a..100ae69 100644 --- a/chrome/browser/safe_browsing/cloud_content_scanning/file_analysis_request_unittest.cc +++ b/chrome/browser/safe_browsing/cloud_content_scanning/file_analysis_request_unittest.cc
@@ -4,9 +4,9 @@ #include "chrome/browser/safe_browsing/cloud_content_scanning/file_analysis_request.h" -#include "base/callback_helpers.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/callback_helpers.h" #include "base/path_service.h" #include "base/run_loop.h" #include "base/test/bind.h"
diff --git a/chrome/browser/safe_browsing/cloud_content_scanning/file_opening_job.cc b/chrome/browser/safe_browsing/cloud_content_scanning/file_opening_job.cc index ea4d66a..e4657b7 100644 --- a/chrome/browser/safe_browsing/cloud_content_scanning/file_opening_job.cc +++ b/chrome/browser/safe_browsing/cloud_content_scanning/file_opening_job.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/safe_browsing/cloud_content_scanning/file_opening_job.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/task/task_traits.h" namespace safe_browsing {
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 f611c170..c0c6f78 100644 --- a/chrome/browser/safe_browsing/cloud_content_scanning/multipart_uploader.cc +++ b/chrome/browser/safe_browsing/cloud_content_scanning/multipart_uploader.cc
@@ -6,9 +6,9 @@ #include <memory> -#include "base/bind.h" #include "base/files/file_path.h" #include "base/files/memory_mapped_file.h" +#include "base/functional/bind.h" #include "base/memory/scoped_refptr.h" #include "base/metrics/histogram_functions.h" #include "base/strings/strcat.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 db71008a..9e6035e 100644 --- a/chrome/browser/safe_browsing/cloud_content_scanning/multipart_uploader.h +++ b/chrome/browser/safe_browsing/cloud_content_scanning/multipart_uploader.h
@@ -8,8 +8,8 @@ #include <memory> #include <string> -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/gtest_prod_util.h" #include "base/memory/read_only_shared_memory_region.h" #include "base/memory/scoped_refptr.h"
diff --git a/chrome/browser/safe_browsing/cloud_content_scanning/multipart_uploader_unittest.cc b/chrome/browser/safe_browsing/cloud_content_scanning/multipart_uploader_unittest.cc index 1d1026d..b538ead 100644 --- a/chrome/browser/safe_browsing/cloud_content_scanning/multipart_uploader_unittest.cc +++ b/chrome/browser/safe_browsing/cloud_content_scanning/multipart_uploader_unittest.cc
@@ -6,9 +6,9 @@ #include <memory> -#include "base/callback_helpers.h" #include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/callback_helpers.h" #include "base/memory/read_only_shared_memory_region.h" #include "base/memory/scoped_refptr.h" #include "base/run_loop.h"
diff --git a/chrome/browser/safe_browsing/download_protection/check_client_download_request.cc b/chrome/browser/safe_browsing/download_protection/check_client_download_request.cc index 4e86b65..9962da8 100644 --- a/chrome/browser/safe_browsing/download_protection/check_client_download_request.cc +++ b/chrome/browser/safe_browsing/download_protection/check_client_download_request.cc
@@ -8,8 +8,8 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h"
diff --git a/chrome/browser/safe_browsing/download_protection/check_client_download_request.h b/chrome/browser/safe_browsing/download_protection/check_client_download_request.h index ec63426a..c2e548b 100644 --- a/chrome/browser/safe_browsing/download_protection/check_client_download_request.h +++ b/chrome/browser/safe_browsing/download_protection/check_client_download_request.h
@@ -10,8 +10,8 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/time/time.h"
diff --git a/chrome/browser/safe_browsing/download_protection/check_client_download_request_base.cc b/chrome/browser/safe_browsing/download_protection/check_client_download_request_base.cc index 022c6d5..13082da 100644 --- a/chrome/browser/safe_browsing/download_protection/check_client_download_request_base.cc +++ b/chrome/browser/safe_browsing/download_protection/check_client_download_request_base.cc
@@ -4,9 +4,9 @@ #include "chrome/browser/safe_browsing/download_protection/check_client_download_request_base.h" -#include "base/bind.h" #include "base/cancelable_callback.h" #include "base/containers/span.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h" #include "base/rand_util.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 6975e06..06c3fb3 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
@@ -11,10 +11,10 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/callback_list.h" #include "base/cancelable_callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/time/time.h"
diff --git a/chrome/browser/safe_browsing/download_protection/check_file_system_access_write_request.cc b/chrome/browser/safe_browsing/download_protection/check_file_system_access_write_request.cc index 85e9daa..bc94ba9 100644 --- a/chrome/browser/safe_browsing/download_protection/check_file_system_access_write_request.cc +++ b/chrome/browser/safe_browsing/download_protection/check_file_system_access_write_request.cc
@@ -7,7 +7,7 @@ #include <algorithm> #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/safe_browsing/download_protection/check_file_system_access_write_request.h b/chrome/browser/safe_browsing/download_protection/check_file_system_access_write_request.h index c93adcd..42c0200 100644 --- a/chrome/browser/safe_browsing/download_protection/check_file_system_access_write_request.h +++ b/chrome/browser/safe_browsing/download_protection/check_file_system_access_write_request.h
@@ -10,7 +10,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "build/build_config.h" #include "chrome/browser/safe_browsing/download_protection/check_client_download_request_base.h"
diff --git a/chrome/browser/safe_browsing/download_protection/deep_scanning_request.cc b/chrome/browser/safe_browsing/download_protection/deep_scanning_request.cc index 0da27f50..81abb5ea 100644 --- a/chrome/browser/safe_browsing/download_protection/deep_scanning_request.cc +++ b/chrome/browser/safe_browsing/download_protection/deep_scanning_request.cc
@@ -7,8 +7,8 @@ #include <memory> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/histogram_functions.h" #include "base/observer_list.h" #include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/safe_browsing/download_protection/deep_scanning_request_unittest.cc b/chrome/browser/safe_browsing/download_protection/deep_scanning_request_unittest.cc index f00fd76..eed3105 100644 --- a/chrome/browser/safe_browsing/download_protection/deep_scanning_request_unittest.cc +++ b/chrome/browser/safe_browsing/download_protection/deep_scanning_request_unittest.cc
@@ -6,12 +6,12 @@ #include <unordered_map> -#include "base/bind.h" -#include "base/callback_forward.h" -#include "base/callback_helpers.h" #include "base/containers/contains.h" #include "base/containers/flat_map.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback_forward.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/strings/strcat.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/safe_browsing/download_protection/download_feedback.cc b/chrome/browser/safe_browsing/download_protection/download_feedback.cc index 98bda2a..afffa1c 100644 --- a/chrome/browser/safe_browsing/download_protection/download_feedback.cc +++ b/chrome/browser/safe_browsing/download_protection/download_feedback.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/safe_browsing/download_protection/download_feedback.h" -#include "base/bind.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/task/task_runner.h" #include "chrome/browser/safe_browsing/download_protection/two_phase_uploader.h"
diff --git a/chrome/browser/safe_browsing/download_protection/download_feedback.h b/chrome/browser/safe_browsing/download_protection/download_feedback.h index 7f3ecb7..27efa1c 100644 --- a/chrome/browser/safe_browsing/download_protection/download_feedback.h +++ b/chrome/browser/safe_browsing/download_protection/download_feedback.h
@@ -9,8 +9,8 @@ #include <string> -#include "base/callback_forward.h" #include "base/files/file_path.h" +#include "base/functional/callback_forward.h" #include "chrome/browser/safe_browsing/download_protection/two_phase_uploader.h" namespace safe_browsing {
diff --git a/chrome/browser/safe_browsing/download_protection/download_feedback_service.cc b/chrome/browser/safe_browsing/download_protection/download_feedback_service.cc index f6c7321..651bf9d1 100644 --- a/chrome/browser/safe_browsing/download_protection/download_feedback_service.cc +++ b/chrome/browser/safe_browsing/download_protection/download_feedback_service.cc
@@ -6,9 +6,9 @@ #include <utility> -#include "base/bind.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "base/supports_user_data.h" #include "base/task/task_runner.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 9f567e4d2..c148ec0 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
@@ -10,9 +10,9 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/run_loop.h" #include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/safe_browsing/download_protection/download_feedback_unittest.cc b/chrome/browser/safe_browsing/download_protection/download_feedback_unittest.cc index 85f3d535..2b86b28f 100644 --- a/chrome/browser/safe_browsing/download_protection/download_feedback_unittest.cc +++ b/chrome/browser/safe_browsing/download_protection/download_feedback_unittest.cc
@@ -7,9 +7,9 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.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 99cc8a1..a3aa3a2e 100644 --- a/chrome/browser/safe_browsing/download_protection/download_protection_service.cc +++ b/chrome/browser/safe_browsing/download_protection/download_protection_service.cc
@@ -7,8 +7,8 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/safe_browsing/download_protection/download_protection_service.h b/chrome/browser/safe_browsing/download_protection/download_protection_service.h index b12737c..7a4ff3c 100644 --- a/chrome/browser/safe_browsing/download_protection/download_protection_service.h +++ b/chrome/browser/safe_browsing/download_protection/download_protection_service.h
@@ -15,9 +15,9 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/callback_list.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h"
diff --git a/chrome/browser/safe_browsing/download_protection/download_protection_service_unittest.cc b/chrome/browser/safe_browsing/download_protection/download_protection_service_unittest.cc index 32eb4f6..34a436c 100644 --- a/chrome/browser/safe_browsing/download_protection/download_protection_service_unittest.cc +++ b/chrome/browser/safe_browsing/download_protection/download_protection_service_unittest.cc
@@ -13,15 +13,15 @@ #include <utility> #include "base/base_paths.h" -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/containers/flat_map.h" #include "base/feature_list.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h"
diff --git a/chrome/browser/safe_browsing/download_protection/download_request_maker.h b/chrome/browser/safe_browsing/download_protection/download_request_maker.h index 8cde2125..a6f73fa 100644 --- a/chrome/browser/safe_browsing/download_protection/download_request_maker.h +++ b/chrome/browser/safe_browsing/download_protection/download_request_maker.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/safe_browsing/download_protection/file_analyzer.h" #include "components/download/public/common/download_item.h"
diff --git a/chrome/browser/safe_browsing/download_protection/download_url_sb_client.cc b/chrome/browser/safe_browsing/download_protection/download_url_sb_client.cc index 9a287bb3..4853ec5 100644 --- a/chrome/browser/safe_browsing/download_protection/download_url_sb_client.cc +++ b/chrome/browser/safe_browsing/download_protection/download_url_sb_client.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/safe_browsing/download_protection/download_url_sb_client.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "base/strings/string_number_conversions.h" #include "chrome/browser/metrics/chrome_metrics_service_accessor.h"
diff --git a/chrome/browser/safe_browsing/download_protection/file_analyzer.cc b/chrome/browser/safe_browsing/download_protection/file_analyzer.cc index 2ece1b13..d8a44a9a 100644 --- a/chrome/browser/safe_browsing/download_protection/file_analyzer.cc +++ b/chrome/browser/safe_browsing/download_protection/file_analyzer.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/safe_browsing/download_protection/file_analyzer.h" -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h" #include "base/task/task_traits.h"
diff --git a/chrome/browser/safe_browsing/download_protection/file_analyzer.h b/chrome/browser/safe_browsing/download_protection/file_analyzer.h index 76665f1..7efcfe7 100644 --- a/chrome/browser/safe_browsing/download_protection/file_analyzer.h +++ b/chrome/browser/safe_browsing/download_protection/file_analyzer.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_SAFE_BROWSING_DOWNLOAD_PROTECTION_FILE_ANALYZER_H_ #define CHROME_BROWSER_SAFE_BROWSING_DOWNLOAD_PROTECTION_FILE_ANALYZER_H_ -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h"
diff --git a/chrome/browser/safe_browsing/download_protection/file_analyzer_unittest.cc b/chrome/browser/safe_browsing/download_protection/file_analyzer_unittest.cc index 0c65959..a25c166e 100644 --- a/chrome/browser/safe_browsing/download_protection/file_analyzer_unittest.cc +++ b/chrome/browser/safe_browsing/download_protection/file_analyzer_unittest.cc
@@ -4,10 +4,10 @@ #include "chrome/browser/safe_browsing/download_protection/file_analyzer.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/path_service.h" #include "base/run_loop.h" #include "base/test/metrics/histogram_tester.h"
diff --git a/chrome/browser/safe_browsing/download_protection/ppapi_download_request.cc b/chrome/browser/safe_browsing/download_protection/ppapi_download_request.cc index f5192740..57d8084a 100644 --- a/chrome/browser/safe_browsing/download_protection/ppapi_download_request.cc +++ b/chrome/browser/safe_browsing/download_protection/ppapi_download_request.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h" #include "base/strings/escape.h"
diff --git a/chrome/browser/safe_browsing/download_protection/two_phase_uploader.cc b/chrome/browser/safe_browsing/download_protection/two_phase_uploader.cc index 6e0b934..83ff968 100644 --- a/chrome/browser/safe_browsing/download_protection/two_phase_uploader.cc +++ b/chrome/browser/safe_browsing/download_protection/two_phase_uploader.cc
@@ -8,7 +8,7 @@ #include <limits> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/task/task_runner.h" #include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/safe_browsing/download_protection/two_phase_uploader.h b/chrome/browser/safe_browsing/download_protection/two_phase_uploader.h index 78009b9..08a9e8968 100644 --- a/chrome/browser/safe_browsing/download_protection/two_phase_uploader.h +++ b/chrome/browser/safe_browsing/download_protection/two_phase_uploader.h
@@ -10,8 +10,8 @@ #include <memory> #include <string> -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "net/traffic_annotation/network_traffic_annotation.h" #include "url/gurl.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 f0260ed6..17084def 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
@@ -9,8 +9,8 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/path_service.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_traits.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 1d50302..c7a9b32 100644 --- a/chrome/browser/safe_browsing/extension_telemetry/extension_telemetry_persister.cc +++ b/chrome/browser/safe_browsing/extension_telemetry/extension_telemetry_persister.cc
@@ -6,8 +6,8 @@ #include <sstream> -#include "base/callback.h" #include "base/files/file_util.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/metrics/histogram_functions.h" #include "base/path_service.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 977e56f..054bbeb 100644 --- a/chrome/browser/safe_browsing/extension_telemetry/extension_telemetry_service.h +++ b/chrome/browser/safe_browsing/extension_telemetry/extension_telemetry_service.h
@@ -7,9 +7,9 @@ #include <memory> -#include "base/callback.h" #include "base/containers/flat_map.h" #include "base/feature_list.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/threading/sequence_bound.h"
diff --git a/chrome/browser/safe_browsing/extension_telemetry/extension_telemetry_service_factory.cc b/chrome/browser/safe_browsing/extension_telemetry/extension_telemetry_service_factory.cc index 07d65eb3..ee1cdb0 100644 --- a/chrome/browser/safe_browsing/extension_telemetry/extension_telemetry_service_factory.cc +++ b/chrome/browser/safe_browsing/extension_telemetry/extension_telemetry_service_factory.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/safe_browsing/extension_telemetry/extension_telemetry_service_factory.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/no_destructor.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/extension_management.h"
diff --git a/chrome/browser/safe_browsing/extension_telemetry/extension_telemetry_uploader.cc b/chrome/browser/safe_browsing/extension_telemetry/extension_telemetry_uploader.cc index 53ec6070..c1d1a6db 100644 --- a/chrome/browser/safe_browsing/extension_telemetry/extension_telemetry_uploader.cc +++ b/chrome/browser/safe_browsing/extension_telemetry/extension_telemetry_uploader.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "chrome/browser/signin/identity_manager_factory.h" #include "components/safe_browsing/core/browser/sync/safe_browsing_primary_account_token_fetcher.h"
diff --git a/chrome/browser/safe_browsing/extension_telemetry/extension_telemetry_uploader.h b/chrome/browser/safe_browsing/extension_telemetry/extension_telemetry_uploader.h index 5305f2a..e5e8f1515 100644 --- a/chrome/browser/safe_browsing/extension_telemetry/extension_telemetry_uploader.h +++ b/chrome/browser/safe_browsing/extension_telemetry/extension_telemetry_uploader.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer.cc b/chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer.cc index ca7d02d..4a28a11a 100644 --- a/chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer.cc +++ b/chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer.cc
@@ -7,9 +7,9 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/metrics/histogram_macros.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h"
diff --git a/chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer_win_unittest.cc b/chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer_win_unittest.cc index 226a730..29d3691 100644 --- a/chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer_win_unittest.cc +++ b/chrome/browser/safe_browsing/incident_reporting/binary_integrity_analyzer_win_unittest.cc
@@ -7,9 +7,9 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/path_service.h" #include "base/test/scoped_path_override.h" #include "chrome/browser/safe_browsing/incident_reporting/incident.h"
diff --git a/chrome/browser/safe_browsing/incident_reporting/delayed_analysis_callback.h b/chrome/browser/safe_browsing/incident_reporting/delayed_analysis_callback.h index f7d8774e..9dc80dd 100644 --- a/chrome/browser/safe_browsing/incident_reporting/delayed_analysis_callback.h +++ b/chrome/browser/safe_browsing/incident_reporting/delayed_analysis_callback.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" namespace safe_browsing {
diff --git a/chrome/browser/safe_browsing/incident_reporting/delayed_callback_runner.h b/chrome/browser/safe_browsing/incident_reporting/delayed_callback_runner.h index 7895e62..325d859 100644 --- a/chrome/browser/safe_browsing/incident_reporting/delayed_callback_runner.h +++ b/chrome/browser/safe_browsing/incident_reporting/delayed_callback_runner.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_SAFE_BROWSING_INCIDENT_REPORTING_DELAYED_CALLBACK_RUNNER_H_ #define CHROME_BROWSER_SAFE_BROWSING_INCIDENT_REPORTING_DELAYED_CALLBACK_RUNNER_H_ -#include "base/callback_forward.h" #include "base/containers/queue.h" +#include "base/functional/callback_forward.h" #include "base/memory/ref_counted.h" #include "base/task/task_runner.h" #include "base/time/time.h"
diff --git a/chrome/browser/safe_browsing/incident_reporting/delayed_callback_runner_unittest.cc b/chrome/browser/safe_browsing/incident_reporting/delayed_callback_runner_unittest.cc index a4f9e6d..6562d80 100644 --- a/chrome/browser/safe_browsing/incident_reporting/delayed_callback_runner_unittest.cc +++ b/chrome/browser/safe_browsing/incident_reporting/delayed_callback_runner_unittest.cc
@@ -8,8 +8,8 @@ #include <memory> #include <string> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h" #include "content/public/browser/browser_thread.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 c48a5c69..a40828b 100644 --- a/chrome/browser/safe_browsing/incident_reporting/download_metadata_manager.cc +++ b/chrome/browser/safe_browsing/incident_reporting/download_metadata_manager.cc
@@ -11,11 +11,11 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/files/file.h" #include "base/files/file_util.h" #include "base/files/important_file_writer.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/memory/ptr_util.h" #include "base/metrics/histogram_macros.h"
diff --git a/chrome/browser/safe_browsing/incident_reporting/download_metadata_manager.h b/chrome/browser/safe_browsing/incident_reporting/download_metadata_manager.h index 43e7a82..87598452 100644 --- a/chrome/browser/safe_browsing/incident_reporting/download_metadata_manager.h +++ b/chrome/browser/safe_browsing/incident_reporting/download_metadata_manager.h
@@ -8,7 +8,7 @@ #include <map> #include <memory> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/ref_counted.h" #include "content/public/browser/download_manager.h"
diff --git a/chrome/browser/safe_browsing/incident_reporting/download_metadata_manager_unittest.cc b/chrome/browser/safe_browsing/incident_reporting/download_metadata_manager_unittest.cc index f7c1288..fdbf03f 100644 --- a/chrome/browser/safe_browsing/incident_reporting/download_metadata_manager_unittest.cc +++ b/chrome/browser/safe_browsing/incident_reporting/download_metadata_manager_unittest.cc
@@ -9,10 +9,10 @@ #include <memory> #include <string> -#include "base/bind.h" -#include "base/callback.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/run_loop.h" #include "base/task/sequenced_task_runner.h" #include "chrome/test/base/testing_profile.h"
diff --git a/chrome/browser/safe_browsing/incident_reporting/incident_report_uploader.h b/chrome/browser/safe_browsing/incident_reporting/incident_report_uploader.h index b52e3fc..4733b78 100644 --- a/chrome/browser/safe_browsing/incident_reporting/incident_report_uploader.h +++ b/chrome/browser/safe_browsing/incident_reporting/incident_report_uploader.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" namespace safe_browsing {
diff --git a/chrome/browser/safe_browsing/incident_reporting/incident_report_uploader_impl.cc b/chrome/browser/safe_browsing/incident_reporting/incident_report_uploader_impl.cc index 6cf55fa8..30660d6 100644 --- a/chrome/browser/safe_browsing/incident_reporting/incident_report_uploader_impl.cc +++ b/chrome/browser/safe_browsing/incident_reporting/incident_report_uploader_impl.cc
@@ -7,8 +7,8 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "base/strings/escape.h" #include "components/safe_browsing/core/common/features.h"
diff --git a/chrome/browser/safe_browsing/incident_reporting/incident_report_uploader_impl_unittest.cc b/chrome/browser/safe_browsing/incident_reporting/incident_report_uploader_impl_unittest.cc index 71472df..5dff311 100644 --- a/chrome/browser/safe_browsing/incident_reporting/incident_report_uploader_impl_unittest.cc +++ b/chrome/browser/safe_browsing/incident_reporting/incident_report_uploader_impl_unittest.cc
@@ -7,7 +7,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/single_thread_task_runner.h" #include "base/test/test_simple_task_runner.h" #include "components/safe_browsing/core/common/proto/csd.pb.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 fdf6c27..ddc88b0f 100644 --- a/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc +++ b/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc
@@ -12,7 +12,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/metrics/histogram_macros.h" #include "base/process/process.h"
diff --git a/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service_unittest.cc b/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service_unittest.cc index cedbb5c..daf7d5e3 100644 --- a/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service_unittest.cc +++ b/chrome/browser/safe_browsing/incident_reporting/incident_reporting_service_unittest.cc
@@ -11,8 +11,8 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/lazy_instance.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/safe_browsing/incident_reporting/last_download_finder.cc b/chrome/browser/safe_browsing/incident_reporting/last_download_finder.cc index 528e513..e0f6d3d 100644 --- a/chrome/browser/safe_browsing/incident_reporting/last_download_finder.cc +++ b/chrome/browser/safe_browsing/incident_reporting/last_download_finder.cc
@@ -13,7 +13,7 @@ #include <tuple> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/safe_browsing/incident_reporting/last_download_finder.h b/chrome/browser/safe_browsing/incident_reporting/last_download_finder.h index 0f740940..fe26f17 100644 --- a/chrome/browser/safe_browsing/incident_reporting/last_download_finder.h +++ b/chrome/browser/safe_browsing/incident_reporting/last_download_finder.h
@@ -9,7 +9,7 @@ #include <memory> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/scoped_multi_source_observation.h" #include "chrome/browser/profiles/profile_manager_observer.h"
diff --git a/chrome/browser/safe_browsing/incident_reporting/last_download_finder_unittest.cc b/chrome/browser/safe_browsing/incident_reporting/last_download_finder_unittest.cc index bf55f6d1..7832f3b 100644 --- a/chrome/browser/safe_browsing/incident_reporting/last_download_finder_unittest.cc +++ b/chrome/browser/safe_browsing/incident_reporting/last_download_finder_unittest.cc
@@ -11,10 +11,10 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/guid.h" #include "base/location.h" #include "base/run_loop.h"
diff --git a/chrome/browser/safe_browsing/incident_reporting/preference_validation_delegate_unittest.cc b/chrome/browser/safe_browsing/incident_reporting/preference_validation_delegate_unittest.cc index 0aa841d8..bdb99ce 100644 --- a/chrome/browser/safe_browsing/incident_reporting/preference_validation_delegate_unittest.cc +++ b/chrome/browser/safe_browsing/incident_reporting/preference_validation_delegate_unittest.cc
@@ -12,8 +12,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" #include "base/values.h" #include "chrome/browser/safe_browsing/incident_reporting/incident.h" #include "chrome/browser/safe_browsing/incident_reporting/mock_incident_receiver.h"
diff --git a/chrome/browser/safe_browsing/local_two_phase_testserver.cc b/chrome/browser/safe_browsing/local_two_phase_testserver.cc index d984459..8fd6652 100644 --- a/chrome/browser/safe_browsing/local_two_phase_testserver.cc +++ b/chrome/browser/safe_browsing/local_two_phase_testserver.cc
@@ -7,9 +7,9 @@ #include <string> #include <vector> -#include "base/bind.h" #include "base/command_line.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/hash/sha1.h" #include "base/logging.h" #include "base/path_service.h"
diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc index 3f131cf..dce1e81 100644 --- a/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc +++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc
@@ -11,10 +11,10 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h"
diff --git a/chrome/browser/safe_browsing/safe_browsing_navigation_observer_browsertest.cc b/chrome/browser/safe_browsing/safe_browsing_navigation_observer_browsertest.cc index 1d1a690..8b37885 100644 --- a/chrome/browser/safe_browsing/safe_browsing_navigation_observer_browsertest.cc +++ b/chrome/browser/safe_browsing/safe_browsing_navigation_observer_browsertest.cc
@@ -4,7 +4,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/run_loop.h"
diff --git a/chrome/browser/safe_browsing/safe_browsing_service.cc b/chrome/browser/safe_browsing/safe_browsing_service.cc index e100446..0d3ee367 100644 --- a/chrome/browser/safe_browsing/safe_browsing_service.cc +++ b/chrome/browser/safe_browsing/safe_browsing_service.cc
@@ -9,10 +9,10 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h" #include "base/no_destructor.h"
diff --git a/chrome/browser/safe_browsing/safe_browsing_service.h b/chrome/browser/safe_browsing/safe_browsing_service.h index 6ab875f..d32a33a 100644 --- a/chrome/browser/safe_browsing/safe_browsing_service.h +++ b/chrome/browser/safe_browsing/safe_browsing_service.h
@@ -12,9 +12,9 @@ #include <memory> #include <string> -#include "base/callback.h" #include "base/callback_list.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "base/scoped_multi_source_observation.h" #include "base/task/sequenced_task_runner_helpers.h"
diff --git a/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc b/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc index 3c5974bfb..9ce0ba39 100644 --- a/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc +++ b/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc
@@ -16,12 +16,12 @@ #include <utility> #include "base/base64.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/feature_list.h" #include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/hash/sha1.h" #include "base/memory/ptr_util.h" #include "base/memory/ref_counted.h"
diff --git a/chrome/browser/safe_browsing/services_delegate.cc b/chrome/browser/safe_browsing/services_delegate.cc index 4295deb..144b6be1 100644 --- a/chrome/browser/safe_browsing/services_delegate.cc +++ b/chrome/browser/safe_browsing/services_delegate.cc
@@ -7,9 +7,9 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/command_line.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/strings/string_util.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
diff --git a/chrome/browser/safe_browsing/services_delegate_desktop.cc b/chrome/browser/safe_browsing/services_delegate_desktop.cc index af1a6a1..1967253 100644 --- a/chrome/browser/safe_browsing/services_delegate_desktop.cc +++ b/chrome/browser/safe_browsing/services_delegate_desktop.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/strings/string_util.h" #include "chrome/browser/safe_browsing/download_protection/download_protection_service.h"
diff --git a/chrome/browser/safe_browsing/settings_reset_prompt/default_settings_fetcher.cc b/chrome/browser/safe_browsing/settings_reset_prompt/default_settings_fetcher.cc index bc90e88..135671e 100644 --- a/chrome/browser/safe_browsing/settings_reset_prompt/default_settings_fetcher.cc +++ b/chrome/browser/safe_browsing/settings_reset_prompt/default_settings_fetcher.cc
@@ -8,9 +8,9 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check_op.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "build/branding_buildflags.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/google/google_brand.h"
diff --git a/chrome/browser/safe_browsing/settings_reset_prompt/default_settings_fetcher.h b/chrome/browser/safe_browsing/settings_reset_prompt/default_settings_fetcher.h index 3328ef1..11b2c3c 100644 --- a/chrome/browser/safe_browsing/settings_reset_prompt/default_settings_fetcher.h +++ b/chrome/browser/safe_browsing/settings_reset_prompt/default_settings_fetcher.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" class BrandcodedDefaultSettings; class BrandcodeConfigFetcher;
diff --git a/chrome/browser/safe_browsing/settings_reset_prompt/default_settings_fetcher_browsertest.cc b/chrome/browser/safe_browsing/settings_reset_prompt/default_settings_fetcher_browsertest.cc index cd9d5a5..48fb9590 100644 --- a/chrome/browser/safe_browsing/settings_reset_prompt/default_settings_fetcher_browsertest.cc +++ b/chrome/browser/safe_browsing/settings_reset_prompt/default_settings_fetcher_browsertest.cc
@@ -6,9 +6,9 @@ #include <memory> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/run_loop.h" #include "chrome/browser/profile_resetter/brandcoded_default_settings.h"
diff --git a/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_controller.cc b/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_controller.cc index 580de3a..1e83eb9 100644 --- a/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_controller.cc +++ b/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_controller.cc
@@ -6,9 +6,9 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check_op.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/metrics/histogram_macros.h" #include "base/metrics/user_metrics.h"
diff --git a/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_model.cc b/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_model.cc index 2e64ebe5..2ed486ea 100644 --- a/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_model.cc +++ b/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_model.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h" #include "chrome/browser/prefs/session_startup_pref.h"
diff --git a/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_model.h b/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_model.h index 6d9d8e01..5477eb1 100644 --- a/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_model.h +++ b/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_model.h
@@ -11,7 +11,7 @@ #include <unordered_set> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/time/time.h" #include "chrome/browser/profile_resetter/profile_resetter.h"
diff --git a/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_model_browsertest_win.cc b/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_model_browsertest_win.cc index 7193a4f..4fd5ea6 100644 --- a/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_model_browsertest_win.cc +++ b/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_model_browsertest_win.cc
@@ -9,7 +9,7 @@ #include <unordered_set> #include <utility> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_model_unittest.cc b/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_model_unittest.cc index a0356d18..a08499c6 100644 --- a/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_model_unittest.cc +++ b/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_model_unittest.cc
@@ -9,8 +9,8 @@ #include <unordered_set> #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h"
diff --git a/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_test_utils.cc b/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_test_utils.cc index 43a345e..90a72164 100644 --- a/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_test_utils.cc +++ b/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_test_utils.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/profile_resetter/brandcoded_default_settings.h" #include "chrome/browser/profile_resetter/resettable_settings_snapshot.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_test_utils.h b/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_test_utils.h index 7c50df8..66ae98d 100644 --- a/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_test_utils.h +++ b/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_test_utils.h
@@ -9,7 +9,7 @@ #include <string> #include <unordered_set> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "chrome/browser/profile_resetter/profile_resetter.h" #include "chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_config.h" #include "testing/gmock/include/gmock/gmock.h"
diff --git a/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_util_win.cc b/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_util_win.cc index d57fabe..764e120 100644 --- a/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_util_win.cc +++ b/chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_util_win.cc
@@ -7,9 +7,9 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/time/time.h" #include "chrome/browser/profile_resetter/brandcoded_default_settings.h"
diff --git a/chrome/browser/safe_browsing/telemetry/android/android_telemetry_service.cc b/chrome/browser/safe_browsing/telemetry/android/android_telemetry_service.cc index ef954d2..61622ab 100644 --- a/chrome/browser/safe_browsing/telemetry/android/android_telemetry_service.cc +++ b/chrome/browser/safe_browsing/telemetry/android/android_telemetry_service.cc
@@ -8,9 +8,9 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/feature_list.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/safe_browsing/test_safe_browsing_database_helper.cc b/chrome/browser/safe_browsing/test_safe_browsing_database_helper.cc index 90c70a5b..f0f4bdf 100644 --- a/chrome/browser/safe_browsing/test_safe_browsing_database_helper.cc +++ b/chrome/browser/safe_browsing/test_safe_browsing_database_helper.cc
@@ -6,10 +6,10 @@ #include <utility> -#include "base/bind.h" #include "base/containers/contains.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h"
diff --git a/chrome/browser/safe_browsing/threat_details_unittest.cc b/chrome/browser/safe_browsing/threat_details_unittest.cc index 73948902..e03425d9 100644 --- a/chrome/browser/safe_browsing/threat_details_unittest.cc +++ b/chrome/browser/safe_browsing/threat_details_unittest.cc
@@ -6,7 +6,7 @@ #include <algorithm> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/pickle.h" #include "base/run_loop.h"
diff --git a/chrome/browser/safe_browsing/url_checker_delegate_impl.cc b/chrome/browser/safe_browsing/url_checker_delegate_impl.cc index 6e0397d..e9b2bbf 100644 --- a/chrome/browser/safe_browsing/url_checker_delegate_impl.cc +++ b/chrome/browser/safe_browsing/url_checker_delegate_impl.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/safe_browsing/url_checker_delegate_impl.h" -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/ranges/algorithm.h" #include "build/build_config.h" #include "chrome/browser/android/customtabs/client_data_header_web_contents_observer.h"
diff --git a/chrome/browser/safe_browsing/url_lookup_service_factory.cc b/chrome/browser/safe_browsing/url_lookup_service_factory.cc index 771ff74..21d6696 100644 --- a/chrome/browser/safe_browsing/url_lookup_service_factory.cc +++ b/chrome/browser/safe_browsing/url_lookup_service_factory.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/safe_browsing/url_lookup_service_factory.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/policy/chrome_browser_policy_connector.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/safe_xml_parser_browsertest.cc b/chrome/browser/safe_xml_parser_browsertest.cc index a59294ef..2a98f0b3 100644 --- a/chrome/browser/safe_xml_parser_browsertest.cc +++ b/chrome/browser/safe_xml_parser_browsertest.cc
@@ -4,8 +4,8 @@ #include <memory> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/json/json_reader.h" #include "base/strings/string_piece.h" #include "base/token.h"
diff --git a/chrome/browser/search/background/ntp_background_service.cc b/chrome/browser/search/background/ntp_background_service.cc index 479f4e6..3806ca0 100644 --- a/chrome/browser/search/background/ntp_background_service.cc +++ b/chrome/browser/search/background/ntp_background_service.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/search/background/ntp_background_service.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/observer_list.h" #include "base/strings/strcat.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/search/background/ntp_background_service.h b/chrome/browser/search/background/ntp_background_service.h index 75a6a34..d1b671e 100644 --- a/chrome/browser/search/background/ntp_background_service.h +++ b/chrome/browser/search/background/ntp_background_service.h
@@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/observer_list.h" #include "chrome/browser/search/background/ntp_background_data.h" #include "chrome/browser/search/background/ntp_background_service_observer.h"
diff --git a/chrome/browser/search/background/ntp_custom_background_service.cc b/chrome/browser/search/background/ntp_custom_background_service.cc index f1f2c41..5675781 100644 --- a/chrome/browser/search/background/ntp_custom_background_service.cc +++ b/chrome/browser/search/background/ntp_custom_background_service.cc
@@ -6,9 +6,9 @@ #include <string> -#include "base/bind.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/observer_list.h" #include "base/task/thread_pool.h" #include "base/time/clock.h"
diff --git a/chrome/browser/search/instant_service.cc b/chrome/browser/search/instant_service.cc index 16387d3..eb1eb12f 100644 --- a/chrome/browser/search/instant_service.cc +++ b/chrome/browser/search/instant_service.cc
@@ -7,9 +7,9 @@ #include <stddef.h> #include <string> -#include "base/bind.h" -#include "base/callback.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/ptr_util.h" #include "base/observer_list.h" #include "base/path_service.h"
diff --git a/chrome/browser/search/instant_unittest_base.cc b/chrome/browser/search/instant_unittest_base.cc index 1483bdf..478c919c 100644 --- a/chrome/browser/search/instant_unittest_base.cc +++ b/chrome/browser/search/instant_unittest_base.cc
@@ -6,7 +6,7 @@ #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h" #include "chrome/browser/chrome_notification_types.h"
diff --git a/chrome/browser/search/most_visited_iframe_source_unittest.cc b/chrome/browser/search/most_visited_iframe_source_unittest.cc index 86044bb..e753306 100644 --- a/chrome/browser/search/most_visited_iframe_source_unittest.cc +++ b/chrome/browser/search/most_visited_iframe_source_unittest.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted_memory.h" #include "chrome/browser/search/instant_service.h" #include "chrome/browser/search/instant_service_factory.h"
diff --git a/chrome/browser/search/search_engine_base_url_tracker.h b/chrome/browser/search/search_engine_base_url_tracker.h index 669d671..fea77487 100644 --- a/chrome/browser/search/search_engine_base_url_tracker.h +++ b/chrome/browser/search/search_engine_base_url_tracker.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/scoped_observation.h" #include "components/search_engines/template_url_data.h"
diff --git a/chrome/browser/search/search_unittest.cc b/chrome/browser/search/search_unittest.cc index 5e2b0b50..f961eda8 100644 --- a/chrome/browser/search/search_unittest.cc +++ b/chrome/browser/search/search_unittest.cc
@@ -10,7 +10,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h" #include "chrome/browser/search/instant_service.h"
diff --git a/chrome/browser/search_engines/template_url_fetcher_unittest.cc b/chrome/browser/search_engines/template_url_fetcher_unittest.cc index 0d41506..78e0054 100644 --- a/chrome/browser/search_engines/template_url_fetcher_unittest.cc +++ b/chrome/browser/search_engines/template_url_fetcher_unittest.cc
@@ -8,9 +8,9 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/path_service.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/search_engines/template_url_parser_unittest.cc b/chrome/browser/search_engines/template_url_parser_unittest.cc index 9806067..f515729f 100644 --- a/chrome/browser/search_engines/template_url_parser_unittest.cc +++ b/chrome/browser/search_engines/template_url_parser_unittest.cc
@@ -4,8 +4,8 @@ #include "components/search_engines/template_url_parser.h" -#include "base/bind.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/path_service.h" #include "base/strings/utf_string_conversions.h" #include "base/test/task_environment.h"
diff --git a/chrome/browser/search_engines/template_url_scraper_browsertest.cc b/chrome/browser/search_engines/template_url_scraper_browsertest.cc index ba4c894..d73ecb36 100644 --- a/chrome/browser/search_engines/template_url_scraper_browsertest.cc +++ b/chrome/browser/search_engines/template_url_scraper_browsertest.cc
@@ -5,8 +5,8 @@ #include <stddef.h> #include <utility> -#include "base/bind.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/path_service.h" #include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/search_engines/template_url_service_factory.cc b/chrome/browser/search_engines/template_url_service_factory.cc index 1943a47..3e664f5f 100644 --- a/chrome/browser/search_engines/template_url_service_factory.cc +++ b/chrome/browser/search_engines/template_url_service_factory.cc
@@ -6,7 +6,7 @@ #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/search_engines/template_url_service_factory_test_util.cc b/chrome/browser/search_engines/template_url_service_factory_test_util.cc index 2ea225f..728dbdf 100644 --- a/chrome/browser/search_engines/template_url_service_factory_test_util.cc +++ b/chrome/browser/search_engines/template_url_service_factory_test_util.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/search_engines/template_url_service_factory_test_util.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/test/base/testing_profile.h"
diff --git a/chrome/browser/search_engines/template_url_service_test_util.cc b/chrome/browser/search_engines/template_url_service_test_util.cc index 0b1f985..8c7cd3b6 100644 --- a/chrome/browser/search_engines/template_url_service_test_util.cc +++ b/chrome/browser/search_engines/template_url_service_test_util.cc
@@ -8,7 +8,7 @@ #include <memory> #include <utility> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/strings/string_util.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/search_engines/template_url_service_unittest.cc b/chrome/browser/search_engines/template_url_service_unittest.cc index 01d914b..e9b9bca 100644 --- a/chrome/browser/search_engines/template_url_service_unittest.cc +++ b/chrome/browser/search_engines/template_url_service_unittest.cc
@@ -7,9 +7,9 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ref_counted.h" #include "base/run_loop.h" #include "base/strings/string_split.h"
diff --git a/chrome/browser/search_provider_logos/logo_service_factory.cc b/chrome/browser/search_provider_logos/logo_service_factory.cc index 234ce8c..6a3e7dc 100644 --- a/chrome/browser/search_provider_logos/logo_service_factory.cc +++ b/chrome/browser/search_provider_logos/logo_service_factory.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/search_provider_logos/logo_service_factory.h" -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "build/build_config.h" #include "chrome/browser/image_fetcher/image_decoder_impl.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/search_resumption/search_resumption_module_bridge.cc b/chrome/browser/search_resumption/search_resumption_module_bridge.cc index 4fba34e7..1e65529a 100644 --- a/chrome/browser/search_resumption/search_resumption_module_bridge.cc +++ b/chrome/browser/search_resumption/search_resumption_module_bridge.cc
@@ -5,7 +5,7 @@ #include "search_resumption_module_bridge.h" #include "base/android/jni_array.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_android.h" #include "chrome/browser/search_resumption/jni_headers/SearchResumptionModuleBridge_jni.h"
diff --git a/chrome/browser/security_events/security_event_recorder_factory.cc b/chrome/browser/security_events/security_event_recorder_factory.cc index 3e60989..40e5a423 100644 --- a/chrome/browser/security_events/security_event_recorder_factory.cc +++ b/chrome/browser/security_events/security_event_recorder_factory.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/time/default_clock.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/security_events/security_event_recorder_impl.h"
diff --git a/chrome/browser/security_events/security_event_sync_bridge_impl.cc b/chrome/browser/security_events/security_event_sync_bridge_impl.cc index 53f230e3..f542497 100644 --- a/chrome/browser/security_events/security_event_sync_bridge_impl.cc +++ b/chrome/browser/security_events/security_event_sync_bridge_impl.cc
@@ -9,9 +9,9 @@ #include <vector> #include "base/big_endian.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check_op.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/strings/string_number_conversions.h" #include "build/build_config.h"
diff --git a/chrome/browser/segmentation_platform/ukm_data_manager_test_utils.h b/chrome/browser/segmentation_platform/ukm_data_manager_test_utils.h index 98b8307..21d503a 100644 --- a/chrome/browser/segmentation_platform/ukm_data_manager_test_utils.h +++ b/chrome/browser/segmentation_platform/ukm_data_manager_test_utils.h
@@ -8,7 +8,7 @@ #include <set> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "components/segmentation_platform/internal/execution/mock_model_provider.h" #include "components/segmentation_platform/public/proto/model_metadata.pb.h"
diff --git a/chrome/browser/send_tab_to_self/desktop_notification_handler_unittest.cc b/chrome/browser/send_tab_to_self/desktop_notification_handler_unittest.cc index 2c277cf..bdb40668 100644 --- a/chrome/browser/send_tab_to_self/desktop_notification_handler_unittest.cc +++ b/chrome/browser/send_tab_to_self/desktop_notification_handler_unittest.cc
@@ -6,7 +6,7 @@ #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/notifications/notification_common.h"
diff --git a/chrome/browser/send_tab_to_self/send_tab_to_self_client_service_factory.cc b/chrome/browser/send_tab_to_self/send_tab_to_self_client_service_factory.cc index cadc47a..251cbce 100644 --- a/chrome/browser/send_tab_to_self/send_tab_to_self_client_service_factory.cc +++ b/chrome/browser/send_tab_to_self/send_tab_to_self_client_service_factory.cc
@@ -6,7 +6,7 @@ #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/singleton.h" #include "build/chromeos_buildflags.h" #include "chrome/browser/notifications/notification_display_service_factory.h"
diff --git a/chrome/browser/send_tab_to_self/send_tab_to_self_util_unittest.cc b/chrome/browser/send_tab_to_self/send_tab_to_self_util_unittest.cc index 19ca907f..3e591688 100644 --- a/chrome/browser/send_tab_to_self/send_tab_to_self_util_unittest.cc +++ b/chrome/browser/send_tab_to_self/send_tab_to_self_util_unittest.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/test/scoped_feature_list.h" #include "chrome/browser/sync/send_tab_to_self_sync_service_factory.h" #include "chrome/browser/sync/sync_service_factory.h"
diff --git a/chrome/browser/serial/serial_policy_allowed_ports.cc b/chrome/browser/serial/serial_policy_allowed_ports.cc index 8c9dc853..47e9277 100644 --- a/chrome/browser/serial/serial_policy_allowed_ports.cc +++ b/chrome/browser/serial/serial_policy_allowed_ports.cc
@@ -6,8 +6,8 @@ #include <vector> -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/values.h" #include "chrome/common/pref_names.h" #include "components/pref_registry/pref_registry_syncable.h"
diff --git a/chrome/browser/services_unittest.cc b/chrome/browser/services_unittest.cc index 45690c5..7e14db8 100644 --- a/chrome/browser/services_unittest.cc +++ b/chrome/browser/services_unittest.cc
@@ -4,7 +4,7 @@ #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/test/bind.h" #include "components/services/patch/content/patch_service.h" #include "components/services/patch/public/mojom/file_patcher.mojom.h"
diff --git a/chrome/browser/sessions/closed_tab_cache.cc b/chrome/browser/sessions/closed_tab_cache.cc index 0ac45d1..97fda22 100644 --- a/chrome/browser/sessions/closed_tab_cache.cc +++ b/chrome/browser/sessions/closed_tab_cache.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/field_trial_params.h" #include "base/ranges/algorithm.h" #include "base/trace_event/trace_event.h"
diff --git a/chrome/browser/sessions/exit_type_service.h b/chrome/browser/sessions/exit_type_service.h index 48c5f0d..949a0b69 100644 --- a/chrome/browser/sessions/exit_type_service.h +++ b/chrome/browser/sessions/exit_type_service.h
@@ -8,8 +8,8 @@ #include <memory> #include <vector> -#include "base/callback_forward.h" #include "base/callback_list.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "components/keyed_service/core/keyed_service.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/chrome/browser/sessions/session_data_deleter.cc b/chrome/browser/sessions/session_data_deleter.cc index bae768b..2450190d 100644 --- a/chrome/browser/sessions/session_data_deleter.cc +++ b/chrome/browser/sessions/session_data_deleter.cc
@@ -7,10 +7,10 @@ #include <stddef.h> #include <stdint.h> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_refptr.h" #include "build/build_config.h"
diff --git a/chrome/browser/sessions/session_data_deleter.h b/chrome/browser/sessions/session_data_deleter.h index 887b6b95..04724c9 100644 --- a/chrome/browser/sessions/session_data_deleter.h +++ b/chrome/browser/sessions/session_data_deleter.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_SESSIONS_SESSION_DATA_DELETER_H_ #define CHROME_BROWSER_SESSIONS_SESSION_DATA_DELETER_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" class Profile;
diff --git a/chrome/browser/sessions/session_data_service.cc b/chrome/browser/sessions/session_data_service.cc index e978214..5ee27d7 100644 --- a/chrome/browser/sessions/session_data_service.cc +++ b/chrome/browser/sessions/session_data_service.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/sessions/session_data_service.h" -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "base/time/time.h" #include "chrome/browser/defaults.h"
diff --git a/chrome/browser/sessions/session_data_service_unittest.cc b/chrome/browser/sessions/session_data_service_unittest.cc index c772327..64f3ffc6 100644 --- a/chrome/browser/sessions/session_data_service_unittest.cc +++ b/chrome/browser/sessions/session_data_service_unittest.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/test/scoped_feature_list.h" #include "base/time/time.h"
diff --git a/chrome/browser/sessions/session_restore.cc b/chrome/browser/sessions/session_restore.cc index 9f6691e8..6a5fcfd 100644 --- a/chrome/browser/sessions/session_restore.cc +++ b/chrome/browser/sessions/session_restore.cc
@@ -13,14 +13,14 @@ #include <set> #include <string> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/containers/flat_map.h" #include "base/cxx17_backports.h" #include "base/debug/alias.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/sessions/session_restore_browsertest_chromeos.cc b/chrome/browser/sessions/session_restore_browsertest_chromeos.cc index bb867fb..50a22ab 100644 --- a/chrome/browser/sessions/session_restore_browsertest_chromeos.cc +++ b/chrome/browser/sessions/session_restore_browsertest_chromeos.cc
@@ -7,8 +7,8 @@ #include <list> #include <vector> -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/callback_helpers.h" #include "base/strings/string_number_conversions.h" #include "build/chromeos_buildflags.h" #include "chrome/browser/ash/crostini/crostini_util.h"
diff --git a/chrome/browser/sessions/session_restore_test_helper.cc b/chrome/browser/sessions/session_restore_test_helper.cc index 7efc8d8..8fc1fdb 100644 --- a/chrome/browser/sessions/session_restore_test_helper.cc +++ b/chrome/browser/sessions/session_restore_test_helper.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/sessions/session_restore_test_helper.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "content/public/test/test_utils.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/sessions/session_restore_test_utils.h b/chrome/browser/sessions/session_restore_test_utils.h index bb4b09af..7806f5f 100644 --- a/chrome/browser/sessions/session_restore_test_utils.h +++ b/chrome/browser/sessions/session_restore_test_utils.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_SESSIONS_SESSION_RESTORE_TEST_UTILS_H_ #define CHROME_BROWSER_SESSIONS_SESSION_RESTORE_TEST_UTILS_H_ -#include "base/callback_forward.h" #include "base/callback_list.h" +#include "base/functional/callback_forward.h" #include "chrome/browser/resource_coordinator/session_restore_policy.h" class Profile;
diff --git a/chrome/browser/sessions/session_service.cc b/chrome/browser/sessions/session_service.cc index b7e3f9a..9e80da62 100644 --- a/chrome/browser/sessions/session_service.cc +++ b/chrome/browser/sessions/session_service.cc
@@ -11,11 +11,11 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/command_line.h" #include "base/containers/contains.h" #include "base/debug/alias.h" #include "base/debug/dump_without_crashing.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "base/values.h" #include "build/build_config.h"
diff --git a/chrome/browser/sessions/session_service_base.cc b/chrome/browser/sessions/session_service_base.cc index 00d053db..839b0503 100644 --- a/chrome/browser/sessions/session_service_base.cc +++ b/chrome/browser/sessions/session_service_base.cc
@@ -10,9 +10,9 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h" #include "chrome/browser/apps/app_service/web_contents_app_id_utils.h"
diff --git a/chrome/browser/sessions/session_service_base.h b/chrome/browser/sessions/session_service_base.h index f778dce..e29a65d 100644 --- a/chrome/browser/sessions/session_service_base.h +++ b/chrome/browser/sessions/session_service_base.h
@@ -9,7 +9,7 @@ #include <string> #include <utility> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/sessions/session_service_base_test_helper.h b/chrome/browser/sessions/session_service_base_test_helper.h index 6bb5c21..ddd7be6 100644 --- a/chrome/browser/sessions/session_service_base_test_helper.h +++ b/chrome/browser/sessions/session_service_base_test_helper.h
@@ -12,7 +12,7 @@ #include <utility> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "components/sessions/core/session_id.h"
diff --git a/chrome/browser/sessions/session_service_test_helper.h b/chrome/browser/sessions/session_service_test_helper.h index e6eb33c3..c0185635 100644 --- a/chrome/browser/sessions/session_service_test_helper.h +++ b/chrome/browser/sessions/session_service_test_helper.h
@@ -12,7 +12,7 @@ #include <utility> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "chrome/browser/sessions/session_service.h"
diff --git a/chrome/browser/sessions/session_service_unittest.cc b/chrome/browser/sessions/session_service_unittest.cc index 50e68678..d959085 100644 --- a/chrome/browser/sessions/session_service_unittest.cc +++ b/chrome/browser/sessions/session_service_unittest.cc
@@ -9,11 +9,11 @@ #include <memory> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/adapters.h" #include "base/containers/contains.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/run_loop.h" #include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/sessions/tab_loader.cc b/chrome/browser/sessions/tab_loader.cc index b80d4577..29d8f2d 100644 --- a/chrome/browser/sessions/tab_loader.cc +++ b/chrome/browser/sessions/tab_loader.cc
@@ -6,8 +6,8 @@ #include <algorithm> -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/memory/memory_pressure_monitor.h" #include "base/memory/raw_ptr.h" #include "base/no_destructor.h"
diff --git a/chrome/browser/sessions/tab_loader.h b/chrome/browser/sessions/tab_loader.h index e7af30ee..c97f1c9b 100644 --- a/chrome/browser/sessions/tab_loader.h +++ b/chrome/browser/sessions/tab_loader.h
@@ -8,8 +8,8 @@ #include <utility> #include <vector> -#include "base/callback.h" #include "base/containers/flat_set.h" +#include "base/functional/callback.h" #include "base/gtest_prod_util.h" #include "base/memory/memory_pressure_listener.h" #include "base/memory/raw_ptr.h"
diff --git a/chrome/browser/sessions/tab_loader_delegate.cc b/chrome/browser/sessions/tab_loader_delegate.cc index 14c7e077..507910eb 100644 --- a/chrome/browser/sessions/tab_loader_delegate.cc +++ b/chrome/browser/sessions/tab_loader_delegate.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/sessions/tab_loader_delegate.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/sessions/tab_loader_unittest.cc b/chrome/browser/sessions/tab_loader_unittest.cc index 629536c..843fb3fd 100644 --- a/chrome/browser/sessions/tab_loader_unittest.cc +++ b/chrome/browser/sessions/tab_loader_unittest.cc
@@ -6,8 +6,8 @@ #include <vector> -#include "base/bind.h" #include "base/containers/flat_set.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/test/simple_test_tick_clock.h" #include "base/time/time.h"
diff --git a/chrome/browser/sessions/tab_restore_browsertest.cc b/chrome/browser/sessions/tab_restore_browsertest.cc index 770a740..66c6f16 100644 --- a/chrome/browser/sessions/tab_restore_browsertest.cc +++ b/chrome/browser/sessions/tab_restore_browsertest.cc
@@ -4,9 +4,9 @@ #include <stddef.h> -#include "base/bind.h" #include "base/command_line.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/sessions/tab_restore_service_unittest.cc b/chrome/browser/sessions/tab_restore_service_unittest.cc index 06ff7c58..0c337f6 100644 --- a/chrome/browser/sessions/tab_restore_service_unittest.cc +++ b/chrome/browser/sessions/tab_restore_service_unittest.cc
@@ -11,8 +11,8 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/share/editor_screenshot_task.cc b/chrome/browser/share/editor_screenshot_task.cc index fde8416a..47704c0 100644 --- a/chrome/browser/share/editor_screenshot_task.cc +++ b/chrome/browser/share/editor_screenshot_task.cc
@@ -5,7 +5,7 @@ #include <stddef.h> #include "base/android/scoped_java_ref.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted_memory.h" #include "chrome/browser/share/android/jni_headers/EditorScreenshotTask_jni.h" #include "third_party/skia/include/core/SkBitmap.h"
diff --git a/chrome/browser/share/fake_share_history.cc b/chrome/browser/share/fake_share_history.cc index b241a4a..1ab5f311 100644 --- a/chrome/browser/share/fake_share_history.cc +++ b/chrome/browser/share/fake_share_history.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/share/fake_share_history.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/sequenced_task_runner.h" namespace sharing {
diff --git a/chrome/browser/share/qr_code_generation_request.cc b/chrome/browser/share/qr_code_generation_request.cc index ca111c6..7d092ff 100644 --- a/chrome/browser/share/qr_code_generation_request.cc +++ b/chrome/browser/share/qr_code_generation_request.cc
@@ -9,7 +9,7 @@ #include "base/android/jni_android.h" #include "base/android/jni_string.h" #include "base/android/scoped_java_ref.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/share/android/jni_headers/QRCodeGenerationRequest_jni.h" #include "chrome/services/qrcode_generator/public/cpp/qrcode_generator_service.h"
diff --git a/chrome/browser/share/share_ranking_unittest.cc b/chrome/browser/share/share_ranking_unittest.cc index edc6fa1..8eb1b88 100644 --- a/chrome/browser/share/share_ranking_unittest.cc +++ b/chrome/browser/share/share_ranking_unittest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/share/share_ranking.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/test/bind.h" #include "chrome/browser/share/fake_share_history.h"
diff --git a/chrome/browser/sharesheet/share_action/share_action.h b/chrome/browser/sharesheet/share_action/share_action.h index bd623779..df96255f 100644 --- a/chrome/browser/sharesheet/share_action/share_action.h +++ b/chrome/browser/sharesheet/share_action/share_action.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "components/services/app_service/public/cpp/intent.h" #include "ui/base/accelerators/accelerator.h" #include "ui/views/view.h"
diff --git a/chrome/browser/sharesheet/sharesheet_service.cc b/chrome/browser/sharesheet/sharesheet_service.cc index 7a648fb..3c4f12ed 100644 --- a/chrome/browser/sharesheet/sharesheet_service.cc +++ b/chrome/browser/sharesheet/sharesheet_service.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/no_destructor.h" #include "base/ranges/algorithm.h" #include "base/strings/string_util.h"
diff --git a/chrome/browser/sharesheet/sharesheet_service.h b/chrome/browser/sharesheet/sharesheet_service.h index 60c9e7c..2cedc17 100644 --- a/chrome/browser/sharesheet/sharesheet_service.h +++ b/chrome/browser/sharesheet/sharesheet_service.h
@@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/sharesheet/sharesheet_service_delegator.cc b/chrome/browser/sharesheet/sharesheet_service_delegator.cc index b43b047..fd16e16f 100644 --- a/chrome/browser/sharesheet/sharesheet_service_delegator.cc +++ b/chrome/browser/sharesheet/sharesheet_service_delegator.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/sharesheet/sharesheet_service.h" #include "chrome/browser/ui/ash/sharesheet/sharesheet_bubble_view_delegate.h" #include "chrome/browser/ui/ash/sharesheet/sharesheet_header_view.h"
diff --git a/chrome/browser/sharesheet/sharesheet_service_delegator.h b/chrome/browser/sharesheet/sharesheet_service_delegator.h index 29e10ce..0b0fe42 100644 --- a/chrome/browser/sharesheet/sharesheet_service_delegator.h +++ b/chrome/browser/sharesheet/sharesheet_service_delegator.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "build/chromeos_buildflags.h" #include "chrome/browser/sharesheet/sharesheet_types.h"
diff --git a/chrome/browser/sharesheet/sharesheet_types.h b/chrome/browser/sharesheet/sharesheet_types.h index 1448ce1..86379fd 100644 --- a/chrome/browser/sharesheet/sharesheet_types.h +++ b/chrome/browser/sharesheet/sharesheet_types.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "chromeos/components/sharesheet/constants.h" #include "third_party/abseil-cpp/absl/types/optional.h" #include "ui/gfx/image/image_skia.h"
diff --git a/chrome/browser/sharing/ack_message_handler.h b/chrome/browser/sharing/ack_message_handler.h index 61b76ee..250423de 100644 --- a/chrome/browser/sharing/ack_message_handler.h +++ b/chrome/browser/sharing/ack_message_handler.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_SHARING_ACK_MESSAGE_HANDLER_H_ #define CHROME_BROWSER_SHARING_ACK_MESSAGE_HANDLER_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/sharing/sharing_message_handler.h"
diff --git a/chrome/browser/sharing/ack_message_handler_unittest.cc b/chrome/browser/sharing/ack_message_handler_unittest.cc index c8a4344..0a51106 100644 --- a/chrome/browser/sharing/ack_message_handler_unittest.cc +++ b/chrome/browser/sharing/ack_message_handler_unittest.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/sharing/ack_message_handler.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/test/mock_callback.h" #include "chrome/browser/sharing/mock_sharing_message_sender.h" #include "chrome/browser/sharing/proto/sharing_message.pb.h"
diff --git a/chrome/browser/sharing/click_to_call/click_to_call_context_menu_observer.cc b/chrome/browser/sharing/click_to_call/click_to_call_context_menu_observer.cc index 3490ff5..6b5705d 100644 --- a/chrome/browser/sharing/click_to_call/click_to_call_context_menu_observer.cc +++ b/chrome/browser/sharing/click_to_call/click_to_call_context_menu_observer.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/sharing/click_to_call/click_to_call_context_menu_observer.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h" #include "chrome/app/chrome_command_ids.h"
diff --git a/chrome/browser/sharing/click_to_call/click_to_call_message_handler_android.cc b/chrome/browser/sharing/click_to_call/click_to_call_message_handler_android.cc index 03e449c9..b041d4b 100644 --- a/chrome/browser/sharing/click_to_call/click_to_call_message_handler_android.cc +++ b/chrome/browser/sharing/click_to_call/click_to_call_message_handler_android.cc
@@ -5,8 +5,8 @@ #include "chrome/browser/sharing/click_to_call/click_to_call_message_handler_android.h" #include "base/android/jni_string.h" -#include "base/callback_helpers.h" #include "base/check.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/histogram_functions.h" #include "base/strings/strcat.h" #include "base/trace_event/trace_event.h"
diff --git a/chrome/browser/sharing/click_to_call/click_to_call_message_handler_android_unittest.cc b/chrome/browser/sharing/click_to_call/click_to_call_message_handler_android_unittest.cc index 0707e23..4350c41 100644 --- a/chrome/browser/sharing/click_to_call/click_to_call_message_handler_android_unittest.cc +++ b/chrome/browser/sharing/click_to_call/click_to_call_message_handler_android_unittest.cc
@@ -7,7 +7,7 @@ #include <memory> #include <string> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "chrome/browser/sharing/proto/click_to_call_message.pb.h" #include "chrome/browser/sharing/proto/sharing_message.pb.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/sharing/click_to_call/click_to_call_ui_controller.cc b/chrome/browser/sharing/click_to_call/click_to_call_ui_controller.cc index a4cbb6f..60d29598 100644 --- a/chrome/browser/sharing/click_to_call/click_to_call_ui_controller.cc +++ b/chrome/browser/sharing/click_to_call/click_to_call_ui_controller.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/strings/utf_string_conversions.h" #include "chrome/app/vector_icons/vector_icons.h" #include "chrome/browser/external_protocol/external_protocol_handler.h"
diff --git a/chrome/browser/sharing/click_to_call/click_to_call_ui_controller.h b/chrome/browser/sharing/click_to_call/click_to_call_ui_controller.h index f85ac17..e70babb 100644 --- a/chrome/browser/sharing/click_to_call/click_to_call_ui_controller.h +++ b/chrome/browser/sharing/click_to_call/click_to_call_ui_controller.h
@@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "build/build_config.h" #include "chrome/browser/sharing/click_to_call/click_to_call_metrics.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 191cb87..b8748611 100644 --- a/chrome/browser/sharing/click_to_call/phone_number_regex.cc +++ b/chrome/browser/sharing/click_to_call/phone_number_regex.cc
@@ -6,8 +6,8 @@ #include <string> -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.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/mock_sharing_message_sender.h b/chrome/browser/sharing/mock_sharing_message_sender.h index 577d7f6..75bc428a 100644 --- a/chrome/browser/sharing/mock_sharing_message_sender.h +++ b/chrome/browser/sharing/mock_sharing_message_sender.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/time/time.h" #include "chrome/browser/sharing/proto/sharing_message.pb.h" #include "chrome/browser/sharing/sharing_message_sender.h"
diff --git a/chrome/browser/sharing/optimization_guide/optimization_guide_message_handler.h b/chrome/browser/sharing/optimization_guide/optimization_guide_message_handler.h index aabea269..dee886f 100644 --- a/chrome/browser/sharing/optimization_guide/optimization_guide_message_handler.h +++ b/chrome/browser/sharing/optimization_guide/optimization_guide_message_handler.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/sharing/sharing_message_handler.h"
diff --git a/chrome/browser/sharing/optimization_guide/optimization_guide_message_handler_unittest.cc b/chrome/browser/sharing/optimization_guide/optimization_guide_message_handler_unittest.cc index f5798d47..3ffa3c2a 100644 --- a/chrome/browser/sharing/optimization_guide/optimization_guide_message_handler_unittest.cc +++ b/chrome/browser/sharing/optimization_guide/optimization_guide_message_handler_unittest.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/test/mock_callback.h" #include "chrome/browser/sharing/proto/optimization_guide_push_notification.pb.h" #include "chrome/browser/sharing/proto/sharing_message.pb.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 1c609504..281460a 100644 --- a/chrome/browser/sharing/shared_clipboard/remote_copy_message_handler.cc +++ b/chrome/browser/sharing/shared_clipboard/remote_copy_message_handler.cc
@@ -7,8 +7,8 @@ #include <algorithm> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/guid.h" #include "base/strings/utf_string_conversions.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/sharing/shared_clipboard/remote_copy_message_handler_unittest.cc b/chrome/browser/sharing/shared_clipboard/remote_copy_message_handler_unittest.cc index adcd61f..a17a0a05 100644 --- a/chrome/browser/sharing/shared_clipboard/remote_copy_message_handler_unittest.cc +++ b/chrome/browser/sharing/shared_clipboard/remote_copy_message_handler_unittest.cc
@@ -7,7 +7,7 @@ #include <map> #include <string> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/guid.h" #include "base/strings/utf_string_conversions.h" #include "base/test/metrics/histogram_tester.h"
diff --git a/chrome/browser/sharing/sharing_device_registration.cc b/chrome/browser/sharing/sharing_device_registration.cc index d3e1dfe8..bd9ed282 100644 --- a/chrome/browser/sharing/sharing_device_registration.cc +++ b/chrome/browser/sharing/sharing_device_registration.cc
@@ -8,8 +8,8 @@ #include <vector> #include "base/base64url.h" -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/time/time.h" #include "build/build_config.h" #include "chrome/browser/sharing/buildflags.h"
diff --git a/chrome/browser/sharing/sharing_device_registration.h b/chrome/browser/sharing/sharing_device_registration.h index 1986a45..b6f980aa 100644 --- a/chrome/browser/sharing/sharing_device_registration.h +++ b/chrome/browser/sharing/sharing_device_registration.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/sharing/sharing_device_source.cc b/chrome/browser/sharing/sharing_device_source.cc index 121af3ee..a0fddb3 100644 --- a/chrome/browser/sharing/sharing_device_source.cc +++ b/chrome/browser/sharing/sharing_device_source.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/sharing/sharing_device_source.h" -#include "base/callback.h" +#include "base/functional/callback.h" SharingDeviceSource::SharingDeviceSource() = default;
diff --git a/chrome/browser/sharing/sharing_device_source.h b/chrome/browser/sharing/sharing_device_source.h index 7d2eb4ca..6d1537f0 100644 --- a/chrome/browser/sharing/sharing_device_source.h +++ b/chrome/browser/sharing/sharing_device_source.h
@@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "components/sync/protocol/device_info_specifics.pb.h" namespace syncer {
diff --git a/chrome/browser/sharing/sharing_device_source_sync.cc b/chrome/browser/sharing/sharing_device_source_sync.cc index 2a8b7af..bd070e3 100644 --- a/chrome/browser/sharing/sharing_device_source_sync.cc +++ b/chrome/browser/sharing/sharing_device_source_sync.cc
@@ -8,8 +8,8 @@ #include <unordered_set> #include <vector> -#include "base/callback.h" #include "base/containers/cxx20_erase.h" +#include "base/functional/callback.h" #include "base/stl_util.h" #include "base/task/thread_pool.h" #include "chrome/browser/sharing/features.h"
diff --git a/chrome/browser/sharing/sharing_device_source_sync_unittest.cc b/chrome/browser/sharing/sharing_device_source_sync_unittest.cc index e3390aa..975b71d 100644 --- a/chrome/browser/sharing/sharing_device_source_sync_unittest.cc +++ b/chrome/browser/sharing/sharing_device_source_sync_unittest.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/guid.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h"
diff --git a/chrome/browser/sharing/sharing_device_source_unittest.cc b/chrome/browser/sharing/sharing_device_source_unittest.cc index 8ea8069..ed0a91c77 100644 --- a/chrome/browser/sharing/sharing_device_source_unittest.cc +++ b/chrome/browser/sharing/sharing_device_source_unittest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/sharing/sharing_device_source.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/test/bind.h" #include "chrome/browser/sharing/mock_sharing_device_source.h" #include "components/sync_device_info/device_info.h"
diff --git a/chrome/browser/sharing/sharing_dialog_data.h b/chrome/browser/sharing/sharing_dialog_data.h index f9e675a..f9b80a891 100644 --- a/chrome/browser/sharing/sharing_dialog_data.h +++ b/chrome/browser/sharing/sharing_dialog_data.h
@@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/sharing/sharing_app.h" #include "chrome/browser/sharing/sharing_metrics.h" #include "components/sync_device_info/device_info.h"
diff --git a/chrome/browser/sharing/sharing_fcm_handler.cc b/chrome/browser/sharing/sharing_fcm_handler.cc index 050c34d..0ad710b 100644 --- a/chrome/browser/sharing/sharing_fcm_handler.cc +++ b/chrome/browser/sharing/sharing_fcm_handler.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/sharing/sharing_fcm_handler.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/no_destructor.h" #include "base/strings/strcat.h" #include "base/time/time.h"
diff --git a/chrome/browser/sharing/sharing_fcm_sender.cc b/chrome/browser/sharing/sharing_fcm_sender.cc index df0c5685..2daacecb 100644 --- a/chrome/browser/sharing/sharing_fcm_sender.cc +++ b/chrome/browser/sharing/sharing_fcm_sender.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/sharing/sharing_fcm_sender.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/guid.h" #include "base/trace_event/trace_event.h" #include "base/version.h"
diff --git a/chrome/browser/sharing/sharing_fcm_sender.h b/chrome/browser/sharing/sharing_fcm_sender.h index da7e446..5f6d925 100644 --- a/chrome/browser/sharing/sharing_fcm_sender.h +++ b/chrome/browser/sharing/sharing_fcm_sender.h
@@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h"
diff --git a/chrome/browser/sharing/sharing_message_bridge.h b/chrome/browser/sharing/sharing_message_bridge.h index 90d1d1f..ed079a70 100644 --- a/chrome/browser/sharing/sharing_message_bridge.h +++ b/chrome/browser/sharing/sharing_message_bridge.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "components/keyed_service/core/keyed_service.h" #include "components/sync/protocol/sharing_message_specifics.pb.h"
diff --git a/chrome/browser/sharing/sharing_message_bridge_impl_unittest.cc b/chrome/browser/sharing/sharing_message_bridge_impl_unittest.cc index 51bdc64..194d1ae 100644 --- a/chrome/browser/sharing/sharing_message_bridge_impl_unittest.cc +++ b/chrome/browser/sharing/sharing_message_bridge_impl_unittest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/sharing/sharing_message_bridge_impl.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/mock_callback.h"
diff --git a/chrome/browser/sharing/sharing_message_handler.h b/chrome/browser/sharing/sharing_message_handler.h index 313f652a..e8b11bd 100644 --- a/chrome/browser/sharing/sharing_message_handler.h +++ b/chrome/browser/sharing/sharing_message_handler.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" namespace chrome_browser_sharing { class SharingMessage;
diff --git a/chrome/browser/sharing/sharing_message_sender.h b/chrome/browser/sharing/sharing_message_sender.h index 5e30bf5..7458999 100644 --- a/chrome/browser/sharing/sharing_message_sender.h +++ b/chrome/browser/sharing/sharing_message_sender.h
@@ -9,7 +9,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h"
diff --git a/chrome/browser/sharing/sharing_message_sender_unittest.cc b/chrome/browser/sharing/sharing_message_sender_unittest.cc index 7007007b..14d15d9 100644 --- a/chrome/browser/sharing/sharing_message_sender_unittest.cc +++ b/chrome/browser/sharing/sharing_message_sender_unittest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/sharing/sharing_message_sender.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/test/mock_callback.h" #include "chrome/browser/sharing/fake_device_info.h"
diff --git a/chrome/browser/sharing/sharing_notification_handler.h b/chrome/browser/sharing/sharing_notification_handler.h index 9cf5560..3919b78 100644 --- a/chrome/browser/sharing/sharing_notification_handler.h +++ b/chrome/browser/sharing/sharing_notification_handler.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "chrome/browser/notifications/notification_handler.h" #include "third_party/abseil-cpp/absl/types/optional.h" #include "url/gurl.h"
diff --git a/chrome/browser/sharing/sharing_service.cc b/chrome/browser/sharing/sharing_service.cc index 0f8a941..d3bc5f9 100644 --- a/chrome/browser/sharing/sharing_service.cc +++ b/chrome/browser/sharing/sharing_service.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/sharing/sharing_service.h" -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/time/time.h" #include "chrome/browser/sharing/features.h" #include "chrome/browser/sharing/sharing_constants.h"
diff --git a/chrome/browser/sharing/sharing_ui_controller.h b/chrome/browser/sharing/sharing_ui_controller.h index 3bd43742..9b9c0b67 100644 --- a/chrome/browser/sharing/sharing_ui_controller.h +++ b/chrome/browser/sharing/sharing_ui_controller.h
@@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/sharing/sms/sms_fetch_request_handler.h b/chrome/browser/sharing/sms/sms_fetch_request_handler.h index 8f2ac52b..7b69c18 100644 --- a/chrome/browser/sharing/sms/sms_fetch_request_handler.h +++ b/chrome/browser/sharing/sms/sms_fetch_request_handler.h
@@ -8,9 +8,9 @@ #include <string> #include "base/android/scoped_java_ref.h" -#include "base/bind.h" #include "base/containers/flat_set.h" #include "base/containers/unique_ptr_adapters.h" +#include "base/functional/bind.h" #include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/sharing/proto/sharing_message.pb.h"
diff --git a/chrome/browser/sharing/sms/sms_fetch_request_handler_unittest.cc b/chrome/browser/sharing/sms/sms_fetch_request_handler_unittest.cc index a06f44c6..ebaf67e 100644 --- a/chrome/browser/sharing/sms/sms_fetch_request_handler_unittest.cc +++ b/chrome/browser/sharing/sms/sms_fetch_request_handler_unittest.cc
@@ -10,7 +10,7 @@ #include "base/android/jni_android.h" #include "base/android/jni_string.h" #include "base/android/scoped_java_ref.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" #include "base/test/bind.h"
diff --git a/chrome/browser/sharing/sms/sms_remote_fetcher.h b/chrome/browser/sharing/sms/sms_remote_fetcher.h index 71695d4..60ac9375 100644 --- a/chrome/browser/sharing/sms/sms_remote_fetcher.h +++ b/chrome/browser/sharing/sms/sms_remote_fetcher.h
@@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "third_party/abseil-cpp/absl/types/optional.h" namespace content {
diff --git a/chrome/browser/sharing/sms/sms_remote_fetcher_ui_controller.cc b/chrome/browser/sharing/sms/sms_remote_fetcher_ui_controller.cc index 97f7baf..c79880f 100644 --- a/chrome/browser/sharing/sms/sms_remote_fetcher_ui_controller.cc +++ b/chrome/browser/sharing/sms/sms_remote_fetcher_ui_controller.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/metrics/histogram_functions.h" #include "base/strings/utf_string_conversions.h" #include "chrome/app/vector_icons/vector_icons.h"
diff --git a/chrome/browser/sharing/sms/sms_remote_fetcher_ui_controller.h b/chrome/browser/sharing/sms/sms_remote_fetcher_ui_controller.h index 84df8ce..744dd1e 100644 --- a/chrome/browser/sharing/sms/sms_remote_fetcher_ui_controller.h +++ b/chrome/browser/sharing/sms/sms_remote_fetcher_ui_controller.h
@@ -8,8 +8,8 @@ #include <string> #include <vector> -#include "base/callback.h" -#include "base/callback_forward.h" +#include "base/functional/callback.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/sharing/sharing_metrics.h" #include "chrome/browser/sharing/sharing_service.h"
diff --git a/chrome/browser/sharing/web_push/web_push_common.h b/chrome/browser/sharing/web_push/web_push_common.h index 69bbabc..e5f04cc5 100644 --- a/chrome/browser/sharing/web_push/web_push_common.h +++ b/chrome/browser/sharing/web_push/web_push_common.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "third_party/abseil-cpp/absl/types/optional.h" // Message to be delivered to the other party via Web Push.
diff --git a/chrome/browser/sharing/web_push/web_push_sender.cc b/chrome/browser/sharing/web_push/web_push_sender.cc index 5527cf8f..f356900 100644 --- a/chrome/browser/sharing/web_push/web_push_sender.cc +++ b/chrome/browser/sharing/web_push/web_push_sender.cc
@@ -7,7 +7,7 @@ #include <limits.h> #include "base/base64url.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" #include "chrome/browser/sharing/web_push/json_web_token_util.h"
diff --git a/chrome/browser/sharing/web_push/web_push_sender_unittest.cc b/chrome/browser/sharing/web_push/web_push_sender_unittest.cc index 8c4f509e..601f8d1 100644 --- a/chrome/browser/sharing/web_push/web_push_sender_unittest.cc +++ b/chrome/browser/sharing/web_push/web_push_sender_unittest.cc
@@ -6,7 +6,7 @@ #include "base/base64.h" #include "base/base64url.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/json/json_reader.h" #include "content/public/test/browser_task_environment.h" #include "crypto/ec_private_key.h"
diff --git a/chrome/browser/shell_integration.cc b/chrome/browser/shell_integration.cc index 67d2c2a6..588c5831 100644 --- a/chrome/browser/shell_integration.cc +++ b/chrome/browser/shell_integration.cc
@@ -6,9 +6,9 @@ #include <utility> -#include "base/bind.h" #include "base/command_line.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/i18n/file_util_icu.h" #include "base/metrics/histogram_macros.h" #include "base/strings/string_util.h"
diff --git a/chrome/browser/shell_integration.h b/chrome/browser/shell_integration.h index 409af2b..e499b949 100644 --- a/chrome/browser/shell_integration.h +++ b/chrome/browser/shell_integration.h
@@ -8,8 +8,8 @@ #include <map> #include <string> -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "build/build_config.h" #include "ui/gfx/image/image_family.h"
diff --git a/chrome/browser/shell_integration_win.cc b/chrome/browser/shell_integration_win.cc index 73d0a8ca..254459a 100644 --- a/chrome/browser/shell_integration_win.cc +++ b/chrome/browser/shell_integration_win.cc
@@ -17,12 +17,12 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" #include "base/feature_list.h" #include "base/files/file_enumerator.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h"
diff --git a/chrome/browser/shell_integration_win.h b/chrome/browser/shell_integration_win.h index c73f2b1..8e455c77 100644 --- a/chrome/browser/shell_integration_win.h +++ b/chrome/browser/shell_integration_win.h
@@ -9,8 +9,8 @@ #include <string> #include <vector> -#include "base/callback_forward.h" #include "base/files/file_path.h" +#include "base/functional/callback_forward.h" namespace base::win { struct ShortcutProperties;
diff --git a/chrome/browser/shutdown_signal_handlers_posix.cc b/chrome/browser/shutdown_signal_handlers_posix.cc index c27cd312..cbbcda6 100644 --- a/chrome/browser/shutdown_signal_handlers_posix.cc +++ b/chrome/browser/shutdown_signal_handlers_posix.cc
@@ -11,8 +11,8 @@ #include <utility> -#include "base/callback.h" #include "base/debug/leak_annotations.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/posix/eintr_wrapper.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/shutdown_signal_handlers_posix.h b/chrome/browser/shutdown_signal_handlers_posix.h index eaa5b79f..99533f3 100644 --- a/chrome/browser/shutdown_signal_handlers_posix.h +++ b/chrome/browser/shutdown_signal_handlers_posix.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_SHUTDOWN_SIGNAL_HANDLERS_POSIX_H_ #define CHROME_BROWSER_SHUTDOWN_SIGNAL_HANDLERS_POSIX_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/ref_counted.h" namespace base {
diff --git a/chrome/browser/signin/bound_session_credentials/bound_session_cookie_fetcher.cc b/chrome/browser/signin/bound_session_credentials/bound_session_cookie_fetcher.cc index 3d2862e..e86f8fa 100644 --- a/chrome/browser/signin/bound_session_credentials/bound_session_cookie_fetcher.cc +++ b/chrome/browser/signin/bound_session_credentials/bound_session_cookie_fetcher.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/signin/bound_session_credentials/bound_session_cookie_fetcher.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/task/sequenced_task_runner.h" #include "base/time/time.h" #include "components/signin/public/base/signin_client.h"
diff --git a/chrome/browser/signin/bound_session_credentials/bound_session_cookie_fetcher.h b/chrome/browser/signin/bound_session_credentials/bound_session_cookie_fetcher.h index 029e34a..54d145d 100644 --- a/chrome/browser/signin/bound_session_credentials/bound_session_cookie_fetcher.h +++ b/chrome/browser/signin/bound_session_credentials/bound_session_cookie_fetcher.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_SIGNIN_BOUND_SESSION_CREDENTIALS_BOUND_SESSION_COOKIE_FETCHER_H_ #define CHROME_BROWSER_SIGNIN_BOUND_SESSION_CREDENTIALS_BOUND_SESSION_COOKIE_FETCHER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/time/time.h" #include "net/cookies/canonical_cookie.h"
diff --git a/chrome/browser/signin/chrome_signin_client.cc b/chrome/browser/signin/chrome_signin_client.cc index 368d067..fee66ef 100644 --- a/chrome/browser/signin/chrome_signin_client.cc +++ b/chrome/browser/signin/chrome_signin_client.cc
@@ -10,7 +10,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h" #include "build/buildflag.h"
diff --git a/chrome/browser/signin/chrome_signin_client_unittest.cc b/chrome/browser/signin/chrome_signin_client_unittest.cc index b00ecf2..1b9d3188 100644 --- a/chrome/browser/signin/chrome_signin_client_unittest.cc +++ b/chrome/browser/signin/chrome_signin_client_unittest.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/notreached.h" #include "base/run_loop.h"
diff --git a/chrome/browser/signin/chrome_signin_helper.cc b/chrome/browser/signin/chrome_signin_helper.cc index c37d9ff..2d0e3e25 100644 --- a/chrome/browser/signin/chrome_signin_helper.cc +++ b/chrome/browser/signin/chrome_signin_helper.cc
@@ -7,8 +7,8 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/metrics/histogram_functions.h" #include "base/strings/string_util.h"
diff --git a/chrome/browser/signin/chrome_signin_proxying_url_loader_factory.cc b/chrome/browser/signin/chrome_signin_proxying_url_loader_factory.cc index d822114..4576d87b 100644 --- a/chrome/browser/signin/chrome_signin_proxying_url_loader_factory.cc +++ b/chrome/browser/signin/chrome_signin_proxying_url_loader_factory.cc
@@ -5,7 +5,7 @@ #include "chrome/browser/signin/chrome_signin_proxying_url_loader_factory.h" #include "base/barrier_closure.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/supports_user_data.h"
diff --git a/chrome/browser/signin/chrome_signin_proxying_url_loader_factory.h b/chrome/browser/signin/chrome_signin_proxying_url_loader_factory.h index cfaf1dc..9ffc2d8 100644 --- a/chrome/browser/signin/chrome_signin_proxying_url_loader_factory.h +++ b/chrome/browser/signin/chrome_signin_proxying_url_loader_factory.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_SIGNIN_CHROME_SIGNIN_PROXYING_URL_LOADER_FACTORY_H_ #define CHROME_BROWSER_SIGNIN_CHROME_SIGNIN_PROXYING_URL_LOADER_FACTORY_H_ -#include "base/callback.h" #include "base/containers/unique_ptr_adapters.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted_delete_on_sequence.h" #include "content/public/browser/web_contents.h" #include "mojo/public/cpp/bindings/pending_receiver.h"
diff --git a/chrome/browser/signin/chrome_signin_proxying_url_loader_factory_unittest.cc b/chrome/browser/signin/chrome_signin_proxying_url_loader_factory_unittest.cc index 71ed9992..e08ff99 100644 --- a/chrome/browser/signin/chrome_signin_proxying_url_loader_factory_unittest.cc +++ b/chrome/browser/signin/chrome_signin_proxying_url_loader_factory_unittest.cc
@@ -7,8 +7,8 @@ #include <algorithm> #include <memory> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/test/mock_callback.h" #include "chrome/browser/signin/chrome_signin_helper.h"
diff --git a/chrome/browser/signin/chrome_signin_url_loader_throttle_unittest.cc b/chrome/browser/signin/chrome_signin_url_loader_throttle_unittest.cc index e4c22566..29ec771f 100644 --- a/chrome/browser/signin/chrome_signin_url_loader_throttle_unittest.cc +++ b/chrome/browser/signin/chrome_signin_url_loader_throttle_unittest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/signin/chrome_signin_url_loader_throttle.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/test/mock_callback.h" #include "chrome/browser/signin/chrome_signin_helper.h"
diff --git a/chrome/browser/signin/dice_browsertest.cc b/chrome/browser/signin/dice_browsertest.cc index 56f2dc6..06985f5 100644 --- a/chrome/browser/signin/dice_browsertest.cc +++ b/chrome/browser/signin/dice_browsertest.cc
@@ -8,11 +8,11 @@ #include <utility> #include "base/auto_reset.h" -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/check.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/run_loop.h" #include "base/scoped_observation.h"
diff --git a/chrome/browser/signin/dice_intercepted_session_startup_helper.cc b/chrome/browser/signin/dice_intercepted_session_startup_helper.cc index dba3837..2f1bd209 100644 --- a/chrome/browser/signin/dice_intercepted_session_startup_helper.cc +++ b/chrome/browser/signin/dice_intercepted_session_startup_helper.cc
@@ -6,9 +6,9 @@ #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/task/single_thread_task_runner.h" #include "base/time/time.h" #include "chrome/browser/signin/account_reconcilor_factory.h"
diff --git a/chrome/browser/signin/dice_intercepted_session_startup_helper.h b/chrome/browser/signin/dice_intercepted_session_startup_helper.h index f6e7091..3da44c3 100644 --- a/chrome/browser/signin/dice_intercepted_session_startup_helper.h +++ b/chrome/browser/signin/dice_intercepted_session_startup_helper.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_SIGNIN_DICE_INTERCEPTED_SESSION_STARTUP_HELPER_H_ #define CHROME_BROWSER_SIGNIN_DICE_INTERCEPTED_SESSION_STARTUP_HELPER_H_ -#include "base/callback_forward.h" #include "base/cancelable_callback.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/scoped_observation.h"
diff --git a/chrome/browser/signin/dice_response_handler.cc b/chrome/browser/signin/dice_response_handler.cc index 1d350076..1fbe572 100644 --- a/chrome/browser/signin/dice_response_handler.cc +++ b/chrome/browser/signin/dice_response_handler.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/signin/dice_response_handler.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/memory/singleton.h"
diff --git a/chrome/browser/signin/dice_signed_in_profile_creator.h b/chrome/browser/signin/dice_signed_in_profile_creator.h index 474f6ac..25e6c856 100644 --- a/chrome/browser/signin/dice_signed_in_profile_creator.h +++ b/chrome/browser/signin/dice_signed_in_profile_creator.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/signin/dice_signed_in_profile_creator_unittest.cc b/chrome/browser/signin/dice_signed_in_profile_creator_unittest.cc index 4c613d8..eb658c5 100644 --- a/chrome/browser/signin/dice_signed_in_profile_creator_unittest.cc +++ b/chrome/browser/signin/dice_signed_in_profile_creator_unittest.cc
@@ -4,10 +4,10 @@ #include "chrome/browser/signin/dice_signed_in_profile_creator.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/signin/dice_web_signin_interceptor.h b/chrome/browser/signin/dice_web_signin_interceptor.h index 0eb78d0..6392e9c 100644 --- a/chrome/browser/signin/dice_web_signin_interceptor.h +++ b/chrome/browser/signin/dice_web_signin_interceptor.h
@@ -7,9 +7,9 @@ #include <memory> -#include "base/callback_forward.h" #include "base/cancelable_callback.h" #include "base/feature_list.h" +#include "base/functional/callback_forward.h" #include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" #include "base/scoped_observation.h"
diff --git a/chrome/browser/signin/dice_web_signin_interceptor_unittest.cc b/chrome/browser/signin/dice_web_signin_interceptor_unittest.cc index 586dd081..20254f92 100644 --- a/chrome/browser/signin/dice_web_signin_interceptor_unittest.cc +++ b/chrome/browser/signin/dice_web_signin_interceptor_unittest.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/signin/force_signin_verifier.cc b/chrome/browser/signin/force_signin_verifier.cc index 30514ec..e28e84d6 100644 --- a/chrome/browser/signin/force_signin_verifier.cc +++ b/chrome/browser/signin/force_signin_verifier.cc
@@ -6,9 +6,9 @@ #include "chrome/browser/signin/force_signin_verifier.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/histogram_macros.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/signin/identity_manager_factory.cc b/chrome/browser/signin/identity_manager_factory.cc index ff1d5b9..0f92e46 100644 --- a/chrome/browser/signin/identity_manager_factory.cc +++ b/chrome/browser/signin/identity_manager_factory.cc
@@ -49,7 +49,7 @@ #endif #if BUILDFLAG(IS_WIN) -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/signin/signin_util_win.h" #endif
diff --git a/chrome/browser/signin/identity_manager_provider.h b/chrome/browser/signin/identity_manager_provider.h index 915f8467..4b323310 100644 --- a/chrome/browser/signin/identity_manager_provider.h +++ b/chrome/browser/signin/identity_manager_provider.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_SIGNIN_IDENTITY_MANAGER_PROVIDER_H_ #define CHROME_BROWSER_SIGNIN_IDENTITY_MANAGER_PROVIDER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" namespace content { class BrowserContext;
diff --git a/chrome/browser/signin/identity_test_environment_profile_adaptor.cc b/chrome/browser/signin/identity_test_environment_profile_adaptor.cc index 09c3491..39b79be 100644 --- a/chrome/browser/signin/identity_test_environment_profile_adaptor.cc +++ b/chrome/browser/signin/identity_test_environment_profile_adaptor.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/signin/identity_test_environment_profile_adaptor.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "build/chromeos_buildflags.h" #include "chrome/browser/signin/chrome_signin_client_factory.h" #include "chrome/browser/signin/identity_manager_factory.h"
diff --git a/chrome/browser/signin/mirror_browsertest.cc b/chrome/browser/signin/mirror_browsertest.cc index 377c197..f653b68b 100644 --- a/chrome/browser/signin/mirror_browsertest.cc +++ b/chrome/browser/signin/mirror_browsertest.cc
@@ -8,11 +8,11 @@ #include <utility> #include "base/base_switches.h" -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/containers/flat_map.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/path_service.h" #include "base/run_loop.h" #include "base/strings/string_util.h"
diff --git a/chrome/browser/signin/process_dice_header_delegate_impl.cc b/chrome/browser/signin/process_dice_header_delegate_impl.cc index e0bad7d..9b9be05 100644 --- a/chrome/browser/signin/process_dice_header_delegate_impl.cc +++ b/chrome/browser/signin/process_dice_header_delegate_impl.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/signin/dice_tab_helper.h"
diff --git a/chrome/browser/signin/process_dice_header_delegate_impl.h b/chrome/browser/signin/process_dice_header_delegate_impl.h index 1d1cd59..4ad90efc 100644 --- a/chrome/browser/signin/process_dice_header_delegate_impl.h +++ b/chrome/browser/signin/process_dice_header_delegate_impl.h
@@ -11,7 +11,7 @@ #include <memory> #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "components/signin/public/base/signin_metrics.h"
diff --git a/chrome/browser/signin/process_dice_header_delegate_impl_unittest.cc b/chrome/browser/signin/process_dice_header_delegate_impl_unittest.cc index 87f909f..8f78c01 100644 --- a/chrome/browser/signin/process_dice_header_delegate_impl_unittest.cc +++ b/chrome/browser/signin/process_dice_header_delegate_impl_unittest.cc
@@ -8,8 +8,8 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/signin/dice_tab_helper.h" #include "chrome/browser/signin/dice_web_signin_interceptor.h"
diff --git a/chrome/browser/signin/reauth_tab_helper.h b/chrome/browser/signin/reauth_tab_helper.h index 158f980..177b73f 100644 --- a/chrome/browser/signin/reauth_tab_helper.h +++ b/chrome/browser/signin/reauth_tab_helper.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_SIGNIN_REAUTH_TAB_HELPER_H_ #define CHROME_BROWSER_SIGNIN_REAUTH_TAB_HELPER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "content/public/browser/web_contents_observer.h" #include "content/public/browser/web_contents_user_data.h" #include "url/gurl.h"
diff --git a/chrome/browser/signin/signin_manager.cc b/chrome/browser/signin/signin_manager.cc index fe1dc469..78bbd5f 100644 --- a/chrome/browser/signin/signin_manager.cc +++ b/chrome/browser/signin/signin_manager.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/task/sequenced_task_runner.h" #include "components/prefs/pref_service.h" #include "components/signin/public/base/signin_metrics.h"
diff --git a/chrome/browser/signin/signin_profile_attributes_updater_unittest.cc b/chrome/browser/signin/signin_profile_attributes_updater_unittest.cc index c6d7b7c..4eb8d999 100644 --- a/chrome/browser/signin/signin_profile_attributes_updater_unittest.cc +++ b/chrome/browser/signin/signin_profile_attributes_updater_unittest.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/signin/signin_profile_attributes_updater.h" -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h"
diff --git a/chrome/browser/signin/signin_ui_delegate_impl_lacros.cc b/chrome/browser/signin/signin_ui_delegate_impl_lacros.cc index b75b6b9..6a77326 100644 --- a/chrome/browser/signin/signin_ui_delegate_impl_lacros.cc +++ b/chrome/browser/signin/signin_ui_delegate_impl_lacros.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/signin/signin_ui_delegate_impl_lacros.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h"
diff --git a/chrome/browser/signin/signin_ui_delegate_impl_lacros_unittest.cc b/chrome/browser/signin/signin_ui_delegate_impl_lacros_unittest.cc index f034ec44..e540c600 100644 --- a/chrome/browser/signin/signin_ui_delegate_impl_lacros_unittest.cc +++ b/chrome/browser/signin/signin_ui_delegate_impl_lacros_unittest.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/signin/signin_ui_delegate_impl_lacros.h" -#include "base/bind.h" #include "base/containers/fixed_flat_map.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/scoped_observation.h" #include "base/strings/strcat.h"
diff --git a/chrome/browser/signin/signin_ui_util.cc b/chrome/browser/signin/signin_ui_util.cc index 0358eeef..2e5bb916 100644 --- a/chrome/browser/signin/signin_ui_util.cc +++ b/chrome/browser/signin/signin_ui_util.cc
@@ -4,10 +4,10 @@ #include "chrome/browser/signin/signin_ui_util.h" -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h" #include "base/metrics/user_metrics.h"
diff --git a/chrome/browser/signin/signin_ui_util.h b/chrome/browser/signin/signin_ui_util.h index 90ab3a3..7f5f42e3 100644 --- a/chrome/browser/signin/signin_ui_util.h +++ b/chrome/browser/signin/signin_ui_util.h
@@ -9,7 +9,7 @@ #include <vector> #include "base/auto_reset.h" -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "build/buildflag.h" #include "build/chromeos_buildflags.h" #include "chrome/browser/signin/reauth_result.h"
diff --git a/chrome/browser/signin/signin_ui_util_browsertest.cc b/chrome/browser/signin/signin_ui_util_browsertest.cc index f95f77e..412df66 100644 --- a/chrome/browser/signin/signin_ui_util_browsertest.cc +++ b/chrome/browser/signin/signin_ui_util_browsertest.cc
@@ -7,7 +7,7 @@ #include "chrome/browser/signin/signin_ui_util.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/test/bind.h" #include "build/buildflag.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/signin/signin_ui_util_unittest.cc b/chrome/browser/signin/signin_ui_util_unittest.cc index 0a6212b0..f26a36d 100644 --- a/chrome/browser/signin/signin_ui_util_unittest.cc +++ b/chrome/browser/signin/signin_ui_util_unittest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/signin/signin_ui_util.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/metrics/user_action_tester.h"
diff --git a/chrome/browser/signin/signin_util.cc b/chrome/browser/signin/signin_util.cc index 238c0c0..eacdd67 100644 --- a/chrome/browser/signin/signin_util.cc +++ b/chrome/browser/signin/signin_util.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/metrics/histogram_functions.h" #include "base/notreached.h"
diff --git a/chrome/browser/signin/signin_util_win.cc b/chrome/browser/signin/signin_util_win.cc index b5fc77a..eab8758 100644 --- a/chrome/browser/signin/signin_util_win.cc +++ b/chrome/browser/signin/signin_util_win.cc
@@ -8,8 +8,8 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/no_destructor.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/signin/signin_util_win_browsertest.cc b/chrome/browser/signin/signin_util_win_browsertest.cc index 8fe3e7f..aa6280dd 100644 --- a/chrome/browser/signin/signin_util_win_browsertest.cc +++ b/chrome/browser/signin/signin_util_win_browsertest.cc
@@ -4,9 +4,9 @@ #include <stddef.h> -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" #include "base/test/bind.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 d7ea041..dd8dad6 100644 --- a/chrome/browser/site_isolation/chrome_site_per_process_browsertest.cc +++ b/chrome/browser/site_isolation/chrome_site_per_process_browsertest.cc
@@ -5,11 +5,11 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/feature_list.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/path_service.h" #include "base/run_loop.h"
diff --git a/chrome/browser/site_isolation/origin_agent_cluster_browsertest.cc b/chrome/browser/site_isolation/origin_agent_cluster_browsertest.cc index 0ec8022..a59096a 100644 --- a/chrome/browser/site_isolation/origin_agent_cluster_browsertest.cc +++ b/chrome/browser/site_isolation/origin_agent_cluster_browsertest.cc
@@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/bind.h" #include "base/command_line.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h" #include "chrome/browser/metrics/metrics_memory_details.h"
diff --git a/chrome/browser/site_isolation/prefs_observer.cc b/chrome/browser/site_isolation/prefs_observer.cc index 40df626..3cb48aa 100644 --- a/chrome/browser/site_isolation/prefs_observer.cc +++ b/chrome/browser/site_isolation/prefs_observer.cc
@@ -6,8 +6,8 @@ #include <string> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "chrome/common/pref_names.h" #include "components/prefs/pref_service.h" #include "components/site_isolation/site_isolation_policy.h"
diff --git a/chrome/browser/site_isolation/site_details_browsertest.cc b/chrome/browser/site_isolation/site_details_browsertest.cc index f03f2c6..4bbfbce1 100644 --- a/chrome/browser/site_isolation/site_details_browsertest.cc +++ b/chrome/browser/site_isolation/site_details_browsertest.cc
@@ -11,8 +11,8 @@ #include <utility> #include <vector> -#include "base/callback_helpers.h" #include "base/files/file_path.h" +#include "base/functional/callback_helpers.h" #include "base/path_service.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/site_isolation/site_per_process_text_input_browsertest.cc b/chrome/browser/site_isolation/site_per_process_text_input_browsertest.cc index efcbc85d..76451ebe 100644 --- a/chrome/browser/site_isolation/site_per_process_text_input_browsertest.cc +++ b/chrome/browser/site_isolation/site_per_process_text_input_browsertest.cc
@@ -5,8 +5,8 @@ #include <memory> #include <vector> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/site_isolation/spellcheck_per_process_browsertest.cc b/chrome/browser/site_isolation/spellcheck_per_process_browsertest.cc index 53fae4bc6..5f982df3 100644 --- a/chrome/browser/site_isolation/spellcheck_per_process_browsertest.cc +++ b/chrome/browser/site_isolation/spellcheck_per_process_browsertest.cc
@@ -7,8 +7,8 @@ // spellcheck_per_process_browsertest.cc -#include "base/callback_helpers.h" #include "base/feature_list.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/speech/chrome_speech_recognition_manager_delegate.cc b/chrome/browser/speech/chrome_speech_recognition_manager_delegate.cc index d785c3a..9048218 100644 --- a/chrome/browser/speech/chrome_speech_recognition_manager_delegate.cc +++ b/chrome/browser/speech/chrome_speech_recognition_manager_delegate.cc
@@ -6,7 +6,7 @@ #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/threading/thread_restrictions.h" #include "build/build_config.h" #include "chrome/browser/profiles/profile_manager.h"
diff --git a/chrome/browser/speech/cros_speech_recognition_service.h b/chrome/browser/speech/cros_speech_recognition_service.h index ebc09e0..b88b88eb 100644 --- a/chrome/browser/speech/cros_speech_recognition_service.h +++ b/chrome/browser/speech/cros_speech_recognition_service.h
@@ -8,9 +8,9 @@ #include <memory> #include <string> -#include "base/bind.h" #include "base/containers/flat_map.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "chrome/browser/speech/chrome_speech_recognition_service.h" #include "media/mojo/mojom/speech_recognition.mojom.h" #include "media/mojo/mojom/speech_recognition_service.mojom.h"
diff --git a/chrome/browser/speech/extension_api/tts_extension_apitest.cc b/chrome/browser/speech/extension_api/tts_extension_apitest.cc index 7b697b07..dd7a665 100644 --- a/chrome/browser/speech/extension_api/tts_extension_apitest.cc +++ b/chrome/browser/speech/extension_api/tts_extension_apitest.cc
@@ -4,8 +4,8 @@ #include <vector> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/speech/network_speech_recognizer.cc b/chrome/browser/speech/network_speech_recognizer.cc index cfc820740..a5093f5 100644 --- a/chrome/browser/speech/network_speech_recognizer.cc +++ b/chrome/browser/speech/network_speech_recognizer.cc
@@ -10,7 +10,7 @@ #include <algorithm> #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/speech/speech_recognizer_delegate.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/speech/speech_recognition_test_helper.cc b/chrome/browser/speech/speech_recognition_test_helper.cc index 469bb08..4e0268a 100644 --- a/chrome/browser/speech/speech_recognition_test_helper.cc +++ b/chrome/browser/speech/speech_recognition_test_helper.cc
@@ -5,7 +5,7 @@ #include "chrome/browser/speech/speech_recognition_test_helper.h" #include "ash/constants/ash_features.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/speech/cros_speech_recognition_service_factory.h"
diff --git a/chrome/browser/speech/tts_ash.cc b/chrome/browser/speech/tts_ash.cc index bb773876..5d2a377 100644 --- a/chrome/browser/speech/tts_ash.cc +++ b/chrome/browser/speech/tts_ash.cc
@@ -8,7 +8,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/weak_ptr.h" #include "base/notreached.h" #include "base/unguessable_token.h"
diff --git a/chrome/browser/spellchecker/spell_check_host_chrome_impl.cc b/chrome/browser/spellchecker/spell_check_host_chrome_impl.cc index f78ec1f..f1218b5 100644 --- a/chrome/browser/spellchecker/spell_check_host_chrome_impl.cc +++ b/chrome/browser/spellchecker/spell_check_host_chrome_impl.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/spellchecker/spell_check_host_chrome_impl.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/no_destructor.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h"
diff --git a/chrome/browser/spellchecker/spell_check_host_chrome_impl.h b/chrome/browser/spellchecker/spell_check_host_chrome_impl.h index e92a63c9..a16e11c8 100644 --- a/chrome/browser/spellchecker/spell_check_host_chrome_impl.h +++ b/chrome/browser/spellchecker/spell_check_host_chrome_impl.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_SPELLCHECKER_SPELL_CHECK_HOST_CHROME_IMPL_H_ #define CHROME_BROWSER_SPELLCHECKER_SPELL_CHECK_HOST_CHROME_IMPL_H_ -#include "base/callback.h" #include "base/containers/unique_ptr_adapters.h" +#include "base/functional/callback.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h" #include "components/spellcheck/browser/spell_check_host_impl.h"
diff --git a/chrome/browser/spellchecker/spell_check_host_chrome_impl_mac_browsertest.cc b/chrome/browser/spellchecker/spell_check_host_chrome_impl_mac_browsertest.cc index 680852e..62c3c8c 100644 --- a/chrome/browser/spellchecker/spell_check_host_chrome_impl_mac_browsertest.cc +++ b/chrome/browser/spellchecker/spell_check_host_chrome_impl_mac_browsertest.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/spellchecker/spell_check_host_chrome_impl_win_browsertest.cc b/chrome/browser/spellchecker/spell_check_host_chrome_impl_win_browsertest.cc index 22ae368..7fb1eb5 100644 --- a/chrome/browser/spellchecker/spell_check_host_chrome_impl_win_browsertest.cc +++ b/chrome/browser/spellchecker/spell_check_host_chrome_impl_win_browsertest.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/spellchecker/spell_check_panel_host_impl.cc b/chrome/browser/spellchecker/spell_check_panel_host_impl.cc index c299adf..8dfdf4b 100644 --- a/chrome/browser/spellchecker/spell_check_panel_host_impl.cc +++ b/chrome/browser/spellchecker/spell_check_panel_host_impl.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/spellchecker/spell_check_panel_host_impl.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/no_destructor.h" #include "components/spellcheck/browser/spellcheck_platform.h" #include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/spellchecker/spell_check_panel_host_impl.h b/chrome/browser/spellchecker/spell_check_panel_host_impl.h index 03ebdf3a..408aa35 100644 --- a/chrome/browser/spellchecker/spell_check_panel_host_impl.h +++ b/chrome/browser/spellchecker/spell_check_panel_host_impl.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_SPELLCHECKER_SPELL_CHECK_PANEL_HOST_IMPL_H_ #define CHROME_BROWSER_SPELLCHECKER_SPELL_CHECK_PANEL_HOST_IMPL_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "components/spellcheck/common/spellcheck_panel.mojom.h" #include "components/spellcheck/spellcheck_buildflags.h"
diff --git a/chrome/browser/spellchecker/spellcheck_custom_dictionary.cc b/chrome/browser/spellchecker/spellcheck_custom_dictionary.cc index 66ef0a95..eb0bda4 100644 --- a/chrome/browser/spellchecker/spellcheck_custom_dictionary.cc +++ b/chrome/browser/spellchecker/spellcheck_custom_dictionary.cc
@@ -12,10 +12,10 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/containers/contains.h" #include "base/files/file_util.h" #include "base/files/important_file_writer.h" +#include "base/functional/bind.h" #include "base/hash/md5.h" #include "base/observer_list.h" #include "base/stl_util.h"
diff --git a/chrome/browser/spellchecker/spellcheck_custom_dictionary_unittest.cc b/chrome/browser/spellchecker/spellcheck_custom_dictionary_unittest.cc index 662bd91..8c27c11 100644 --- a/chrome/browser/spellchecker/spellcheck_custom_dictionary_unittest.cc +++ b/chrome/browser/spellchecker/spellcheck_custom_dictionary_unittest.cc
@@ -11,8 +11,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/metrics/histogram_samples.h"
diff --git a/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc b/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc index c331a7935e..27f5a78 100644 --- a/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc +++ b/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc
@@ -8,9 +8,9 @@ #include <utility> -#include "base/bind.h" #include "base/check_op.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/lazy_instance.h" #include "base/location.h" #include "base/notreached.h"
diff --git a/chrome/browser/spellchecker/spellcheck_service.cc b/chrome/browser/spellchecker/spellcheck_service.cc index f6fe51c..809410c3c 100644 --- a/chrome/browser/spellchecker/spellcheck_service.cc +++ b/chrome/browser/spellchecker/spellcheck_service.cc
@@ -9,10 +9,10 @@ #include <set> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check_op.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/no_destructor.h" #include "base/ranges/algorithm.h" #include "base/strings/string_split.h"
diff --git a/chrome/browser/spellchecker/spellcheck_service.h b/chrome/browser/spellchecker/spellcheck_service.h index 1527b8f..17b0aae 100644 --- a/chrome/browser/spellchecker/spellcheck_service.h +++ b/chrome/browser/spellchecker/spellcheck_service.h
@@ -12,7 +12,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/spellchecker/spellcheck_service_browsertest.cc b/chrome/browser/spellchecker/spellcheck_service_browsertest.cc index d69f6ea..efb0d06 100644 --- a/chrome/browser/spellchecker/spellcheck_service_browsertest.cc +++ b/chrome/browser/spellchecker/spellcheck_service_browsertest.cc
@@ -9,10 +9,10 @@ #include <string> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/path_service.h" #include "base/run_loop.h"
diff --git a/chrome/browser/spellchecker/spelling_request.cc b/chrome/browser/spellchecker/spelling_request.cc index 17f46aa..9de7d9f 100644 --- a/chrome/browser/spellchecker/spelling_request.cc +++ b/chrome/browser/spellchecker/spelling_request.cc
@@ -5,7 +5,7 @@ #include "chrome/browser/spellchecker/spelling_request.h" #include "base/barrier_closure.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/i18n/char_iterator.h" #include "base/memory/ptr_util.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/spellchecker/spelling_request_unittest.cc b/chrome/browser/spellchecker/spelling_request_unittest.cc index b748317a..8ca311f 100644 --- a/chrome/browser/spellchecker/spelling_request_unittest.cc +++ b/chrome/browser/spellchecker/spelling_request_unittest.cc
@@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "components/spellcheck/common/spellcheck_result.h" #include "content/public/test/browser_task_environment.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/spellchecker/spelling_service_client_unittest.cc b/chrome/browser/spellchecker/spelling_service_client_unittest.cc index a4908f7..e578edc 100644 --- a/chrome/browser/spellchecker/spelling_service_client_unittest.cc +++ b/chrome/browser/spellchecker/spelling_service_client_unittest.cc
@@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/json/json_reader.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/spellchecker/test/spellcheck_mock_panel_host.h b/chrome/browser/spellchecker/test/spellcheck_mock_panel_host.h index 4ada4a8..5ce089e 100644 --- a/chrome/browser/spellchecker/test/spellcheck_mock_panel_host.h +++ b/chrome/browser/spellchecker/test/spellcheck_mock_panel_host.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_SPELLCHECKER_TEST_SPELLCHECK_MOCK_PANEL_HOST_H_ #define CHROME_BROWSER_SPELLCHECKER_TEST_SPELLCHECK_MOCK_PANEL_HOST_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "components/spellcheck/common/spellcheck_panel.mojom.h" #include "content/public/browser/render_process_host.h"
diff --git a/chrome/browser/spellchecker/test/spellcheck_panel_browsertest_helper.cc b/chrome/browser/spellchecker/test/spellcheck_panel_browsertest_helper.cc index 455ade50..52629087 100644 --- a/chrome/browser/spellchecker/test/spellcheck_panel_browsertest_helper.cc +++ b/chrome/browser/spellchecker/test/spellcheck_panel_browsertest_helper.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/spellchecker/test/spellcheck_panel_browsertest_helper.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "chrome/browser/spellchecker/spell_check_panel_host_impl.h" #include "content/public/browser/browser_task_traits.h"
diff --git a/chrome/browser/ssl/captive_portal_blocking_page_browsertest.cc b/chrome/browser/ssl/captive_portal_blocking_page_browsertest.cc index b2618f81..8bcc7283 100644 --- a/chrome/browser/ssl/captive_portal_blocking_page_browsertest.cc +++ b/chrome/browser/ssl/captive_portal_blocking_page_browsertest.cc
@@ -8,11 +8,11 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/run_loop.h" #include "base/test/scoped_feature_list.h"
diff --git a/chrome/browser/ssl/certificate_error_reporter.h b/chrome/browser/ssl/certificate_error_reporter.h index 14af0a5..84c9960 100644 --- a/chrome/browser/ssl/certificate_error_reporter.h +++ b/chrome/browser/ssl/certificate_error_reporter.h
@@ -11,7 +11,7 @@ #include <set> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "url/gurl.h"
diff --git a/chrome/browser/ssl/certificate_error_reporter_unittest.cc b/chrome/browser/ssl/certificate_error_reporter_unittest.cc index 0876725e..5502092 100644 --- a/chrome/browser/ssl/certificate_error_reporter_unittest.cc +++ b/chrome/browser/ssl/certificate_error_reporter_unittest.cc
@@ -10,8 +10,8 @@ #include <set> #include <string> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/strings/string_piece.h" #include "base/test/bind.h"
diff --git a/chrome/browser/ssl/certificate_reporting_test_utils.cc b/chrome/browser/ssl/certificate_reporting_test_utils.cc index b5a5064..a6d3acc 100644 --- a/chrome/browser/ssl/certificate_reporting_test_utils.cc +++ b/chrome/browser/ssl/certificate_reporting_test_utils.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/field_trial.h" #include "base/run_loop.h" #include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/ssl/chrome_security_blocking_page_factory.cc b/chrome/browser/ssl/chrome_security_blocking_page_factory.cc index 11b257b..9b05fc16 100644 --- a/chrome/browser/ssl/chrome_security_blocking_page_factory.cc +++ b/chrome/browser/ssl/chrome_security_blocking_page_factory.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ssl/chrome_security_blocking_page_factory.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "base/time/time.h" #include "build/build_config.h"
diff --git a/chrome/browser/ssl/https_only_mode_upgrade_interceptor.cc b/chrome/browser/ssl/https_only_mode_upgrade_interceptor.cc index f303502..ba20223f 100644 --- a/chrome/browser/ssl/https_only_mode_upgrade_interceptor.cc +++ b/chrome/browser/ssl/https_only_mode_upgrade_interceptor.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ssl/https_only_mode_upgrade_interceptor.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h"
diff --git a/chrome/browser/ssl/https_only_mode_upgrade_url_loader.cc b/chrome/browser/ssl/https_only_mode_upgrade_url_loader.cc index 347392e..f5c7b51 100644 --- a/chrome/browser/ssl/https_only_mode_upgrade_url_loader.cc +++ b/chrome/browser/ssl/https_only_mode_upgrade_url_loader.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/sequence_checker.h" #include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/ssl/https_upgrades_interceptor.cc b/chrome/browser/ssl/https_upgrades_interceptor.cc index a22761e..550c8d59 100644 --- a/chrome/browser/ssl/https_upgrades_interceptor.cc +++ b/chrome/browser/ssl/https_upgrades_interceptor.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ssl/https_upgrades_interceptor.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h"
diff --git a/chrome/browser/ssl/sct_reporting_service_browsertest.cc b/chrome/browser/ssl/sct_reporting_service_browsertest.cc index 9fed05e5..9995a08 100644 --- a/chrome/browser/ssl/sct_reporting_service_browsertest.cc +++ b/chrome/browser/ssl/sct_reporting_service_browsertest.cc
@@ -6,9 +6,9 @@ #include <tuple> #include "base/base64.h" -#include "base/callback.h" #include "base/files/file_path_watcher.h" #include "base/files/file_util.h" +#include "base/functional/callback.h" #include "base/json/json_writer.h" #include "base/memory/scoped_refptr.h" #include "base/synchronization/lock.h"
diff --git a/chrome/browser/ssl/sct_reporting_service_factory.cc b/chrome/browser/ssl/sct_reporting_service_factory.cc index 8407d624..947ce0c8 100644 --- a/chrome/browser/ssl/sct_reporting_service_factory.cc +++ b/chrome/browser/ssl/sct_reporting_service_factory.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ssl/sct_reporting_service_factory.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/safe_browsing/safe_browsing_service.h"
diff --git a/chrome/browser/ssl/secure_origin_prefs_observer.cc b/chrome/browser/ssl/secure_origin_prefs_observer.cc index e233033d..f273ed44 100644 --- a/chrome/browser/ssl/secure_origin_prefs_observer.cc +++ b/chrome/browser/ssl/secure_origin_prefs_observer.cc
@@ -6,8 +6,8 @@ #include <string> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/strings/string_util.h" #include "base/syslog_logging.h" #include "chrome/common/pref_names.h"
diff --git a/chrome/browser/ssl/security_state_tab_helper.cc b/chrome/browser/ssl/security_state_tab_helper.cc index 7d99019..bd7d3cf 100644 --- a/chrome/browser/ssl/security_state_tab_helper.cc +++ b/chrome/browser/ssl/security_state_tab_helper.cc
@@ -6,8 +6,8 @@ #include <string> -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/metrics/field_trial_params.h" #include "base/metrics/histogram_macros.h" #include "base/strings/pattern.h"
diff --git a/chrome/browser/ssl/security_state_tab_helper.h b/chrome/browser/ssl/security_state_tab_helper.h index a2ff292b..74ffae779 100644 --- a/chrome/browser/ssl/security_state_tab_helper.h +++ b/chrome/browser/ssl/security_state_tab_helper.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "components/security_state/core/security_state.h" #include "content/public/browser/web_contents_observer.h" #include "content/public/browser/web_contents_user_data.h"
diff --git a/chrome/browser/ssl/security_state_tab_helper_browsertest.cc b/chrome/browser/ssl/security_state_tab_helper_browsertest.cc index f34134d..ab52489 100644 --- a/chrome/browser/ssl/security_state_tab_helper_browsertest.cc +++ b/chrome/browser/ssl/security_state_tab_helper_browsertest.cc
@@ -6,10 +6,10 @@ #include "base/base64.h" #include "base/base_paths.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/feature_list.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/metrics/field_trial.h" #include "base/metrics/field_trial_params.h"
diff --git a/chrome/browser/ssl/ssl_browsertest.cc b/chrome/browser/ssl/ssl_browsertest.cc index 94b8df6..225ae07 100644 --- a/chrome/browser/ssl/ssl_browsertest.cc +++ b/chrome/browser/ssl/ssl_browsertest.cc
@@ -7,13 +7,13 @@ #include "base/base64.h" #include "base/base_switches.h" -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/containers/contains.h" #include "base/feature_list.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/json/json_reader.h" #include "base/location.h" #include "base/memory/raw_ptr.h"
diff --git a/chrome/browser/ssl/ssl_client_auth_requestor_mock.cc b/chrome/browser/ssl/ssl_client_auth_requestor_mock.cc index 221db7c..063831969 100644 --- a/chrome/browser/ssl/ssl_client_auth_requestor_mock.cc +++ b/chrome/browser/ssl/ssl_client_auth_requestor_mock.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/callback.h" +#include "base/functional/callback.h" #include "content/public/browser/client_certificate_delegate.h" #include "net/cert/x509_certificate.h" #include "net/ssl/ssl_cert_request_info.h"
diff --git a/chrome/browser/ssl/ssl_client_certificate_selector.h b/chrome/browser/ssl/ssl_client_certificate_selector.h index c44940a..f1b838f 100644 --- a/chrome/browser/ssl/ssl_client_certificate_selector.h +++ b/chrome/browser/ssl/ssl_client_certificate_selector.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "build/build_config.h" #include "net/ssl/client_cert_identity.h"
diff --git a/chrome/browser/ssl/ssl_config_service_manager.cc b/chrome/browser/ssl/ssl_config_service_manager.cc index 72b571a5..a50fab904 100644 --- a/chrome/browser/ssl/ssl_config_service_manager.cc +++ b/chrome/browser/ssl/ssl_config_service_manager.cc
@@ -9,8 +9,8 @@ #include <string> #include <vector> -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/strings/string_util.h" #include "base/values.h"
diff --git a/chrome/browser/ssl/ssl_error_controller_client.cc b/chrome/browser/ssl/ssl_error_controller_client.cc index 946d4ed..19c4d806 100644 --- a/chrome/browser/ssl/ssl_error_controller_client.cc +++ b/chrome/browser/ssl/ssl_error_controller_client.cc
@@ -6,10 +6,10 @@ #include <string> -#include "base/bind.h" #include "base/command_line.h" #include "base/feature_list.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/metrics/field_trial_params.h" #include "base/metrics/histogram_macros.h" #include "base/process/launch.h"
diff --git a/chrome/browser/ssl/ssl_prerender_browsertest.cc b/chrome/browser/ssl/ssl_prerender_browsertest.cc index 2a59cbe5..9fc69c7 100644 --- a/chrome/browser/ssl/ssl_prerender_browsertest.cc +++ b/chrome/browser/ssl/ssl_prerender_browsertest.cc
@@ -4,8 +4,8 @@ #include <memory> -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/strings/string_number_conversions.h" #include "build/build_config.h" #include "chrome/browser/interstitials/security_interstitial_page_test_utils.h"
diff --git a/chrome/browser/ssl/stateful_ssl_host_state_delegate_test.cc b/chrome/browser/ssl/stateful_ssl_host_state_delegate_test.cc index 980bbc5..c68e7e8a 100644 --- a/chrome/browser/ssl/stateful_ssl_host_state_delegate_test.cc +++ b/chrome/browser/ssl/stateful_ssl_host_state_delegate_test.cc
@@ -7,9 +7,9 @@ #include <stdint.h> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/strings/string_number_conversions.h" #include "base/test/simple_test_clock.h" #include "build/build_config.h"
diff --git a/chrome/browser/startup_data.cc b/chrome/browser/startup_data.cc index 00aa195..47911d68 100644 --- a/chrome/browser/startup_data.cc +++ b/chrome/browser/startup_data.cc
@@ -19,8 +19,8 @@ #include "third_party/metrics_proto/system_profile.pb.h" #if BUILDFLAG(IS_ANDROID) -#include "base/bind.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/path_service.h" #include "chrome/browser/android/profile_key_startup_accessor.h" #include "chrome/browser/policy/profile_policy_connector.h"
diff --git a/chrome/browser/status_icons/status_icon_menu_model.cc b/chrome/browser/status_icons/status_icon_menu_model.cc index 90491ab..a4ec537 100644 --- a/chrome/browser/status_icons/status_icon_menu_model.cc +++ b/chrome/browser/status_icons/status_icon_menu_model.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/status_icons/status_icon_menu_model.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/observer_list.h" #include "ui/base/accelerators/accelerator.h" #include "ui/gfx/image/image.h"
diff --git a/chrome/browser/storage/durable_storage_permission_context_unittest.cc b/chrome/browser/storage/durable_storage_permission_context_unittest.cc index 42419e7..c92376e 100644 --- a/chrome/browser/storage/durable_storage_permission_context_unittest.cc +++ b/chrome/browser/storage/durable_storage_permission_context_unittest.cc
@@ -6,8 +6,8 @@ #include <string> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/content_settings/cookie_settings_factory.h"
diff --git a/chrome/browser/storage_access_api/api_browsertest.cc b/chrome/browser/storage_access_api/api_browsertest.cc index de2d05b..564a7b0 100644 --- a/chrome/browser/storage_access_api/api_browsertest.cc +++ b/chrome/browser/storage_access_api/api_browsertest.cc
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/path_service.h" #include "base/strings/strcat.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/storage_access_api/storage_access_grant_permission_context.cc b/chrome/browser/storage_access_api/storage_access_grant_permission_context.cc index 9811d9d7..3aa64b92 100644 --- a/chrome/browser/storage_access_api/storage_access_grant_permission_context.cc +++ b/chrome/browser/storage_access_api/storage_access_grant_permission_context.cc
@@ -4,10 +4,10 @@ #include "chrome/browser/storage_access_api/storage_access_grant_permission_context.h" -#include "base/bind.h" #include "base/check.h" #include "base/check_op.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/metrics/field_trial_params.h" #include "base/metrics/histogram_functions.h" #include "base/notreached.h"
diff --git a/chrome/browser/subresource_filter/ad_tagging_browsertest.cc b/chrome/browser/subresource_filter/ad_tagging_browsertest.cc index e179108..d289ead 100644 --- a/chrome/browser/subresource_filter/ad_tagging_browsertest.cc +++ b/chrome/browser/subresource_filter/ad_tagging_browsertest.cc
@@ -4,8 +4,8 @@ #include <string> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/strings/stringprintf.h" #include "base/test/metrics/histogram_tester.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
diff --git a/chrome/browser/subresource_filter/android_test_ruleset_publisher.cc b/chrome/browser/subresource_filter/android_test_ruleset_publisher.cc index 29c857f..d158f5bf 100644 --- a/chrome/browser/subresource_filter/android_test_ruleset_publisher.cc +++ b/chrome/browser/subresource_filter/android_test_ruleset_publisher.cc
@@ -9,8 +9,8 @@ #include "base/android/jni_android.h" #include "base/android/jni_string.h" #include "base/android/scoped_java_ref.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/hash/hash.h" #include "base/strings/string_number_conversions.h" #include "chrome/browser/after_startup_task_utils.h"
diff --git a/chrome/browser/subresource_filter/ruleset_browsertest.cc b/chrome/browser/subresource_filter/ruleset_browsertest.cc index 8a948cc..3cf14af 100644 --- a/chrome/browser/subresource_filter/ruleset_browsertest.cc +++ b/chrome/browser/subresource_filter/ruleset_browsertest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/subresource_filter/subresource_filter_browser_test_harness.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/test/metrics/histogram_tester.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/subresource_filter/subresource_filter_browser_test_harness.cc b/chrome/browser/subresource_filter/subresource_filter_browser_test_harness.cc index 04ba386..386fa968 100644 --- a/chrome/browser/subresource_filter/subresource_filter_browser_test_harness.cc +++ b/chrome/browser/subresource_filter/subresource_filter_browser_test_harness.cc
@@ -6,9 +6,9 @@ #include <utility> -#include "base/bind.h" #include "base/check.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/path_service.h" #include "base/strings/string_piece.h"
diff --git a/chrome/browser/subresource_filter/subresource_filter_browsertest.cc b/chrome/browser/subresource_filter/subresource_filter_browsertest.cc index 85a9dda8..a14bfe83 100644 --- a/chrome/browser/subresource_filter/subresource_filter_browsertest.cc +++ b/chrome/browser/subresource_filter/subresource_filter_browsertest.cc
@@ -10,8 +10,8 @@ #include "chrome/browser/subresource_filter/subresource_filter_browser_test_harness.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/ref_counted.h" #include "base/strings/pattern.h"
diff --git a/chrome/browser/subresource_filter/subresource_filter_special_subframe_navigations_browsertest.cc b/chrome/browser/subresource_filter/subresource_filter_special_subframe_navigations_browsertest.cc index f7a33d3..3d2175f 100644 --- a/chrome/browser/subresource_filter/subresource_filter_special_subframe_navigations_browsertest.cc +++ b/chrome/browser/subresource_filter/subresource_filter_special_subframe_navigations_browsertest.cc
@@ -4,7 +4,7 @@ #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/string_piece.h" #include "base/strings/stringprintf.h" #include "chrome/browser/subresource_filter/subresource_filter_browser_test_harness.h"
diff --git a/chrome/browser/supervised_user/android/favicon_fetcher.cc b/chrome/browser/supervised_user/android/favicon_fetcher.cc index 27366c8..059472d 100644 --- a/chrome/browser/supervised_user/android/favicon_fetcher.cc +++ b/chrome/browser/supervised_user/android/favicon_fetcher.cc
@@ -8,8 +8,8 @@ #include <memory> #include "base/android/callback_android.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/task/cancelable_task_tracker.h" #include "components/favicon/core/large_icon_service.h"
diff --git a/chrome/browser/supervised_user/android/website_parent_approval.cc b/chrome/browser/supervised_user/android/website_parent_approval.cc index 2f4ebdd..6c923322 100644 --- a/chrome/browser/supervised_user/android/website_parent_approval.cc +++ b/chrome/browser/supervised_user/android/website_parent_approval.cc
@@ -11,7 +11,7 @@ #include "base/android/jni_android.h" #include "base/android/jni_string.h" #include "base/android/scoped_java_ref.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/no_destructor.h" #include "chrome/browser/favicon/large_icon_service_factory.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/supervised_user/android/website_parent_approval.h b/chrome/browser/supervised_user/android/website_parent_approval.h index 4c72cf1..27c4393 100644 --- a/chrome/browser/supervised_user/android/website_parent_approval.h +++ b/chrome/browser/supervised_user/android/website_parent_approval.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_SUPERVISED_USER_ANDROID_WEBSITE_PARENT_APPROVAL_H_ #define CHROME_BROWSER_SUPERVISED_USER_ANDROID_WEBSITE_PARENT_APPROVAL_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "chrome/browser/supervised_user/web_approvals_manager.h" class GURL;
diff --git a/chrome/browser/supervised_user/child_accounts/child_account_service_android.cc b/chrome/browser/supervised_user/child_accounts/child_account_service_android.cc index b6285c9e..a7be051f 100644 --- a/chrome/browser/supervised_user/child_accounts/child_account_service_android.cc +++ b/chrome/browser/supervised_user/child_accounts/child_account_service_android.cc
@@ -8,7 +8,7 @@ #include "base/android/callback_android.h" #include "base/android/jni_string.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/android/chrome_jni_headers/ChildAccountService_jni.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/supervised_user/child_accounts/child_account_service.h"
diff --git a/chrome/browser/supervised_user/child_accounts/child_account_service_android.h b/chrome/browser/supervised_user/child_accounts/child_account_service_android.h index 67255ddc..57f30a2 100644 --- a/chrome/browser/supervised_user/child_accounts/child_account_service_android.h +++ b/chrome/browser/supervised_user/child_accounts/child_account_service_android.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" namespace content { class WebContents;
diff --git a/chrome/browser/supervised_user/child_accounts/child_account_service_impl.cc b/chrome/browser/supervised_user/child_accounts/child_account_service_impl.cc index 27af20a..3c59d78 100644 --- a/chrome/browser/supervised_user/child_accounts/child_account_service_impl.cc +++ b/chrome/browser/supervised_user/child_accounts/child_account_service_impl.cc
@@ -7,8 +7,8 @@ #include <memory> #include <utility> -#include "base/callback.h" #include "base/command_line.h" +#include "base/functional/callback.h" #include "base/metrics/field_trial.h" #include "base/values.h" #include "build/build_config.h"
diff --git a/chrome/browser/supervised_user/child_accounts/child_account_service_impl.h b/chrome/browser/supervised_user/child_accounts/child_account_service_impl.h index 1be415f..c7deb3898 100644 --- a/chrome/browser/supervised_user/child_accounts/child_account_service_impl.h +++ b/chrome/browser/supervised_user/child_accounts/child_account_service_impl.h
@@ -8,8 +8,8 @@ #include <memory> #include <vector> -#include "base/callback_forward.h" #include "base/callback_list.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h"
diff --git a/chrome/browser/supervised_user/child_accounts/child_account_service_unittest.cc b/chrome/browser/supervised_user/child_accounts/child_account_service_unittest.cc index 7f69937..81f1bbf 100644 --- a/chrome/browser/supervised_user/child_accounts/child_account_service_unittest.cc +++ b/chrome/browser/supervised_user/child_accounts/child_account_service_unittest.cc
@@ -6,7 +6,7 @@ #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/signin/chrome_signin_client_factory.h" #include "chrome/browser/signin/identity_test_environment_profile_adaptor.h"
diff --git a/chrome/browser/supervised_user/child_accounts/family_info_fetcher.cc b/chrome/browser/supervised_user/child_accounts/family_info_fetcher.cc index 66ec96ad..b568acd 100644 --- a/chrome/browser/supervised_user/child_accounts/family_info_fetcher.cc +++ b/chrome/browser/supervised_user/child_accounts/family_info_fetcher.cc
@@ -8,7 +8,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/json/json_reader.h" #include "base/metrics/histogram_functions.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/supervised_user/child_accounts/family_info_fetcher.h b/chrome/browser/supervised_user/child_accounts/family_info_fetcher.h index a2a7c87..fb06b0d 100644 --- a/chrome/browser/supervised_user/child_accounts/family_info_fetcher.h +++ b/chrome/browser/supervised_user/child_accounts/family_info_fetcher.h
@@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/time/time.h"
diff --git a/chrome/browser/supervised_user/child_accounts/family_info_fetcher_unittest.cc b/chrome/browser/supervised_user/child_accounts/family_info_fetcher_unittest.cc index 53221e5..a6a188d2 100644 --- a/chrome/browser/supervised_user/child_accounts/family_info_fetcher_unittest.cc +++ b/chrome/browser/supervised_user/child_accounts/family_info_fetcher_unittest.cc
@@ -11,7 +11,7 @@ #include <utility> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/json/json_writer.h" #include "base/test/mock_callback.h" #include "base/test/task_environment.h"
diff --git a/chrome/browser/supervised_user/child_accounts/permission_request_creator_apiary.cc b/chrome/browser/supervised_user/child_accounts/permission_request_creator_apiary.cc index 505d68a..3a2cbe3 100644 --- a/chrome/browser/supervised_user/child_accounts/permission_request_creator_apiary.cc +++ b/chrome/browser/supervised_user/child_accounts/permission_request_creator_apiary.cc
@@ -4,9 +4,9 @@ #include "chrome/browser/supervised_user/child_accounts/permission_request_creator_apiary.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/logging.h"
diff --git a/chrome/browser/supervised_user/child_accounts/permission_request_creator_apiary_unittest.cc b/chrome/browser/supervised_user/child_accounts/permission_request_creator_apiary_unittest.cc index 7bf7221..2e11c9cf 100644 --- a/chrome/browser/supervised_user/child_accounts/permission_request_creator_apiary_unittest.cc +++ b/chrome/browser/supervised_user/child_accounts/permission_request_creator_apiary_unittest.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/json/json_writer.h" #include "base/test/task_environment.h" #include "base/threading/thread_task_runner_handle.h"
diff --git a/chrome/browser/supervised_user/kids_chrome_management/kids_access_token_fetcher.cc b/chrome/browser/supervised_user/kids_chrome_management/kids_access_token_fetcher.cc index ca4a806f..de077aa 100644 --- a/chrome/browser/supervised_user/kids_chrome_management/kids_access_token_fetcher.cc +++ b/chrome/browser/supervised_user/kids_chrome_management/kids_access_token_fetcher.cc
@@ -7,7 +7,6 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/functional/bind.h" #include "base/no_destructor.h" #include "base/types/expected.h"
diff --git a/chrome/browser/supervised_user/kids_chrome_management/kids_access_token_fetcher_unittest.cc b/chrome/browser/supervised_user/kids_chrome_management/kids_access_token_fetcher_unittest.cc index b0c052b..c16a9b9 100644 --- a/chrome/browser/supervised_user/kids_chrome_management/kids_access_token_fetcher_unittest.cc +++ b/chrome/browser/supervised_user/kids_chrome_management/kids_access_token_fetcher_unittest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/supervised_user/kids_chrome_management/kids_access_token_fetcher.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/functional/callback.h" #include "base/time/time.h" #include "base/types/expected.h"
diff --git a/chrome/browser/supervised_user/kids_chrome_management/kids_chrome_management_client.h b/chrome/browser/supervised_user/kids_chrome_management/kids_chrome_management_client.h index 2cb9ed5f..41e871c 100644 --- a/chrome/browser/supervised_user/kids_chrome_management/kids_chrome_management_client.h +++ b/chrome/browser/supervised_user/kids_chrome_management/kids_chrome_management_client.h
@@ -9,7 +9,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "chrome/browser/supervised_user/kids_chrome_management/kidschromemanagement_messages.pb.h"
diff --git a/chrome/browser/supervised_user/kids_management_url_checker_client.cc b/chrome/browser/supervised_user/kids_management_url_checker_client.cc index 97d13a9..1dfb906a 100644 --- a/chrome/browser/supervised_user/kids_management_url_checker_client.cc +++ b/chrome/browser/supervised_user/kids_management_url_checker_client.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/supervised_user/kids_chrome_management/kids_chrome_management_client_factory.h"
diff --git a/chrome/browser/supervised_user/kids_management_url_checker_client_unittest.cc b/chrome/browser/supervised_user/kids_management_url_checker_client_unittest.cc index 076fcea..5f3860b2 100644 --- a/chrome/browser/supervised_user/kids_management_url_checker_client_unittest.cc +++ b/chrome/browser/supervised_user/kids_management_url_checker_client_unittest.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/supervised_user/permission_request_creator.h b/chrome/browser/supervised_user/permission_request_creator.h index cc839d1..79731f5 100644 --- a/chrome/browser/supervised_user/permission_request_creator.h +++ b/chrome/browser/supervised_user/permission_request_creator.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_SUPERVISED_USER_PERMISSION_REQUEST_CREATOR_H_ #define CHROME_BROWSER_SUPERVISED_USER_PERMISSION_REQUEST_CREATOR_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" class GURL;
diff --git a/chrome/browser/supervised_user/permission_request_creator_mock.cc b/chrome/browser/supervised_user/permission_request_creator_mock.cc index bc5888e6..dc98da35 100644 --- a/chrome/browser/supervised_user/permission_request_creator_mock.cc +++ b/chrome/browser/supervised_user/permission_request_creator_mock.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/callback.h" #include "base/check.h" +#include "base/functional/callback.h" #include "base/values.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_key.h"
diff --git a/chrome/browser/supervised_user/supervised_user_denylist.cc b/chrome/browser/supervised_user/supervised_user_denylist.cc index 57afe90c..8c3995a 100644 --- a/chrome/browser/supervised_user/supervised_user_denylist.cc +++ b/chrome/browser/supervised_user/supervised_user_denylist.cc
@@ -8,9 +8,9 @@ #include <cstring> #include <fstream> -#include "base/bind.h" #include "base/files/file_path.h" #include "base/files/memory_mapped_file.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/task/thread_pool.h" #include "url/gurl.h"
diff --git a/chrome/browser/supervised_user/supervised_user_denylist.h b/chrome/browser/supervised_user/supervised_user_denylist.h index dd8f036..e774311 100644 --- a/chrome/browser/supervised_user/supervised_user_denylist.h +++ b/chrome/browser/supervised_user/supervised_user_denylist.h
@@ -11,7 +11,7 @@ #include <string> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/hash/sha1.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/supervised_user/supervised_user_google_auth_navigation_throttle.cc b/chrome/browser/supervised_user/supervised_user_google_auth_navigation_throttle.cc index eb57e6c..772cc91d 100644 --- a/chrome/browser/supervised_user/supervised_user_google_auth_navigation_throttle.cc +++ b/chrome/browser/supervised_user/supervised_user_google_auth_navigation_throttle.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/supervised_user/supervised_user_google_auth_navigation_throttle.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/notreached.h" #include "build/build_config.h"
diff --git a/chrome/browser/supervised_user/supervised_user_interstitial.cc b/chrome/browser/supervised_user/supervised_user_interstitial.cc index e8b9a22..4f4c786 100644 --- a/chrome/browser/supervised_user/supervised_user_interstitial.cc +++ b/chrome/browser/supervised_user/supervised_user_interstitial.cc
@@ -6,9 +6,9 @@ #include <stddef.h> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/memory/weak_ptr.h" #include "base/metrics/histogram_macros.h"
diff --git a/chrome/browser/supervised_user/supervised_user_interstitial.h b/chrome/browser/supervised_user/supervised_user_interstitial.h index d64d2d9..752171e 100644 --- a/chrome/browser/supervised_user/supervised_user_interstitial.h +++ b/chrome/browser/supervised_user/supervised_user_interstitial.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "build/chromeos_buildflags.h" #include "components/supervised_user/core/browser/supervised_user_error_page.h"
diff --git a/chrome/browser/supervised_user/supervised_user_model_type_controller_unittest.cc b/chrome/browser/supervised_user/supervised_user_model_type_controller_unittest.cc index 4871a07..df1600d1 100644 --- a/chrome/browser/supervised_user/supervised_user_model_type_controller_unittest.cc +++ b/chrome/browser/supervised_user/supervised_user_model_type_controller_unittest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/supervised_user/supervised_user_sync_model_type_controller.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "chrome/test/base/testing_profile.h" #include "components/sync/base/model_type.h" #include "components/sync/base/sync_mode.h"
diff --git a/chrome/browser/supervised_user/supervised_user_navigation_observer.cc b/chrome/browser/supervised_user/supervised_user_navigation_observer.cc index df43fcb..e1c2f79 100644 --- a/chrome/browser/supervised_user/supervised_user_navigation_observer.cc +++ b/chrome/browser/supervised_user/supervised_user_navigation_observer.cc
@@ -6,9 +6,9 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/ptr_util.h" #include "base/metrics/histogram_macros.h" #include "chrome/browser/history/history_service_factory.h"
diff --git a/chrome/browser/supervised_user/supervised_user_navigation_throttle.cc b/chrome/browser/supervised_user/supervised_user_navigation_throttle.cc index 1298ce4..381f9e90 100644 --- a/chrome/browser/supervised_user/supervised_user_navigation_throttle.cc +++ b/chrome/browser/supervised_user/supervised_user_navigation_throttle.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/supervised_user/supervised_user_navigation_throttle.h" -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/ptr_util.h" #include "base/metrics/histogram_functions.h"
diff --git a/chrome/browser/supervised_user/supervised_user_pref_store.cc b/chrome/browser/supervised_user/supervised_user_pref_store.cc index f9d188e..52930c4 100644 --- a/chrome/browser/supervised_user/supervised_user_pref_store.cc +++ b/chrome/browser/supervised_user/supervised_user_pref_store.cc
@@ -9,9 +9,9 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/command_line.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "base/strings/string_piece.h" #include "base/values.h"
diff --git a/chrome/browser/supervised_user/supervised_user_service.cc b/chrome/browser/supervised_user/supervised_user_service.cc index 182c23d..bf6a672 100644 --- a/chrome/browser/supervised_user/supervised_user_service.cc +++ b/chrome/browser/supervised_user/supervised_user_service.cc
@@ -8,11 +8,11 @@ #include <set> #include <utility> -#include "base/bind.h" #include "base/containers/contains.h" #include "base/feature_list.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/scoped_refptr.h" #include "base/metrics/histogram_functions.h"
diff --git a/chrome/browser/supervised_user/supervised_user_service.h b/chrome/browser/supervised_user/supervised_user_service.h index 6a95ecc..0e320e0 100644 --- a/chrome/browser/supervised_user/supervised_user_service.h +++ b/chrome/browser/supervised_user/supervised_user_service.h
@@ -11,7 +11,7 @@ #include <set> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" #include "base/observer_list.h"
diff --git a/chrome/browser/supervised_user/supervised_user_service_browsertest.cc b/chrome/browser/supervised_user/supervised_user_service_browsertest.cc index 7309751..98a3e1e 100644 --- a/chrome/browser/supervised_user/supervised_user_service_browsertest.cc +++ b/chrome/browser/supervised_user/supervised_user_service_browsertest.cc
@@ -6,11 +6,11 @@ #include <memory> -#include "base/callback.h" #include "base/command_line.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/callback.h" #include "base/strings/utf_string_conversions.h" #include "base/test/bind.h" #include "base/test/scoped_path_override.h"
diff --git a/chrome/browser/supervised_user/supervised_user_settings_service.cc b/chrome/browser/supervised_user/supervised_user_settings_service.cc index 65fb08bb..3c9b1b8 100644 --- a/chrome/browser/supervised_user/supervised_user_settings_service.cc +++ b/chrome/browser/supervised_user/supervised_user_settings_service.cc
@@ -9,7 +9,7 @@ #include <set> #include <utility> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/logging.h"
diff --git a/chrome/browser/supervised_user/supervised_user_settings_service.h b/chrome/browser/supervised_user/supervised_user_settings_service.h index a220dd8..cd6551a 100644 --- a/chrome/browser/supervised_user/supervised_user_settings_service.h +++ b/chrome/browser/supervised_user/supervised_user_settings_service.h
@@ -9,8 +9,8 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/callback_list.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "base/strings/string_piece_forward.h" #include "base/values.h"
diff --git a/chrome/browser/supervised_user/supervised_user_settings_service_unittest.cc b/chrome/browser/supervised_user/supervised_user_settings_service_unittest.cc index 3dee10a..fe0ee943 100644 --- a/chrome/browser/supervised_user/supervised_user_settings_service_unittest.cc +++ b/chrome/browser/supervised_user/supervised_user_settings_service_unittest.cc
@@ -7,8 +7,8 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/json/json_reader.h" #include "base/strings/string_util.h" #include "base/test/mock_callback.h"
diff --git a/chrome/browser/supervised_user/supervised_user_sync_model_type_controller.cc b/chrome/browser/supervised_user/supervised_user_sync_model_type_controller.cc index bea5b68a..e5b7e25a 100644 --- a/chrome/browser/supervised_user/supervised_user_sync_model_type_controller.cc +++ b/chrome/browser/supervised_user/supervised_user_sync_model_type_controller.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/supervised_user/supervised_user_sync_model_type_controller.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/profiles/profile.h" #include "components/sync/model/model_type_store_service.h"
diff --git a/chrome/browser/supervised_user/supervised_user_sync_model_type_controller.h b/chrome/browser/supervised_user/supervised_user_sync_model_type_controller.h index 1b4e8287..c10fc31 100644 --- a/chrome/browser/supervised_user/supervised_user_sync_model_type_controller.h +++ b/chrome/browser/supervised_user/supervised_user_sync_model_type_controller.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_SYNC_MODEL_TYPE_CONTROLLER_H_ #define CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_SYNC_MODEL_TYPE_CONTROLLER_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "components/sync/driver/syncable_service_based_model_type_controller.h"
diff --git a/chrome/browser/supervised_user/supervised_user_url_filter.cc b/chrome/browser/supervised_user/supervised_user_url_filter.cc index bf0f31c..3047c087 100644 --- a/chrome/browser/supervised_user/supervised_user_url_filter.cc +++ b/chrome/browser/supervised_user/supervised_user_url_filter.cc
@@ -7,9 +7,9 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/containers/contains.h" #include "base/containers/fixed_flat_set.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h" #include "base/no_destructor.h"
diff --git a/chrome/browser/supervised_user/supervised_user_url_filter.h b/chrome/browser/supervised_user/supervised_user_url_filter.h index 1cbf4ae..494e728 100644 --- a/chrome/browser/supervised_user/supervised_user_url_filter.h +++ b/chrome/browser/supervised_user/supervised_user_url_filter.h
@@ -10,7 +10,7 @@ #include <string> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/observer_list.h" #include "base/sequence_checker.h"
diff --git a/chrome/browser/supervised_user/supervised_user_url_filter_browsertest.cc b/chrome/browser/supervised_user/supervised_user_url_filter_browsertest.cc index 5bfca6bb..45ea637 100644 --- a/chrome/browser/supervised_user/supervised_user_url_filter_browsertest.cc +++ b/chrome/browser/supervised_user/supervised_user_url_filter_browsertest.cc
@@ -4,9 +4,9 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" #include "base/test/bind.h"
diff --git a/chrome/browser/supervised_user/supervised_user_url_filter_unittest.cc b/chrome/browser/supervised_user/supervised_user_url_filter_unittest.cc index 986b301..e059935f 100644 --- a/chrome/browser/supervised_user/supervised_user_url_filter_unittest.cc +++ b/chrome/browser/supervised_user/supervised_user_url_filter_unittest.cc
@@ -7,8 +7,8 @@ #include <map> #include <memory> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ref_counted.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/supervised_user/web_approvals_manager.cc b/chrome/browser/supervised_user/web_approvals_manager.cc index de86e06..c1b3be31 100644 --- a/chrome/browser/supervised_user/web_approvals_manager.cc +++ b/chrome/browser/supervised_user/web_approvals_manager.cc
@@ -5,8 +5,8 @@ #include "chrome/browser/supervised_user/web_approvals_manager.h" #include <string> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/json/json_reader.h" #include "base/logging.h" #include "base/metrics/histogram_functions.h"
diff --git a/chrome/browser/supervised_user/web_approvals_manager.h b/chrome/browser/supervised_user/web_approvals_manager.h index 2e6b4d34..72e6a76 100644 --- a/chrome/browser/supervised_user/web_approvals_manager.h +++ b/chrome/browser/supervised_user/web_approvals_manager.h
@@ -11,7 +11,7 @@ #include <string> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/gtest_prod_util.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h"
diff --git a/chrome/browser/supervised_user/web_approvals_manager_unittest.cc b/chrome/browser/supervised_user/web_approvals_manager_unittest.cc index fbda9d2..708cef5 100644 --- a/chrome/browser/supervised_user/web_approvals_manager_unittest.cc +++ b/chrome/browser/supervised_user/web_approvals_manager_unittest.cc
@@ -8,7 +8,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/test/metrics/histogram_tester.h" #include "base/time/time.h"
diff --git a/chrome/browser/support_tool/ash/chrome_user_logs_data_collector.h b/chrome/browser/support_tool/ash/chrome_user_logs_data_collector.h index d72de3a..b28ab94 100644 --- a/chrome/browser/support_tool/ash/chrome_user_logs_data_collector.h +++ b/chrome/browser/support_tool/ash/chrome_user_logs_data_collector.h
@@ -11,8 +11,8 @@ #include <vector> #include "base/barrier_closure.h" -#include "base/callback_forward.h" #include "base/files/file_path.h" +#include "base/functional/callback_forward.h" #include "base/memory/scoped_refptr.h" #include "base/sequence_checker.h" #include "base/task/sequenced_task_runner.h"
diff --git a/chrome/browser/support_tool/ash/network_health_data_collector.h b/chrome/browser/support_tool/ash/network_health_data_collector.h index ca999e4..e54a88c 100644 --- a/chrome/browser/support_tool/ash/network_health_data_collector.h +++ b/chrome/browser/support_tool/ash/network_health_data_collector.h
@@ -8,8 +8,8 @@ #include <set> #include <string> -#include "base/callback_forward.h" #include "base/files/file_path.h" +#include "base/functional/callback_forward.h" #include "base/memory/scoped_refptr.h" #include "base/sequence_checker.h" #include "base/task/sequenced_task_runner.h"
diff --git a/chrome/browser/support_tool/ash/network_routes_data_collector.cc b/chrome/browser/support_tool/ash/network_routes_data_collector.cc index 41775fc2..9deb1fc 100644 --- a/chrome/browser/support_tool/ash/network_routes_data_collector.cc +++ b/chrome/browser/support_tool/ash/network_routes_data_collector.cc
@@ -9,11 +9,11 @@ #include <utility> #include "base/barrier_closure.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/check.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/logging.h" #include "base/memory/scoped_refptr.h"
diff --git a/chrome/browser/support_tool/ash/network_routes_data_collector.h b/chrome/browser/support_tool/ash/network_routes_data_collector.h index d531db7..c31d6535 100644 --- a/chrome/browser/support_tool/ash/network_routes_data_collector.h +++ b/chrome/browser/support_tool/ash/network_routes_data_collector.h
@@ -10,8 +10,8 @@ #include <vector> #include "base/barrier_closure.h" -#include "base/callback_forward.h" #include "base/files/file_path.h" +#include "base/functional/callback_forward.h" #include "base/memory/scoped_refptr.h" #include "base/sequence_checker.h" #include "base/task/sequenced_task_runner.h"
diff --git a/chrome/browser/support_tool/ash/shill_data_collector.cc b/chrome/browser/support_tool/ash/shill_data_collector.cc index f3e7e09..1521468 100644 --- a/chrome/browser/support_tool/ash/shill_data_collector.cc +++ b/chrome/browser/support_tool/ash/shill_data_collector.cc
@@ -4,10 +4,10 @@ #include "chrome/browser/support_tool/ash/shill_data_collector.h" -#include "base/bind.h" #include "base/containers/contains.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/json/json_writer.h" #include "base/logging.h" #include "base/strings/strcat.h"
diff --git a/chrome/browser/support_tool/ash/shill_data_collector.h b/chrome/browser/support_tool/ash/shill_data_collector.h index 12b8d5b..a207726 100644 --- a/chrome/browser/support_tool/ash/shill_data_collector.h +++ b/chrome/browser/support_tool/ash/shill_data_collector.h
@@ -11,8 +11,8 @@ #include <string> #include "base/atomic_ref_count.h" -#include "base/callback_forward.h" #include "base/files/file_path.h" +#include "base/functional/callback_forward.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h"
diff --git a/chrome/browser/support_tool/ash/shill_data_collector_unittest.cc b/chrome/browser/support_tool/ash/shill_data_collector_unittest.cc index 993aac177..fc6c8cc 100644 --- a/chrome/browser/support_tool/ash/shill_data_collector_unittest.cc +++ b/chrome/browser/support_tool/ash/shill_data_collector_unittest.cc
@@ -9,11 +9,11 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/files/file_enumerator.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/memory/scoped_refptr.h" #include "base/run_loop.h" #include "base/task/task_traits.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 ee6d058..c92a0b1 100644 --- a/chrome/browser/support_tool/ash/ui_hierarchy_data_collector.cc +++ b/chrome/browser/support_tool/ash/ui_hierarchy_data_collector.cc
@@ -9,11 +9,11 @@ #include <vector> #include "ash/public/cpp/debug_utils.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/check.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/memory/scoped_refptr.h" #include "base/task/sequenced_task_runner.h"
diff --git a/chrome/browser/support_tool/ash/ui_hierarchy_data_collector.h b/chrome/browser/support_tool/ash/ui_hierarchy_data_collector.h index 87e651aa..691fa9b2 100644 --- a/chrome/browser/support_tool/ash/ui_hierarchy_data_collector.h +++ b/chrome/browser/support_tool/ash/ui_hierarchy_data_collector.h
@@ -7,8 +7,8 @@ #include <set> -#include "base/callback_forward.h" #include "base/files/file_path.h" +#include "base/functional/callback_forward.h" #include "base/memory/scoped_refptr.h" #include "base/sequence_checker.h" #include "base/task/sequenced_task_runner.h"
diff --git a/chrome/browser/support_tool/data_collector.h b/chrome/browser/support_tool/data_collector.h index 6965559..c29d849 100644 --- a/chrome/browser/support_tool/data_collector.h +++ b/chrome/browser/support_tool/data_collector.h
@@ -11,8 +11,8 @@ #include <string> #include <tuple> -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/task/sequenced_task_runner.h" #include "components/feedback/pii_types.h"
diff --git a/chrome/browser/support_tool/policy_data_collector.h b/chrome/browser/support_tool/policy_data_collector.h index 306c8e4..5416ccf0 100644 --- a/chrome/browser/support_tool/policy_data_collector.h +++ b/chrome/browser/support_tool/policy_data_collector.h
@@ -9,8 +9,8 @@ #include <set> #include <string> -#include "base/callback_forward.h" #include "base/files/file_path.h" +#include "base/functional/callback_forward.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h"
diff --git a/chrome/browser/support_tool/support_packet_metadata.cc b/chrome/browser/support_tool/support_packet_metadata.cc index 87ffc956..301a8d8 100644 --- a/chrome/browser/support_tool/support_packet_metadata.cc +++ b/chrome/browser/support_tool/support_packet_metadata.cc
@@ -10,10 +10,10 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_forward.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_forward.h" #include "base/guid.h" #include "base/i18n/time_formatting.h" #include "base/location.h"
diff --git a/chrome/browser/support_tool/support_packet_metadata.h b/chrome/browser/support_tool/support_packet_metadata.h index 21099ef..01473ab 100644 --- a/chrome/browser/support_tool/support_packet_metadata.h +++ b/chrome/browser/support_tool/support_packet_metadata.h
@@ -11,8 +11,8 @@ #include <string> #include <vector> -#include "base/callback_forward.h" #include "base/files/file_path.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h" #include "base/values.h"
diff --git a/chrome/browser/support_tool/support_tool_handler.cc b/chrome/browser/support_tool/support_tool_handler.cc index 1f5098e..da451ed3 100644 --- a/chrome/browser/support_tool/support_tool_handler.cc +++ b/chrome/browser/support_tool/support_tool_handler.cc
@@ -13,12 +13,12 @@ #include <vector> #include "base/barrier_closure.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/check.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/logging.h" #include "base/memory/scoped_refptr.h"
diff --git a/chrome/browser/support_tool/support_tool_handler.h b/chrome/browser/support_tool/support_tool_handler.h index 02833af..bc36585 100644 --- a/chrome/browser/support_tool/support_tool_handler.h +++ b/chrome/browser/support_tool/support_tool_handler.h
@@ -9,9 +9,9 @@ #include <set> #include <vector> -#include "base/callback_forward.h" #include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/callback_forward.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h"
diff --git a/chrome/browser/support_tool/support_tool_handler_unittest.cc b/chrome/browser/support_tool/support_tool_handler_unittest.cc index 4161315..3f55b84d 100644 --- a/chrome/browser/support_tool/support_tool_handler_unittest.cc +++ b/chrome/browser/support_tool/support_tool_handler_unittest.cc
@@ -11,11 +11,11 @@ #include <string> #include <vector> -#include "base/bind.h" -#include "base/callback.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/run_loop.h" #include "base/task/bind_post_task.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/support_tool/system_log_source_data_collector_adaptor.cc b/chrome/browser/support_tool/system_log_source_data_collector_adaptor.cc index f44841ff3..77c3269 100644 --- a/chrome/browser/support_tool/system_log_source_data_collector_adaptor.cc +++ b/chrome/browser/support_tool/system_log_source_data_collector_adaptor.cc
@@ -10,9 +10,9 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/check.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/scoped_refptr.h" #include "base/task/sequenced_task_runner.h"
diff --git a/chrome/browser/support_tool/system_log_source_data_collector_adaptor.h b/chrome/browser/support_tool/system_log_source_data_collector_adaptor.h index bf5f92ba..ea6af9d 100644 --- a/chrome/browser/support_tool/system_log_source_data_collector_adaptor.h +++ b/chrome/browser/support_tool/system_log_source_data_collector_adaptor.h
@@ -9,8 +9,8 @@ #include <set> #include <string> -#include "base/callback_forward.h" #include "base/files/file_path.h" +#include "base/functional/callback_forward.h" #include "base/memory/scoped_refptr.h" #include "base/sequence_checker.h" #include "base/task/sequenced_task_runner.h"
diff --git a/chrome/browser/sync/android/sync_service_android_bridge.cc b/chrome/browser/sync/android/sync_service_android_bridge.cc index 0e2e7631..071e9f4 100644 --- a/chrome/browser/sync/android/sync_service_android_bridge.cc +++ b/chrome/browser/sync/android/sync_service_android_bridge.cc
@@ -9,8 +9,8 @@ #include "base/android/jni_array.h" #include "base/android/jni_string.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/i18n/time_formatting.h" #include "base/json/json_writer.h" #include "base/logging.h"
diff --git a/chrome/browser/sync/chrome_sync_client.cc b/chrome/browser/sync/chrome_sync_client.cc index f544d77..147b8c2 100644 --- a/chrome/browser/sync/chrome_sync_client.cc +++ b/chrome/browser/sync/chrome_sync_client.cc
@@ -8,9 +8,9 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/feature_list.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/path_service.h" #include "base/syslog_logging.h" #include "build/build_config.h"
diff --git a/chrome/browser/sync/device_info_sync_service_factory.cc b/chrome/browser/sync/device_info_sync_service_factory.cc index e096960..67c0319 100644 --- a/chrome/browser/sync/device_info_sync_service_factory.cc +++ b/chrome/browser/sync/device_info_sync_service_factory.cc
@@ -9,7 +9,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/singleton.h" #include "base/time/default_clock.h" #include "build/build_config.h"
diff --git a/chrome/browser/sync/glue/extension_model_type_controller.h b/chrome/browser/sync/glue/extension_model_type_controller.h index 330908e..f8a1eaf 100644 --- a/chrome/browser/sync/glue/extension_model_type_controller.h +++ b/chrome/browser/sync/glue/extension_model_type_controller.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_SYNC_GLUE_EXTENSION_MODEL_TYPE_CONTROLLER_H_ #define CHROME_BROWSER_SYNC_GLUE_EXTENSION_MODEL_TYPE_CONTROLLER_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "components/sync/driver/syncable_service_based_model_type_controller.h"
diff --git a/chrome/browser/sync/glue/extension_setting_model_type_controller.h b/chrome/browser/sync/glue/extension_setting_model_type_controller.h index a01e9644..1969b15 100644 --- a/chrome/browser/sync/glue/extension_setting_model_type_controller.h +++ b/chrome/browser/sync/glue/extension_setting_model_type_controller.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_SYNC_GLUE_EXTENSION_SETTING_MODEL_TYPE_CONTROLLER_H_ #define CHROME_BROWSER_SYNC_GLUE_EXTENSION_SETTING_MODEL_TYPE_CONTROLLER_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "components/sync/driver/non_ui_syncable_service_based_model_type_controller.h"
diff --git a/chrome/browser/sync/glue/sync_start_util.cc b/chrome/browser/sync/glue/sync_start_util.cc index 47499d8..019a6fd 100644 --- a/chrome/browser/sync/glue/sync_start_util.cc +++ b/chrome/browser/sync/glue/sync_start_util.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/sync/glue/sync_start_util.h" -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/sync/send_tab_to_self_sync_service_factory.cc b/chrome/browser/sync/send_tab_to_self_sync_service_factory.cc index 4ca4ebcf..2cec0824 100644 --- a/chrome/browser/sync/send_tab_to_self_sync_service_factory.cc +++ b/chrome/browser/sync/send_tab_to_self_sync_service_factory.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/sync/send_tab_to_self_sync_service_factory.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/singleton.h" #include "chrome/browser/history/history_service_factory.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/sync/sessions/sync_sessions_router_tab_helper_browsertest.cc b/chrome/browser/sync/sessions/sync_sessions_router_tab_helper_browsertest.cc index 1f59b06..af832f3d 100644 --- a/chrome/browser/sync/sessions/sync_sessions_router_tab_helper_browsertest.cc +++ b/chrome/browser/sync/sessions/sync_sessions_router_tab_helper_browsertest.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 "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "chrome/browser/sync/sessions/sync_sessions_web_contents_router.h"
diff --git a/chrome/browser/sync/sessions/sync_sessions_web_contents_router.cc b/chrome/browser/sync/sessions/sync_sessions_web_contents_router.cc index 85f03207..0f45f67 100644 --- a/chrome/browser/sync/sessions/sync_sessions_web_contents_router.cc +++ b/chrome/browser/sync/sessions/sync_sessions_web_contents_router.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/sync/sessions/sync_sessions_web_contents_router.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "build/build_config.h" #include "chrome/browser/history/history_service_factory.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/sync/sessions/sync_sessions_web_contents_router_unittest.cc b/chrome/browser/sync/sessions/sync_sessions_web_contents_router_unittest.cc index 57b8e69..aaeb4dc 100644 --- a/chrome/browser/sync/sessions/sync_sessions_web_contents_router_unittest.cc +++ b/chrome/browser/sync/sessions/sync_sessions_web_contents_router_unittest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/sync/sessions/sync_sessions_web_contents_router.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "build/build_config.h" #include "chrome/browser/sync/sessions/sync_sessions_web_contents_router_factory.h"
diff --git a/chrome/browser/sync/sync_service_factory.cc b/chrome/browser/sync/sync_service_factory.cc index 023b57d..acb8ddc 100644 --- a/chrome/browser/sync/sync_service_factory.cc +++ b/chrome/browser/sync/sync_service_factory.cc
@@ -7,7 +7,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/singleton.h" #include "base/metrics/histogram_functions.h" #include "build/build_config.h"
diff --git a/chrome/browser/sync/sync_startup_tracker.cc b/chrome/browser/sync/sync_startup_tracker.cc index ded5d65..b97ecab 100644 --- a/chrome/browser/sync/sync_startup_tracker.cc +++ b/chrome/browser/sync/sync_startup_tracker.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/sync/sync_startup_tracker.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "components/sync/driver/sync_service.h" #include "google_apis/gaia/google_service_auth_error.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/chrome/browser/sync/sync_startup_tracker.h b/chrome/browser/sync/sync_startup_tracker.h index ab30f9c..8fa1118 100644 --- a/chrome/browser/sync/sync_startup_tracker.h +++ b/chrome/browser/sync/sync_startup_tracker.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_SYNC_SYNC_STARTUP_TRACKER_H_ #define CHROME_BROWSER_SYNC_SYNC_STARTUP_TRACKER_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/scoped_observation.h" #include "base/time/time.h"
diff --git a/chrome/browser/sync/test/integration/autofill_helper.cc b/chrome/browser/sync/test/integration/autofill_helper.cc index 8b085c7c..acbe971 100644 --- a/chrome/browser/sync/test/integration/autofill_helper.cc +++ b/chrome/browser/sync/test/integration/autofill_helper.cc
@@ -9,7 +9,7 @@ #include <map> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/guid.h" #include "base/run_loop.h" #include "base/synchronization/waitable_event.h"
diff --git a/chrome/browser/sync/test/integration/await_match_status_change_checker.h b/chrome/browser/sync/test/integration/await_match_status_change_checker.h index 380134b..ec7240ce 100644 --- a/chrome/browser/sync/test/integration/await_match_status_change_checker.h +++ b/chrome/browser/sync/test/integration/await_match_status_change_checker.h
@@ -7,7 +7,7 @@ #include <iosfwd> -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/sync/test/integration/multi_client_status_change_checker.h" // Helper class used in the datatype specific AwaitAllModelsMatch
diff --git a/chrome/browser/sync/test/integration/bookmarks_helper.cc b/chrome/browser/sync/test/integration/bookmarks_helper.cc index e47ea4e..2eccd2919 100644 --- a/chrome/browser/sync/test/integration/bookmarks_helper.cc +++ b/chrome/browser/sync/test/integration/bookmarks_helper.cc
@@ -11,9 +11,9 @@ #include <set> #include <vector> -#include "base/bind.h" #include "base/containers/stack.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/guid.h" #include "base/memory/raw_ptr.h" #include "base/path_service.h"
diff --git a/chrome/browser/sync/test/integration/bookmarks_helper.h b/chrome/browser/sync/test/integration/bookmarks_helper.h index 2741b08..985f533e 100644 --- a/chrome/browser/sync/test/integration/bookmarks_helper.h +++ b/chrome/browser/sync/test/integration/bookmarks_helper.h
@@ -12,7 +12,7 @@ #include <utility> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h"
diff --git a/chrome/browser/sync/test/integration/dictionary_load_observer.h b/chrome/browser/sync/test/integration/dictionary_load_observer.h index ef24e08b..a826a040 100644 --- a/chrome/browser/sync/test/integration/dictionary_load_observer.h +++ b/chrome/browser/sync/test/integration/dictionary_load_observer.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_SYNC_TEST_INTEGRATION_DICTIONARY_LOAD_OBSERVER_H_ #define CHROME_BROWSER_SYNC_TEST_INTEGRATION_DICTIONARY_LOAD_OBSERVER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/spellchecker/spellcheck_custom_dictionary.h" // DictionaryLoadObserver is used when blocking until the
diff --git a/chrome/browser/sync/test/integration/encryption_helper.cc b/chrome/browser/sync/test/integration/encryption_helper.cc index 09dae740..478df7c3 100644 --- a/chrome/browser/sync/test/integration/encryption_helper.cc +++ b/chrome/browser/sync/test/integration/encryption_helper.cc
@@ -7,7 +7,7 @@ #include <string> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "components/sync/base/passphrase_enums.h" #include "components/sync/driver/sync_client.h" #include "components/sync/driver/sync_service_impl.h"
diff --git a/chrome/browser/sync/test/integration/extension_settings_helper.cc b/chrome/browser/sync/test/integration/extension_settings_helper.cc index f33ad29..807d827 100644 --- a/chrome/browser/sync/test/integration/extension_settings_helper.cc +++ b/chrome/browser/sync/test/integration/extension_settings_helper.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/json/json_writer.h" #include "base/synchronization/waitable_event.h" #include "base/values.h"
diff --git a/chrome/browser/sync/test/integration/passwords_helper.cc b/chrome/browser/sync/test/integration/passwords_helper.cc index b05689b..11bc3a6 100644 --- a/chrome/browser/sync/test/integration/passwords_helper.cc +++ b/chrome/browser/sync/test/integration/passwords_helper.cc
@@ -8,8 +8,8 @@ #include <utility> #include "base/base64.h" -#include "base/bind.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/strings/escape.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/sync/test/integration/preferences_helper.cc b/chrome/browser/sync/test/integration/preferences_helper.cc index ef3b9d24..7b4e7e7 100644 --- a/chrome/browser/sync/test/integration/preferences_helper.cc +++ b/chrome/browser/sync/test/integration/preferences_helper.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/notreached.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sync/test/integration/sync_datatype_helper.h"
diff --git a/chrome/browser/sync/test/integration/printers_helper.cc b/chrome/browser/sync/test/integration/printers_helper.cc index 28576e8..b14595a 100644 --- a/chrome/browser/sync/test/integration/printers_helper.cc +++ b/chrome/browser/sync/test/integration/printers_helper.cc
@@ -10,7 +10,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/ranges/algorithm.h" #include "base/strings/stringprintf.h" #include "chrome/browser/ash/printing/synced_printers_manager.h"
diff --git a/chrome/browser/sync/test/integration/quiesce_status_change_checker.cc b/chrome/browser/sync/test/integration/quiesce_status_change_checker.cc index b03cc45..12d58c0 100644 --- a/chrome/browser/sync/test/integration/quiesce_status_change_checker.cc +++ b/chrome/browser/sync/test/integration/quiesce_status_change_checker.cc
@@ -6,8 +6,8 @@ #include <stddef.h> -#include "base/bind.h" #include "base/format_macros.h" +#include "base/functional/bind.h" #include "base/strings/string_number_conversions.h" #include "chrome/browser/sync/test/integration/updated_progress_marker_checker.h" #include "components/sync/driver/sync_service_impl.h"
diff --git a/chrome/browser/sync/test/integration/search_engines_helper.cc b/chrome/browser/sync/test/integration/search_engines_helper.cc index 71765b61a..598d53dc 100644 --- a/chrome/browser/sync/test/integration/search_engines_helper.cc +++ b/chrome/browser/sync/test/integration/search_engines_helper.cc
@@ -8,7 +8,7 @@ #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/guid.h" #include "base/hash/sha1.h" #include "base/strings/strcat.h"
diff --git a/chrome/browser/sync/test/integration/secondary_account_helper.cc b/chrome/browser/sync/test/integration/secondary_account_helper.cc index e9636fa0..620c911d 100644 --- a/chrome/browser/sync/test/integration/secondary_account_helper.cc +++ b/chrome/browser/sync/test/integration/secondary_account_helper.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/sync/test/integration/secondary_account_helper.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "build/chromeos_buildflags.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/signin/chrome_signin_client_factory.h"
diff --git a/chrome/browser/sync/test/integration/sessions_helper.cc b/chrome/browser/sync/test/integration/sessions_helper.cc index 826be06b..382e516 100644 --- a/chrome/browser/sync/test/integration/sessions_helper.cc +++ b/chrome/browser/sync/test/integration/sessions_helper.cc
@@ -9,8 +9,8 @@ #include <set> #include <utility> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/weak_ptr.h" #include "base/ranges/algorithm.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 c671c2a..d5aa602f 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
@@ -5,7 +5,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/guid.h" #include "base/memory/ref_counted_memory.h" #include "base/metrics/statistics_recorder.h"
diff --git a/chrome/browser/sync/test/integration/single_client_extensions_sync_test.cc b/chrome/browser/sync/test/integration/single_client_extensions_sync_test.cc index 618967a..c1e3f00 100644 --- a/chrome/browser/sync/test/integration/single_client_extensions_sync_test.cc +++ b/chrome/browser/sync/test/integration/single_client_extensions_sync_test.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 "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/sync/test/integration/await_match_status_change_checker.h" #include "chrome/browser/sync/test/integration/extensions_helper.h" #include "chrome/browser/sync/test/integration/sync_test.h"
diff --git a/chrome/browser/sync/test/integration/single_client_user_events_sync_test.cc b/chrome/browser/sync/test/integration/single_client_user_events_sync_test.cc index 1b5a8586..e43cb7c5 100644 --- a/chrome/browser/sync/test/integration/single_client_user_events_sync_test.cc +++ b/chrome/browser/sync/test/integration/single_client_user_events_sync_test.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 "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/statistics_recorder.h" #include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h"
diff --git a/chrome/browser/sync/test/integration/status_change_checker.cc b/chrome/browser/sync/test/integration/status_change_checker.cc index 3f34478..c863996d 100644 --- a/chrome/browser/sync/test/integration/status_change_checker.cc +++ b/chrome/browser/sync/test/integration/status_change_checker.cc
@@ -7,8 +7,8 @@ #include <sstream> #include <string> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/strings/string_number_conversions.h" #include "base/timer/timer.h"
diff --git a/chrome/browser/sync/test/integration/sync_exponential_backoff_test.cc b/chrome/browser/sync/test/integration/sync_exponential_backoff_test.cc index c7f0579..748f5b05 100644 --- a/chrome/browser/sync/test/integration/sync_exponential_backoff_test.cc +++ b/chrome/browser/sync/test/integration/sync_exponential_backoff_test.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 "base/bind.h" +#include "base/functional/bind.h" #include "build/chromeos_buildflags.h" #include "chrome/browser/sync/test/integration/bookmarks_helper.h" #include "chrome/browser/sync/test/integration/exponential_backoff_helper.h"
diff --git a/chrome/browser/sync/test/integration/sync_service_impl_harness.h b/chrome/browser/sync/test/integration/sync_service_impl_harness.h index cecd03c..8d1398ca 100644 --- a/chrome/browser/sync/test/integration/sync_service_impl_harness.h +++ b/chrome/browser/sync/test/integration/sync_service_impl_harness.h
@@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/sync/test/integration/sync_test.cc b/chrome/browser/sync/test/integration/sync_test.cc index 7650d52..e70bdb77 100644 --- a/chrome/browser/sync/test/integration/sync_test.cc +++ b/chrome/browser/sync/test/integration/sync_test.cc
@@ -6,11 +6,11 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.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 657afa7c..408b9b5 100644 --- a/chrome/browser/sync/test/integration/sync_test_utils_android.cc +++ b/chrome/browser/sync/test/integration/sync_test_utils_android.cc
@@ -5,7 +5,7 @@ #include "chrome/browser/sync/test/integration/sync_test_utils_android.h" #include "base/android/jni_android.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/run_loop.h" #include "base/task/thread_pool.h" #include "base/test/bind.h"
diff --git a/chrome/browser/sync/test/integration/themes_helper.cc b/chrome/browser/sync/test/integration/themes_helper.cc index b644cbc..7a53932 100644 --- a/chrome/browser/sync/test/integration/themes_helper.cc +++ b/chrome/browser/sync/test/integration/themes_helper.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/sync/test/integration/themes_helper.h" -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/strings/string_number_conversions.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/updater/extension_updater.h"
diff --git a/chrome/browser/sync/test/integration/themes_helper.h b/chrome/browser/sync/test/integration/themes_helper.h index 8068bd7d..72acee1 100644 --- a/chrome/browser/sync/test/integration/themes_helper.h +++ b/chrome/browser/sync/test/integration/themes_helper.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/raw_ref.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/sync/test/integration/two_client_extension_apps_sync_test.cc b/chrome/browser/sync/test/integration/two_client_extension_apps_sync_test.cc index 9e87c0b5..a51d7c5 100644 --- a/chrome/browser/sync/test/integration/two_client_extension_apps_sync_test.cc +++ b/chrome/browser/sync/test/integration/two_client_extension_apps_sync_test.cc
@@ -6,7 +6,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "base/test/metrics/histogram_tester.h" #include "chrome/browser/chrome_notification_types.h"
diff --git a/chrome/browser/sync/test/integration/two_client_web_apps_bmo_sync_test.cc b/chrome/browser/sync/test/integration/two_client_web_apps_bmo_sync_test.cc index 0739d58..6c83d9c 100644 --- a/chrome/browser/sync/test/integration/two_client_web_apps_bmo_sync_test.cc +++ b/chrome/browser/sync/test/integration/two_client_web_apps_bmo_sync_test.cc
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/strings/utf_string_conversions.h" #include "base/test/bind.h" #include "build/build_config.h"
diff --git a/chrome/browser/sync/test/integration/two_client_web_apps_sync_test.cc b/chrome/browser/sync/test/integration/two_client_web_apps_sync_test.cc index 59f1a40..700f2ec 100644 --- a/chrome/browser/sync/test/integration/two_client_web_apps_sync_test.cc +++ b/chrome/browser/sync/test/integration/two_client_web_apps_sync_test.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 "base/bind.h" +#include "base/functional/bind.h" #include "base/scoped_observation.h" #include "base/strings/utf_string_conversions.h" #include "base/test/bind.h"
diff --git a/chrome/browser/sync/test/integration/typed_urls_helper.cc b/chrome/browser/sync/test/integration/typed_urls_helper.cc index 7473b2e..0b20d9e06 100644 --- a/chrome/browser/sync/test/integration/typed_urls_helper.cc +++ b/chrome/browser/sync/test/integration/typed_urls_helper.cc
@@ -10,8 +10,8 @@ #include <sstream> #include "base/big_endian.h" -#include "base/callback_helpers.h" #include "base/compiler_specific.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/memory/raw_ref.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/sync/test/integration/updated_progress_marker_checker.cc b/chrome/browser/sync/test/integration/updated_progress_marker_checker.cc index bef52a5..0cc6417 100644 --- a/chrome/browser/sync/test/integration/updated_progress_marker_checker.cc +++ b/chrome/browser/sync/test/integration/updated_progress_marker_checker.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/sync/test/integration/updated_progress_marker_checker.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/sync/test/integration/sync_datatype_helper.h" #include "chrome/browser/sync/test/integration/sync_test.h" #include "components/sync/driver/sync_service_impl.h"
diff --git a/chrome/browser/sync/test/integration/wallet_helper.cc b/chrome/browser/sync/test/integration/wallet_helper.cc index ad73ee0..09ce314 100644 --- a/chrome/browser/sync/test/integration/wallet_helper.cc +++ b/chrome/browser/sync/test/integration/wallet_helper.cc
@@ -6,7 +6,7 @@ #include <stddef.h> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/autofill/personal_data_manager_factory.h"
diff --git a/chrome/browser/sync/trusted_vault_client_android.h b/chrome/browser/sync/trusted_vault_client_android.h index 0b70291..e2d779d 100644 --- a/chrome/browser/sync/trusted_vault_client_android.h +++ b/chrome/browser/sync/trusted_vault_client_android.h
@@ -13,7 +13,7 @@ #include "base/android/jni_array.h" #include "base/android/jni_string.h" #include "base/android/scoped_java_ref.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/observer_list.h" #include "components/signin/public/identity_manager/account_info.h" #include "components/sync/driver/trusted_vault_client.h"
diff --git a/chrome/browser/sync/user_event_service_factory.cc b/chrome/browser/sync/user_event_service_factory.cc index b9bece0..9c8cf3c 100644 --- a/chrome/browser/sync/user_event_service_factory.cc +++ b/chrome/browser/sync/user_event_service_factory.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sync/model_type_store_service_factory.h" #include "chrome/browser/sync/session_sync_service_factory.h"
diff --git a/chrome/browser/sync_file_system/drive_backend/callback_helper.h b/chrome/browser/sync_file_system/drive_backend/callback_helper.h index a110a6c..59db0ce 100644 --- a/chrome/browser/sync_file_system/drive_backend/callback_helper.h +++ b/chrome/browser/sync_file_system/drive_backend/callback_helper.h
@@ -9,8 +9,8 @@ #include <memory> #include <type_traits> -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/task/sequenced_task_runner.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/sync_file_system/drive_backend/callback_helper_unittest.cc b/chrome/browser/sync_file_system/drive_backend/callback_helper_unittest.cc index e941805..c3ea6bac 100644 --- a/chrome/browser/sync_file_system/drive_backend/callback_helper_unittest.cc +++ b/chrome/browser/sync_file_system/drive_backend/callback_helper_unittest.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/sync_file_system/drive_backend/callback_helper.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/sync_file_system/drive_backend/callback_tracker.h b/chrome/browser/sync_file_system/drive_backend/callback_tracker.h index ac5f3a3..49b0495 100644 --- a/chrome/browser/sync_file_system/drive_backend/callback_tracker.h +++ b/chrome/browser/sync_file_system/drive_backend/callback_tracker.h
@@ -7,8 +7,8 @@ #include <map> -#include "base/bind.h" -#include "base/callback_forward.h" +#include "base/functional/bind.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/sync_file_system/drive_backend/callback_tracker_internal.h"
diff --git a/chrome/browser/sync_file_system/drive_backend/callback_tracker_internal.h b/chrome/browser/sync_file_system/drive_backend/callback_tracker_internal.h index f6b3439..8e4041c 100644 --- a/chrome/browser/sync_file_system/drive_backend/callback_tracker_internal.h +++ b/chrome/browser/sync_file_system/drive_backend/callback_tracker_internal.h
@@ -8,7 +8,7 @@ #include <memory> #include <utility> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/sync_file_system/drive_backend/callback_tracker_unittest.cc b/chrome/browser/sync_file_system/drive_backend/callback_tracker_unittest.cc index b0ac236b..2ff721c 100644 --- a/chrome/browser/sync_file_system/drive_backend/callback_tracker_unittest.cc +++ b/chrome/browser/sync_file_system/drive_backend/callback_tracker_unittest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/sync_file_system/drive_backend/callback_tracker.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "testing/gtest/include/gtest/gtest.h" namespace sync_file_system {
diff --git a/chrome/browser/sync_file_system/drive_backend/conflict_resolver.cc b/chrome/browser/sync_file_system/drive_backend/conflict_resolver.cc index c83606f..facee4b 100644 --- a/chrome/browser/sync_file_system/drive_backend/conflict_resolver.cc +++ b/chrome/browser/sync_file_system/drive_backend/conflict_resolver.cc
@@ -7,10 +7,10 @@ #include <stdint.h> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/check_op.h" #include "base/format_macros.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/notreached.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc b/chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc index 3b26efb..bb187bf 100644 --- a/chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc +++ b/chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc
@@ -7,10 +7,10 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h" #include "chrome/browser/sync_file_system/drive_backend/drive_backend_constants.h"
diff --git a/chrome/browser/sync_file_system/drive_backend/drive_backend_sync_unittest.cc b/chrome/browser/sync_file_system/drive_backend/drive_backend_sync_unittest.cc index b1b1ff5..d7f950ec 100644 --- a/chrome/browser/sync_file_system/drive_backend/drive_backend_sync_unittest.cc +++ b/chrome/browser/sync_file_system/drive_backend/drive_backend_sync_unittest.cc
@@ -9,10 +9,10 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/containers/contains.h" #include "base/containers/stack.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/task/sequenced_task_runner.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/sync_file_system/drive_backend/drive_backend_util.h b/chrome/browser/sync_file_system/drive_backend/drive_backend_util.h index 0f9f22d..5cc8fcb 100644 --- a/chrome/browser/sync_file_system/drive_backend/drive_backend_util.h +++ b/chrome/browser/sync_file_system/drive_backend/drive_backend_util.h
@@ -10,8 +10,8 @@ #include <memory> #include <string> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "chrome/browser/sync_file_system/drive_backend/metadata_database.pb.h" #include "chrome/browser/sync_file_system/sync_status_code.h" #include "google_apis/common/api_error_codes.h"
diff --git a/chrome/browser/sync_file_system/drive_backend/drive_service_on_worker.cc b/chrome/browser/sync_file_system/drive_backend/drive_service_on_worker.cc index 29cffce4..07f8ac1 100644 --- a/chrome/browser/sync_file_system/drive_backend/drive_service_on_worker.cc +++ b/chrome/browser/sync_file_system/drive_backend/drive_service_on_worker.cc
@@ -7,8 +7,8 @@ #include <memory> #include <string> -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/notreached.h" #include "base/task/single_thread_task_runner.h" #include "chrome/browser/sync_file_system/drive_backend/callback_helper.h"
diff --git a/chrome/browser/sync_file_system/drive_backend/drive_uploader_on_worker.cc b/chrome/browser/sync_file_system/drive_backend/drive_uploader_on_worker.cc index 3a96185..b0c0cebd 100644 --- a/chrome/browser/sync_file_system/drive_backend/drive_uploader_on_worker.cc +++ b/chrome/browser/sync_file_system/drive_backend/drive_uploader_on_worker.cc
@@ -6,7 +6,7 @@ #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/task/single_thread_task_runner.h" #include "chrome/browser/sync_file_system/drive_backend/callback_helper.h"
diff --git a/chrome/browser/sync_file_system/drive_backend/fake_drive_service_helper.cc b/chrome/browser/sync_file_system/drive_backend/fake_drive_service_helper.cc index d556c58ea..305253b 100644 --- a/chrome/browser/sync_file_system/drive_backend/fake_drive_service_helper.cc +++ b/chrome/browser/sync_file_system/drive_backend/fake_drive_service_helper.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "chrome/browser/sync_file_system/sync_file_system_test_util.h" #include "chrome/browser/sync_file_system/sync_status_code.h"
diff --git a/chrome/browser/sync_file_system/drive_backend/fake_drive_uploader.cc b/chrome/browser/sync_file_system/drive_backend/fake_drive_uploader.cc index 98e1ccb..77421c5 100644 --- a/chrome/browser/sync_file_system/drive_backend/fake_drive_uploader.cc +++ b/chrome/browser/sync_file_system/drive_backend/fake_drive_uploader.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/sync_file_system/drive_backend/fake_drive_uploader.h" -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/notreached.h" #include "base/run_loop.h"
diff --git a/chrome/browser/sync_file_system/drive_backend/fake_sync_worker.h b/chrome/browser/sync_file_system/drive_backend/fake_sync_worker.h index 848f6a26..cda8595ce 100644 --- a/chrome/browser/sync_file_system/drive_backend/fake_sync_worker.h +++ b/chrome/browser/sync_file_system/drive_backend/fake_sync_worker.h
@@ -9,7 +9,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/observer_list.h" #include "base/sequence_checker.h" #include "chrome/browser/sync_file_system/drive_backend/sync_worker_interface.h"
diff --git a/chrome/browser/sync_file_system/drive_backend/folder_creator.cc b/chrome/browser/sync_file_system/drive_backend/folder_creator.cc index 00da8f5..2fd24c7 100644 --- a/chrome/browser/sync_file_system/drive_backend/folder_creator.cc +++ b/chrome/browser/sync_file_system/drive_backend/folder_creator.cc
@@ -7,7 +7,7 @@ #include <stddef.h> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/sync_file_system/drive_backend/drive_backend_util.h" #include "chrome/browser/sync_file_system/drive_backend/metadata_database.h" #include "components/drive/drive_api_util.h"
diff --git a/chrome/browser/sync_file_system/drive_backend/list_changes_task.cc b/chrome/browser/sync_file_system/drive_backend/list_changes_task.cc index 916d2a9..0e73039d 100644 --- a/chrome/browser/sync_file_system/drive_backend/list_changes_task.cc +++ b/chrome/browser/sync_file_system/drive_backend/list_changes_task.cc
@@ -8,9 +8,9 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/containers/cxx20_erase.h" #include "base/format_macros.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/strings/stringprintf.h" #include "chrome/browser/sync_file_system/drive_backend/drive_backend_util.h"
diff --git a/chrome/browser/sync_file_system/drive_backend/list_changes_task_unittest.cc b/chrome/browser/sync_file_system/drive_backend/list_changes_task_unittest.cc index e35e2516..127c048 100644 --- a/chrome/browser/sync_file_system/drive_backend/list_changes_task_unittest.cc +++ b/chrome/browser/sync_file_system/drive_backend/list_changes_task_unittest.cc
@@ -10,9 +10,9 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/files/scoped_temp_dir.h" #include "base/format_macros.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h" #include "chrome/browser/sync_file_system/drive_backend/drive_backend_constants.h"
diff --git a/chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer.cc b/chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer.cc index 3db7195..ba5d3de 100644 --- a/chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer.cc +++ b/chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer.cc
@@ -9,10 +9,10 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" #include "base/check_op.h" #include "base/format_macros.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/notreached.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer_unittest.cc b/chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer_unittest.cc index 9fef898..a501e6dd 100644 --- a/chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer_unittest.cc +++ b/chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer_unittest.cc
@@ -7,9 +7,9 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h" #include "chrome/browser/sync_file_system/drive_backend/drive_backend_constants.h"
diff --git a/chrome/browser/sync_file_system/drive_backend/metadata_database.cc b/chrome/browser/sync_file_system/drive_backend/metadata_database.cc index ca80725..362588d 100644 --- a/chrome/browser/sync_file_system/drive_backend/metadata_database.cc +++ b/chrome/browser/sync_file_system/drive_backend/metadata_database.cc
@@ -9,12 +9,12 @@ #include <unordered_set> #include <utility> -#include "base/bind.h" #include "base/command_line.h" #include "base/containers/adapters.h" #include "base/containers/contains.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_piece.h"
diff --git a/chrome/browser/sync_file_system/drive_backend/metadata_database_unittest.cc b/chrome/browser/sync_file_system/drive_backend/metadata_database_unittest.cc index b9716e1..83e9cbb 100644 --- a/chrome/browser/sync_file_system/drive_backend/metadata_database_unittest.cc +++ b/chrome/browser/sync_file_system/drive_backend/metadata_database_unittest.cc
@@ -9,9 +9,9 @@ #include <unordered_map> #include <utility> -#include "base/bind.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/strings/string_number_conversions.h" #include "base/test/task_environment.h"
diff --git a/chrome/browser/sync_file_system/drive_backend/register_app_task.cc b/chrome/browser/sync_file_system/drive_backend/register_app_task.cc index b10bf4b..ccef5de 100644 --- a/chrome/browser/sync_file_system/drive_backend/register_app_task.cc +++ b/chrome/browser/sync_file_system/drive_backend/register_app_task.cc
@@ -7,7 +7,7 @@ #include <stdint.h> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "chrome/browser/sync_file_system/drive_backend/drive_backend_constants.h" #include "chrome/browser/sync_file_system/drive_backend/folder_creator.h"
diff --git a/chrome/browser/sync_file_system/drive_backend/remote_change_processor_on_worker.cc b/chrome/browser/sync_file_system/drive_backend/remote_change_processor_on_worker.cc index f8eabae..72a1709 100644 --- a/chrome/browser/sync_file_system/drive_backend/remote_change_processor_on_worker.cc +++ b/chrome/browser/sync_file_system/drive_backend/remote_change_processor_on_worker.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/sync_file_system/drive_backend/remote_change_processor_on_worker.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/weak_ptr.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/sync_file_system/drive_backend/remote_change_processor_wrapper.cc b/chrome/browser/sync_file_system/drive_backend/remote_change_processor_wrapper.cc index 31ac6931..b0287f9b 100644 --- a/chrome/browser/sync_file_system/drive_backend/remote_change_processor_wrapper.cc +++ b/chrome/browser/sync_file_system/drive_backend/remote_change_processor_wrapper.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/sync_file_system/drive_backend/remote_change_processor_wrapper.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/sync_file_system/remote_change_processor.h"
diff --git a/chrome/browser/sync_file_system/drive_backend/remote_to_local_syncer.cc b/chrome/browser/sync_file_system/drive_backend/remote_to_local_syncer.cc index 4e35cef..3eee8a4 100644 --- a/chrome/browser/sync_file_system/drive_backend/remote_to_local_syncer.cc +++ b/chrome/browser/sync_file_system/drive_backend/remote_to_local_syncer.cc
@@ -10,11 +10,11 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/check_op.h" #include "base/files/file_util.h" #include "base/format_macros.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/memory/ptr_util.h" #include "base/notreached.h"
diff --git a/chrome/browser/sync_file_system/drive_backend/remote_to_local_syncer_unittest.cc b/chrome/browser/sync_file_system/drive_backend/remote_to_local_syncer_unittest.cc index 69a99b7..6e52867 100644 --- a/chrome/browser/sync_file_system/drive_backend/remote_to_local_syncer_unittest.cc +++ b/chrome/browser/sync_file_system/drive_backend/remote_to_local_syncer_unittest.cc
@@ -8,9 +8,9 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h" #include "chrome/browser/sync_file_system/drive_backend/drive_backend_constants.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 646e61d25..17b0e8f 100644 --- a/chrome/browser/sync_file_system/drive_backend/sync_engine.cc +++ b/chrome/browser/sync_file_system/drive_backend/sync_engine.cc
@@ -7,8 +7,8 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/observer_list.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/sync_file_system/drive_backend/sync_engine_initializer.cc b/chrome/browser/sync_file_system/drive_backend/sync_engine_initializer.cc index 3fd3c9a..773f6de 100644 --- a/chrome/browser/sync_file_system/drive_backend/sync_engine_initializer.cc +++ b/chrome/browser/sync_file_system/drive_backend/sync_engine_initializer.cc
@@ -7,8 +7,8 @@ #include <stddef.h> #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "chrome/browser/sync_file_system/drive_backend/drive_backend_constants.h" #include "chrome/browser/sync_file_system/drive_backend/drive_backend_util.h"
diff --git a/chrome/browser/sync_file_system/drive_backend/sync_engine_initializer_unittest.cc b/chrome/browser/sync_file_system/drive_backend/sync_engine_initializer_unittest.cc index ab97a08..57a1482 100644 --- a/chrome/browser/sync_file_system/drive_backend/sync_engine_initializer_unittest.cc +++ b/chrome/browser/sync_file_system/drive_backend/sync_engine_initializer_unittest.cc
@@ -11,8 +11,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.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 7ab7f597..102195c 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
@@ -8,8 +8,8 @@ #include <utility> -#include "base/bind.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/sync_file_system/drive_backend/sync_task.cc b/chrome/browser/sync_file_system/drive_backend/sync_task.cc index 3f02fd7..dc0ffa38 100644 --- a/chrome/browser/sync_file_system/drive_backend/sync_task.cc +++ b/chrome/browser/sync_file_system/drive_backend/sync_task.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/sync_file_system/drive_backend/sync_task_manager.h" #include "chrome/browser/sync_file_system/drive_backend/sync_task_token.h" #include "chrome/browser/sync_file_system/drive_backend/task_dependency_manager.h"
diff --git a/chrome/browser/sync_file_system/drive_backend/sync_task_manager.cc b/chrome/browser/sync_file_system/drive_backend/sync_task_manager.cc index 236db17..9e9eadf 100644 --- a/chrome/browser/sync_file_system/drive_backend/sync_task_manager.cc +++ b/chrome/browser/sync_file_system/drive_backend/sync_task_manager.cc
@@ -7,8 +7,8 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/logging.h" #include "base/task/sequenced_task_runner.h"
diff --git a/chrome/browser/sync_file_system/drive_backend/sync_task_manager.h b/chrome/browser/sync_file_system/drive_backend/sync_task_manager.h index 979a4e4e..ef8d2149 100644 --- a/chrome/browser/sync_file_system/drive_backend/sync_task_manager.h +++ b/chrome/browser/sync_file_system/drive_backend/sync_task_manager.h
@@ -13,7 +13,7 @@ #include <unordered_map> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h" #include "chrome/browser/sync_file_system/drive_backend/task_dependency_manager.h"
diff --git a/chrome/browser/sync_file_system/drive_backend/sync_task_manager_unittest.cc b/chrome/browser/sync_file_system/drive_backend/sync_task_manager_unittest.cc index 37d68cc3..076b104a 100644 --- a/chrome/browser/sync_file_system/drive_backend/sync_task_manager_unittest.cc +++ b/chrome/browser/sync_file_system/drive_backend/sync_task_manager_unittest.cc
@@ -10,8 +10,8 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/containers/circular_deque.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/sync_file_system/drive_backend/sync_task_token.cc b/chrome/browser/sync_file_system/drive_backend/sync_task_token.cc index eb256f3..f8a99fa 100644 --- a/chrome/browser/sync_file_system/drive_backend/sync_task_token.cc +++ b/chrome/browser/sync_file_system/drive_backend/sync_task_token.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/ptr_util.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/sync_file_system/drive_backend/sync_task_token.h b/chrome/browser/sync_file_system/drive_backend/sync_task_token.h index 53349e6..43356f9 100644 --- a/chrome/browser/sync_file_system/drive_backend/sync_task_token.h +++ b/chrome/browser/sync_file_system/drive_backend/sync_task_token.h
@@ -9,7 +9,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/sync_file_system/sync_callbacks.h"
diff --git a/chrome/browser/sync_file_system/drive_backend/sync_worker.cc b/chrome/browser/sync_file_system/drive_backend/sync_worker.cc index 6b2e9d7..106d58045 100644 --- a/chrome/browser/sync_file_system/drive_backend/sync_worker.cc +++ b/chrome/browser/sync_file_system/drive_backend/sync_worker.cc
@@ -8,8 +8,8 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/observer_list.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/sync_file_system/drive_backend/callback_helper.h"
diff --git a/chrome/browser/sync_file_system/drive_backend/sync_worker_unittest.cc b/chrome/browser/sync_file_system/drive_backend/sync_worker_unittest.cc index b772b8c..9836d1e 100644 --- a/chrome/browser/sync_file_system/drive_backend/sync_worker_unittest.cc +++ b/chrome/browser/sync_file_system/drive_backend/sync_worker_unittest.cc
@@ -7,8 +7,8 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/sync_file_system/drive_backend/uninstall_app_task.cc b/chrome/browser/sync_file_system/drive_backend/uninstall_app_task.cc index 55503d9..0a70622 100644 --- a/chrome/browser/sync_file_system/drive_backend/uninstall_app_task.cc +++ b/chrome/browser/sync_file_system/drive_backend/uninstall_app_task.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/sync_file_system/drive_backend/uninstall_app_task.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "chrome/browser/sync_file_system/drive_backend/drive_backend_constants.h" #include "chrome/browser/sync_file_system/drive_backend/drive_backend_util.h"
diff --git a/chrome/browser/sync_file_system/fake_remote_change_processor.cc b/chrome/browser/sync_file_system/fake_remote_change_processor.cc index b67c9c2..518233b 100644 --- a/chrome/browser/sync_file_system/fake_remote_change_processor.cc +++ b/chrome/browser/sync_file_system/fake_remote_change_processor.cc
@@ -6,8 +6,8 @@ #include <stddef.h> -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/task/single_thread_task_runner.h" #include "chrome/browser/sync_file_system/file_change.h"
diff --git a/chrome/browser/sync_file_system/fake_remote_change_processor.h b/chrome/browser/sync_file_system/fake_remote_change_processor.h index 4f29ac2..1bf66552 100644 --- a/chrome/browser/sync_file_system/fake_remote_change_processor.h +++ b/chrome/browser/sync_file_system/fake_remote_change_processor.h
@@ -8,7 +8,7 @@ #include <map> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/sync_file_system/remote_change_processor.h" #include "chrome/browser/sync_file_system/sync_callbacks.h"
diff --git a/chrome/browser/sync_file_system/local/canned_syncable_file_system.cc b/chrome/browser/sync_file_system/local/canned_syncable_file_system.cc index 55bd106..bd02c942 100644 --- a/chrome/browser/sync_file_system/local/canned_syncable_file_system.cc +++ b/chrome/browser/sync_file_system/local/canned_syncable_file_system.cc
@@ -9,10 +9,10 @@ #include <iterator> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/files/file.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/guid.h" #include "base/memory/scoped_refptr.h" #include "base/ranges/algorithm.h"
diff --git a/chrome/browser/sync_file_system/local/canned_syncable_file_system.h b/chrome/browser/sync_file_system/local/canned_syncable_file_system.h index a06cb999..0294d43 100644 --- a/chrome/browser/sync_file_system/local/canned_syncable_file_system.h +++ b/chrome/browser/sync_file_system/local/canned_syncable_file_system.h
@@ -11,9 +11,9 @@ #include <string> #include <vector> -#include "base/callback_forward.h" #include "base/files/file.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/callback_forward.h" #include "base/observer_list_threadsafe.h" #include "chrome/browser/sync_file_system/local/local_file_sync_status.h" #include "chrome/browser/sync_file_system/sync_status_code.h"
diff --git a/chrome/browser/sync_file_system/local/local_file_sync_context.cc b/chrome/browser/sync_file_system/local/local_file_sync_context.cc index 46ec65e8..20f8ae3c 100644 --- a/chrome/browser/sync_file_system/local/local_file_sync_context.cc +++ b/chrome/browser/sync_file_system/local/local_file_sync_context.cc
@@ -7,11 +7,11 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/contains.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/observer_list.h" #include "base/task/single_thread_task_runner.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 ac7ae7a..578bc44 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
@@ -11,10 +11,10 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/containers/circular_deque.h" #include "base/files/file.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/sync_file_system/local/local_file_sync_context_unittest.cc b/chrome/browser/sync_file_system/local/local_file_sync_context_unittest.cc index e4fd99d..df5c348 100644 --- a/chrome/browser/sync_file_system/local/local_file_sync_context_unittest.cc +++ b/chrome/browser/sync_file_system/local/local_file_sync_context_unittest.cc
@@ -8,11 +8,11 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/contains.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/run_loop.h" #include "base/task/sequenced_task_runner.h"
diff --git a/chrome/browser/sync_file_system/local/local_file_sync_service.cc b/chrome/browser/sync_file_system/local/local_file_sync_service.cc index f7fd00d..847df6d 100644 --- a/chrome/browser/sync_file_system/local/local_file_sync_service.cc +++ b/chrome/browser/sync_file_system/local/local_file_sync_service.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/sync_file_system/local/local_file_sync_service.h" -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/observer_list.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/sync_file_system/local/local_file_sync_service.h b/chrome/browser/sync_file_system/local/local_file_sync_service.h index 16e6d82..6f976a2 100644 --- a/chrome/browser/sync_file_system/local/local_file_sync_service.h +++ b/chrome/browser/sync_file_system/local/local_file_sync_service.h
@@ -11,7 +11,7 @@ #include <memory> #include <set> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/sync_file_system/local/local_file_sync_service_unittest.cc b/chrome/browser/sync_file_system/local/local_file_sync_service_unittest.cc index 55a5545..6f3ff38f 100644 --- a/chrome/browser/sync_file_system/local/local_file_sync_service_unittest.cc +++ b/chrome/browser/sync_file_system/local/local_file_sync_service_unittest.cc
@@ -7,9 +7,9 @@ #include <memory> #include <vector> -#include "base/bind.h" #include "base/containers/contains.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h"
diff --git a/chrome/browser/sync_file_system/local/root_delete_helper.cc b/chrome/browser/sync_file_system/local/root_delete_helper.cc index 2225da8..b77f6136e 100644 --- a/chrome/browser/sync_file_system/local/root_delete_helper.cc +++ b/chrome/browser/sync_file_system/local/root_delete_helper.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/sync_file_system/local/root_delete_helper.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/sequenced_task_runner.h" #include "chrome/browser/sync_file_system/local/local_file_change_tracker.h" #include "chrome/browser/sync_file_system/local/local_file_sync_status.h"
diff --git a/chrome/browser/sync_file_system/local/root_delete_helper.h b/chrome/browser/sync_file_system/local/root_delete_helper.h index c6d5ad2..d1f6b46 100644 --- a/chrome/browser/sync_file_system/local/root_delete_helper.h +++ b/chrome/browser/sync_file_system/local/root_delete_helper.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_SYNC_FILE_SYSTEM_LOCAL_ROOT_DELETE_HELPER_H_ #define CHROME_BROWSER_SYNC_FILE_SYSTEM_LOCAL_ROOT_DELETE_HELPER_H_ -#include "base/callback.h" #include "base/files/file.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/sync_file_system/local/sync_file_system_backend.cc b/chrome/browser/sync_file_system/local/sync_file_system_backend.cc index c61992c6..fb3afaf 100644 --- a/chrome/browser/sync_file_system/local/sync_file_system_backend.cc +++ b/chrome/browser/sync_file_system/local/sync_file_system_backend.cc
@@ -7,8 +7,8 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/types/pass_key.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/sync_file_system/local/syncable_file_operation_runner.cc b/chrome/browser/sync_file_system/local/syncable_file_operation_runner.cc index e1e352d..273e12fe 100644 --- a/chrome/browser/sync_file_system/local/syncable_file_operation_runner.cc +++ b/chrome/browser/sync_file_system/local/syncable_file_operation_runner.cc
@@ -8,7 +8,7 @@ #include <algorithm> -#include "base/callback.h" +#include "base/functional/callback.h" #include "content/public/browser/browser_thread.h" using storage::FileSystemURL;
diff --git a/chrome/browser/sync_file_system/local/syncable_file_operation_runner.h b/chrome/browser/sync_file_system/local/syncable_file_operation_runner.h index bc6d111..adac7ca 100644 --- a/chrome/browser/sync_file_system/local/syncable_file_operation_runner.h +++ b/chrome/browser/sync_file_system/local/syncable_file_operation_runner.h
@@ -11,7 +11,7 @@ #include <memory> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/sync_file_system/local/local_file_sync_status.h"
diff --git a/chrome/browser/sync_file_system/local/syncable_file_operation_runner_unittest.cc b/chrome/browser/sync_file_system/local/syncable_file_operation_runner_unittest.cc index 4f3e032..7b461f3 100644 --- a/chrome/browser/sync_file_system/local/syncable_file_operation_runner_unittest.cc +++ b/chrome/browser/sync_file_system/local/syncable_file_operation_runner_unittest.cc
@@ -10,10 +10,10 @@ #include <memory> #include <string> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/files/file.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/sync_file_system/local/syncable_file_system_operation.cc b/chrome/browser/sync_file_system/local/syncable_file_system_operation.cc index 4bb819f..5a72cd2 100644 --- a/chrome/browser/sync_file_system/local/syncable_file_system_operation.cc +++ b/chrome/browser/sync_file_system/local/syncable_file_system_operation.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/notreached.h" #include "chrome/browser/sync_file_system/local/local_file_sync_context.h" #include "chrome/browser/sync_file_system/local/sync_file_system_backend.h"
diff --git a/chrome/browser/sync_file_system/local/syncable_file_system_operation.h b/chrome/browser/sync_file_system/local/syncable_file_system_operation.h index 194d5fb9..653879a 100644 --- a/chrome/browser/sync_file_system/local/syncable_file_system_operation.h +++ b/chrome/browser/sync_file_system/local/syncable_file_system_operation.h
@@ -10,7 +10,7 @@ #include <memory> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/types/pass_key.h" #include "storage/browser/file_system/file_system_operation.h"
diff --git a/chrome/browser/sync_file_system/local_change_processor.h b/chrome/browser/sync_file_system/local_change_processor.h index a58cd6d..757c8745 100644 --- a/chrome/browser/sync_file_system/local_change_processor.h +++ b/chrome/browser/sync_file_system/local_change_processor.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_SYNC_FILE_SYSTEM_LOCAL_CHANGE_PROCESSOR_H_ #define CHROME_BROWSER_SYNC_FILE_SYSTEM_LOCAL_CHANGE_PROCESSOR_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "chrome/browser/sync_file_system/sync_callbacks.h" namespace storage {
diff --git a/chrome/browser/sync_file_system/mock_local_change_processor.cc b/chrome/browser/sync_file_system/mock_local_change_processor.cc index b5a6793..80b9760 100644 --- a/chrome/browser/sync_file_system/mock_local_change_processor.cc +++ b/chrome/browser/sync_file_system/mock_local_change_processor.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/sync_file_system/mock_local_change_processor.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/task/single_thread_task_runner.h" #include "chrome/browser/sync_file_system/file_change.h"
diff --git a/chrome/browser/sync_file_system/mock_local_change_processor.h b/chrome/browser/sync_file_system/mock_local_change_processor.h index 061df50..441fe9cde 100644 --- a/chrome/browser/sync_file_system/mock_local_change_processor.h +++ b/chrome/browser/sync_file_system/mock_local_change_processor.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_SYNC_FILE_SYSTEM_MOCK_LOCAL_CHANGE_PROCESSOR_H_ #define CHROME_BROWSER_SYNC_FILE_SYSTEM_MOCK_LOCAL_CHANGE_PROCESSOR_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/sync_file_system/local_change_processor.h" #include "testing/gmock/include/gmock/gmock.h"
diff --git a/chrome/browser/sync_file_system/mock_remote_change_processor.h b/chrome/browser/sync_file_system/mock_remote_change_processor.h index c687d5e..1849823 100644 --- a/chrome/browser/sync_file_system/mock_remote_change_processor.h +++ b/chrome/browser/sync_file_system/mock_remote_change_processor.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_SYNC_FILE_SYSTEM_MOCK_REMOTE_CHANGE_PROCESSOR_H_ #define CHROME_BROWSER_SYNC_FILE_SYSTEM_MOCK_REMOTE_CHANGE_PROCESSOR_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/sync_file_system/file_change.h" #include "chrome/browser/sync_file_system/remote_change_processor.h" #include "chrome/browser/sync_file_system/sync_callbacks.h"
diff --git a/chrome/browser/sync_file_system/mock_remote_file_sync_service.cc b/chrome/browser/sync_file_system/mock_remote_file_sync_service.cc index d3282ae1..e0165a3 100644 --- a/chrome/browser/sync_file_system/mock_remote_file_sync_service.cc +++ b/chrome/browser/sync_file_system/mock_remote_file_sync_service.cc
@@ -6,7 +6,7 @@ #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/task/single_thread_task_runner.h" #include "base/values.h"
diff --git a/chrome/browser/sync_file_system/mock_remote_file_sync_service.h b/chrome/browser/sync_file_system/mock_remote_file_sync_service.h index 2182a4a..2de052f 100644 --- a/chrome/browser/sync_file_system/mock_remote_file_sync_service.h +++ b/chrome/browser/sync_file_system/mock_remote_file_sync_service.h
@@ -10,7 +10,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/observer_list.h" #include "chrome/browser/sync_file_system/file_status_observer.h" #include "chrome/browser/sync_file_system/mock_local_change_processor.h"
diff --git a/chrome/browser/sync_file_system/remote_change_processor.h b/chrome/browser/sync_file_system/remote_change_processor.h index 45a2f0b..ac40c6d 100644 --- a/chrome/browser/sync_file_system/remote_change_processor.h +++ b/chrome/browser/sync_file_system/remote_change_processor.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_SYNC_FILE_SYSTEM_REMOTE_CHANGE_PROCESSOR_H_ #define CHROME_BROWSER_SYNC_FILE_SYSTEM_REMOTE_CHANGE_PROCESSOR_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "chrome/browser/sync_file_system/sync_callbacks.h" #include "chrome/browser/sync_file_system/sync_status_code.h"
diff --git a/chrome/browser/sync_file_system/sync_callbacks.h b/chrome/browser/sync_file_system/sync_callbacks.h index cc9c2cc..5a1736d5 100644 --- a/chrome/browser/sync_file_system/sync_callbacks.h +++ b/chrome/browser/sync_file_system/sync_callbacks.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_SYNC_FILE_SYSTEM_SYNC_CALLBACKS_H_ #define CHROME_BROWSER_SYNC_FILE_SYSTEM_SYNC_CALLBACKS_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "chrome/browser/sync_file_system/sync_file_status.h" #include "chrome/browser/sync_file_system/sync_status_code.h" #include "storage/browser/file_system/file_system_url.h"
diff --git a/chrome/browser/sync_file_system/sync_file_system_service.cc b/chrome/browser/sync_file_system/sync_file_system_service.cc index b3f92a4..10677c4 100644 --- a/chrome/browser/sync_file_system/sync_file_system_service.cc +++ b/chrome/browser/sync_file_system/sync_file_system_service.cc
@@ -10,8 +10,8 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/format_macros.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h"
diff --git a/chrome/browser/sync_file_system/sync_file_system_service.h b/chrome/browser/sync_file_system/sync_file_system_service.h index 33aafff..2581bbe 100644 --- a/chrome/browser/sync_file_system/sync_file_system_service.h +++ b/chrome/browser/sync_file_system/sync_file_system_service.h
@@ -10,7 +10,7 @@ #include <string> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h"
diff --git a/chrome/browser/sync_file_system/sync_file_system_service_unittest.cc b/chrome/browser/sync_file_system/sync_file_system_service_unittest.cc index b4506c3..cfe181ea 100644 --- a/chrome/browser/sync_file_system/sync_file_system_service_unittest.cc +++ b/chrome/browser/sync_file_system/sync_file_system_service_unittest.cc
@@ -10,7 +10,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/synchronization/waitable_event.h"
diff --git a/chrome/browser/sync_file_system/sync_file_system_test_util.h b/chrome/browser/sync_file_system/sync_file_system_test_util.h index 66408d4..d9170c6 100644 --- a/chrome/browser/sync_file_system/sync_file_system_test_util.h +++ b/chrome/browser/sync_file_system/sync_file_system_test_util.h
@@ -8,8 +8,8 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "testing/gtest/include/gtest/gtest.h" namespace base {
diff --git a/chrome/browser/sync_file_system/sync_process_runner.cc b/chrome/browser/sync_file_system/sync_process_runner.cc index 59564e3..d12b507 100644 --- a/chrome/browser/sync_file_system/sync_process_runner.cc +++ b/chrome/browser/sync_file_system/sync_process_runner.cc
@@ -7,8 +7,8 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/format_macros.h" +#include "base/functional/bind.h" #include "chrome/browser/sync_file_system/logger.h" namespace sync_file_system {
diff --git a/chrome/browser/sync_file_system/syncable_file_system_util.h b/chrome/browser/sync_file_system/syncable_file_system_util.h index b88bdfe..bfce369 100644 --- a/chrome/browser/sync_file_system/syncable_file_system_util.h +++ b/chrome/browser/sync_file_system/syncable_file_system_util.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/callback_forward.h" #include "base/files/file_path.h" +#include "base/functional/callback_forward.h" #include "storage/browser/file_system/file_system_url.h" namespace storage {
diff --git a/chrome/browser/tab/web_contents_state.h b/chrome/browser/tab/web_contents_state.h index 5ec6b01..25e65d8 100644 --- a/chrome/browser/tab/web_contents_state.h +++ b/chrome/browser/tab/web_contents_state.h
@@ -6,7 +6,7 @@ #define CHROME_BROWSER_TAB_WEB_CONTENTS_STATE_H_ #include "base/android/scoped_java_ref.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "content/public/browser/web_contents.h" namespace sessions {
diff --git a/chrome/browser/tab_contents/form_interaction_tab_helper.cc b/chrome/browser/tab_contents/form_interaction_tab_helper.cc index 8ccc039d..12b76f5f 100644 --- a/chrome/browser/tab_contents/form_interaction_tab_helper.cc +++ b/chrome/browser/tab_contents/form_interaction_tab_helper.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/tab_contents/form_interaction_tab_helper.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "components/performance_manager/public/graph/graph.h" #include "components/performance_manager/public/graph/page_node.h" #include "components/performance_manager/public/performance_manager.h"
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 dfd60b73..668e43d 100644 --- a/chrome/browser/tab_contents/form_interaction_tab_helper_unittest.cc +++ b/chrome/browser/tab_contents/form_interaction_tab_helper_unittest.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/task/task_traits.h" #include "base/test/bind.h"
diff --git a/chrome/browser/tab_contents/view_source_browsertest.cc b/chrome/browser/tab_contents/view_source_browsertest.cc index e83fcf3..38631dbc 100644 --- a/chrome/browser/tab_contents/view_source_browsertest.cc +++ b/chrome/browser/tab_contents/view_source_browsertest.cc
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/strings/strcat.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/task_manager/providers/arc/arc_process_task.cc b/chrome/browser/task_manager/providers/arc/arc_process_task.cc index 181411f..c655afaf 100644 --- a/chrome/browser/task_manager/providers/arc/arc_process_task.cc +++ b/chrome/browser/task_manager/providers/arc/arc_process_task.cc
@@ -10,7 +10,7 @@ #include "ash/components/arc/mojom/process.mojom.h" #include "ash/components/arc/session/arc_bridge_service.h" #include "ash/components/arc/session/arc_service_manager.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/i18n/rtl.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/task_manager/providers/arc/arc_process_task_provider.cc b/chrome/browser/task_manager/providers/arc/arc_process_task_provider.cc index e8bfec1e..cecb3d4 100644 --- a/chrome/browser/task_manager/providers/arc/arc_process_task_provider.cc +++ b/chrome/browser/task_manager/providers/arc/arc_process_task_provider.cc
@@ -12,8 +12,8 @@ #include <vector> #include "ash/components/arc/mojom/process.mojom.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/process/process.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/task_manager/providers/arc/arc_process_task_provider.h b/chrome/browser/task_manager/providers/arc/arc_process_task_provider.h index 5741a7b..fd92c40e 100644 --- a/chrome/browser/task_manager/providers/arc/arc_process_task_provider.h +++ b/chrome/browser/task_manager/providers/arc/arc_process_task_provider.h
@@ -9,7 +9,7 @@ #include <unordered_map> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/process/process.h" #include "chrome/browser/ash/arc/process/arc_process.h"
diff --git a/chrome/browser/task_manager/providers/child_process_task.cc b/chrome/browser/task_manager/providers/child_process_task.cc index bd0225e..dec08ce 100644 --- a/chrome/browser/task_manager/providers/child_process_task.cc +++ b/chrome/browser/task_manager/providers/child_process_task.cc
@@ -6,9 +6,9 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/i18n/rtl.h" #include "base/numerics/safe_conversions.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/task_manager/providers/child_process_task_provider.cc b/chrome/browser/task_manager/providers/child_process_task_provider.cc index d951ec0..1fbe624 100644 --- a/chrome/browser/task_manager/providers/child_process_task_provider.cc +++ b/chrome/browser/task_manager/providers/child_process_task_provider.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/process/process.h" #include "chrome/browser/task_manager/providers/child_process_task.h" #include "content/public/browser/browser_child_process_host_iterator.h"
diff --git a/chrome/browser/task_manager/providers/fallback_task_provider.cc b/chrome/browser/task_manager/providers/fallback_task_provider.cc index 22ab7e49..94fefa4 100644 --- a/chrome/browser/task_manager/providers/fallback_task_provider.cc +++ b/chrome/browser/task_manager/providers/fallback_task_provider.cc
@@ -4,9 +4,9 @@ #include "chrome/browser/task_manager/providers/fallback_task_provider.h" -#include "base/bind.h" #include "base/containers/contains.h" #include "base/containers/cxx20_erase.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/metrics/histogram_functions.h" #include "base/process/process.h"
diff --git a/chrome/browser/task_manager/providers/spare_render_process_host_task_provider.cc b/chrome/browser/task_manager/providers/spare_render_process_host_task_provider.cc index da3e8d3..96efd014 100644 --- a/chrome/browser/task_manager/providers/spare_render_process_host_task_provider.cc +++ b/chrome/browser/task_manager/providers/spare_render_process_host_task_provider.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/task_manager/providers/spare_render_process_host_task_provider.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/process/process.h" #include "chrome/browser/task_manager/providers/child_process_task.h" #include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/task_manager/providers/vm/crostini_process_task.cc b/chrome/browser/task_manager/providers/vm/crostini_process_task.cc index 89bb929e..afd9f4bd 100644 --- a/chrome/browser/task_manager/providers/vm/crostini_process_task.cc +++ b/chrome/browser/task_manager/providers/vm/crostini_process_task.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/task_manager/providers/vm/crostini_process_task.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "chrome/browser/ash/crostini/crostini_manager.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/grit/chrome_unscaled_resources.h"
diff --git a/chrome/browser/task_manager/providers/vm/vm_process_task.cc b/chrome/browser/task_manager/providers/vm/vm_process_task.cc index b444493..dcfc51f8 100644 --- a/chrome/browser/task_manager/providers/vm/vm_process_task.cc +++ b/chrome/browser/task_manager/providers/vm/vm_process_task.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/task_manager/providers/vm/vm_process_task.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/i18n/rtl.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/ash/crostini/crostini_manager.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 b26e155..6143d7fa 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
@@ -5,8 +5,8 @@ #include "chrome/browser/task_manager/providers/vm/vm_process_task_provider.h" #include "base/base64.h" -#include "base/bind.h" #include "base/containers/flat_set.h" +#include "base/functional/bind.h" #include "base/process/process.h" #include "base/process/process_iterator.h" #include "base/task/task_traits.h"
diff --git a/chrome/browser/task_manager/providers/web_contents/renderer_task.cc b/chrome/browser/task_manager/providers/web_contents/renderer_task.cc index 96fdd365..f081520 100644 --- a/chrome/browser/task_manager/providers/web_contents/renderer_task.cc +++ b/chrome/browser/task_manager/providers/web_contents/renderer_task.cc
@@ -7,7 +7,7 @@ #include <string> #include <utility> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/i18n/rtl.h" #include "base/numerics/safe_conversions.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/task_manager/providers/web_contents/web_contents_task_provider.cc b/chrome/browser/task_manager/providers/web_contents/web_contents_task_provider.cc index f5cba88a..6911d5c 100644 --- a/chrome/browser/task_manager/providers/web_contents/web_contents_task_provider.cc +++ b/chrome/browser/task_manager/providers/web_contents/web_contents_task_provider.cc
@@ -6,10 +6,10 @@ #include <memory> -#include "base/bind.h" #include "base/check.h" #include "base/containers/flat_map.h" #include "base/containers/flat_set.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/notreached.h"
diff --git a/chrome/browser/task_manager/providers/worker_task_provider_browsertest.cc b/chrome/browser/task_manager/providers/worker_task_provider_browsertest.cc index 85397c6d..0d8a6ca6 100644 --- a/chrome/browser/task_manager/providers/worker_task_provider_browsertest.cc +++ b/chrome/browser/task_manager/providers/worker_task_provider_browsertest.cc
@@ -5,9 +5,9 @@ #include <memory> #include <vector> -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/containers/cxx20_erase.h" +#include "base/functional/callback_helpers.h" #include "base/strings/utf_string_conversions.h" #include "build/chromeos_buildflags.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/task_manager/sampling/arc_shared_sampler.cc b/chrome/browser/task_manager/sampling/arc_shared_sampler.cc index d2c7ed02..c8a15d3 100644 --- a/chrome/browser/task_manager/sampling/arc_shared_sampler.cc +++ b/chrome/browser/task_manager/sampling/arc_shared_sampler.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/arc/process/arc_process_service.h" #include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/task_manager/sampling/arc_shared_sampler.h b/chrome/browser/task_manager/sampling/arc_shared_sampler.h index 4778530..ebcf27d 100644 --- a/chrome/browser/task_manager/sampling/arc_shared_sampler.h +++ b/chrome/browser/task_manager/sampling/arc_shared_sampler.h
@@ -10,8 +10,8 @@ #include <map> #include "ash/components/arc/mojom/process.mojom.h" -#include "base/callback.h" #include "base/containers/flat_map.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/process/process_handle.h" #include "base/time/time.h"
diff --git a/chrome/browser/task_manager/sampling/shared_sampler.h b/chrome/browser/task_manager/sampling/shared_sampler.h index d9e8d56..adb0c08 100644 --- a/chrome/browser/task_manager/sampling/shared_sampler.h +++ b/chrome/browser/task_manager/sampling/shared_sampler.h
@@ -10,8 +10,8 @@ #include <utility> #include <vector> -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "base/process/process_handle.h" #include "base/sequence_checker.h"
diff --git a/chrome/browser/task_manager/sampling/shared_sampler_win.cc b/chrome/browser/task_manager/sampling/shared_sampler_win.cc index 54c362c..db1018f49 100644 --- a/chrome/browser/task_manager/sampling/shared_sampler_win.cc +++ b/chrome/browser/task_manager/sampling/shared_sampler_win.cc
@@ -9,9 +9,9 @@ #include <algorithm> -#include "base/bind.h" #include "base/bit_cast.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/path_service.h" #include "base/threading/platform_thread.h" #include "base/time/time.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 f2f46ed..d8b8f048 100644 --- a/chrome/browser/task_manager/sampling/shared_sampler_win_unittest.cc +++ b/chrome/browser/task_manager/sampling/shared_sampler_win_unittest.cc
@@ -9,8 +9,8 @@ #include <memory> #include <numeric> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "base/path_service.h" #include "base/run_loop.h"
diff --git a/chrome/browser/task_manager/sampling/task_group.cc b/chrome/browser/task_manager/sampling/task_group.cc index e75c4ad..4c2e84c 100644 --- a/chrome/browser/task_manager/sampling/task_group.cc +++ b/chrome/browser/task_manager/sampling/task_group.cc
@@ -7,9 +7,9 @@ #include <algorithm> #include <limits> -#include "base/bind.h" -#include "base/callback.h" #include "base/containers/cxx20_erase.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/task/sequenced_task_runner.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/task_manager/sampling/task_group_sampler.cc b/chrome/browser/task_manager/sampling/task_group_sampler.cc index 212bfc45..755fd21 100644 --- a/chrome/browser/task_manager/sampling/task_group_sampler.cc +++ b/chrome/browser/task_manager/sampling/task_group_sampler.cc
@@ -7,8 +7,8 @@ #include <limits> #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/process/process_metrics.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/task_manager/sampling/task_group_sampler.h b/chrome/browser/task_manager/sampling/task_group_sampler.h index b690fea..32b2cd7 100644 --- a/chrome/browser/task_manager/sampling/task_group_sampler.h +++ b/chrome/browser/task_manager/sampling/task_group_sampler.h
@@ -9,7 +9,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "base/process/process.h" #include "base/process/process_handle.h"
diff --git a/chrome/browser/task_manager/sampling/task_group_unittest.cc b/chrome/browser/task_manager/sampling/task_group_unittest.cc index a948913..16dfe9f 100644 --- a/chrome/browser/task_manager/sampling/task_group_unittest.cc +++ b/chrome/browser/task_manager/sampling/task_group_unittest.cc
@@ -7,8 +7,8 @@ #include <memory> #include <string> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ref_counted.h" #include "base/run_loop.h" #include "base/task/sequenced_task_runner.h"
diff --git a/chrome/browser/task_manager/sampling/task_manager_impl.cc b/chrome/browser/task_manager/sampling/task_manager_impl.cc index 4a9bc7c..763646ac 100644 --- a/chrome/browser/task_manager/sampling/task_manager_impl.cc +++ b/chrome/browser/task_manager/sampling/task_manager_impl.cc
@@ -12,9 +12,9 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/command_line.h" #include "base/containers/adapters.h" +#include "base/functional/bind.h" #include "base/task/thread_pool.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/task_manager/task_manager_browsertest.cc b/chrome/browser/task_manager/task_manager_browsertest.cc index e71bd90..a3a5ee0 100644 --- a/chrome/browser/task_manager/task_manager_browsertest.cc +++ b/chrome/browser/task_manager/task_manager_browsertest.cc
@@ -5,9 +5,9 @@ #include <stddef.h> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/path_service.h" #include "base/run_loop.h" #include "base/strings/strcat.h"
diff --git a/chrome/browser/task_manager/task_manager_browsertest_util.cc b/chrome/browser/task_manager/task_manager_browsertest_util.cc index 130a73d..413afc11 100644 --- a/chrome/browser/task_manager/task_manager_browsertest_util.cc +++ b/chrome/browser/task_manager/task_manager_browsertest_util.cc
@@ -6,9 +6,9 @@ #include <string> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/run_loop.h" #include "base/strings/pattern.h"
diff --git a/chrome/browser/task_manager/task_manager_interface.cc b/chrome/browser/task_manager/task_manager_interface.cc index a980e53..b217e347 100644 --- a/chrome/browser/task_manager/task_manager_interface.cc +++ b/chrome/browser/task_manager/task_manager_interface.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/task_manager/task_manager_interface.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/observer_list.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/task_manager/task_manager_tester.h b/chrome/browser/task_manager/task_manager_tester.h index 60b3cf8..7790031 100644 --- a/chrome/browser/task_manager/task_manager_tester.h +++ b/chrome/browser/task_manager/task_manager_tester.h
@@ -10,7 +10,7 @@ #include <memory> #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/task_manager/task_manager_browsertest_util.h" #include "components/sessions/core/session_id.h"
diff --git a/chrome/browser/taskbar/taskbar_decorator_win.cc b/chrome/browser/taskbar/taskbar_decorator_win.cc index 9c8b244..3410749 100644 --- a/chrome/browser/taskbar/taskbar_decorator_win.cc +++ b/chrome/browser/taskbar/taskbar_decorator_win.cc
@@ -11,7 +11,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/metrics/histogram_macros.h" #include "base/numerics/safe_conversions.h"
diff --git a/chrome/browser/themes/theme_service.cc b/chrome/browser/themes/theme_service.cc index 7a34996..851cacf 100644 --- a/chrome/browser/themes/theme_service.cc +++ b/chrome/browser/themes/theme_service.cc
@@ -9,10 +9,10 @@ #include <algorithm> #include <memory> -#include "base/bind.h" #include "base/command_line.h" #include "base/containers/fixed_flat_map.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted_memory.h"
diff --git a/chrome/browser/themes/theme_service_aura_linux.cc b/chrome/browser/themes/theme_service_aura_linux.cc index 47f67561..8f518003 100644 --- a/chrome/browser/themes/theme_service_aura_linux.cc +++ b/chrome/browser/themes/theme_service_aura_linux.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/themes/theme_service_aura_linux.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/metrics/histogram_macros.h"
diff --git a/chrome/browser/themes/theme_syncable_service_unittest.cc b/chrome/browser/themes/theme_syncable_service_unittest.cc index f3d7219..0acb5bd 100644 --- a/chrome/browser/themes/theme_syncable_service_unittest.cc +++ b/chrome/browser/themes/theme_syncable_service_unittest.cc
@@ -6,10 +6,10 @@ #include <memory> -#include "base/bind.h" #include "base/command_line.h" #include "base/compiler_specific.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/no_destructor.h"
diff --git a/chrome/browser/thumbnail/cc/thumbnail.cc b/chrome/browser/thumbnail/cc/thumbnail.cc index 2be64d84..11857bb 100644 --- a/chrome/browser/thumbnail/cc/thumbnail.cc +++ b/chrome/browser/thumbnail/cc/thumbnail.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/thumbnail/cc/thumbnail.h" -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/ptr_util.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/thumbnail/cc/thumbnail_cache.h b/chrome/browser/thumbnail/cc/thumbnail_cache.h index 219cd47..3436db6 100644 --- a/chrome/browser/thumbnail/cc/thumbnail_cache.h +++ b/chrome/browser/thumbnail/cc/thumbnail_cache.h
@@ -11,8 +11,8 @@ #include <map> #include <set> -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/memory/memory_pressure_listener.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/thumbnail/generator/android/thumbnail_generator.cc b/chrome/browser/thumbnail/generator/android/thumbnail_generator.cc index 9bef423da..77bb5b83 100644 --- a/chrome/browser/thumbnail/generator/android/thumbnail_generator.cc +++ b/chrome/browser/thumbnail/generator/android/thumbnail_generator.cc
@@ -7,7 +7,7 @@ #include <memory> #include "base/android/jni_string.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/sequenced_task_runner.h" #include "base/threading/thread_restrictions.h" #include "chrome/browser/thumbnail/generator/android/thumbnail_media_parser.h"
diff --git a/chrome/browser/thumbnail/generator/android/thumbnail_media_parser.h b/chrome/browser/thumbnail/generator/android/thumbnail_media_parser.h index 2bdfe41..3264821 100644 --- a/chrome/browser/thumbnail/generator/android/thumbnail_media_parser.h +++ b/chrome/browser/thumbnail/generator/android/thumbnail_media_parser.h
@@ -8,8 +8,8 @@ #include <memory> #include <string> -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "chrome/services/media_gallery_util/public/cpp/media_parser_provider.h" #include "chrome/services/media_gallery_util/public/mojom/media_parser.mojom-forward.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 159b782..4933037 100644 --- a/chrome/browser/thumbnail/generator/android/thumbnail_media_parser_bridge.cc +++ b/chrome/browser/thumbnail/generator/android/thumbnail_media_parser_bridge.cc
@@ -4,8 +4,8 @@ #include "base/android/callback_android.h" #include "base/android/jni_string.h" -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.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 18119c01..dfccbcc9 100644 --- a/chrome/browser/thumbnail/generator/android/thumbnail_media_parser_impl.cc +++ b/chrome/browser/thumbnail/generator/android/thumbnail_media_parser_impl.cc
@@ -6,9 +6,9 @@ #include <tuple> -#include "base/bind.h" #include "base/files/file.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/numerics/safe_conversions.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/thumbnail/generator/android/thumbnail_media_parser_impl.h b/chrome/browser/thumbnail/generator/android/thumbnail_media_parser_impl.h index ac17253..550d19f 100644 --- a/chrome/browser/thumbnail/generator/android/thumbnail_media_parser_impl.h +++ b/chrome/browser/thumbnail/generator/android/thumbnail_media_parser_impl.h
@@ -9,8 +9,8 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "base/task/sequenced_task_runner.h"
diff --git a/chrome/browser/thumbnail/generator/image_thumbnail_request.cc b/chrome/browser/thumbnail/generator/image_thumbnail_request.cc index 31c38127..a7d2d4c 100644 --- a/chrome/browser/thumbnail/generator/image_thumbnail_request.cc +++ b/chrome/browser/thumbnail/generator/image_thumbnail_request.cc
@@ -7,8 +7,8 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/task/thread_pool.h" #include "base/threading/scoped_blocking_call.h"
diff --git a/chrome/browser/thumbnail/generator/thumbnail_util.cc b/chrome/browser/thumbnail/generator/thumbnail_util.cc index c7b67cfe..1ee512a2 100644 --- a/chrome/browser/thumbnail/generator/thumbnail_util.cc +++ b/chrome/browser/thumbnail/generator/thumbnail_util.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/thumbnail/generator/thumbnail_util.h" -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.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/thumbnail/generator/thumbnail_util.h b/chrome/browser/thumbnail/generator/thumbnail_util.h index 4f932bf..b06d8f7b 100644 --- a/chrome/browser/thumbnail/generator/thumbnail_util.h +++ b/chrome/browser/thumbnail/generator/thumbnail_util.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_THUMBNAIL_GENERATOR_THUMBNAIL_UTIL_H_ #define CHROME_BROWSER_THUMBNAIL_GENERATOR_THUMBNAIL_UTIL_H_ -#include "base/callback.h" +#include "base/functional/callback.h" class SkBitmap;
diff --git a/chrome/browser/top_level_storage_access_api/top_level_storage_access_permission_context.cc b/chrome/browser/top_level_storage_access_api/top_level_storage_access_permission_context.cc index 5bcdb71..3a586a2a 100644 --- a/chrome/browser/top_level_storage_access_api/top_level_storage_access_permission_context.cc +++ b/chrome/browser/top_level_storage_access_api/top_level_storage_access_permission_context.cc
@@ -4,10 +4,10 @@ #include "chrome/browser/top_level_storage_access_api/top_level_storage_access_permission_context.h" -#include "base/bind.h" #include "base/check.h" #include "base/check_op.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/metrics/field_trial_params.h" #include "base/metrics/histogram_functions.h" #include "base/notreached.h"
diff --git a/chrome/browser/touch_to_fill/android/touch_to_fill_view_impl.h b/chrome/browser/touch_to_fill/android/touch_to_fill_view_impl.h index f3e8026..a4f83f53 100644 --- a/chrome/browser/touch_to_fill/android/touch_to_fill_view_impl.h +++ b/chrome/browser/touch_to_fill/android/touch_to_fill_view_impl.h
@@ -6,7 +6,7 @@ #define CHROME_BROWSER_TOUCH_TO_FILL_ANDROID_TOUCH_TO_FILL_VIEW_IMPL_H_ #include "base/android/scoped_java_ref.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/touch_to_fill/touch_to_fill_view.h"
diff --git a/chrome/browser/tracing/chrome_background_tracing_metrics_provider_unittest.cc b/chrome/browser/tracing/chrome_background_tracing_metrics_provider_unittest.cc index 984085a..f2067008 100644 --- a/chrome/browser/tracing/chrome_background_tracing_metrics_provider_unittest.cc +++ b/chrome/browser/tracing/chrome_background_tracing_metrics_provider_unittest.cc
@@ -7,7 +7,7 @@ #include <utility> #include "base/barrier_closure.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/test/bind.h" #include "chrome/test/base/scoped_testing_local_state.h"
diff --git a/chrome/browser/tracing/chrome_tracing_delegate.cc b/chrome/browser/tracing/chrome_tracing_delegate.cc index 7cdbfb6..7e6f6d2 100644 --- a/chrome/browser/tracing/chrome_tracing_delegate.cc +++ b/chrome/browser/tracing/chrome_tracing_delegate.cc
@@ -8,8 +8,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/json/values_util.h" #include "base/metrics/histogram_macros.h" #include "base/no_destructor.h"
diff --git a/chrome/browser/tracing/chrome_tracing_delegate_browsertest.cc b/chrome/browser/tracing/chrome_tracing_delegate_browsertest.cc index 9ad3eaaf..b910518 100644 --- a/chrome/browser/tracing/chrome_tracing_delegate_browsertest.cc +++ b/chrome/browser/tracing/chrome_tracing_delegate_browsertest.cc
@@ -4,13 +4,13 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" #include "base/files/file_path.h" #include "base/files/file_path_watcher.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/json/json_writer.h" #include "base/run_loop.h" #include "base/strings/pattern.h"
diff --git a/chrome/browser/transition_manager/full_browser_transition_manager.h b/chrome/browser/transition_manager/full_browser_transition_manager.h index bbbe929..880a178 100644 --- a/chrome/browser/transition_manager/full_browser_transition_manager.h +++ b/chrome/browser/transition_manager/full_browser_transition_manager.h
@@ -8,8 +8,8 @@ #include <map> #include <vector> -#include "base/callback.h" #include "base/component_export.h" +#include "base/functional/callback.h" #include "base/no_destructor.h" #include "base/sequence_checker.h" #include "components/keyed_service/core/simple_factory_key.h"
diff --git a/chrome/browser/translate/chrome_translate_client.cc b/chrome/browser/translate/chrome_translate_client.cc index d708e9a5..d9b9502 100644 --- a/chrome/browser/translate/chrome_translate_client.cc +++ b/chrome/browser/translate/chrome_translate_client.cc
@@ -7,9 +7,9 @@ #include <memory> #include <vector> -#include "base/bind.h" #include "base/check.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/notreached.h" #include "base/path_service.h" #include "base/strings/string_split.h"
diff --git a/chrome/browser/translate/translate_frame_binder_browsertest.cc b/chrome/browser/translate/translate_frame_binder_browsertest.cc index b5072ed3e..6411402 100644 --- a/chrome/browser/translate/translate_frame_binder_browsertest.cc +++ b/chrome/browser/translate/translate_frame_binder_browsertest.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 "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "build/chromeos_buildflags.h" #include "chrome/browser/chrome_content_browser_client.h"
diff --git a/chrome/browser/translate/translate_manager_browsertest.cc b/chrome/browser/translate/translate_manager_browsertest.cc index 31a269a..559630e9 100644 --- a/chrome/browser/translate/translate_manager_browsertest.cc +++ b/chrome/browser/translate/translate_manager_browsertest.cc
@@ -4,7 +4,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h"
diff --git a/chrome/browser/translate/translate_manager_render_view_host_unittest.cc b/chrome/browser/translate/translate_manager_render_view_host_unittest.cc index 2a871149..3b15461a 100644 --- a/chrome/browser/translate/translate_manager_render_view_host_unittest.cc +++ b/chrome/browser/translate/translate_manager_render_view_host_unittest.cc
@@ -10,9 +10,9 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/command_line.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/scoped_observation.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/translate/translate_model_service_browsertest.cc b/chrome/browser/translate/translate_model_service_browsertest.cc index 6ce191c1..1080e2a 100644 --- a/chrome/browser/translate/translate_model_service_browsertest.cc +++ b/chrome/browser/translate/translate_model_service_browsertest.cc
@@ -3,10 +3,10 @@ // found in the LICENSE file. #include "base/base_paths.h" -#include "base/bind.h" #include "base/files/file.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/path_service.h" #include "base/run_loop.h" #include "base/task/thread_pool/thread_pool_instance.h"
diff --git a/chrome/browser/translate/translate_service.cc b/chrome/browser/translate/translate_service.cc index 28b43efa..64085311 100644 --- a/chrome/browser/translate/translate_service.cc +++ b/chrome/browser/translate/translate_service.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/translate/translate_service.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/metrics/field_trial.h" #include "base/notreached.h" #include "base/strings/string_split.h"
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn index 8215c79..fba1fe89 100644 --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn
@@ -1366,8 +1366,6 @@ "tabs/tab_strip_user_gesture_details.h", "tabs/tab_style.cc", "tabs/tab_style.h", - "tabs/tab_switch_event_latency_recorder.cc", - "tabs/tab_switch_event_latency_recorder.h", "tabs/tab_types.h", "tabs/tab_utils.cc", "tabs/tab_utils.h",
diff --git a/chrome/browser/ui/android/autofill/autofill_keyboard_accessory_view.cc b/chrome/browser/ui/android/autofill/autofill_keyboard_accessory_view.cc index ffa2d1a..34d9d86 100644 --- a/chrome/browser/ui/android/autofill/autofill_keyboard_accessory_view.cc +++ b/chrome/browser/ui/android/autofill/autofill_keyboard_accessory_view.cc
@@ -8,7 +8,7 @@ #include "base/android/jni_android.h" #include "base/android/jni_string.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/strings/utf_string_conversions.h" #include "base/trace_event/trace_event.h"
diff --git a/chrome/browser/ui/android/autofill/autofill_keyboard_accessory_view.h b/chrome/browser/ui/android/autofill/autofill_keyboard_accessory_view.h index 9398651..8715cc5 100644 --- a/chrome/browser/ui/android/autofill/autofill_keyboard_accessory_view.h +++ b/chrome/browser/ui/android/autofill/autofill_keyboard_accessory_view.h
@@ -10,7 +10,7 @@ #include <vector> #include "base/android/scoped_java_ref.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ui/autofill/autofill_keyboard_accessory_adapter.h"
diff --git a/chrome/browser/ui/android/autofill/save_update_address_profile_flow_manager.h b/chrome/browser/ui/android/autofill/save_update_address_profile_flow_manager.h index 8b2a7990..a43fc26 100644 --- a/chrome/browser/ui/android/autofill/save_update_address_profile_flow_manager.h +++ b/chrome/browser/ui/android/autofill/save_update_address_profile_flow_manager.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/autofill/android/save_update_address_profile_message_controller.h" #include "chrome/browser/autofill/android/save_update_address_profile_prompt_controller.h" #include "components/autofill/core/browser/autofill_client.h"
diff --git a/chrome/browser/ui/android/chrome_javascript_app_modal_dialog_android.cc b/chrome/browser/ui/android/chrome_javascript_app_modal_dialog_android.cc index 31947a5..55b6d65 100644 --- a/chrome/browser/ui/android/chrome_javascript_app_modal_dialog_android.cc +++ b/chrome/browser/ui/android/chrome_javascript_app_modal_dialog_android.cc
@@ -5,7 +5,7 @@ #include "chrome/browser/ui/javascript_dialogs/chrome_javascript_app_modal_dialog_view_factory.h" #include "base/android/jni_android.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "components/javascript_dialogs/android/app_modal_dialog_view_android.h" #include "components/javascript_dialogs/app_modal_dialog_controller.h" #include "components/javascript_dialogs/app_modal_dialog_manager.h"
diff --git a/chrome/browser/ui/android/context_menu_helper.cc b/chrome/browser/ui/android/context_menu_helper.cc index 388d137..bf92f7c 100644 --- a/chrome/browser/ui/android/context_menu_helper.cc +++ b/chrome/browser/ui/android/context_menu_helper.cc
@@ -9,9 +9,9 @@ #include <map> #include "base/android/jni_string.h" -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/strings/string_util.h" #include "chrome/android/chrome_jni_headers/ContextMenuHelper_jni.h" #include "chrome/browser/vr/vr_tab_helper.h"
diff --git a/chrome/browser/ui/android/device_dialog/usb_chooser_dialog_android.cc b/chrome/browser/ui/android/device_dialog/usb_chooser_dialog_android.cc index 2f9bab18..8bf5b110 100644 --- a/chrome/browser/ui/android/device_dialog/usb_chooser_dialog_android.cc +++ b/chrome/browser/ui/android/device_dialog/usb_chooser_dialog_android.cc
@@ -10,7 +10,7 @@ #include "base/android/jni_android.h" #include "base/android/jni_string.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/ranges/algorithm.h" #include "base/strings/utf_string_conversions.h" #include "chrome/android/chrome_jni_headers/UsbChooserDialog_jni.h"
diff --git a/chrome/browser/ui/android/device_dialog/usb_chooser_dialog_android.h b/chrome/browser/ui/android/device_dialog/usb_chooser_dialog_android.h index fbc17d53..efa3160 100644 --- a/chrome/browser/ui/android/device_dialog/usb_chooser_dialog_android.h +++ b/chrome/browser/ui/android/device_dialog/usb_chooser_dialog_android.h
@@ -13,7 +13,7 @@ #include "base/android/jni_int_wrapper.h" #include "base/android/jni_string.h" #include "base/android/scoped_java_ref.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "components/permissions/chooser_controller.h" namespace content {
diff --git a/chrome/browser/ui/android/fast_checkout/fast_checkout_view_impl.h b/chrome/browser/ui/android/fast_checkout/fast_checkout_view_impl.h index 6f9684f..72ae410 100644 --- a/chrome/browser/ui/android/fast_checkout/fast_checkout_view_impl.h +++ b/chrome/browser/ui/android/fast_checkout/fast_checkout_view_impl.h
@@ -7,7 +7,7 @@ #include "base/android/jni_android.h" #include "base/android/scoped_java_ref.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/ui/fast_checkout/fast_checkout_view.h"
diff --git a/chrome/browser/ui/android/infobars/near_oom_infobar.cc b/chrome/browser/ui/android/infobars/near_oom_infobar.cc index bcf76ea..a78fd51 100644 --- a/chrome/browser/ui/android/infobars/near_oom_infobar.cc +++ b/chrome/browser/ui/android/infobars/near_oom_infobar.cc
@@ -8,9 +8,9 @@ #include <utility> #include "base/android/jni_string.h" -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "chrome/android/chrome_jni_headers/NearOomInfoBar_jni.h" #include "chrome/browser/android/tab_android.h"
diff --git a/chrome/browser/ui/android/infobars/translate_compact_infobar.cc b/chrome/browser/ui/android/infobars/translate_compact_infobar.cc index 3668d61f..c0828406 100644 --- a/chrome/browser/ui/android/infobars/translate_compact_infobar.cc +++ b/chrome/browser/ui/android/infobars/translate_compact_infobar.cc
@@ -12,7 +12,7 @@ #include "base/android/jni_array.h" #include "base/android/jni_string.h" #include "base/android/jni_weak_ref.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/types/cxx23_to_underlying.h" #include "chrome/android/chrome_jni_headers/TranslateCompactInfoBar_jni.h" #include "chrome/browser/android/tab_android.h"
diff --git a/chrome/browser/ui/android/logo/logo_bridge.cc b/chrome/browser/ui/android/logo/logo_bridge.cc index a25fd6b..131aa529 100644 --- a/chrome/browser/ui/android/logo/logo_bridge.cc +++ b/chrome/browser/ui/android/logo/logo_bridge.cc
@@ -10,7 +10,7 @@ #include "base/android/jni_android.h" #include "base/android/jni_array.h" #include "base/android/jni_string.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_android.h"
diff --git a/chrome/browser/ui/android/passwords/manual_filling_view_android.cc b/chrome/browser/ui/android/passwords/manual_filling_view_android.cc index 091cf01..00da835 100644 --- a/chrome/browser/ui/android/passwords/manual_filling_view_android.cc +++ b/chrome/browser/ui/android/passwords/manual_filling_view_android.cc
@@ -14,9 +14,9 @@ #include "base/android/jni_android.h" #include "base/android/jni_array.h" #include "base/android/jni_string.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/strings/utf_string_conversions.h" #include "base/trace_event/trace_event.h" #include "chrome/android/features/keyboard_accessory/jni_headers/ManualFillingComponentBridge_jni.h"
diff --git a/chrome/browser/ui/android/passwords/manual_filling_view_android.h b/chrome/browser/ui/android/passwords/manual_filling_view_android.h index fb956bc..8d814eb 100644 --- a/chrome/browser/ui/android/passwords/manual_filling_view_android.h +++ b/chrome/browser/ui/android/passwords/manual_filling_view_android.h
@@ -8,7 +8,7 @@ #include <jni.h> #include "base/android/scoped_java_ref.h" -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/task/thread_pool.h" #include "chrome/browser/autofill/manual_filling_view_interface.h"
diff --git a/chrome/browser/ui/android/simple_message_box_android.cc b/chrome/browser/ui/android/simple_message_box_android.cc index 200f68c4..11865fb 100644 --- a/chrome/browser/ui/android/simple_message_box_android.cc +++ b/chrome/browser/ui/android/simple_message_box_android.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/notreached.h" namespace chrome {
diff --git a/chrome/browser/ui/android/ssl_client_certificate_selector.cc b/chrome/browser/ui/android/ssl_client_certificate_selector.cc index 94f274be..305bdc5 100644 --- a/chrome/browser/ui/android/ssl_client_certificate_selector.cc +++ b/chrome/browser/ui/android/ssl_client_certificate_selector.cc
@@ -4,7 +4,7 @@ #include <utility> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/no_destructor.h" #include "chrome/browser/ssl/ssl_client_certificate_selector.h" #include "chrome/browser/vr/vr_tab_helper.h"
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_as.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_as.xtb index f1e33155..2464570 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_as.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_as.xtb
@@ -1161,6 +1161,7 @@ <translation id="7379900596734708416">ছাইটৰ বাবে গাঢ় ৰঙৰ থীম উপলব্ধ</translation> <translation id="7400418766976504921">URL</translation> <translation id="7403691278183511381">Chrome প্ৰথমবাৰ চলোৱাৰ অভিজ্ঞতা</translation> +<translation id="7411224099004328643">Google একাউণ্টৰ ব্যৱহাৰকাৰী</translation> <translation id="741204030948306876">হয়, মই সন্মত</translation> <translation id="7419565702166471774">সদায় সুৰক্ষিত সংযোগ ব্যৱহাৰ কৰক</translation> <translation id="7431991332293347422">আপোনাক Search আৰু অন্য সেৱাসমূহত ব্যক্তিগতকৰণ কৰা অভিজ্ঞতা প্ৰদান কৰিবলৈ কেনেকৈ আপোনাৰ ব্ৰাউজিংৰ ইতিহাস ব্যৱহাৰ কৰা হয় সেয়া নিয়ন্ত্ৰণ কৰক</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_bn.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_bn.xtb index 5ba1fb2a..44acc1a 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_bn.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_bn.xtb
@@ -1163,6 +1163,7 @@ <translation id="7379900596734708416">সাইটের জন্য ডার্ক থিম উপলভ্য আছে</translation> <translation id="7400418766976504921">URL</translation> <translation id="7403691278183511381">Chrome প্রথম চালানোর অভিজ্ঞতা</translation> +<translation id="7411224099004328643">Google অ্যাকাউন্ট ব্যবহারকারী</translation> <translation id="741204030948306876">হ্যাঁ, আমি রাজি</translation> <translation id="7419565702166471774">সবসময় সুরক্ষিত কানেকশন ব্যবহার করুন</translation> <translation id="7431991332293347422">সার্চ এবং আরও অনেক কিছু নিজের মত করে সাজিয়ে নেওয়ার জন্য আপনার ব্রাউজিং ইতিহাস কীভাবে ব্যবহার হবে তা নিয়ন্ত্রণ করুন</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_de.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_de.xtb index 0b38b3d..2c5134dc 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_de.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_de.xtb
@@ -1161,6 +1161,7 @@ <translation id="7379900596734708416">Dunkles Design für Websites verfügbar</translation> <translation id="7400418766976504921">URL</translation> <translation id="7403691278183511381">Eindruck beim ersten Ausführen von Chrome</translation> +<translation id="7411224099004328643">Nutzer des Google-Kontos</translation> <translation id="741204030948306876">Ja, bitte</translation> <translation id="7419565702166471774">Immer sichere Verbindungen verwenden</translation> <translation id="7431991332293347422">Lege fest, wie dein Browserverlauf zur Personalisierung der Google Suche verwendet wird</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_el.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_el.xtb index 6a915dd..dbdca18 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_el.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_el.xtb
@@ -883,6 +883,7 @@ <translation id="5865733239029070421">Αποστέλλει αυτόματα στατιστικά στοιχεία χρήσης και αναφορές σφαλμάτων στην Google</translation> <translation id="5869522115854928033">Αποθηκευμένοι κωδικοί πρόσβασης</translation> <translation id="5869789175361934029">Συνέχεια από άλλη συσκευή</translation> +<translation id="5876496397064130037">Η εργασία συνεχίστηκε</translation> <translation id="587735546353481577">Για να ακολουθήσετε έναν ιστότοπο, μεταβείτε στον ιστότοπο, ανοίξτε το μενού Chrome και πατήστε Παρακολούθηση.</translation> <translation id="5879072387416556377">Δείτε καλύτερες προτάσεις</translation> <translation id="5906513782029855931">Εάν ο Βοηθός Google γνωρίζει τα URL των ιστοτόπων, τότε θα μπορεί να σας βοηθήσει να ολοκληρώσετε εργασίες. Μπορείτε να απενεργοποιήσετε τον Βοηθό στις ρυθμίσεις του Chrome.</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_fa.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_fa.xtb index b81a302b..3c2b2931 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_fa.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_fa.xtb
@@ -1161,6 +1161,7 @@ <translation id="7379900596734708416">زمینه تیره برای سایتها دردسترس است</translation> <translation id="7400418766976504921">نشانی وب</translation> <translation id="7403691278183511381">اولین تجربه اجرا Chrome</translation> +<translation id="7411224099004328643">کاربر «حساب Google»</translation> <translation id="741204030948306876">بله، موافقم</translation> <translation id="7419565702166471774">همیشه از اتصالهای امن استفاده شود</translation> <translation id="7431991332293347422">کنترل نحوه استفاده از سابقه مرور برای شخصیسازی «جستجو» و موارد دیگر</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_fr-CA.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_fr-CA.xtb index a2c44c1..53e2323 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_fr-CA.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_fr-CA.xtb
@@ -883,6 +883,7 @@ <translation id="5865733239029070421">Envoie automatiquement des statistiques d'utilisation et des rapports d'erreur à Google</translation> <translation id="5869522115854928033">Mots de passe enregistrés</translation> <translation id="5869789175361934029">Continuer à partir d'un autre appareil</translation> +<translation id="5876496397064130037">Reprise de la tâche</translation> <translation id="587735546353481577">Pour suivre un site, accédez à ce dernier, ouvrez le menu Chrome et touchez Suivre.</translation> <translation id="5879072387416556377">Obtenir de meilleures suggestions</translation> <translation id="5906513782029855931">Le fait de connaître les URL des sites permet à l'Assistant Google de vous aider à effectuer des tâches. Vous pouvez désactiver l'Assistant dans les paramètres de Chrome.</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_fr.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_fr.xtb index 43888a3b..9a402fde 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_fr.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_fr.xtb
@@ -1161,6 +1161,7 @@ <translation id="7379900596734708416">Le thème sombre pour les sites est disponible</translation> <translation id="7400418766976504921">URL</translation> <translation id="7403691278183511381">Expérience de première utilisation de Chrome</translation> +<translation id="7411224099004328643">Utilisateur du compte Google</translation> <translation id="741204030948306876">J'accepte</translation> <translation id="7419565702166471774">Toujours utiliser une connexion sécurisée</translation> <translation id="7431991332293347422">Contrôler la manière dont votre historique de navigation est utilisé pour personnaliser la recherche et plus encore</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_hy.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_hy.xtb index a7a1b981..bc7da985 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_hy.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_hy.xtb
@@ -883,6 +883,7 @@ <translation id="5865733239029070421">Ավտոմատ Google-ին է ուղարկում օգտագործման վիճակագրությունը և խափանումների մասին հաշվետվությունները</translation> <translation id="5869522115854928033">Պահված գաղտնաբառեր</translation> <translation id="5869789175361934029">Շարունակեք այլ սարքից</translation> +<translation id="5876496397064130037">Առաջադրանքը վերսկսվեց</translation> <translation id="587735546353481577">Կայքին հետևելու համար անցեք այդ կայք, բացեք Chrome-ի ընտրացանկն ու հպեք «Հետևել»։</translation> <translation id="5879072387416556377">Ստացեք ավելի լավ առաջարկներ</translation> <translation id="5906513782029855931">Երբ Google Օգնականը ճանաչում է կայքերի URL-ները, այն կարող է օգնել ձեզ առաջադրանքներ կատարել։ Օգնականը կարող եք անջատել Chrome-ի կարգավորումներում։</translation> @@ -1161,6 +1162,7 @@ <translation id="7379900596734708416">Կայքերի համար մուգ թեման հասանելի է</translation> <translation id="7400418766976504921">URL</translation> <translation id="7403691278183511381">Chrome-ի առաջին գործարկում</translation> +<translation id="7411224099004328643">Google հաշվի օգտատեր</translation> <translation id="741204030948306876">Լավ</translation> <translation id="7419565702166471774">Միշտ օգտագործել անվտանգ միացումներ</translation> <translation id="7431991332293347422">Կառավարեք ձեր այցելությունների պատմության օգտագործումը՝ Որոնումը և այլ ծառայություններ անհատականացնելու համար</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_kn.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_kn.xtb index ce8f29a..eaa7727 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_kn.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_kn.xtb
@@ -1160,6 +1160,7 @@ <translation id="7379900596734708416">ಸೈಟ್ಗಳ ಡಾರ್ಕ್ ಥೀಮ್ ಲಭ್ಯವಿದೆ</translation> <translation id="7400418766976504921">URL</translation> <translation id="7403691278183511381">Chrome ಮೊದಲ ರನ್ ಅನುಭವ</translation> +<translation id="7411224099004328643">Google ಖಾತೆ ಬಳಕೆದಾರರು</translation> <translation id="741204030948306876">ಹೌದು, ನಾನಿದ್ದೇನೆ</translation> <translation id="7419565702166471774">ಯಾವಾಗಲೂ ಸುರಕ್ಷಿತವಾದ ಕನೆಕ್ಷನ್ಗಳನ್ನು ಬಳಸಿ</translation> <translation id="7431991332293347422">ಹುಡುಕಾಟ ಮತ್ತು ಇನ್ನೂ ಹೆಚ್ಚಿನವುಗಳನ್ನು ವೈಯಕ್ತೀಕರಿಸಲು ನಿಮ್ಮ ಬ್ರೌಸಿಂಗ್ ಇತಿಹಾಸವನ್ನು ಹೇಗೆ ಬಳಸಲಾಗುತ್ತದೆ ಎಂಬುದನ್ನು ನಿಯಂತ್ರಿಸಿ</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_no.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_no.xtb index 2441b3d..4640ef8 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_no.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_no.xtb
@@ -1161,6 +1161,7 @@ <translation id="7379900596734708416">Mørkt tema for nettsteder er tilgjengelig</translation> <translation id="7400418766976504921">Nettadresse</translation> <translation id="7403691278183511381">Førsteinntrykk ved bruk av Chrome</translation> +<translation id="7411224099004328643">Google-kontobruker</translation> <translation id="741204030948306876">Ja, jeg er med</translation> <translation id="7419565702166471774">Bruk alltid sikre tilkoblinger</translation> <translation id="7431991332293347422">Kontroller hvordan nettleserloggen din brukes til blant annet personlig tilpasning av søk</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_pt-BR.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_pt-BR.xtb index 81fb1be..c54c1c70 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_pt-BR.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_pt-BR.xtb
@@ -884,6 +884,7 @@ <translation id="5865733239029070421">Envia estatísticas de uso e relatórios de erros automaticamente para o Google</translation> <translation id="5869522115854928033">Senhas salvas</translation> <translation id="5869789175361934029">Continue de outro dispositivo</translation> +<translation id="5876496397064130037">Tarefa retomada</translation> <translation id="587735546353481577">Para seguir um site, acesse-o, abra o menu do Google Chrome e toque em "Seguir".</translation> <translation id="5879072387416556377">Receba sugestões melhores</translation> <translation id="5906513782029855931">Ao saber os URLs de sites, o Google Assistente pode ajudar você a realizar tarefas. É possível desativar o Assistente nas configurações do Chrome.</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_sk.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_sk.xtb index be53d438..85b000fc 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_sk.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_sk.xtb
@@ -883,6 +883,7 @@ <translation id="5865733239029070421">Automaticky odosiela štatistiky o používaní a správy o zlyhaní Googlu</translation> <translation id="5869522115854928033">Uložené heslá</translation> <translation id="5869789175361934029">Pokračujte v inom zariadení</translation> +<translation id="5876496397064130037">Úloha bola obnovená</translation> <translation id="587735546353481577">Ak chcete sledovať určitý web, prejdite naň, otvorte Ponuku Chrome a klepnite na Sledovať.</translation> <translation id="5879072387416556377">Dostávajte lepšie návrhy</translation> <translation id="5906513782029855931">Keď bude Asistent Google poznať webové adresy, bude vám môcť pomáhať s plnením úloh. Asistenta môžete vypnúť v nastaveniach Chromu.</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_te.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_te.xtb index 9ffcea7..57e9314 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_te.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_te.xtb
@@ -883,6 +883,7 @@ <translation id="5865733239029070421">వినియోగ గణాంకాలను, క్రాష్ రిపోర్ట్లను ఆటోమేటిక్గా Googleకు పంపుతుంది</translation> <translation id="5869522115854928033">సేవ్ చేసిన పాస్వర్డ్లు</translation> <translation id="5869789175361934029">మరో పరికరం నుండి కొనసాగించండి</translation> +<translation id="5876496397064130037">టాస్క్ కొనసాగించబడింది</translation> <translation id="587735546353481577">సైట్ను ఫాలో చేయడానికి, సైట్కు వెళ్లి, Chrome మెనూను తెరిచి, 'ఫాలో చేయండి'ని ట్యాప్ చేయండి.</translation> <translation id="5879072387416556377">ఉత్తమ సూచనలను పొందండి</translation> <translation id="5906513782029855931">సైట్ల URLలను తెలుసుకుంటే, టాస్క్లను పూర్తి చేయడంలో Google Assistant మీకు సహాయం చేస్తుంది. మీరు Assistantను Chrome సెట్టింగ్లలో ఆఫ్ చేయవచ్చు.</translation> @@ -1161,6 +1162,7 @@ <translation id="7379900596734708416">సైట్ల కోసం ముదురు రంగు రూపం అందుబాటులో ఉంది</translation> <translation id="7400418766976504921">URL</translation> <translation id="7403691278183511381">Chrome మొదటి అమలు అనుభవం</translation> +<translation id="7411224099004328643">Google ఖాతా యూజర్</translation> <translation id="741204030948306876">సరే, సమ్మతమే</translation> <translation id="7419565702166471774">ఎల్లప్పుడూ సురక్షిత కనెక్షన్లను ఉపయోగించండి</translation> <translation id="7431991332293347422">సెర్చ్లు మరియు మరిన్నింటిని వ్యక్తిగతీకరించడానికి మీ బ్రౌజింగ్ హిస్టరీ ఎలా ఉపయోగించబడుతుందో నియంత్రించండి</translation>
diff --git a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ur.xtb b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ur.xtb index 4ec91043..abf8f04 100644 --- a/chrome/browser/ui/android/strings/translations/android_chrome_strings_ur.xtb +++ b/chrome/browser/ui/android/strings/translations/android_chrome_strings_ur.xtb
@@ -1161,6 +1161,7 @@ <translation id="7379900596734708416">سائٹس کے لیے گہری تھیم دستیاب ہے</translation> <translation id="7400418766976504921">URL</translation> <translation id="7403691278183511381">Chrome کے پہلی بار چلانے کا تجربہ</translation> +<translation id="7411224099004328643">Google اکاؤنٹ کا صارف</translation> <translation id="741204030948306876">ہاں، میں شامل ہوں</translation> <translation id="7419565702166471774">ہمیشہ محفوظ کنکشنز کا استعمال کریں</translation> <translation id="7431991332293347422">تلاش کو ذاتی نوعیت کا بنانے کیلئے آپ کی براؤزنگ کی سرگزشت جس طریقے سے استعمال کی جاتی ہے اسے کنٹرول کریں اور مزید بہت کچھ</translation>
diff --git a/chrome/browser/ui/android/webid/account_selection_view_android.h b/chrome/browser/ui/android/webid/account_selection_view_android.h index bee19cf..e563cb9 100644 --- a/chrome/browser/ui/android/webid/account_selection_view_android.h +++ b/chrome/browser/ui/android/webid/account_selection_view_android.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/ui/webid/account_selection_view.h" // This class provides an implementation of the AccountSelectionView interface
diff --git a/chrome/browser/ui/apps/app_info_dialog.h b/chrome/browser/ui/apps/app_info_dialog.h index 30d636d..376ad2f 100644 --- a/chrome/browser/ui/apps/app_info_dialog.h +++ b/chrome/browser/ui/apps/app_info_dialog.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "build/chromeos_buildflags.h" class Profile;
diff --git a/chrome/browser/ui/apps/chrome_app_delegate.cc b/chrome/browser/ui/apps/chrome_app_delegate.cc index 4a59c78..71cfb60 100644 --- a/chrome/browser/ui/apps/chrome_app_delegate.cc +++ b/chrome/browser/ui/apps/chrome_app_delegate.cc
@@ -8,7 +8,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h" #include "chrome/browser/app_mode/app_mode_utils.h"
diff --git a/chrome/browser/ui/apps/chrome_app_delegate.h b/chrome/browser/ui/apps/chrome_app_delegate.h index 4c838d2a..82cab8b7 100644 --- a/chrome/browser/ui/apps/chrome_app_delegate.h +++ b/chrome/browser/ui/apps/chrome_app_delegate.h
@@ -7,8 +7,8 @@ #include <memory> -#include "base/callback.h" #include "base/callback_list.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "extensions/browser/app_window/app_delegate.h"
diff --git a/chrome/browser/ui/apps/directory_access_confirmation_dialog.cc b/chrome/browser/ui/apps/directory_access_confirmation_dialog.cc index ff9b133..37a87d9 100644 --- a/chrome/browser/ui/apps/directory_access_confirmation_dialog.cc +++ b/chrome/browser/ui/apps/directory_access_confirmation_dialog.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/ui/tab_modal_confirm_dialog.h" #include "chrome/browser/ui/tab_modal_confirm_dialog_delegate.h" #include "chrome/grit/generated_resources.h"
diff --git a/chrome/browser/ui/apps/directory_access_confirmation_dialog.h b/chrome/browser/ui/apps/directory_access_confirmation_dialog.h index de6bcab06..459f594 100644 --- a/chrome/browser/ui/apps/directory_access_confirmation_dialog.h +++ b/chrome/browser/ui/apps/directory_access_confirmation_dialog.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" namespace content { class WebContents;
diff --git a/chrome/browser/ui/ash/ambient/ambient_client_impl.cc b/chrome/browser/ui/ash/ambient/ambient_client_impl.cc index 2145137..be1014bbf 100644 --- a/chrome/browser/ui/ash/ambient/ambient_client_impl.cc +++ b/chrome/browser/ui/ash/ambient/ambient_client_impl.cc
@@ -10,7 +10,7 @@ #include "ash/constants/ash_features.h" #include "ash/public/cpp/ambient/ambient_prefs.h" #include "ash/public/cpp/image_downloader.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/ash/login/demo_mode/demo_session.h" #include "chrome/browser/ash/profiles/profile_helper.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ui/ash/app_icon_color_cache.cc b/chrome/browser/ui/ash/app_icon_color_cache.cc index b67f248..0e094e0 100644 --- a/chrome/browser/ui/ash/app_icon_color_cache.cc +++ b/chrome/browser/ui/ash/app_icon_color_cache.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/ash/app_icon_color_cache.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/no_destructor.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/gfx/color_analysis.h"
diff --git a/chrome/browser/ui/ash/assistant/assistant_setup.cc b/chrome/browser/ui/ash/assistant/assistant_setup.cc index c3359be..afa9a36 100644 --- a/chrome/browser/ui/ash/assistant/assistant_setup.cc +++ b/chrome/browser/ui/ash/assistant/assistant_setup.cc
@@ -8,8 +8,8 @@ #include <utility> #include "ash/public/cpp/notification_utils.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/task/sequenced_task_runner.h" #include "chrome/browser/ash/assistant/assistant_util.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ui/ash/assistant/assistant_state_client.cc b/chrome/browser/ui/ash/assistant/assistant_state_client.cc index 993e6bd..188aa39 100644 --- a/chrome/browser/ui/ash/assistant/assistant_state_client.cc +++ b/chrome/browser/ui/ash/assistant/assistant_state_client.cc
@@ -9,7 +9,7 @@ #include "ash/components/arc/arc_util.h" #include "ash/public/cpp/assistant/assistant_state.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/arc/arc_util.h" #include "chrome/browser/ash/arc/session/arc_session_manager.h" #include "chrome/browser/ash/assistant/assistant_util.h"
diff --git a/chrome/browser/ui/ash/assistant/assistant_state_client_unittest.cc b/chrome/browser/ui/ash/assistant/assistant_state_client_unittest.cc index 0375693..8033034 100644 --- a/chrome/browser/ui/ash/assistant/assistant_state_client_unittest.cc +++ b/chrome/browser/ui/ash/assistant/assistant_state_client_unittest.cc
@@ -9,8 +9,8 @@ #include "ash/components/arc/arc_util.h" #include "ash/components/arc/test/fake_arc_session.h" #include "ash/public/cpp/assistant/assistant_state.h" -#include "base/bind.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/arc/session/arc_session_manager.h" #include "chrome/browser/ash/arc/test/test_arc_session_manager.h" #include "chrome/browser/ash/login/users/fake_chrome_user_manager.h"
diff --git a/chrome/browser/ui/ash/assistant/device_actions.cc b/chrome/browser/ui/ash/assistant/device_actions.cc index a99693e..d0459f9 100644 --- a/chrome/browser/ui/ash/assistant/device_actions.cc +++ b/chrome/browser/ui/ash/assistant/device_actions.cc
@@ -13,7 +13,7 @@ #include "ash/components/arc/session/arc_service_manager.h" #include "ash/constants/ash_pref_names.h" #include "ash/public/cpp/bluetooth_config_service.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/ash/app_list/arc/arc_app_list_prefs.h"
diff --git a/chrome/browser/ui/ash/assistant/device_actions_unittest.cc b/chrome/browser/ui/ash/assistant/device_actions_unittest.cc index 411b6272..6fe6eeb 100644 --- a/chrome/browser/ui/ash/assistant/device_actions_unittest.cc +++ b/chrome/browser/ui/ash/assistant/device_actions_unittest.cc
@@ -10,7 +10,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/app_list/arc/arc_app_list_prefs.h" #include "chrome/browser/ash/app_list/arc/arc_app_utils.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ui/ash/assistant/search_and_assistant_enabled_checker.cc b/chrome/browser/ui/ash/assistant/search_and_assistant_enabled_checker.cc index 82431f5..99aca76d 100644 --- a/chrome/browser/ui/ash/assistant/search_and_assistant_enabled_checker.cc +++ b/chrome/browser/ui/ash/assistant/search_and_assistant_enabled_checker.cc
@@ -7,8 +7,8 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/json/json_writer.h" #include "base/strings/string_util.h" #include "chromeos/ash/services/assistant/public/cpp/assistant_prefs.h"
diff --git a/chrome/browser/ui/ash/assistant/search_and_assistant_enabled_checker_unittest.cc b/chrome/browser/ui/ash/assistant/search_and_assistant_enabled_checker_unittest.cc index 44e4591..68d5c6d 100644 --- a/chrome/browser/ui/ash/assistant/search_and_assistant_enabled_checker_unittest.cc +++ b/chrome/browser/ui/ash/assistant/search_and_assistant_enabled_checker_unittest.cc
@@ -8,7 +8,7 @@ #include <set> #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/test/base/chrome_ash_test_base.h" #include "chromeos/services/assistant/public/shared/constants.h" #include "services/data_decoder/public/cpp/test_support/in_process_data_decoder.h"
diff --git a/chrome/browser/ui/ash/capture_mode/capture_mode_browsertest.cc b/chrome/browser/ui/ash/capture_mode/capture_mode_browsertest.cc index e7d5f5e9..6f1a535 100644 --- a/chrome/browser/ui/ash/capture_mode/capture_mode_browsertest.cc +++ b/chrome/browser/ui/ash/capture_mode/capture_mode_browsertest.cc
@@ -12,8 +12,8 @@ #include "ash/public/cpp/test/shell_test_api.h" #include "ash/session/session_controller_impl.h" #include "ash/shell.h" -#include "base/callback_forward.h" #include "base/files/file_util.h" +#include "base/functional/callback_forward.h" #include "base/run_loop.h" #include "base/scoped_observation.h" #include "base/task/sequenced_task_runner.h"
diff --git a/chrome/browser/ui/ash/capture_mode/chrome_capture_mode_delegate.cc b/chrome/browser/ui/ash/capture_mode/chrome_capture_mode_delegate.cc index e795dc9..43bf171 100644 --- a/chrome/browser/ui/ash/capture_mode/chrome_capture_mode_delegate.cc +++ b/chrome/browser/ui/ash/capture_mode/chrome_capture_mode_delegate.cc
@@ -6,10 +6,10 @@ #include <memory> -#include "base/bind.h" #include "base/check.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/i18n/time_formatting.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/ui/ash/capture_mode/chrome_capture_mode_delegate.h b/chrome/browser/ui/ash/capture_mode/chrome_capture_mode_delegate.h index 7cf9a6b..a82cd41c 100644 --- a/chrome/browser/ui/ash/capture_mode/chrome_capture_mode_delegate.h +++ b/chrome/browser/ui/ash/capture_mode/chrome_capture_mode_delegate.h
@@ -6,8 +6,8 @@ #define CHROME_BROWSER_UI_ASH_CAPTURE_MODE_CHROME_CAPTURE_MODE_DELEGATE_H_ #include "ash/public/cpp/capture_mode/capture_mode_delegate.h" -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "chromeos/ash/components/drivefs/mojom/drivefs.mojom-forward.h" #include "components/drive/file_errors.h"
diff --git a/chrome/browser/ui/ash/capture_mode/recording_overlay_view_impl.cc b/chrome/browser/ui/ash/capture_mode/recording_overlay_view_impl.cc index 82bb8423..77817d5 100644 --- a/chrome/browser/ui/ash/capture_mode/recording_overlay_view_impl.cc +++ b/chrome/browser/ui/ash/capture_mode/recording_overlay_view_impl.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/ash/projector/projector_client_impl.h"
diff --git a/chrome/browser/ui/ash/capture_mode/recording_service_browsertest.cc b/chrome/browser/ui/ash/capture_mode/recording_service_browsertest.cc index 7c5240c2..8f2d5d4 100644 --- a/chrome/browser/ui/ash/capture_mode/recording_service_browsertest.cc +++ b/chrome/browser/ui/ash/capture_mode/recording_service_browsertest.cc
@@ -7,10 +7,10 @@ #include "ash/public/cpp/capture_mode/capture_mode_test_api.h" #include "ash/public/cpp/test/shell_test_api.h" -#include "base/bind.h" #include "base/check.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/ui/ash/cast_config_controller_media_router.cc b/chrome/browser/ui/ash/cast_config_controller_media_router.cc index 179f5c0..a39df8d 100644 --- a/chrome/browser/ui/ash/cast_config_controller_media_router.cc +++ b/chrome/browser/ui/ash/cast_config_controller_media_router.cc
@@ -9,10 +9,10 @@ #include <vector> #include "ash/constants/ash_switches.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/feature_list.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/ash/chrome_shell_delegate.cc b/chrome/browser/ui/ash/chrome_shell_delegate.cc index f159f42..44898d3 100644 --- a/chrome/browser/ui/ash/chrome_shell_delegate.cc +++ b/chrome/browser/ui/ash/chrome_shell_delegate.cc
@@ -13,9 +13,9 @@ #include "ash/public/cpp/assistant/assistant_state.h" #include "ash/public/cpp/new_window_delegate.h" #include "ash/public/cpp/system_sounds_delegate.h" -#include "base/bind.h" #include "base/check.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "cc/input/touch_action.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/ui/ash/chrome_shell_delegate.h b/chrome/browser/ui/ash/chrome_shell_delegate.h index 1d7df86..31387b4 100644 --- a/chrome/browser/ui/ash/chrome_shell_delegate.h +++ b/chrome/browser/ui/ash/chrome_shell_delegate.h
@@ -9,7 +9,7 @@ #include <string> #include "ash/shell_delegate.h" -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "url/gurl.h" class ChromeShellDelegate : public ash::ShellDelegate {
diff --git a/chrome/browser/ui/ash/clipboard_util.cc b/chrome/browser/ui/ash/clipboard_util.cc index f4d4ffa..0fb6734 100644 --- a/chrome/browser/ui/ash/clipboard_util.cc +++ b/chrome/browser/ui/ash/clipboard_util.cc
@@ -10,9 +10,9 @@ #include "ash/public/cpp/clipboard_history_controller.h" #include "base/base64.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/files/file_util.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ref_counted_memory.h" #include "base/memory/scoped_refptr.h" #include "base/metrics/user_metrics.h"
diff --git a/chrome/browser/ui/ash/clipboard_util.h b/chrome/browser/ui/ash/clipboard_util.h index a3a167b..d754c1d 100644 --- a/chrome/browser/ui/ash/clipboard_util.h +++ b/chrome/browser/ui/ash/clipboard_util.h
@@ -7,7 +7,7 @@ #include <stdint.h> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/ref_counted_memory.h" #include "base/memory/scoped_refptr.h" #include "ui/base/clipboard/clipboard.h"
diff --git a/chrome/browser/ui/ash/desks/chrome_desks_templates_delegate.cc b/chrome/browser/ui/ash/desks/chrome_desks_templates_delegate.cc index c1b0b5f..76f8542 100644 --- a/chrome/browser/ui/ash/desks/chrome_desks_templates_delegate.cc +++ b/chrome/browser/ui/ash/desks/chrome_desks_templates_delegate.cc
@@ -11,8 +11,8 @@ #include "ash/public/cpp/system/toast_data.h" #include "ash/public/cpp/system/toast_manager.h" #include "ash/strings/grit/ash_strings.h" -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/strings/string_number_conversions.h" #include "chrome/app/vector_icons/vector_icons.h" #include "chrome/browser/apps/app_service/app_service_proxy.h"
diff --git a/chrome/browser/ui/ash/desks/chrome_desks_templates_delegate.h b/chrome/browser/ui/ash/desks/chrome_desks_templates_delegate.h index bd4d22b4..85f6e04c 100644 --- a/chrome/browser/ui/ash/desks/chrome_desks_templates_delegate.h +++ b/chrome/browser/ui/ash/desks/chrome_desks_templates_delegate.h
@@ -8,7 +8,7 @@ #include <memory> #include "ash/public/cpp/desks_templates_delegate.h" -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "chromeos/crosapi/mojom/desk_template.mojom-forward.h" #include "components/favicon_base/favicon_types.h"
diff --git a/chrome/browser/ui/ash/desks/desks_client.cc b/chrome/browser/ui/ash/desks/desks_client.cc index 5a932f5..19470a0 100644 --- a/chrome/browser/ui/ash/desks/desks_client.cc +++ b/chrome/browser/ui/ash/desks/desks_client.cc
@@ -23,8 +23,8 @@ #include "ash/wm/overview/overview_controller.h" #include "ash/wm/overview/overview_grid.h" #include "ash/wm/overview/overview_session.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/guid.h" #include "base/metrics/histogram_functions.h" #include "base/scoped_observation.h"
diff --git a/chrome/browser/ui/ash/desks/desks_client.h b/chrome/browser/ui/ash/desks/desks_client.h index 2d356b5..c501557 100644 --- a/chrome/browser/ui/ash/desks/desks_client.h +++ b/chrome/browser/ui/ash/desks/desks_client.h
@@ -9,8 +9,8 @@ #include <memory> #include "ash/public/cpp/session/session_observer.h" -#include "base/callback.h" #include "base/containers/flat_map.h" +#include "base/functional/callback.h" #include "base/guid.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h"
diff --git a/chrome/browser/ui/ash/desks/desks_client_browsertest.cc b/chrome/browser/ui/ash/desks/desks_client_browsertest.cc index dcfaadb7..1d6ca31 100644 --- a/chrome/browser/ui/ash/desks/desks_client_browsertest.cc +++ b/chrome/browser/ui/ash/desks/desks_client_browsertest.cc
@@ -31,9 +31,9 @@ #include "ash/wm/overview/overview_session.h" #include "ash/wm/overview/overview_test_util.h" #include "ash/wm/window_state.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/guid.h" #include "base/json/json_writer.h" #include "base/run_loop.h"
diff --git a/chrome/browser/ui/ash/device_scheduled_reboot/reboot_notification_controller.cc b/chrome/browser/ui/ash/device_scheduled_reboot/reboot_notification_controller.cc index c085e5a5..e9ee396 100644 --- a/chrome/browser/ui/ash/device_scheduled_reboot/reboot_notification_controller.cc +++ b/chrome/browser/ui/ash/device_scheduled_reboot/reboot_notification_controller.cc
@@ -9,7 +9,7 @@ #include "ash/public/cpp/notification_utils.h" #include "ash/public/cpp/shell_window_ids.h" #include "ash/shell.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/i18n/time_formatting.h" #include "base/memory/ptr_util.h" #include "base/strings/strcat.h"
diff --git a/chrome/browser/ui/ash/device_scheduled_reboot/reboot_notification_controller.h b/chrome/browser/ui/ash/device_scheduled_reboot/reboot_notification_controller.h index 031b007..15a2b3e4 100644 --- a/chrome/browser/ui/ash/device_scheduled_reboot/reboot_notification_controller.h +++ b/chrome/browser/ui/ash/device_scheduled_reboot/reboot_notification_controller.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ui/ash/device_scheduled_reboot/scheduled_reboot_dialog.h"
diff --git a/chrome/browser/ui/ash/device_scheduled_reboot/reboot_notification_controller_browsertest.cc b/chrome/browser/ui/ash/device_scheduled_reboot/reboot_notification_controller_browsertest.cc index 5e04dfe..20804cc 100644 --- a/chrome/browser/ui/ash/device_scheduled_reboot/reboot_notification_controller_browsertest.cc +++ b/chrome/browser/ui/ash/device_scheduled_reboot/reboot_notification_controller_browsertest.cc
@@ -3,7 +3,7 @@ // found in the LICENSE file. #include "chrome/browser/ui/ash/device_scheduled_reboot/reboot_notification_controller.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/time/time.h" #include "chrome/browser/ui/test/test_browser_dialog.h" #include "content/public/test/browser_test.h"
diff --git a/chrome/browser/ui/ash/device_scheduled_reboot/reboot_notification_controller_unittest.cc b/chrome/browser/ui/ash/device_scheduled_reboot/reboot_notification_controller_unittest.cc index a0acba95..5e5000a 100644 --- a/chrome/browser/ui/ash/device_scheduled_reboot/reboot_notification_controller_unittest.cc +++ b/chrome/browser/ui/ash/device_scheduled_reboot/reboot_notification_controller_unittest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/ash/device_scheduled_reboot/reboot_notification_controller.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/time/time.h" #include "chrome/browser/ash/login/users/fake_chrome_user_manager.h" #include "chrome/browser/notifications/notification_display_service_tester.h"
diff --git a/chrome/browser/ui/ash/device_scheduled_reboot/scheduled_reboot_dialog.cc b/chrome/browser/ui/ash/device_scheduled_reboot/scheduled_reboot_dialog.cc index 27dc97e4e..9f54259 100644 --- a/chrome/browser/ui/ash/device_scheduled_reboot/scheduled_reboot_dialog.cc +++ b/chrome/browser/ui/ash/device_scheduled_reboot/scheduled_reboot_dialog.cc
@@ -7,8 +7,8 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/i18n/time_formatting.h" #include "components/constrained_window/constrained_window_views.h" #include "components/strings/grit/components_strings.h"
diff --git a/chrome/browser/ui/ash/device_scheduled_reboot/scheduled_reboot_dialog.h b/chrome/browser/ui/ash/device_scheduled_reboot/scheduled_reboot_dialog.h index d17d9103..e915e55 100644 --- a/chrome/browser/ui/ash/device_scheduled_reboot/scheduled_reboot_dialog.h +++ b/chrome/browser/ui/ash/device_scheduled_reboot/scheduled_reboot_dialog.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/time/time.h" #include "chrome/browser/ui/views/relaunch_notification/relaunch_required_timer.h"
diff --git a/chrome/browser/ui/ash/holding_space/holding_space_browsertest_base.cc b/chrome/browser/ui/ash/holding_space/holding_space_browsertest_base.cc index 41bdb22..e94877c 100644 --- a/chrome/browser/ui/ash/holding_space/holding_space_browsertest_base.cc +++ b/chrome/browser/ui/ash/holding_space/holding_space_browsertest_base.cc
@@ -11,8 +11,8 @@ #include "ash/public/cpp/holding_space/holding_space_model.h" #include "ash/public/cpp/holding_space/holding_space_test_api.h" #include "ash/public/cpp/holding_space/holding_space_util.h" -#include "base/callback_helpers.h" #include "base/files/file_util.h" +#include "base/functional/callback_helpers.h" #include "base/scoped_observation.h" #include "base/strings/stringprintf.h" #include "base/test/bind.h"
diff --git a/chrome/browser/ui/ash/holding_space/holding_space_client_impl.cc b/chrome/browser/ui/ash/holding_space/holding_space_client_impl.cc index b36a1fa9b..257e41c4 100644 --- a/chrome/browser/ui/ash/holding_space/holding_space_client_impl.cc +++ b/chrome/browser/ui/ash/holding_space/holding_space_client_impl.cc
@@ -11,7 +11,7 @@ #include "ash/public/cpp/holding_space/holding_space_metrics.h" #include "ash/public/cpp/holding_space/holding_space_progress.h" #include "base/barrier_closure.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/notreached.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/ui/ash/holding_space/holding_space_client_impl.h b/chrome/browser/ui/ash/holding_space/holding_space_client_impl.h index 54dc228..14748b69e 100644 --- a/chrome/browser/ui/ash/holding_space/holding_space_client_impl.h +++ b/chrome/browser/ui/ash/holding_space/holding_space_client_impl.h
@@ -8,7 +8,7 @@ #include <vector> #include "ash/public/cpp/holding_space/holding_space_client.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" class Profile;
diff --git a/chrome/browser/ui/ash/holding_space/holding_space_client_impl_browsertest.cc b/chrome/browser/ui/ash/holding_space/holding_space_client_impl_browsertest.cc index 8e4884a..aa17b1c 100644 --- a/chrome/browser/ui/ash/holding_space/holding_space_client_impl_browsertest.cc +++ b/chrome/browser/ui/ash/holding_space/holding_space_client_impl_browsertest.cc
@@ -12,9 +12,9 @@ #include "ash/public/cpp/holding_space/holding_space_metrics.h" #include "ash/public/cpp/holding_space/holding_space_model.h" #include "ash/public/cpp/holding_space/holding_space_util.h" -#include "base/callback_helpers.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/callback_helpers.h" #include "base/path_service.h" #include "base/run_loop.h" #include "base/test/bind.h"
diff --git a/chrome/browser/ui/ash/holding_space/holding_space_file_system_delegate.h b/chrome/browser/ui/ash/holding_space/holding_space_file_system_delegate.h index 0f862b7..637c965 100644 --- a/chrome/browser/ui/ash/holding_space/holding_space_file_system_delegate.h +++ b/chrome/browser/ui/ash/holding_space/holding_space_file_system_delegate.h
@@ -11,7 +11,7 @@ #include "ash/components/arc/mojom/file_system.mojom-forward.h" #include "ash/components/arc/session/connection_holder.h" #include "ash/components/arc/session/connection_observer.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/scoped_observation.h" #include "base/timer/timer.h" #include "chrome/browser/ash/file_manager/volume_manager.h"
diff --git a/chrome/browser/ui/ash/holding_space/holding_space_keyed_service.cc b/chrome/browser/ui/ash/holding_space/holding_space_keyed_service.cc index d11a75f..c0252d9 100644 --- a/chrome/browser/ui/ash/holding_space/holding_space_keyed_service.cc +++ b/chrome/browser/ui/ash/holding_space/holding_space_keyed_service.cc
@@ -11,9 +11,9 @@ #include "ash/public/cpp/holding_space/holding_space_item.h" #include "ash/public/cpp/holding_space/holding_space_metrics.h" #include "ash/public/cpp/holding_space/holding_space_prefs.h" -#include "base/callback_helpers.h" #include "base/containers/adapters.h" #include "base/files/file_path.h" +#include "base/functional/callback_helpers.h" #include "chrome/browser/ash/drive/drive_integration_service.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ui/ash/holding_space/holding_space_keyed_service_browsertest.cc b/chrome/browser/ui/ash/holding_space/holding_space_keyed_service_browsertest.cc index 37aea8d..6ae16cf 100644 --- a/chrome/browser/ui/ash/holding_space/holding_space_keyed_service_browsertest.cc +++ b/chrome/browser/ui/ash/holding_space/holding_space_keyed_service_browsertest.cc
@@ -14,10 +14,10 @@ #include "ash/public/cpp/holding_space/holding_space_model_observer.h" #include "ash/public/cpp/holding_space/holding_space_util.h" #include "ash/public/cpp/holding_space/mock_holding_space_model_observer.h" -#include "base/callback_helpers.h" #include "base/files/file_path.h" #include "base/files/file_path_watcher.h" #include "base/files/file_util.h" +#include "base/functional/callback_helpers.h" #include "base/path_service.h" #include "base/ranges/algorithm.h" #include "base/run_loop.h"
diff --git a/chrome/browser/ui/ash/holding_space/holding_space_persistence_delegate.h b/chrome/browser/ui/ash/holding_space/holding_space_persistence_delegate.h index 4c36111..409d85c 100644 --- a/chrome/browser/ui/ash/holding_space/holding_space_persistence_delegate.h +++ b/chrome/browser/ui/ash/holding_space/holding_space_persistence_delegate.h
@@ -8,7 +8,7 @@ #include <memory> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/ui/ash/holding_space/holding_space_keyed_service_delegate.h" #include "chrome/browser/ui/ash/holding_space/holding_space_util.h"
diff --git a/chrome/browser/ui/ash/holding_space/holding_space_ui_browsertest.cc b/chrome/browser/ui/ash/holding_space/holding_space_ui_browsertest.cc index 2cd56c1..fa189b2 100644 --- a/chrome/browser/ui/ash/holding_space/holding_space_ui_browsertest.cc +++ b/chrome/browser/ui/ash/holding_space/holding_space_ui_browsertest.cc
@@ -22,10 +22,10 @@ #include "ash/public/cpp/holding_space/mock_holding_space_model_observer.h" #include "ash/style/dark_light_mode_controller_impl.h" #include "ash/test/view_drawn_waiter.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/contains.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/guid.h" #include "base/run_loop.h" #include "base/scoped_observation.h"
diff --git a/chrome/browser/ui/ash/holding_space/holding_space_util.h b/chrome/browser/ui/ash/holding_space/holding_space_util.h index 6089172..5e54d74 100644 --- a/chrome/browser/ui/ash/holding_space/holding_space_util.h +++ b/chrome/browser/ui/ash/holding_space/holding_space_util.h
@@ -10,7 +10,7 @@ #include "ash/public/cpp/holding_space/holding_space_image.h" #include "ash/public/cpp/holding_space/holding_space_item.h" -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/time/time.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/chrome/browser/ui/ash/ime_controller_client_impl_unittest.cc b/chrome/browser/ui/ash/ime_controller_client_impl_unittest.cc index 8bd7ab7..20404ab 100644 --- a/chrome/browser/ui/ash/ime_controller_client_impl_unittest.cc +++ b/chrome/browser/ui/ash/ime_controller_client_impl_unittest.cc
@@ -10,7 +10,7 @@ #include <vector> #include "ash/public/cpp/ime_info.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "base/test/bind.h" #include "base/test/task_environment.h"
diff --git a/chrome/browser/ui/ash/in_session_auth_dialog_client.cc b/chrome/browser/ui/ash/in_session_auth_dialog_client.cc index c750cd1..030f27e 100644 --- a/chrome/browser/ui/ash/in_session_auth_dialog_client.cc +++ b/chrome/browser/ui/ash/in_session_auth_dialog_client.cc
@@ -8,8 +8,7 @@ #include "ash/constants/ash_features.h" #include "ash/public/cpp/webauthn_dialog_controller.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" #include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/ash/in_session_auth_dialog_client.h b/chrome/browser/ui/ash/in_session_auth_dialog_client.h index 2b2cb04c..45253be7 100644 --- a/chrome/browser/ui/ash/in_session_auth_dialog_client.h +++ b/chrome/browser/ui/ash/in_session_auth_dialog_client.h
@@ -9,7 +9,7 @@ #include <string> #include "ash/public/cpp/in_session_auth_dialog_client.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/functional/callback_forward.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/ui/ash/in_session_auth_dialog_client_unittest.cc b/chrome/browser/ui/ash/in_session_auth_dialog_client_unittest.cc index 4588c53..fa9553e 100644 --- a/chrome/browser/ui/ash/in_session_auth_dialog_client_unittest.cc +++ b/chrome/browser/ui/ash/in_session_auth_dialog_client_unittest.cc
@@ -7,7 +7,7 @@ #include "ash/constants/ash_features.h" #include "ash/public/cpp/in_session_auth_dialog_client.h" #include "ash/public/cpp/webauthn_dialog_controller.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" #include "base/test/bind.h"
diff --git a/chrome/browser/ui/ash/in_session_auth_token_provider_impl.h b/chrome/browser/ui/ash/in_session_auth_token_provider_impl.h index 085a2dc1..c80edaf 100644 --- a/chrome/browser/ui/ash/in_session_auth_token_provider_impl.h +++ b/chrome/browser/ui/ash/in_session_auth_token_provider_impl.h
@@ -7,7 +7,7 @@ #include "ash/public/cpp/ash_public_export.h" #include "ash/public/cpp/in_session_auth_token_provider.h" -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/time/time.h" #include "base/unguessable_token.h" #include "chromeos/ash/components/login/auth/public/user_context.h"
diff --git a/chrome/browser/ui/ash/keyboard/chrome_keyboard_controller_client.cc b/chrome/browser/ui/ash/keyboard/chrome_keyboard_controller_client.cc index f8811ed0..5d26111 100644 --- a/chrome/browser/ui/ash/keyboard/chrome_keyboard_controller_client.cc +++ b/chrome/browser/ui/ash/keyboard/chrome_keyboard_controller_client.cc
@@ -10,10 +10,10 @@ #include "ash/keyboard/ui/keyboard_ui_controller.h" #include "ash/keyboard/ui/resources/keyboard_resource_util.h" #include "ash/public/cpp/keyboard/keyboard_switches.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/ptr_util.h" #include "base/values.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ui/ash/keyboard/chrome_keyboard_controller_client.h b/chrome/browser/ui/ash/keyboard/chrome_keyboard_controller_client.h index 6906c01..6a24580 100644 --- a/chrome/browser/ui/ash/keyboard/chrome_keyboard_controller_client.h +++ b/chrome/browser/ui/ash/keyboard/chrome_keyboard_controller_client.h
@@ -12,7 +12,7 @@ #include "ash/public/cpp/keyboard/keyboard_config.h" #include "ash/public/cpp/keyboard/keyboard_controller.h" #include "ash/public/cpp/keyboard/keyboard_controller_observer.h" -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h"
diff --git a/chrome/browser/ui/ash/keyboard/chrome_keyboard_controller_client_test_helper.cc b/chrome/browser/ui/ash/keyboard/chrome_keyboard_controller_client_test_helper.cc index 9a5d080..f6a53d45 100644 --- a/chrome/browser/ui/ash/keyboard/chrome_keyboard_controller_client_test_helper.cc +++ b/chrome/browser/ui/ash/keyboard/chrome_keyboard_controller_client_test_helper.cc
@@ -11,8 +11,8 @@ #include "ash/public/cpp/keyboard/keyboard_controller.h" #include "ash/public/cpp/keyboard/keyboard_controller_observer.h" #include "ash/shell.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "chrome/browser/profiles/profile.h" class ChromeKeyboardControllerClientTestHelper::FakeKeyboardController
diff --git a/chrome/browser/ui/ash/keyboard/chrome_keyboard_ui.cc b/chrome/browser/ui/ash/keyboard/chrome_keyboard_ui.cc index 18d5dc6..448d0cf 100644 --- a/chrome/browser/ui/ash/keyboard/chrome_keyboard_ui.cc +++ b/chrome/browser/ui/ash/keyboard/chrome_keyboard_ui.cc
@@ -9,8 +9,8 @@ #include "ash/keyboard/ui/keyboard_ui_controller.h" #include "ash/shell.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "chrome/browser/ui/ash/keyboard/chrome_keyboard_bounds_observer.h" #include "chrome/browser/ui/ash/keyboard/chrome_keyboard_controller_client.h" #include "chrome/browser/ui/ash/keyboard/chrome_keyboard_web_contents.h"
diff --git a/chrome/browser/ui/ash/keyboard/chrome_keyboard_ui_unittest.cc b/chrome/browser/ui/ash/keyboard/chrome_keyboard_ui_unittest.cc index e1dce06..b6f50d0 100644 --- a/chrome/browser/ui/ash/keyboard/chrome_keyboard_ui_unittest.cc +++ b/chrome/browser/ui/ash/keyboard/chrome_keyboard_ui_unittest.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "chrome/browser/ui/ash/keyboard/chrome_keyboard_controller_client.h" #include "chrome/test/base/chrome_render_view_host_test_harness.h" #include "chrome/test/base/test_chrome_web_ui_controller_factory.h"
diff --git a/chrome/browser/ui/ash/keyboard/chrome_keyboard_web_contents.cc b/chrome/browser/ui/ash/keyboard/chrome_keyboard_web_contents.cc index 0e9e413..aaaa61d5 100644 --- a/chrome/browser/ui/ash/keyboard/chrome_keyboard_web_contents.cc +++ b/chrome/browser/ui/ash/keyboard/chrome_keyboard_web_contents.cc
@@ -9,9 +9,9 @@ #include "ash/keyboard/ui/resources/keyboard_resource_util.h" #include "ash/style/color_util.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/trace_event/trace_event.h" #include "chrome/browser/media/webrtc/media_capture_devices_dispatcher.h" #include "chrome/browser/ui/ash/keyboard/chrome_keyboard_bounds_observer.h"
diff --git a/chrome/browser/ui/ash/keyboard/chrome_keyboard_web_contents.h b/chrome/browser/ui/ash/keyboard/chrome_keyboard_web_contents.h index f65bdb52..e7a99af 100644 --- a/chrome/browser/ui/ash/keyboard/chrome_keyboard_web_contents.h +++ b/chrome/browser/ui/ash/keyboard/chrome_keyboard_web_contents.h
@@ -8,7 +8,7 @@ #include <memory> #include "ash/style/ash_color_provider_source.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "content/public/browser/web_contents_observer.h" #include "ui/aura/window_observer.h"
diff --git a/chrome/browser/ui/ash/keyboard/chrome_keyboard_web_contents_unittest.cc b/chrome/browser/ui/ash/keyboard/chrome_keyboard_web_contents_unittest.cc index 2cb6e05..a9bf95e6 100644 --- a/chrome/browser/ui/ash/keyboard/chrome_keyboard_web_contents_unittest.cc +++ b/chrome/browser/ui/ash/keyboard/chrome_keyboard_web_contents_unittest.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "chrome/browser/ui/ash/keyboard/chrome_keyboard_controller_client.h" #include "chrome/test/base/chrome_render_view_host_test_harness.h"
diff --git a/chrome/browser/ui/ash/keyboard/keyboard_controller_browsertest.cc b/chrome/browser/ui/ash/keyboard/keyboard_controller_browsertest.cc index 9cae065..fa230313a5 100644 --- a/chrome/browser/ui/ash/keyboard/keyboard_controller_browsertest.cc +++ b/chrome/browser/ui/ash/keyboard/keyboard_controller_browsertest.cc
@@ -5,8 +5,8 @@ #include "ash/keyboard/ui/keyboard_ui_controller.h" #include "ash/keyboard/ui/resources/keyboard_resource_util.h" #include "ash/public/cpp/keyboard/keyboard_switches.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "chrome/browser/apps/platform_apps/app_browsertest_util.h" #include "chrome/browser/extensions/extension_service.h"
diff --git a/chrome/browser/ui/ash/login_screen_client_impl.cc b/chrome/browser/ui/ash/login_screen_client_impl.cc index c99dd42a..1c3e113 100644 --- a/chrome/browser/ui/ash/login_screen_client_impl.cc +++ b/chrome/browser/ui/ash/login_screen_client_impl.cc
@@ -9,7 +9,7 @@ #include "ash/public/cpp/child_accounts/parent_access_controller.h" #include "ash/public/cpp/login_screen.h" #include "ash/public/cpp/login_screen_model.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/scoped_refptr.h" #include "base/metrics/histogram_functions.h" #include "chrome/browser/ash/child_accounts/parent_access_code/parent_access_service.h"
diff --git a/chrome/browser/ui/ash/media_client_impl.cc b/chrome/browser/ui/ash/media_client_impl.cc index d8c3e793..8140f99b 100644 --- a/chrome/browser/ui/ash/media_client_impl.cc +++ b/chrome/browser/ui/ash/media_client_impl.cc
@@ -15,11 +15,11 @@ #include "ash/public/cpp/system/toast_data.h" #include "ash/public/cpp/system/toast_manager.h" #include "ash/session/session_controller_impl.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check_op.h" #include "base/containers/contains.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/metrics/histogram_functions.h" #include "base/strings/strcat.h"
diff --git a/chrome/browser/ui/ash/multi_user/multi_profile_support_unittest.cc b/chrome/browser/ui/ash/multi_user/multi_profile_support_unittest.cc index 0ed62db..bc42fdf 100644 --- a/chrome/browser/ui/ash/multi_user/multi_profile_support_unittest.cc +++ b/chrome/browser/ui/ash/multi_user/multi_profile_support_unittest.cc
@@ -27,9 +27,9 @@ #include "ash/wm/tablet_mode/tablet_mode_window_manager.h" #include "ash/wm/window_state.h" #include "ash/wm/wm_event.h" -#include "base/bind.h" #include "base/check.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/run_loop.h" #include "base/strings/string_piece.h"
diff --git a/chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos.cc b/chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos.cc index 416ba18..5ea2f9e 100644 --- a/chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos.cc +++ b/chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos.cc
@@ -5,8 +5,8 @@ #include "chrome/browser/ui/ash/multi_user/multi_user_context_menu.h" #include "ash/public/cpp/multi_user_window_manager.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/strings/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ui/ash/multi_user/multi_user_util_chromeos_unittest.cc b/chrome/browser/ui/ash/multi_user/multi_user_util_chromeos_unittest.cc index ec6da1c..f314f24 100644 --- a/chrome/browser/ui/ash/multi_user/multi_user_util_chromeos_unittest.cc +++ b/chrome/browser/ui/ash/multi_user/multi_user_util_chromeos_unittest.cc
@@ -4,7 +4,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "chrome/browser/ash/login/users/fake_chrome_user_manager.h" #include "chrome/browser/signin/identity_manager_factory.h"
diff --git a/chrome/browser/ui/ash/network/enrollment_dialog_view.cc b/chrome/browser/ui/ash/network/enrollment_dialog_view.cc index 8f5e53a..a34e6ef 100644 --- a/chrome/browser/ui/ash/network/enrollment_dialog_view.cc +++ b/chrome/browser/ui/ash/network/enrollment_dialog_view.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ui/ash/network/enrollment_dialog_view.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/ash/profiles/profile_helper.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ui/ash/network/mobile_data_notifications.cc b/chrome/browser/ui/ash/network/mobile_data_notifications.cc index 6cf93fd1..f14fe59 100644 --- a/chrome/browser/ui/ash/network/mobile_data_notifications.cc +++ b/chrome/browser/ui/ash/network/mobile_data_notifications.cc
@@ -8,7 +8,7 @@ #include "ash/constants/notifier_catalogs.h" #include "ash/public/cpp/notification_utils.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/time/time.h" #include "chrome/app/vector_icons/vector_icons.h" #include "chrome/browser/notifications/system_notification_helper.h"
diff --git a/chrome/browser/ui/ash/network/network_portal_notification_controller.cc b/chrome/browser/ui/ash/network/network_portal_notification_controller.cc index e195c949..9c346dd5 100644 --- a/chrome/browser/ui/ash/network/network_portal_notification_controller.cc +++ b/chrome/browser/ui/ash/network/network_portal_notification_controller.cc
@@ -13,10 +13,10 @@ #include "ash/constants/ash_features.h" #include "ash/constants/notifier_catalogs.h" #include "ash/public/cpp/notification_utils.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ref_counted.h" #include "base/metrics/histogram_functions.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/ash/network/network_state_notifier.cc b/chrome/browser/ui/ash/network/network_state_notifier.cc index 63dc032..11e5b5f 100644 --- a/chrome/browser/ui/ash/network/network_state_notifier.cc +++ b/chrome/browser/ui/ash/network/network_state_notifier.cc
@@ -9,7 +9,7 @@ #include "ash/constants/notifier_catalogs.h" #include "ash/public/cpp/notification_utils.h" #include "ash/public/cpp/system_tray_client.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/ash/network/tether_notification_presenter.cc b/chrome/browser/ui/ash/network/tether_notification_presenter.cc index 2f1a1f61..bbabff8 100644 --- a/chrome/browser/ui/ash/network/tether_notification_presenter.cc +++ b/chrome/browser/ui/ash/network/tether_notification_presenter.cc
@@ -9,8 +9,8 @@ #include "ash/constants/notifier_catalogs.h" #include "ash/public/cpp/network_icon_image_source.h" #include "ash/public/cpp/notification_utils.h" -#include "base/bind.h" #include "base/cxx17_backports.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/metrics/histogram_macros.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/ash/network/tether_notification_presenter.h b/chrome/browser/ui/ash/network/tether_notification_presenter.h index 70062bb..e208ff94 100644 --- a/chrome/browser/ui/ash/network/tether_notification_presenter.h +++ b/chrome/browser/ui/ash/network/tether_notification_presenter.h
@@ -9,7 +9,7 @@ #include <string> #include "ash/constants/notifier_catalogs.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "chromeos/ash/components/multidevice/remote_device_ref.h" #include "chromeos/ash/components/network/network_state.h"
diff --git a/chrome/browser/ui/ash/projector/pending_screencast_manager.cc b/chrome/browser/ui/ash/projector/pending_screencast_manager.cc index c9a1509..ceb63d26 100644 --- a/chrome/browser/ui/ash/projector/pending_screencast_manager.cc +++ b/chrome/browser/ui/ash/projector/pending_screencast_manager.cc
@@ -10,12 +10,12 @@ #include "ash/constants/ash_features.h" #include "ash/projector/projector_metrics.h" #include "ash/webui/projector_app/public/cpp/projector_app_constants.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check.h" #include "base/files/file_enumerator.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/strings/strcat.h"
diff --git a/chrome/browser/ui/ash/projector/pending_screencast_manager.h b/chrome/browser/ui/ash/projector/pending_screencast_manager.h index 091dca7..9248d9d 100644 --- a/chrome/browser/ui/ash/projector/pending_screencast_manager.h +++ b/chrome/browser/ui/ash/projector/pending_screencast_manager.h
@@ -10,7 +10,7 @@ #include "ash/webui/projector_app/projector_app_client.h" #include "ash/webui/projector_app/projector_xhr_sender.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "base/scoped_observation.h"
diff --git a/chrome/browser/ui/ash/projector/projector_app_client_impl.cc b/chrome/browser/ui/ash/projector/projector_app_client_impl.cc index 7f3a0240..398c8415 100644 --- a/chrome/browser/ui/ash/projector/projector_app_client_impl.cc +++ b/chrome/browser/ui/ash/projector/projector_app_client_impl.cc
@@ -11,7 +11,7 @@ #include "ash/public/cpp/projector/annotator_tool.h" #include "ash/webui/projector_app/annotator_message_handler.h" #include "ash/webui/projector_app/public/cpp/projector_app_constants.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/profiles/profile_helper.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ui/ash/projector/projector_client_impl.cc b/chrome/browser/ui/ash/projector/projector_client_impl.cc index d6462c82..d40d808 100644 --- a/chrome/browser/ui/ash/projector/projector_client_impl.cc +++ b/chrome/browser/ui/ash/projector/projector_client_impl.cc
@@ -12,9 +12,9 @@ #include "ash/public/cpp/projector/projector_new_screencast_precondition.h" #include "ash/webui/projector_app/projector_app_client.h" #include "ash/webui/projector_app/public/cpp/projector_app_constants.h" -#include "base/bind.h" #include "base/containers/fixed_flat_map.h" #include "base/containers/flat_set.h" +#include "base/functional/bind.h" #include "base/functional/callback_helpers.h" #include "base/strings/string_util.h" #include "chrome/browser/ash/system_web_apps/system_web_app_manager.h"
diff --git a/chrome/browser/ui/ash/projector/projector_client_impl_browsertest.cc b/chrome/browser/ui/ash/projector/projector_client_impl_browsertest.cc index f0aa2c59..6dc35a0d 100644 --- a/chrome/browser/ui/ash/projector/projector_client_impl_browsertest.cc +++ b/chrome/browser/ui/ash/projector/projector_client_impl_browsertest.cc
@@ -12,9 +12,9 @@ #include "ash/public/cpp/projector/projector_new_screencast_precondition.h" #include "ash/public/cpp/test/mock_projector_client.h" #include "ash/webui/projector_app/public/cpp/projector_app_constants.h" -#include "base/bind.h" -#include "base/callback_forward.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback_forward.h" #include "base/run_loop.h" #include "base/test/scoped_feature_list.h" #include "chrome/browser/apps/app_service/app_icon/app_icon_factory.h"
diff --git a/chrome/browser/ui/ash/projector/projector_drivefs_provider.h b/chrome/browser/ui/ash/projector/projector_drivefs_provider.h index 040d56d1..1b50355 100644 --- a/chrome/browser/ui/ash/projector/projector_drivefs_provider.h +++ b/chrome/browser/ui/ash/projector/projector_drivefs_provider.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_UI_ASH_PROJECTOR_PROJECTOR_DRIVEFS_PROVIDER_H_ #define CHROME_BROWSER_UI_ASH_PROJECTOR_PROJECTOR_DRIVEFS_PROVIDER_H_ -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/scoped_observation.h" #include "components/session_manager/core/session_manager_observer.h" #include "components/user_manager/user_manager.h"
diff --git a/chrome/browser/ui/ash/projector/projector_soda_installation_controller_unittest.cc b/chrome/browser/ui/ash/projector/projector_soda_installation_controller_unittest.cc index 109d845..7050d90 100644 --- a/chrome/browser/ui/ash/projector/projector_soda_installation_controller_unittest.cc +++ b/chrome/browser/ui/ash/projector/projector_soda_installation_controller_unittest.cc
@@ -10,7 +10,7 @@ #include "ash/public/cpp/projector/projector_new_screencast_precondition.h" #include "ash/public/cpp/test/mock_projector_client.h" #include "ash/webui/projector_app/test/mock_app_client.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/test/scoped_feature_list.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ui/ash/projector/screencast_manager.cc b/chrome/browser/ui/ash/projector/screencast_manager.cc index 1b6b95dd..86b0d29 100644 --- a/chrome/browser/ui/ash/projector/screencast_manager.cc +++ b/chrome/browser/ui/ash/projector/screencast_manager.cc
@@ -9,10 +9,10 @@ #include "ash/webui/projector_app/projector_screencast.h" #include "ash/webui/projector_app/public/cpp/projector_app_constants.h" -#include "base/bind.h" #include "base/check.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/ui/ash/session_controller_client_impl.cc b/chrome/browser/ui/ash/session_controller_client_impl.cc index 698ae7e..1936983a 100644 --- a/chrome/browser/ui/ash/session_controller_client_impl.cc +++ b/chrome/browser/ui/ash/session_controller_client_impl.cc
@@ -10,8 +10,8 @@ #include "ash/constants/ash_pref_names.h" #include "ash/public/cpp/session/session_controller.h" #include "ash/public/cpp/session/session_types.h" -#include "base/bind.h" #include "base/cxx17_backports.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/ranges/algorithm.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/ash/session_controller_client_impl.h b/chrome/browser/ui/ash/session_controller_client_impl.h index 8b8b76fc..0839548 100644 --- a/chrome/browser/ui/ash/session_controller_client_impl.h +++ b/chrome/browser/ui/ash/session_controller_client_impl.h
@@ -10,8 +10,8 @@ #include <vector> #include "ash/public/cpp/session/session_controller_client.h" -#include "base/callback_forward.h" #include "base/callback_list.h" +#include "base/functional/callback_forward.h" #include "base/gtest_prod_util.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ash/crosapi/browser_manager_observer.h"
diff --git a/chrome/browser/ui/ash/session_controller_client_impl_unittest.cc b/chrome/browser/ui/ash/session_controller_client_impl_unittest.cc index f1744e1..c420587 100644 --- a/chrome/browser/ui/ash/session_controller_client_impl_unittest.cc +++ b/chrome/browser/ui/ash/session_controller_client_impl_unittest.cc
@@ -9,7 +9,7 @@ #include <vector> #include "ash/constants/ash_pref_names.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/run_loop.h" #include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/ui/ash/session_util.h b/chrome/browser/ui/ash/session_util.h index 101d21acd..5efe1606 100644 --- a/chrome/browser/ui/ash/session_util.h +++ b/chrome/browser/ui/ash/session_util.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_ASH_SESSION_UTIL_H_ #define CHROME_BROWSER_UI_ASH_SESSION_UTIL_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "ui/gfx/image/image_skia.h" namespace aura {
diff --git a/chrome/browser/ui/ash/sharesheet/sharesheet_bubble_view_browsertest.cc b/chrome/browser/ui/ash/sharesheet/sharesheet_bubble_view_browsertest.cc index adbef29..3c8075f 100644 --- a/chrome/browser/ui/ash/sharesheet/sharesheet_bubble_view_browsertest.cc +++ b/chrome/browser/ui/ash/sharesheet/sharesheet_bubble_view_browsertest.cc
@@ -7,7 +7,7 @@ #include <algorithm> #include "ash/shell.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/test/scoped_feature_list.h" #include "chrome/browser/nearby_sharing/common/nearby_share_features.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ui/ash/sharesheet/sharesheet_bubble_view_delegate.cc b/chrome/browser/ui/ash/sharesheet/sharesheet_bubble_view_delegate.cc index 0e0f6ac..7e143ab 100644 --- a/chrome/browser/ui/ash/sharesheet/sharesheet_bubble_view_delegate.cc +++ b/chrome/browser/ui/ash/sharesheet/sharesheet_bubble_view_delegate.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sharesheet/sharesheet_service_delegator.h" #include "chrome/browser/ui/ash/sharesheet/sharesheet_bubble_view.h"
diff --git a/chrome/browser/ui/ash/sharesheet/sharesheet_header_view.cc b/chrome/browser/ui/ash/sharesheet/sharesheet_header_view.cc index b3888d0..71f77b9 100644 --- a/chrome/browser/ui/ash/sharesheet/sharesheet_header_view.cc +++ b/chrome/browser/ui/ash/sharesheet/sharesheet_header_view.cc
@@ -16,8 +16,8 @@ #include "ash/style/ash_color_provider.h" #include "ash/style/color_util.h" #include "ash/style/dark_light_mode_controller_impl.h" -#include "base/bind.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/strings/strcat.h" #include "base/strings/string_util.h" #include "chrome/app/vector_icons/vector_icons.h"
diff --git a/chrome/browser/ui/ash/shelf/app_service/app_service_shelf_context_menu.cc b/chrome/browser/ui/ash/shelf/app_service/app_service_shelf_context_menu.cc index 1c630765..027e7722 100644 --- a/chrome/browser/ui/ash/shelf/app_service/app_service_shelf_context_menu.cc +++ b/chrome/browser/ui/ash/shelf/app_service/app_service_shelf_context_menu.cc
@@ -6,9 +6,9 @@ #include "ash/public/cpp/app_menu_constants.h" #include "ash/public/cpp/new_window_delegate.h" -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.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/extension_apps_utils.h"
diff --git a/chrome/browser/ui/ash/shelf/app_service/app_service_shelf_context_menu_browsertest.cc b/chrome/browser/ui/ash/shelf/app_service/app_service_shelf_context_menu_browsertest.cc index 5d5ce64a..77123f1 100644 --- a/chrome/browser/ui/ash/shelf/app_service/app_service_shelf_context_menu_browsertest.cc +++ b/chrome/browser/ui/ash/shelf/app_service/app_service_shelf_context_menu_browsertest.cc
@@ -5,7 +5,7 @@ #include "ash/public/cpp/app_menu_constants.h" #include "ash/public/cpp/shelf_item_delegate.h" #include "ash/public/cpp/shelf_model.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/test/bind.h" #include "base/test/metrics/user_action_tester.h"
diff --git a/chrome/browser/ui/ash/shelf/app_shortcut_shelf_item_controller.cc b/chrome/browser/ui/ash/shelf/app_shortcut_shelf_item_controller.cc index 32806f9..0b1beba 100644 --- a/chrome/browser/ui/ash/shelf/app_shortcut_shelf_item_controller.cc +++ b/chrome/browser/ui/ash/shelf/app_shortcut_shelf_item_controller.cc
@@ -9,8 +9,8 @@ #include <memory> #include <utility> -#include "base/callback_helpers.h" #include "base/containers/contains.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/ranges/algorithm.h" #include "chrome/browser/ash/app_list/arc/arc_app_utils.h"
diff --git a/chrome/browser/ui/ash/shelf/app_shortcut_shelf_item_controller_browsertest.cc b/chrome/browser/ui/ash/shelf/app_shortcut_shelf_item_controller_browsertest.cc index 6490ce6c..ea4d12f 100644 --- a/chrome/browser/ui/ash/shelf/app_shortcut_shelf_item_controller_browsertest.cc +++ b/chrome/browser/ui/ash/shelf/app_shortcut_shelf_item_controller_browsertest.cc
@@ -6,7 +6,7 @@ #include "ash/public/cpp/shelf_model.h" #include "ash/public/cpp/shelf_types.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "chrome/browser/ash/crostini/crostini_util.h" #include "chrome/browser/ash/guest_os/guest_os_terminal.h" #include "chrome/browser/ash/system_web_apps/system_web_app_manager.h"
diff --git a/chrome/browser/ui/ash/shelf/arc_app_shelf_browsertest.cc b/chrome/browser/ui/ash/shelf/arc_app_shelf_browsertest.cc index cbe07a51..88bdd288 100644 --- a/chrome/browser/ui/ash/shelf/arc_app_shelf_browsertest.cc +++ b/chrome/browser/ui/ash/shelf/arc_app_shelf_browsertest.cc
@@ -19,7 +19,7 @@ #include "ash/shelf/shelf_view_test_api.h" #include "ash/shell.h" #include "ash/system/status_area_widget_test_helper.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/ash/shelf/arc_app_window.cc b/chrome/browser/ui/ash/shelf/arc_app_window.cc index d622854..fcad242 100644 --- a/chrome/browser/ui/ash/shelf/arc_app_window.cc +++ b/chrome/browser/ui/ash/shelf/arc_app_window.cc
@@ -6,7 +6,7 @@ #include "ash/components/arc/arc_util.h" #include "base/auto_reset.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/ash/app_list/app_service/app_service_app_icon_loader.h" #include "chrome/browser/ash/app_list/arc/arc_app_icon.h"
diff --git a/chrome/browser/ui/ash/shelf/browser_app_shelf_controller_browsertest.cc b/chrome/browser/ui/ash/shelf/browser_app_shelf_controller_browsertest.cc index b1e7dfc..86c043ef 100644 --- a/chrome/browser/ui/ash/shelf/browser_app_shelf_controller_browsertest.cc +++ b/chrome/browser/ui/ash/shelf/browser_app_shelf_controller_browsertest.cc
@@ -10,7 +10,7 @@ #include "ash/public/cpp/shelf_model.h" #include "ash/public/cpp/shelf_types.h" #include "ash/public/cpp/window_properties.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/run_loop.h" #include "base/scoped_observation.h"
diff --git a/chrome/browser/ui/ash/shelf/browser_shortcut_shelf_item_controller_browsertest.cc b/chrome/browser/ui/ash/shelf/browser_shortcut_shelf_item_controller_browsertest.cc index a98d240..90d7e4b 100644 --- a/chrome/browser/ui/ash/shelf/browser_shortcut_shelf_item_controller_browsertest.cc +++ b/chrome/browser/ui/ash/shelf/browser_shortcut_shelf_item_controller_browsertest.cc
@@ -5,7 +5,7 @@ #include "chrome/browser/ui/ash/shelf/browser_shortcut_shelf_item_controller.h" #include "ash/public/cpp/shelf_model.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/ash/shelf/chrome_shelf_controller.h"
diff --git a/chrome/browser/ui/ash/shelf/chrome_shelf_controller.cc b/chrome/browser/ui/ash/shelf/chrome_shelf_controller.cc index b8ac98e..ed3ad33 100644 --- a/chrome/browser/ui/ash/shelf/chrome_shelf_controller.cc +++ b/chrome/browser/ui/ash/shelf/chrome_shelf_controller.cc
@@ -21,11 +21,11 @@ #include "ash/public/cpp/window_animation_types.h" #include "ash/public/cpp/window_properties.h" #include "ash/shell.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/contains.h" #include "base/debug/dump_without_crashing.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/histogram_macros.h" #include "base/ranges/algorithm.h" #include "base/strings/pattern.h"
diff --git a/chrome/browser/ui/ash/shelf/chrome_shelf_controller_browsertest.cc b/chrome/browser/ui/ash/shelf/chrome_shelf_controller_browsertest.cc index cda764f..31fedcda 100644 --- a/chrome/browser/ui/ash/shelf/chrome_shelf_controller_browsertest.cc +++ b/chrome/browser/ui/ash/shelf/chrome_shelf_controller_browsertest.cc
@@ -34,8 +34,8 @@ #include "ash/wm/desks/desks_controller.h" #include "ash/wm/desks/desks_test_util.h" #include "ash/wm/tablet_mode/tablet_mode_controller.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" #include "base/test/bind.h"
diff --git a/chrome/browser/ui/ash/shelf/chrome_shelf_controller_test_util.cc b/chrome/browser/ui/ash/shelf/chrome_shelf_controller_test_util.cc index fe0a0408..a0457d87 100644 --- a/chrome/browser/ui/ash/shelf/chrome_shelf_controller_test_util.cc +++ b/chrome/browser/ui/ash/shelf/chrome_shelf_controller_test_util.cc
@@ -8,8 +8,8 @@ #include "ash/public/cpp/shelf_item_delegate.h" #include "ash/public/cpp/shelf_model.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "chrome/browser/ui/ash/shelf/app_shortcut_shelf_item_controller.h" #include "chrome/browser/ui/ash/shelf/chrome_shelf_controller.h"
diff --git a/chrome/browser/ui/ash/shelf/chrome_shelf_controller_unittest.cc b/chrome/browser/ui/ash/shelf/chrome_shelf_controller_unittest.cc index a35409c..eb87ddc 100644 --- a/chrome/browser/ui/ash/shelf/chrome_shelf_controller_unittest.cc +++ b/chrome/browser/ui/ash/shelf/chrome_shelf_controller_unittest.cc
@@ -36,7 +36,6 @@ #include "ash/shelf/shelf_application_menu_model.h" #include "ash/webui/system_apps/public/system_web_app_type.h" #include "base/auto_reset.h" -#include "base/callback_helpers.h" #include "base/check.h" #include "base/check_op.h" #include "base/command_line.h" @@ -44,6 +43,7 @@ #include "base/containers/flat_map.h" #include "base/feature_list.h" #include "base/files/file_path.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/memory/ptr_util.h" #include "base/metrics/histogram.h"
diff --git a/chrome/browser/ui/ash/shelf/extension_shelf_context_menu.cc b/chrome/browser/ui/ash/shelf/extension_shelf_context_menu.cc index 4416f836..31e7fa5 100644 --- a/chrome/browser/ui/ash/shelf/extension_shelf_context_menu.cc +++ b/chrome/browser/ui/ash/shelf/extension_shelf_context_menu.cc
@@ -8,7 +8,7 @@ #include "ash/public/cpp/app_menu_constants.h" #include "ash/public/cpp/new_window_delegate.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/apps/app_service/menu_util.h" #include "chrome/browser/ash/app_list/extension_app_utils.h" #include "chrome/browser/extensions/context_menu_matcher.h"
diff --git a/chrome/browser/ui/ash/shelf/shelf_context_menu_unittest.cc b/chrome/browser/ui/ash/shelf/shelf_context_menu_unittest.cc index 4ec7abb..6c9fc05 100644 --- a/chrome/browser/ui/ash/shelf/shelf_context_menu_unittest.cc +++ b/chrome/browser/ui/ash/shelf/shelf_context_menu_unittest.cc
@@ -13,9 +13,9 @@ #include "ash/public/cpp/app_menu_constants.h" #include "ash/public/cpp/shelf_item.h" #include "ash/public/cpp/shelf_model.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/files/file_path.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/ash/shelf/shelf_spinner_controller.cc b/chrome/browser/ui/ash/shelf/shelf_spinner_controller.cc index 5869c8ab..8eb71954 100644 --- a/chrome/browser/ui/ash/shelf/shelf_spinner_controller.cc +++ b/chrome/browser/ui/ash/shelf/shelf_spinner_controller.cc
@@ -7,8 +7,8 @@ #include <vector> #include "ash/public/cpp/shelf_model.h" -#include "base/bind.h" #include "base/cxx17_backports.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/task/single_thread_task_runner.h" #include "chrome/browser/ash/guest_os/guest_os_shelf_utils.h"
diff --git a/chrome/browser/ui/ash/shelf/standalone_browser_extension_app_shelf_item_controller.cc b/chrome/browser/ui/ash/shelf/standalone_browser_extension_app_shelf_item_controller.cc index c3270b5..bb8906e 100644 --- a/chrome/browser/ui/ash/shelf/standalone_browser_extension_app_shelf_item_controller.cc +++ b/chrome/browser/ui/ash/shelf/standalone_browser_extension_app_shelf_item_controller.cc
@@ -10,8 +10,8 @@ #include "ash/public/cpp/window_properties.h" #include "ash/shell.h" #include "ash/wm/window_util.h" -#include "base/bind.h" #include "base/containers/cxx20_erase.h" +#include "base/functional/bind.h" #include "base/numerics/safe_conversions.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/ui/ash/test_session_controller.cc b/chrome/browser/ui/ash/test_session_controller.cc index c6916c13..595a51d 100644 --- a/chrome/browser/ui/ash/test_session_controller.cc +++ b/chrome/browser/ui/ash/test_session_controller.cc
@@ -7,7 +7,7 @@ #include <utility> #include "ash/public/cpp/session/session_observer.h" -#include "base/callback.h" +#include "base/functional/callback.h" TestSessionController::TestSessionController() = default; TestSessionController::~TestSessionController() = default;
diff --git a/chrome/browser/ui/ash/thumbnail_loader.cc b/chrome/browser/ui/ash/thumbnail_loader.cc index 0b6da18..05dc097 100644 --- a/chrome/browser/ui/ash/thumbnail_loader.cc +++ b/chrome/browser/ui/ash/thumbnail_loader.cc
@@ -8,9 +8,9 @@ #include <utility> #include "ash/public/cpp/image_downloader.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/json/values_util.h"
diff --git a/chrome/browser/ui/ash/thumbnail_loader.h b/chrome/browser/ui/ash/thumbnail_loader.h index 2d6ba87..1cb669a7 100644 --- a/chrome/browser/ui/ash/thumbnail_loader.h +++ b/chrome/browser/ui/ash/thumbnail_loader.h
@@ -9,8 +9,8 @@ #include <memory> #include <string> -#include "base/callback.h" #include "base/files/file.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/unguessable_token.h"
diff --git a/chrome/browser/ui/ash/touch_selection_menu_runner_chromeos.cc b/chrome/browser/ui/ash/touch_selection_menu_runner_chromeos.cc index 2b6f09bd..ccb29ea8 100644 --- a/chrome/browser/ui/ash/touch_selection_menu_runner_chromeos.cc +++ b/chrome/browser/ui/ash/touch_selection_menu_runner_chromeos.cc
@@ -10,7 +10,7 @@ #include "ash/components/arc/session/arc_service_manager.h" #include "ash/session/session_controller_impl.h" #include "ash/shell.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/user_metrics.h" #include "base/metrics/user_metrics_action.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/ash/vpn_list_forwarder.cc b/chrome/browser/ui/ash/vpn_list_forwarder.cc index 9c57432..1d2db8b 100644 --- a/chrome/browser/ui/ash/vpn_list_forwarder.cc +++ b/chrome/browser/ui/ash/vpn_list_forwarder.cc
@@ -5,8 +5,8 @@ #include "chrome/browser/ui/ash/vpn_list_forwarder.h" #include "ash/public/cpp/network_config_service.h" -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/threading/thread_task_runner_handle.h" #include "chrome/browser/ash/crosapi/crosapi_ash.h"
diff --git a/chrome/browser/ui/ash/wallpaper_controller_client_impl.cc b/chrome/browser/ui/ash/wallpaper_controller_client_impl.cc index 9245f73..26a98c4 100644 --- a/chrome/browser/ui/ash/wallpaper_controller_client_impl.cc +++ b/chrome/browser/ui/ash/wallpaper_controller_client_impl.cc
@@ -16,9 +16,9 @@ #include "ash/webui/personalization_app/mojom/personalization_app.mojom.h" #include "ash/webui/personalization_app/personalization_app_url_constants.h" #include "ash/webui/personalization_app/proto/backdrop_wallpaper.pb.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/hash/hash.h" #include "base/hash/sha1.h" #include "base/json/json_reader.h"
diff --git a/chrome/browser/ui/aura/accessibility/automation_manager_aura.cc b/chrome/browser/ui/aura/accessibility/automation_manager_aura.cc index cf2e7e3..ffc67e9 100644 --- a/chrome/browser/ui/aura/accessibility/automation_manager_aura.cc +++ b/chrome/browser/ui/aura/accessibility/automation_manager_aura.cc
@@ -6,7 +6,7 @@ #include <stddef.h> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/no_destructor.h" #include "base/task/single_thread_task_runner.h" #include "build/build_config.h"
diff --git a/chrome/browser/ui/autofill/autofill_keyboard_accessory_adapter.cc b/chrome/browser/ui/autofill/autofill_keyboard_accessory_adapter.cc index 3a7180d..659a92ab 100644 --- a/chrome/browser/ui/autofill/autofill_keyboard_accessory_adapter.cc +++ b/chrome/browser/ui/autofill/autofill_keyboard_accessory_adapter.cc
@@ -8,8 +8,8 @@ #include <string> #include <vector> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/strings/utf_string_conversions.h" #include "base/trace_event/trace_event.h"
diff --git a/chrome/browser/ui/autofill/autofill_keyboard_accessory_adapter.h b/chrome/browser/ui/autofill/autofill_keyboard_accessory_adapter.h index 5d9b708..fd3246a 100644 --- a/chrome/browser/ui/autofill/autofill_keyboard_accessory_adapter.h +++ b/chrome/browser/ui/autofill/autofill_keyboard_accessory_adapter.h
@@ -11,7 +11,7 @@ #include <utility> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "build/build_config.h" #include "chrome/browser/ui/autofill/autofill_popup_controller.h"
diff --git a/chrome/browser/ui/autofill/autofill_keyboard_accessory_adapter_unittest.cc b/chrome/browser/ui/autofill/autofill_keyboard_accessory_adapter_unittest.cc index 96d0ba8..2b50de19 100644 --- a/chrome/browser/ui/autofill/autofill_keyboard_accessory_adapter_unittest.cc +++ b/chrome/browser/ui/autofill/autofill_keyboard_accessory_adapter_unittest.cc
@@ -9,7 +9,7 @@ #include <utility> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/memory/raw_ptr.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/autofill/autofill_popup_controller_impl.cc b/chrome/browser/ui/autofill/autofill_popup_controller_impl.cc index ffdb183..6061525 100644 --- a/chrome/browser/ui/autofill/autofill_popup_controller_impl.cc +++ b/chrome/browser/ui/autofill/autofill_popup_controller_impl.cc
@@ -8,9 +8,9 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/check_op.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/i18n/rtl.h" #include "base/memory/weak_ptr.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/autofill/chrome_autofill_client.cc b/chrome/browser/ui/autofill/chrome_autofill_client.cc index 2ae1ef1d..d044ce8 100644 --- a/chrome/browser/ui/autofill/chrome_autofill_client.cc +++ b/chrome/browser/ui/autofill/chrome_autofill_client.cc
@@ -6,11 +6,11 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check.h" #include "base/command_line.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/i18n/rtl.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/autofill/chrome_autofill_client.h b/chrome/browser/ui/autofill/chrome_autofill_client.h index 09e30ec9..58b15b38 100644 --- a/chrome/browser/ui/autofill/chrome_autofill_client.h +++ b/chrome/browser/ui/autofill/chrome_autofill_client.h
@@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/i18n/rtl.h" #include "base/memory/weak_ptr.h" #include "build/build_config.h"
diff --git a/chrome/browser/ui/autofill/edit_address_profile_dialog_controller_impl_browsertest.cc b/chrome/browser/ui/autofill/edit_address_profile_dialog_controller_impl_browsertest.cc index 5cbf6e0..efa6f52 100644 --- a/chrome/browser/ui/autofill/edit_address_profile_dialog_controller_impl_browsertest.cc +++ b/chrome/browser/ui/autofill/edit_address_profile_dialog_controller_impl_browsertest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/autofill/edit_address_profile_dialog_controller_impl.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/test/test_browser_dialog.h"
diff --git a/chrome/browser/ui/autofill/payments/card_unmask_prompt_view_browsertest.cc b/chrome/browser/ui/autofill/payments/card_unmask_prompt_view_browsertest.cc index 758b9b6..a9b7172 100644 --- a/chrome/browser/ui/autofill/payments/card_unmask_prompt_view_browsertest.cc +++ b/chrome/browser/ui/autofill/payments/card_unmask_prompt_view_browsertest.cc
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/guid.h" #include "base/location.h" #include "base/memory/raw_ptr.h"
diff --git a/chrome/browser/ui/autofill/payments/credit_card_scanner_controller.cc b/chrome/browser/ui/autofill/payments/credit_card_scanner_controller.cc index ab07cf4..2d4af42 100644 --- a/chrome/browser/ui/autofill/payments/credit_card_scanner_controller.cc +++ b/chrome/browser/ui/autofill/payments/credit_card_scanner_controller.cc
@@ -8,8 +8,8 @@ #include <string> #include <utility> -#include "base/callback.h" #include "base/check.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h" #include "chrome/browser/ui/autofill/payments/credit_card_scanner_view.h"
diff --git a/chrome/browser/ui/autofill/payments/local_card_migration_bubble_controller_impl_unittest.cc b/chrome/browser/ui/autofill/payments/local_card_migration_bubble_controller_impl_unittest.cc index 0d59aeb7c..24d9e195 100644 --- a/chrome/browser/ui/autofill/payments/local_card_migration_bubble_controller_impl_unittest.cc +++ b/chrome/browser/ui/autofill/payments/local_card_migration_bubble_controller_impl_unittest.cc
@@ -7,7 +7,7 @@ #include <stddef.h> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h"
diff --git a/chrome/browser/ui/autofill/payments/local_card_migration_dialog.h b/chrome/browser/ui/autofill/payments/local_card_migration_dialog.h index 24abb38d..5db7766 100644 --- a/chrome/browser/ui/autofill/payments/local_card_migration_dialog.h +++ b/chrome/browser/ui/autofill/payments/local_card_migration_dialog.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_AUTOFILL_PAYMENTS_LOCAL_CARD_MIGRATION_DIALOG_H_ #define CHROME_BROWSER_UI_AUTOFILL_PAYMENTS_LOCAL_CARD_MIGRATION_DIALOG_H_ -#include "base/callback.h" +#include "base/functional/callback.h" namespace content { class WebContents;
diff --git a/chrome/browser/ui/autofill/payments/local_card_migration_dialog_controller_impl.cc b/chrome/browser/ui/autofill/payments/local_card_migration_dialog_controller_impl.cc index 6c2c78e..2070437 100644 --- a/chrome/browser/ui/autofill/payments/local_card_migration_dialog_controller_impl.cc +++ b/chrome/browser/ui/autofill/payments/local_card_migration_dialog_controller_impl.cc
@@ -10,9 +10,9 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/containers/contains.h" #include "base/containers/cxx20_erase.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/observer_list.h" #include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/ui/autofill/payments/save_card_bubble_controller_impl_browsertest.cc b/chrome/browser/ui/autofill/payments/save_card_bubble_controller_impl_browsertest.cc index 0d86ee16..4ece9e0e 100644 --- a/chrome/browser/ui/autofill/payments/save_card_bubble_controller_impl_browsertest.cc +++ b/chrome/browser/ui/autofill/payments/save_card_bubble_controller_impl_browsertest.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/json/json_reader.h" #include "base/memory/raw_ptr.h" #include "base/values.h"
diff --git a/chrome/browser/ui/autofill/payments/save_card_bubble_controller_impl_unittest.cc b/chrome/browser/ui/autofill/payments/save_card_bubble_controller_impl_unittest.cc index 8859587..3825311 100644 --- a/chrome/browser/ui/autofill/payments/save_card_bubble_controller_impl_unittest.cc +++ b/chrome/browser/ui/autofill/payments/save_card_bubble_controller_impl_unittest.cc
@@ -9,7 +9,7 @@ #include <tuple> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/json/json_reader.h" #include "base/memory/raw_ptr.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/autofill/payments/save_upi_bubble_controller_impl_browsertest.cc b/chrome/browser/ui/autofill/payments/save_upi_bubble_controller_impl_browsertest.cc index 7e2962c..5aefe545 100644 --- a/chrome/browser/ui/autofill/payments/save_upi_bubble_controller_impl_browsertest.cc +++ b/chrome/browser/ui/autofill/payments/save_upi_bubble_controller_impl_browsertest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/autofill/payments/save_upi_bubble_controller_impl.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/test/test_browser_dialog.h"
diff --git a/chrome/browser/ui/autofill/risk_util.cc b/chrome/browser/ui/autofill/risk_util.cc index 502bcdc2..4e2316a 100644 --- a/chrome/browser/ui/autofill/risk_util.cc +++ b/chrome/browser/ui/autofill/risk_util.cc
@@ -7,8 +7,8 @@ #include <memory> #include "base/base64.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/time/time.h" #include "build/build_config.h" #include "chrome/browser/apps/platform_apps/app_window_registry_util.h"
diff --git a/chrome/browser/ui/autofill/risk_util.h b/chrome/browser/ui/autofill/risk_util.h index 3341c6f..3ff3169 100644 --- a/chrome/browser/ui/autofill/risk_util.h +++ b/chrome/browser/ui/autofill/risk_util.h
@@ -9,7 +9,7 @@ #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "ui/gfx/geometry/rect.h"
diff --git a/chrome/browser/ui/autofill/save_update_address_profile_bubble_controller_impl_browsertest.cc b/chrome/browser/ui/autofill/save_update_address_profile_bubble_controller_impl_browsertest.cc index 5fc19692..85f4895 100644 --- a/chrome/browser/ui/autofill/save_update_address_profile_bubble_controller_impl_browsertest.cc +++ b/chrome/browser/ui/autofill/save_update_address_profile_bubble_controller_impl_browsertest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/autofill/save_update_address_profile_bubble_controller_impl.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/ui/autofill/chrome_autofill_client.h" #include "chrome/browser/ui/browser.h"
diff --git a/chrome/browser/ui/autofill/save_update_address_profile_bubble_controller_impl_unittest.cc b/chrome/browser/ui/autofill/save_update_address_profile_bubble_controller_impl_unittest.cc index 52ef39f..a7bb7fd 100644 --- a/chrome/browser/ui/autofill/save_update_address_profile_bubble_controller_impl_unittest.cc +++ b/chrome/browser/ui/autofill/save_update_address_profile_bubble_controller_impl_unittest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/autofill/save_update_address_profile_bubble_controller_impl.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/test/mock_callback.h" #include "base/test/scoped_feature_list.h" #include "chrome/browser/ui/tabs/tab_enums.h"
diff --git a/chrome/browser/ui/blocked_content/framebust_block_tab_helper.h b/chrome/browser/ui/blocked_content/framebust_block_tab_helper.h index 512ff9d..fba82e44 100644 --- a/chrome/browser/ui/blocked_content/framebust_block_tab_helper.h +++ b/chrome/browser/ui/blocked_content/framebust_block_tab_helper.h
@@ -7,7 +7,7 @@ #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "components/blocked_content/url_list_manager.h" #include "content/public/browser/web_contents_observer.h" #include "content/public/browser/web_contents_user_data.h"
diff --git a/chrome/browser/ui/blocked_content/popup_blocker_browsertest.cc b/chrome/browser/ui/blocked_content/popup_blocker_browsertest.cc index 337c83f5..270090e 100644 --- a/chrome/browser/ui/blocked_content/popup_blocker_browsertest.cc +++ b/chrome/browser/ui/blocked_content/popup_blocker_browsertest.cc
@@ -4,10 +4,10 @@ #include <stdint.h> -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/containers/contains.h" #include "base/files/file_path.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" #include "base/test/metrics/histogram_tester.h"
diff --git a/chrome/browser/ui/blocked_content/popup_opener_tab_helper_unittest.cc b/chrome/browser/ui/blocked_content/popup_opener_tab_helper_unittest.cc index 6d9dd03..d0c9b0a 100644 --- a/chrome/browser/ui/blocked_content/popup_opener_tab_helper_unittest.cc +++ b/chrome/browser/ui/blocked_content/popup_opener_tab_helper_unittest.cc
@@ -9,7 +9,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/stringprintf.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h"
diff --git a/chrome/browser/ui/blocked_content/tab_under_navigation_throttle.cc b/chrome/browser/ui/blocked_content/tab_under_navigation_throttle.cc index 84f79f0e..64d5813 100644 --- a/chrome/browser/ui/blocked_content/tab_under_navigation_throttle.cc +++ b/chrome/browser/ui/blocked_content/tab_under_navigation_throttle.cc
@@ -8,9 +8,9 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/check.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/ptr_util.h" #include "base/metrics/field_trial_params.h" #include "base/metrics/histogram_macros.h"
diff --git a/chrome/browser/ui/bookmarks/bookmark_browsertest.cc b/chrome/browser/ui/bookmarks/bookmark_browsertest.cc index 0d1d39f0..8f7b0ad 100644 --- a/chrome/browser/ui/bookmarks/bookmark_browsertest.cc +++ b/chrome/browser/ui/bookmarks/bookmark_browsertest.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 "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/scoped_observation.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/bookmarks/bookmark_context_menu_controller.h b/chrome/browser/ui/bookmarks/bookmark_context_menu_controller.h index 322b0d7..e065f8d 100644 --- a/chrome/browser/ui/bookmarks/bookmark_context_menu_controller.h +++ b/chrome/browser/ui/bookmarks/bookmark_context_menu_controller.h
@@ -8,7 +8,7 @@ #include <memory> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ui/bookmarks/bookmark_stats.h"
diff --git a/chrome/browser/ui/bookmarks/bookmark_drag_drop.h b/chrome/browser/ui/bookmarks/bookmark_drag_drop.h index 25d8639..ff74c7d 100644 --- a/chrome/browser/ui/bookmarks/bookmark_drag_drop.h +++ b/chrome/browser/ui/bookmarks/bookmark_drag_drop.h
@@ -8,7 +8,7 @@ #include <memory> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "build/build_config.h" #include "ui/base/dragdrop/mojom/drag_drop_types.mojom-forward.h"
diff --git a/chrome/browser/ui/bookmarks/bookmark_editor.h b/chrome/browser/ui/bookmarks/bookmark_editor.h index 6b270d9..d2ad5d9d 100644 --- a/chrome/browser/ui/bookmarks/bookmark_editor.h +++ b/chrome/browser/ui/bookmarks/bookmark_editor.h
@@ -9,7 +9,7 @@ #include <utility> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "components/bookmarks/browser/bookmark_node.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/chrome/browser/ui/bookmarks/bookmark_utils.cc b/chrome/browser/ui/bookmarks/bookmark_utils.cc index 8b00744..f527ee6 100644 --- a/chrome/browser/ui/bookmarks/bookmark_utils.cc +++ b/chrome/browser/ui/bookmarks/bookmark_utils.cc
@@ -6,9 +6,9 @@ #include <stddef.h> -#include "base/bind.h" #include "base/check.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/notreached.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h"
diff --git a/chrome/browser/ui/bookmarks/bookmark_utils_desktop.cc b/chrome/browser/ui/bookmarks/bookmark_utils_desktop.cc index 6433ee5..ef48e6c2 100644 --- a/chrome/browser/ui/bookmarks/bookmark_utils_desktop.cc +++ b/chrome/browser/ui/bookmarks/bookmark_utils_desktop.cc
@@ -7,10 +7,10 @@ #include <iterator> #include <numeric> -#include "base/bind.h" -#include "base/callback.h" #include "base/containers/contains.h" #include "base/containers/flat_set.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/strings/string_number_conversions.h" #include "build/build_config.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h"
diff --git a/chrome/browser/ui/bookmarks/bookmark_utils_desktop.h b/chrome/browser/ui/bookmarks/bookmark_utils_desktop.h index 3a49ce6..8e4d56f1 100644 --- a/chrome/browser/ui/bookmarks/bookmark_utils_desktop.h +++ b/chrome/browser/ui/bookmarks/bookmark_utils_desktop.h
@@ -7,7 +7,7 @@ #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "chrome/browser/ui/bookmarks/bookmark_editor.h" #include "chrome/browser/ui/simple_message_box.h" #include "chrome/browser/ui/tabs/tab_group.h"
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc index 3490be7e..990b8a0 100644 --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc
@@ -12,12 +12,11 @@ #include <utility> #include "base/base_paths.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/containers/contains.h" #include "base/feature_list.h" #include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/logging.h" #include "base/metrics/histogram_macros.h"
diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h index 25a4953..c1fcaf3 100644 --- a/chrome/browser/ui/browser.h +++ b/chrome/browser/ui/browser.h
@@ -12,7 +12,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h"
diff --git a/chrome/browser/ui/browser_browsertest.cc b/chrome/browser/ui/browser_browsertest.cc index 7c82065..debf04d2 100644 --- a/chrome/browser/ui/browser_browsertest.cc +++ b/chrome/browser/ui/browser_browsertest.cc
@@ -10,11 +10,11 @@ #include <memory> #include <string> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/compiler_specific.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h"
diff --git a/chrome/browser/ui/browser_close_unittest.cc b/chrome/browser/ui/browser_close_unittest.cc index 1b1688d9..061d63e 100644 --- a/chrome/browser/ui/browser_close_unittest.cc +++ b/chrome/browser/ui/browser_close_unittest.cc
@@ -4,9 +4,9 @@ #include <stddef.h> -#include "base/bind.h" #include "base/check_op.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/strings/stringprintf.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/ui/browser_command_controller.cc b/chrome/browser/ui/browser_command_controller.cc index 154e9c94..2e1eb84 100644 --- a/chrome/browser/ui/browser_command_controller.cc +++ b/chrome/browser/ui/browser_command_controller.cc
@@ -8,11 +8,11 @@ #include <string> -#include "base/bind.h" #include "base/command_line.h" #include "base/containers/contains.h" #include "base/debug/debugging_buildflags.h" #include "base/debug/profiler.h" +#include "base/functional/bind.h" #include "base/metrics/user_metrics.h" #include "build/branding_buildflags.h" #include "build/build_config.h"
diff --git a/chrome/browser/ui/browser_dialogs.cc b/chrome/browser/ui/browser_dialogs.cc index c95a9f2..f612571f 100644 --- a/chrome/browser/ui/browser_dialogs.cc +++ b/chrome/browser/ui/browser_dialogs.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/browser_dialogs.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/histogram_macros.h" #if !defined(TOOLKIT_VIEWS)
diff --git a/chrome/browser/ui/browser_dialogs.h b/chrome/browser/ui/browser_dialogs.h index 7ac2ddd..ff6b29f 100644 --- a/chrome/browser/ui/browser_dialogs.h +++ b/chrome/browser/ui/browser_dialogs.h
@@ -10,7 +10,7 @@ #include <utility> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h" #include "chrome/browser/ui/bookmarks/bookmark_editor.h"
diff --git a/chrome/browser/ui/browser_focus_uitest.cc b/chrome/browser/ui/browser_focus_uitest.cc index f00fd4c..bdf05690 100644 --- a/chrome/browser/ui/browser_focus_uitest.cc +++ b/chrome/browser/ui/browser_focus_uitest.cc
@@ -4,9 +4,9 @@ #include <stddef.h> -#include "base/bind.h" #include "base/files/file_util.h" #include "base/format_macros.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/path_service.h" #include "base/run_loop.h"
diff --git a/chrome/browser/ui/browser_instant_controller.cc b/chrome/browser/ui/browser_instant_controller.cc index 7ffb4ded..8df6139 100644 --- a/chrome/browser/ui/browser_instant_controller.cc +++ b/chrome/browser/ui/browser_instant_controller.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/browser_instant_controller.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/search/instant_service.h" #include "chrome/browser/search/instant_service_factory.h"
diff --git a/chrome/browser/ui/browser_list.cc b/chrome/browser/ui/browser_list.cc index 5fd5c450..0e12228 100644 --- a/chrome/browser/ui/browser_list.cc +++ b/chrome/browser/ui/browser_list.cc
@@ -5,9 +5,9 @@ #include "chrome/browser/ui/browser_list.h" #include "base/auto_reset.h" -#include "base/bind.h" #include "base/check.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/user_metrics.h" #include "base/observer_list.h"
diff --git a/chrome/browser/ui/browser_list.h b/chrome/browser/ui/browser_list.h index 2d302f9..9449bb1b 100644 --- a/chrome/browser/ui/browser_list.h +++ b/chrome/browser/ui/browser_list.h
@@ -9,8 +9,8 @@ #include <vector> -#include "base/callback_forward.h" #include "base/containers/flat_set.h" +#include "base/functional/callback_forward.h" #include "base/lazy_instance.h" #include "base/observer_list.h" #include "build/build_config.h"
diff --git a/chrome/browser/ui/browser_tab_strip_model_delegate.cc b/chrome/browser/ui/browser_tab_strip_model_delegate.cc index 52830ef9..6bd258b 100644 --- a/chrome/browser/ui/browser_tab_strip_model_delegate.cc +++ b/chrome/browser/ui/browser_tab_strip_model_delegate.cc
@@ -6,8 +6,8 @@ #include <stddef.h> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "build/build_config.h" #include "chrome/browser/lifetime/browser_shutdown.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ui/browser_window.h b/chrome/browser/ui/browser_window.h index 0785caeb8..570a3a54 100644 --- a/chrome/browser/ui/browser_window.h +++ b/chrome/browser/ui/browser_window.h
@@ -9,9 +9,9 @@ #include <string> #include <vector> -#include "base/callback_forward.h" -#include "base/callback_helpers.h" #include "base/feature_list.h" +#include "base/functional/callback_forward.h" +#include "base/functional/callback_helpers.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h" #include "chrome/browser/apps/intent_helper/apps_navigation_types.h"
diff --git a/chrome/browser/ui/certificate_dialogs.cc b/chrome/browser/ui/certificate_dialogs.cc index 668c0ea..a80f2f4f 100644 --- a/chrome/browser/ui/certificate_dialogs.cc +++ b/chrome/browser/ui/certificate_dialogs.cc
@@ -13,8 +13,8 @@ #include <vector> #include "base/base64.h" -#include "base/bind.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/task/thread_pool.h" #include "chrome/browser/download/download_prefs.h"
diff --git a/chrome/browser/ui/chrome_select_file_policy.cc b/chrome/browser/ui/chrome_select_file_policy.cc index fc1885d..0b2197a 100644 --- a/chrome/browser/ui/chrome_select_file_policy.cc +++ b/chrome/browser/ui/chrome_select_file_policy.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ui/chrome_select_file_policy.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/infobars/simple_alert_infobar_creator.h"
diff --git a/chrome/browser/ui/cocoa/applescript/tab_applescript.mm b/chrome/browser/ui/cocoa/applescript/tab_applescript.mm index 9575ca9..10387f8 100644 --- a/chrome/browser/ui/cocoa/applescript/tab_applescript.mm +++ b/chrome/browser/ui/cocoa/applescript/tab_applescript.mm
@@ -4,9 +4,9 @@ #import "chrome/browser/ui/cocoa/applescript/tab_applescript.h" -#include "base/bind.h" #include "base/check.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #import "base/mac/scoped_nsobject.h" #include "base/notreached.h" #include "base/strings/sys_string_conversions.h"
diff --git a/chrome/browser/ui/cocoa/color_chooser_mac.mm b/chrome/browser/ui/cocoa/color_chooser_mac.mm index 7658b01..e1d5cc43 100644 --- a/chrome/browser/ui/cocoa/color_chooser_mac.mm +++ b/chrome/browser/ui/cocoa/color_chooser_mac.mm
@@ -4,8 +4,8 @@ #import "chrome/browser/ui/cocoa/color_chooser_mac.h" -#include "base/callback_helpers.h" #include "base/check_op.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "chrome/browser/ui/color_chooser.h" #include "components/remote_cocoa/app_shim/color_panel_bridge.h"
diff --git a/chrome/browser/ui/cocoa/first_run_dialog_cocoa.mm b/chrome/browser/ui/cocoa/first_run_dialog_cocoa.mm index 2fbbf775..31295a60 100644 --- a/chrome/browser/ui/cocoa/first_run_dialog_cocoa.mm +++ b/chrome/browser/ui/cocoa/first_run_dialog_cocoa.mm
@@ -4,9 +4,9 @@ #import "chrome/browser/ui/cocoa/first_run_dialog_cocoa.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" #include "base/mac/bundle_locations.h" #import "base/mac/scoped_nsobject.h" #include "base/memory/ref_counted.h"
diff --git a/chrome/browser/ui/cocoa/fullscreen/fullscreen_toolbar_animation_controller.mm b/chrome/browser/ui/cocoa/fullscreen/fullscreen_toolbar_animation_controller.mm index f5ae8ed..3a0bc91 100644 --- a/chrome/browser/ui/cocoa/fullscreen/fullscreen_toolbar_animation_controller.mm +++ b/chrome/browser/ui/cocoa/fullscreen/fullscreen_toolbar_animation_controller.mm
@@ -4,7 +4,7 @@ #import "chrome/browser/ui/cocoa/fullscreen/fullscreen_toolbar_animation_controller.h" -#include "base/bind.h" +#include "base/functional/bind.h" #import "chrome/browser/ui/cocoa/fullscreen/fullscreen_toolbar_controller.h" #include "content/public/browser/web_contents.h"
diff --git a/chrome/browser/ui/cocoa/history_menu_bridge.mm b/chrome/browser/ui/cocoa/history_menu_bridge.mm index b19ecc1..127fbae 100644 --- a/chrome/browser/ui/cocoa/history_menu_bridge.mm +++ b/chrome/browser/ui/cocoa/history_menu_bridge.mm
@@ -6,7 +6,7 @@ #include <stddef.h> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/mac/foundation_util.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h"
diff --git a/chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.mm b/chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.mm index fc0b8b5f..8eb1c4e 100644 --- a/chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.mm +++ b/chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.mm
@@ -7,7 +7,7 @@ #import <Cocoa/Cocoa.h> #include <stddef.h> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #import "chrome/browser/chrome_browser_application_mac.h" #include "chrome/browser/ui/blocked_content/popunder_preventer.h"
diff --git a/chrome/browser/ui/cocoa/keystone_infobar_delegate.mm b/chrome/browser/ui/cocoa/keystone_infobar_delegate.mm index 3e9e043..7e351ead 100644 --- a/chrome/browser/ui/cocoa/keystone_infobar_delegate.mm +++ b/chrome/browser/ui/cocoa/keystone_infobar_delegate.mm
@@ -8,9 +8,9 @@ #include <string> -#include "base/bind.h" #include "base/command_line.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/task/single_thread_task_runner.h" #include "chrome/browser/first_run/first_run.h" #include "chrome/browser/infobars/confirm_infobar_creator.h"
diff --git a/chrome/browser/ui/cocoa/screentime/webpage_controller.h b/chrome/browser/ui/cocoa/screentime/webpage_controller.h index 61fde63..9804a6e 100644 --- a/chrome/browser/ui/cocoa/screentime/webpage_controller.h +++ b/chrome/browser/ui/cocoa/screentime/webpage_controller.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_COCOA_SCREENTIME_WEBPAGE_CONTROLLER_H_ #define CHROME_BROWSER_UI_COCOA_SCREENTIME_WEBPAGE_CONTROLLER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "url/gurl.h" @class NSView;
diff --git a/chrome/browser/ui/cocoa/simple_message_box_cocoa.mm b/chrome/browser/ui/cocoa/simple_message_box_cocoa.mm index f451e6e..f3e58bd 100644 --- a/chrome/browser/ui/cocoa/simple_message_box_cocoa.mm +++ b/chrome/browser/ui/cocoa/simple_message_box_cocoa.mm
@@ -8,7 +8,7 @@ #include <utility> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/mac/scoped_nsobject.h" #include "base/strings/sys_string_conversions.h" #include "chrome/browser/ui/simple_message_box_internal.h"
diff --git a/chrome/browser/ui/cocoa/tab_menu_bridge.mm b/chrome/browser/ui/cocoa/tab_menu_bridge.mm index 55f0466..e2bf07e6 100644 --- a/chrome/browser/ui/cocoa/tab_menu_bridge.mm +++ b/chrome/browser/ui/cocoa/tab_menu_bridge.mm
@@ -6,7 +6,7 @@ #import <Cocoa/Cocoa.h> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/mac/scoped_nsobject.h" #include "base/strings/sys_string_conversions.h" #include "chrome/browser/ui/recently_audible_helper.h"
diff --git a/chrome/browser/ui/cocoa/task_manager_mac_browsertest.mm b/chrome/browser/ui/cocoa/task_manager_mac_browsertest.mm index 9d18741..e63724c 100644 --- a/chrome/browser/ui/cocoa/task_manager_mac_browsertest.mm +++ b/chrome/browser/ui/cocoa/task_manager_mac_browsertest.mm
@@ -5,7 +5,7 @@ #import <Cocoa/Cocoa.h> #include <stddef.h> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/ranges/algorithm.h" #include "base/strings/pattern.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/ui/cocoa/touchbar/browser_window_default_touch_bar.mm b/chrome/browser/ui/cocoa/touchbar/browser_window_default_touch_bar.mm index 64abf02..7d6e748 100644 --- a/chrome/browser/ui/cocoa/touchbar/browser_window_default_touch_bar.mm +++ b/chrome/browser/ui/cocoa/touchbar/browser_window_default_touch_bar.mm
@@ -8,7 +8,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/mac/mac_util.h" #import "base/mac/scoped_nsobject.h" #include "base/no_destructor.h"
diff --git a/chrome/browser/ui/color/chrome_color_mixers.cc b/chrome/browser/ui/color/chrome_color_mixers.cc index 182dc6c..2f01f5f 100644 --- a/chrome/browser/ui/color/chrome_color_mixers.cc +++ b/chrome/browser/ui/color/chrome_color_mixers.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/bind.h" #include "base/containers/fixed_flat_map.h" +#include "base/functional/bind.h" #include "base/no_destructor.h" #include "base/strings/string_piece.h" #include "chrome/browser/ui/color/chrome_color_id.h"
diff --git a/chrome/browser/ui/color/linux/native_chrome_color_mixer_linux.cc b/chrome/browser/ui/color/linux/native_chrome_color_mixer_linux.cc index 51aed600..9d72264 100644 --- a/chrome/browser/ui/color/linux/native_chrome_color_mixer_linux.cc +++ b/chrome/browser/ui/color/linux/native_chrome_color_mixer_linux.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/color/native_chrome_color_mixer.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "chrome/browser/themes/theme_properties.h" #include "chrome/browser/ui/color/chrome_color_id.h"
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 7625036..b674de6 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
@@ -4,8 +4,8 @@ #include "chrome/browser/ui/color/native_chrome_color_mixer.h" -#include "base/bind.h" #include "base/callback_list.h" +#include "base/functional/bind.h" #include "base/no_destructor.h" #include "base/win/windows_version.h" #include "chrome/browser/themes/browser_theme_pack.h"
diff --git a/chrome/browser/ui/commander/command_source.h b/chrome/browser/ui/commander/command_source.h index 1a3c3028..48e249f 100644 --- a/chrome/browser/ui/commander/command_source.h +++ b/chrome/browser/ui/commander/command_source.h
@@ -9,7 +9,7 @@ #include <utility> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "third_party/abseil-cpp/absl/types/variant.h" #include "ui/gfx/range/range.h"
diff --git a/chrome/browser/ui/commander/commander_backend.h b/chrome/browser/ui/commander/commander_backend.h index 9ae5ba2..ed6d27e 100644 --- a/chrome/browser/ui/commander/commander_backend.h +++ b/chrome/browser/ui/commander/commander_backend.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" class Browser;
diff --git a/chrome/browser/ui/commander/commander_controller_unittest.cc b/chrome/browser/ui/commander/commander_controller_unittest.cc index 0b2c4996..56670060 100644 --- a/chrome/browser/ui/commander/commander_controller_unittest.cc +++ b/chrome/browser/ui/commander/commander_controller_unittest.cc
@@ -7,8 +7,8 @@ #include <string> #include <tuple> -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/test/bind.h"
diff --git a/chrome/browser/ui/commander/simple_command_source.cc b/chrome/browser/ui/commander/simple_command_source.cc index 614afe3..256d38ab 100644 --- a/chrome/browser/ui/commander/simple_command_source.cc +++ b/chrome/browser/ui/commander/simple_command_source.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ui/commander/simple_command_source.h" -#include "base/bind.h" #include "base/containers/cxx20_erase.h" +#include "base/functional/bind.h" #include "base/i18n/case_conversion.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/ui/accelerator_utils.h"
diff --git a/chrome/browser/ui/commander/tab_command_source.cc b/chrome/browser/ui/commander/tab_command_source.cc index d67f6615..9abc9aaa 100644 --- a/chrome/browser/ui/commander/tab_command_source.cc +++ b/chrome/browser/ui/commander/tab_command_source.cc
@@ -7,8 +7,8 @@ #include <numeric> #include <string> -#include "base/bind.h" #include "base/containers/cxx20_erase.h" +#include "base/functional/bind.h" #include "base/ranges/algorithm.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/send_tab_to_self/send_tab_to_self_util.h"
diff --git a/chrome/browser/ui/commerce/price_tracking/shopping_list_ui_tab_helper.cc b/chrome/browser/ui/commerce/price_tracking/shopping_list_ui_tab_helper.cc index 5cc61b0..0763324c 100644 --- a/chrome/browser/ui/commerce/price_tracking/shopping_list_ui_tab_helper.cc +++ b/chrome/browser/ui/commerce/price_tracking/shopping_list_ui_tab_helper.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ui/commerce/price_tracking/shopping_list_ui_tab_helper.h" -#include "base/bind.h" #include "base/check_is_test.h" +#include "base/functional/bind.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h"
diff --git a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc index 12a898f..a7396cd 100644 --- a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc +++ b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc
@@ -9,9 +9,9 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/command_line.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/metrics/user_metrics.h" #include "base/metrics/user_metrics_action.h" #include "base/scoped_observation.h"
diff --git a/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc b/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc index 7a5d2cb..01ebae1 100644 --- a/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc +++ b/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc
@@ -7,8 +7,8 @@ #include <memory> #include "base/auto_reset.h" -#include "base/callback.h" #include "base/command_line.h" +#include "base/functional/callback.h" #include "base/strings/utf_string_conversions.h" #include "base/test/scoped_feature_list.h" #include "build/build_config.h"
diff --git a/chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc b/chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc index 219e277a..0b0c7bc 100644 --- a/chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc +++ b/chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ui/content_settings/content_setting_image_model.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/content_settings/framebust_block_browsertest.cc b/chrome/browser/ui/content_settings/framebust_block_browsertest.cc index e2d6dd7..be11186 100644 --- a/chrome/browser/ui/content_settings/framebust_block_browsertest.cc +++ b/chrome/browser/ui/content_settings/framebust_block_browsertest.cc
@@ -4,9 +4,9 @@ #include <cstddef> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/ui/content_settings/media_authorization_wrapper_test.h b/chrome/browser/ui/content_settings/media_authorization_wrapper_test.h index b6060df..ac1c2c32 100644 --- a/chrome/browser/ui/content_settings/media_authorization_wrapper_test.h +++ b/chrome/browser/ui/content_settings/media_authorization_wrapper_test.h
@@ -7,7 +7,7 @@ #import <AVFoundation/AVFoundation.h> -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/media/webrtc/media_authorization_wrapper_mac.h" enum AuthStatus {
diff --git a/chrome/browser/ui/cookie_controls/cookie_controls_service.cc b/chrome/browser/ui/cookie_controls/cookie_controls_service.cc index 24f3008..8ab48427 100644 --- a/chrome/browser/ui/cookie_controls/cookie_controls_service.cc +++ b/chrome/browser/ui/cookie_controls/cookie_controls_service.cc
@@ -8,7 +8,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/user_metrics.h" #include "base/metrics/user_metrics_action.h" #include "chrome/browser/content_settings/cookie_settings_factory.h"
diff --git a/chrome/browser/ui/crypto_module_delegate_nss.cc b/chrome/browser/ui/crypto_module_delegate_nss.cc index d2a15f7f..06100a8d 100644 --- a/chrome/browser/ui/crypto_module_delegate_nss.cc +++ b/chrome/browser/ui/crypto_module_delegate_nss.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/synchronization/waitable_event.h" #include "base/threading/thread_restrictions.h" #include "content/public/browser/browser_task_traits.h"
diff --git a/chrome/browser/ui/crypto_module_password_dialog.h b/chrome/browser/ui/crypto_module_password_dialog.h index cebb655..7975f62 100644 --- a/chrome/browser/ui/crypto_module_password_dialog.h +++ b/chrome/browser/ui/crypto_module_password_dialog.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "ui/gfx/native_widget_types.h" // An enum to describe the reason for the password request.
diff --git a/chrome/browser/ui/crypto_module_password_dialog_nss.cc b/chrome/browser/ui/crypto_module_password_dialog_nss.cc index b9eb2d5a..13914c3 100644 --- a/chrome/browser/ui/crypto_module_password_dialog_nss.cc +++ b/chrome/browser/ui/crypto_module_password_dialog_nss.cc
@@ -7,8 +7,8 @@ #include <pk11pub.h> #include <stddef.h> -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "content/public/browser/browser_thread.h" using content::BrowserThread;
diff --git a/chrome/browser/ui/crypto_module_password_dialog_nss.h b/chrome/browser/ui/crypto_module_password_dialog_nss.h index 6b59ef3..56eea6b0be 100644 --- a/chrome/browser/ui/crypto_module_password_dialog_nss.h +++ b/chrome/browser/ui/crypto_module_password_dialog_nss.h
@@ -7,7 +7,7 @@ #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "chrome/browser/ui/crypto_module_password_dialog.h" #include "crypto/scoped_nss_types.h" #include "net/base/host_port_pair.h"
diff --git a/chrome/browser/ui/dialogs/outdated_upgrade_bubble.cc b/chrome/browser/ui/dialogs/outdated_upgrade_bubble.cc index 598436e3..ec67e6e1 100644 --- a/chrome/browser/ui/dialogs/outdated_upgrade_bubble.cc +++ b/chrome/browser/ui/dialogs/outdated_upgrade_bubble.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/dialogs/outdated_upgrade_bubble.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/user_metrics.h" #include "base/strings/strcat.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/ui/enterprise_startup_dialog.h b/chrome/browser/ui/enterprise_startup_dialog.h index 97f28e7a4..7621da9 100644 --- a/chrome/browser/ui/enterprise_startup_dialog.h +++ b/chrome/browser/ui/enterprise_startup_dialog.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "third_party/abseil-cpp/absl/types/optional.h" namespace policy {
diff --git a/chrome/browser/ui/exclusive_access/exclusive_access_bubble_hide_callback.h b/chrome/browser/ui/exclusive_access/exclusive_access_bubble_hide_callback.h index 6d5baa3..e1f33f6a 100644 --- a/chrome/browser/ui/exclusive_access/exclusive_access_bubble_hide_callback.h +++ b/chrome/browser/ui/exclusive_access/exclusive_access_bubble_hide_callback.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_EXCLUSIVE_ACCESS_EXCLUSIVE_ACCESS_BUBBLE_HIDE_CALLBACK_H_ #define CHROME_BROWSER_UI_EXCLUSIVE_ACCESS_EXCLUSIVE_ACCESS_BUBBLE_HIDE_CALLBACK_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" enum class ExclusiveAccessBubbleHideReason { // The bubble was never shown. e.g.
diff --git a/chrome/browser/ui/exclusive_access/exclusive_access_test.cc b/chrome/browser/ui/exclusive_access/exclusive_access_test.cc index 664880a..77dcdb69f 100644 --- a/chrome/browser/ui/exclusive_access/exclusive_access_test.cc +++ b/chrome/browser/ui/exclusive_access/exclusive_access_test.cc
@@ -7,10 +7,10 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" #include "base/containers/flat_set.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/browser_window.h"
diff --git a/chrome/browser/ui/exclusive_access/exclusive_access_test.h b/chrome/browser/ui/exclusive_access/exclusive_access_test.h index 86cb087..28f9332 100644 --- a/chrome/browser/ui/exclusive_access/exclusive_access_test.h +++ b/chrome/browser/ui/exclusive_access/exclusive_access_test.h
@@ -7,7 +7,7 @@ #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "base/run_loop.h" #include "base/scoped_observation.h"
diff --git a/chrome/browser/ui/exclusive_access/fullscreen_controller.cc b/chrome/browser/ui/exclusive_access/fullscreen_controller.cc index a296f90a..0255e13e 100644 --- a/chrome/browser/ui/exclusive_access/fullscreen_controller.cc +++ b/chrome/browser/ui/exclusive_access/fullscreen_controller.cc
@@ -5,9 +5,9 @@ #include "chrome/browser/ui/exclusive_access/fullscreen_controller.h" #include "base/auto_reset.h" -#include "base/bind.h" #include "base/check.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/metrics/histogram_macros.h" #include "base/metrics/user_metrics.h"
diff --git a/chrome/browser/ui/exclusive_access/fullscreen_controller.h b/chrome/browser/ui/exclusive_access/fullscreen_controller.h index 232938c..0a8e5eb 100644 --- a/chrome/browser/ui/exclusive_access/fullscreen_controller.h +++ b/chrome/browser/ui/exclusive_access/fullscreen_controller.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_EXCLUSIVE_ACCESS_FULLSCREEN_CONTROLLER_H_ #define CHROME_BROWSER_UI_EXCLUSIVE_ACCESS_FULLSCREEN_CONTROLLER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" #include "chrome/browser/ui/exclusive_access/exclusive_access_controller_base.h"
diff --git a/chrome/browser/ui/exclusive_access/fullscreen_controller_browsertest.cc b/chrome/browser/ui/exclusive_access/fullscreen_controller_browsertest.cc index efd9127..3cd9f6c 100644 --- a/chrome/browser/ui/exclusive_access/fullscreen_controller_browsertest.cc +++ b/chrome/browser/ui/exclusive_access/fullscreen_controller_browsertest.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 "base/bind.h" +#include "base/functional/bind.h" #include "base/test/simple_test_tick_clock.h" #include "base/test/test_mock_time_task_runner.h" #include "base/time/time.h"
diff --git a/chrome/browser/ui/exclusive_access/keyboard_lock_controller.cc b/chrome/browser/ui/exclusive_access/keyboard_lock_controller.cc index 94dac91..442c553 100644 --- a/chrome/browser/ui/exclusive_access/keyboard_lock_controller.cc +++ b/chrome/browser/ui/exclusive_access/keyboard_lock_controller.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ui/exclusive_access/keyboard_lock_controller.h" -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "base/time/default_tick_clock.h" #include "base/time/time.h"
diff --git a/chrome/browser/ui/exclusive_access/keyboard_lock_controller.h b/chrome/browser/ui/exclusive_access/keyboard_lock_controller.h index 1261fa8..2675ce7a 100644 --- a/chrome/browser/ui/exclusive_access/keyboard_lock_controller.h +++ b/chrome/browser/ui/exclusive_access/keyboard_lock_controller.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_UI_EXCLUSIVE_ACCESS_KEYBOARD_LOCK_CONTROLLER_H_ #define CHROME_BROWSER_UI_EXCLUSIVE_ACCESS_KEYBOARD_LOCK_CONTROLLER_H_ -#include "base/callback.h" #include "base/containers/circular_deque.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/time/time.h" #include "base/timer/timer.h"
diff --git a/chrome/browser/ui/exclusive_access/mouse_lock_controller.cc b/chrome/browser/ui/exclusive_access/mouse_lock_controller.cc index 99cf754..83b9c4ba 100644 --- a/chrome/browser/ui/exclusive_access/mouse_lock_controller.cc +++ b/chrome/browser/ui/exclusive_access/mouse_lock_controller.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/exclusive_access/mouse_lock_controller.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ui/exclusive_access/mouse_lock_controller.h b/chrome/browser/ui/exclusive_access/mouse_lock_controller.h index 01665fd..af4b4089e3 100644 --- a/chrome/browser/ui/exclusive_access/mouse_lock_controller.h +++ b/chrome/browser/ui/exclusive_access/mouse_lock_controller.h
@@ -7,7 +7,7 @@ #include <utility> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h"
diff --git a/chrome/browser/ui/exclusive_access/mouse_lock_controller_browsertest.cc b/chrome/browser/ui/exclusive_access/mouse_lock_controller_browsertest.cc index 002f8606..eb3dfbc 100644 --- a/chrome/browser/ui/exclusive_access/mouse_lock_controller_browsertest.cc +++ b/chrome/browser/ui/exclusive_access/mouse_lock_controller_browsertest.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 "base/bind.h" +#include "base/functional/bind.h" #include "base/test/simple_test_tick_clock.h" #include "base/test/test_mock_time_task_runner.h" #include "base/time/time.h"
diff --git a/chrome/browser/ui/extensions/application_launch.cc b/chrome/browser/ui/extensions/application_launch.cc index 87827a5..a44b4afa 100644 --- a/chrome/browser/ui/extensions/application_launch.cc +++ b/chrome/browser/ui/extensions/application_launch.cc
@@ -9,9 +9,9 @@ #include <utility> #include "apps/launcher.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/metrics/histogram_macros.h" #include "base/time/time.h"
diff --git a/chrome/browser/ui/extensions/extension_action_view_controller.cc b/chrome/browser/ui/extensions/extension_action_view_controller.cc index b8614c7c..2625c38 100644 --- a/chrome/browser/ui/extensions/extension_action_view_controller.cc +++ b/chrome/browser/ui/extensions/extension_action_view_controller.cc
@@ -8,9 +8,9 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/check_op.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/metrics/histogram_functions.h" #include "base/strings/strcat.h"
diff --git a/chrome/browser/ui/extensions/extension_action_view_controller_unittest.cc b/chrome/browser/ui/extensions/extension_action_view_controller_unittest.cc index 9b51684..2904afcb 100644 --- a/chrome/browser/ui/extensions/extension_action_view_controller_unittest.cc +++ b/chrome/browser/ui/extensions/extension_action_view_controller_unittest.cc
@@ -8,9 +8,9 @@ #include <memory> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/json/json_reader.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h"
diff --git a/chrome/browser/ui/extensions/extension_enable_flow.cc b/chrome/browser/ui/extensions/extension_enable_flow.cc index 84eb79d9..e6c1b3e 100644 --- a/chrome/browser/ui/extensions/extension_enable_flow.cc +++ b/chrome/browser/ui/extensions/extension_enable_flow.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/notreached.h" #include "build/chromeos_buildflags.h" #include "chrome/browser/chrome_notification_types.h"
diff --git a/chrome/browser/ui/extensions/extension_enable_flow.h b/chrome/browser/ui/extensions/extension_enable_flow.h index 350dd2c..662f70f 100644 --- a/chrome/browser/ui/extensions/extension_enable_flow.h +++ b/chrome/browser/ui/extensions/extension_enable_flow.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/scoped_observation.h"
diff --git a/chrome/browser/ui/extensions/extension_install_ui_default.cc b/chrome/browser/ui/extensions/extension_install_ui_default.cc index 978e223f..596bd46 100644 --- a/chrome/browser/ui/extensions/extension_install_ui_default.cc +++ b/chrome/browser/ui/extensions/extension_install_ui_default.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/extensions/extension_install_ui_default.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h" @@ -42,7 +42,7 @@ #endif #if BUILDFLAG(IS_CHROMEOS_LACROS) -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "chrome/browser/notifications/notification_display_service.h" #include "chrome/browser/notifications/notification_display_service_factory.h" #include "chrome/grit/generated_resources.h"
diff --git a/chrome/browser/ui/extensions/extension_installed_waiter.h b/chrome/browser/ui/extensions/extension_installed_waiter.h index 1ee90cf4e..7e89bd2f 100644 --- a/chrome/browser/ui/extensions/extension_installed_waiter.h +++ b/chrome/browser/ui/extensions/extension_installed_waiter.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_EXTENSIONS_EXTENSION_INSTALLED_WAITER_H_ #define CHROME_BROWSER_UI_EXTENSIONS_EXTENSION_INSTALLED_WAITER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/scoped_observation.h"
diff --git a/chrome/browser/ui/extensions/extension_installed_waiter_unittest.cc b/chrome/browser/ui/extensions/extension_installed_waiter_unittest.cc index da6a581..8baf290 100644 --- a/chrome/browser/ui/extensions/extension_installed_waiter_unittest.cc +++ b/chrome/browser/ui/extensions/extension_installed_waiter_unittest.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ui/extensions/extension_installed_waiter.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/load_error_reporter.h"
diff --git a/chrome/browser/ui/extensions/extension_message_bubble_bridge_unittest.cc b/chrome/browser/ui/extensions/extension_message_bubble_bridge_unittest.cc index f3cbdd1..6b36799 100644 --- a/chrome/browser/ui/extensions/extension_message_bubble_bridge_unittest.cc +++ b/chrome/browser/ui/extensions/extension_message_bubble_bridge_unittest.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ui/extensions/extension_message_bubble_bridge.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/path_service.h" #include "base/values.h" #include "chrome/browser/extensions/extension_service.h"
diff --git a/chrome/browser/ui/extensions/extension_popup_types.h b/chrome/browser/ui/extensions/extension_popup_types.h index 86bacd7bd..3a109a2c 100644 --- a/chrome/browser/ui/extensions/extension_popup_types.h +++ b/chrome/browser/ui/extensions/extension_popup_types.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_EXTENSIONS_EXTENSION_POPUP_TYPES_H_ #define CHROME_BROWSER_UI_EXTENSIONS_EXTENSION_POPUP_TYPES_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" namespace extensions { class ExtensionHost;
diff --git a/chrome/browser/ui/extensions/extensions_container.h b/chrome/browser/ui/extensions/extensions_container.h index 7cffc3f5..f51c0b4 100644 --- a/chrome/browser/ui/extensions/extensions_container.h +++ b/chrome/browser/ui/extensions/extensions_container.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "chrome/browser/extensions/extension_context_menu_model.h" #include "chrome/browser/ui/extensions/extension_popup_types.h" #include "chrome/browser/ui/toolbar/toolbar_action_hover_card_types.h"
diff --git a/chrome/browser/ui/extensions/extensions_dialogs.h b/chrome/browser/ui/extensions/extensions_dialogs.h index 58d97e5..a13f7d0d 100644 --- a/chrome/browser/ui/extensions/extensions_dialogs.h +++ b/chrome/browser/ui/extensions/extensions_dialogs.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h" #include "chrome/common/buildflags.h"
diff --git a/chrome/browser/ui/extensions/hosted_app_browsertest.cc b/chrome/browser/ui/extensions/hosted_app_browsertest.cc index 16ff16d..8b32284 100644 --- a/chrome/browser/ui/extensions/hosted_app_browsertest.cc +++ b/chrome/browser/ui/extensions/hosted_app_browsertest.cc
@@ -6,11 +6,11 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" #include "base/compiler_specific.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/strings/string_split.h"
diff --git a/chrome/browser/ui/extensions/icon_with_badge_image_source.h b/chrome/browser/ui/extensions/icon_with_badge_image_source.h index 3328b6b4..206f129 100644 --- a/chrome/browser/ui/extensions/icon_with_badge_image_source.h +++ b/chrome/browser/ui/extensions/icon_with_badge_image_source.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "third_party/skia/include/core/SkColor.h" #include "ui/gfx/geometry/rect.h" #include "ui/gfx/image/canvas_image_source.h"
diff --git a/chrome/browser/ui/extensions/settings_api_bubble_helpers_unittest.cc b/chrome/browser/ui/extensions/settings_api_bubble_helpers_unittest.cc index 2cba5ad..d6e7f60 100644 --- a/chrome/browser/ui/extensions/settings_api_bubble_helpers_unittest.cc +++ b/chrome/browser/ui/extensions/settings_api_bubble_helpers_unittest.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_service_test_base.h" #include "chrome/browser/extensions/extension_web_ui_override_registrar.h"
diff --git a/chrome/browser/ui/file_system_access_dialogs.h b/chrome/browser/ui/file_system_access_dialogs.h index fc21e06..ba75aeac 100644 --- a/chrome/browser/ui/file_system_access_dialogs.h +++ b/chrome/browser/ui/file_system_access_dialogs.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_FILE_SYSTEM_ACCESS_DIALOGS_H_ #define CHROME_BROWSER_UI_FILE_SYSTEM_ACCESS_DIALOGS_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/file_system_access/file_system_access_permission_request_manager.h" #include "content/public/browser/file_system_access_permission_context.h"
diff --git a/chrome/browser/ui/global_error/global_error_browsertest.cc b/chrome/browser/ui/global_error/global_error_browsertest.cc index 1ae0d0ac..5e5cc361 100644 --- a/chrome/browser/ui/global_error/global_error_browsertest.cc +++ b/chrome/browser/ui/global_error/global_error_browsertest.cc
@@ -4,9 +4,9 @@ #include <memory> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/path_service.h" #include "base/run_loop.h"
diff --git a/chrome/browser/ui/global_media_controls/cast_media_notification_producer.h b/chrome/browser/ui/global_media_controls/cast_media_notification_producer.h index 7af8839..b72bac1 100644 --- a/chrome/browser/ui/global_media_controls/cast_media_notification_producer.h +++ b/chrome/browser/ui/global_media_controls/cast_media_notification_producer.h
@@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ui/global_media_controls/cast_media_notification_item.h"
diff --git a/chrome/browser/ui/global_media_controls/media_notification_device_monitor.cc b/chrome/browser/ui/global_media_controls/media_notification_device_monitor.cc index 7ad2f247..d0d931d 100644 --- a/chrome/browser/ui/global_media_controls/media_notification_device_monitor.cc +++ b/chrome/browser/ui/global_media_controls/media_notification_device_monitor.cc
@@ -6,7 +6,7 @@ #include <iterator> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/hash/hash.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h"
diff --git a/chrome/browser/ui/hats/hats_helper.cc b/chrome/browser/ui/hats/hats_helper.cc index f425f95..7287cb9 100644 --- a/chrome/browser/ui/hats/hats_helper.cc +++ b/chrome/browser/ui/hats/hats_helper.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/hats/hats_helper.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/field_trial_params.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/hats/hats_service.h"
diff --git a/chrome/browser/ui/hats/hats_service.h b/chrome/browser/ui/hats/hats_service.h index 4f709fb..ec7a17c 100644 --- a/chrome/browser/ui/hats/hats_service.h +++ b/chrome/browser/ui/hats/hats_service.h
@@ -9,10 +9,10 @@ #include <set> #include <string> -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/containers/flat_map.h" #include "base/feature_list.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/ui/hats/hats_service_browsertest.cc b/chrome/browser/ui/hats/hats_service_browsertest.cc index eac3d8d..f3791f40 100644 --- a/chrome/browser/ui/hats/hats_service_browsertest.cc +++ b/chrome/browser/ui/hats/hats_service_browsertest.cc
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/metrics/user_metrics.h" #include "base/run_loop.h" #include "base/test/metrics/histogram_tester.h"
diff --git a/chrome/browser/ui/hid/hid_chooser.h b/chrome/browser/ui/hid/hid_chooser.h index 9462e86..3bc186b 100644 --- a/chrome/browser/ui/hid/hid_chooser.h +++ b/chrome/browser/ui/hid/hid_chooser.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_HID_HID_CHOOSER_H_ #define CHROME_BROWSER_UI_HID_HID_CHOOSER_H_ -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "content/public/browser/hid_chooser.h" // Owns a HID device chooser dialog and closes it when destroyed.
diff --git a/chrome/browser/ui/hid/hid_chooser_controller.cc b/chrome/browser/ui/hid/hid_chooser_controller.cc index 35da0eb..21bbc09 100644 --- a/chrome/browser/ui/hid/hid_chooser_controller.cc +++ b/chrome/browser/ui/hid/hid_chooser_controller.cc
@@ -6,10 +6,10 @@ #include <utility> -#include "base/bind.h" #include "base/command_line.h" #include "base/containers/contains.h" #include "base/containers/cxx20_erase.h" +#include "base/functional/bind.h" #include "base/ranges/algorithm.h" #include "chrome/browser/chooser_controller/title_util.h" #include "chrome/browser/hid/hid_chooser_context.h"
diff --git a/chrome/browser/ui/hid/hid_chooser_controller_unittest.cc b/chrome/browser/ui/hid/hid_chooser_controller_unittest.cc index 83df32b..bcbd242 100644 --- a/chrome/browser/ui/hid/hid_chooser_controller_unittest.cc +++ b/chrome/browser/ui/hid/hid_chooser_controller_unittest.cc
@@ -7,8 +7,8 @@ #include <string> #include <utility> -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/callback_helpers.h" #include "base/strings/utf_string_conversions.h" #include "base/test/bind.h" #include "base/test/gmock_callback_support.h"
diff --git a/chrome/browser/ui/hung_plugin_tab_helper.cc b/chrome/browser/ui/hung_plugin_tab_helper.cc index 060a661a..42513b1 100644 --- a/chrome/browser/ui/hung_plugin_tab_helper.cc +++ b/chrome/browser/ui/hung_plugin_tab_helper.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/process/process.h" #include "base/ranges/algorithm.h"
diff --git a/chrome/browser/ui/hung_renderer/hung_renderer_interactive_uitest.cc b/chrome/browser/ui/hung_renderer/hung_renderer_interactive_uitest.cc index 1295f2d..39bce66 100644 --- a/chrome/browser/ui/hung_renderer/hung_renderer_interactive_uitest.cc +++ b/chrome/browser/ui/hung_renderer/hung_renderer_interactive_uitest.cc
@@ -4,7 +4,7 @@ #include <string> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "chrome/browser/platform_util.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tab_dialogs.h"
diff --git a/chrome/browser/ui/idle_dialog.h b/chrome/browser/ui/idle_dialog.h index edf94779..df271f87 100644 --- a/chrome/browser/ui/idle_dialog.h +++ b/chrome/browser/ui/idle_dialog.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_IDLE_DIALOG_H_ #define CHROME_BROWSER_UI_IDLE_DIALOG_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h" #include "ui/views/widget/widget.h"
diff --git a/chrome/browser/ui/intent_picker_tab_helper.cc b/chrome/browser/ui/intent_picker_tab_helper.cc index 227269c23..3683633 100644 --- a/chrome/browser/ui/intent_picker_tab_helper.cc +++ b/chrome/browser/ui/intent_picker_tab_helper.cc
@@ -7,8 +7,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "build/build_config.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/ui/intent_picker_tab_helper.h b/chrome/browser/ui/intent_picker_tab_helper.h index 771fe85..bebd61b 100644 --- a/chrome/browser/ui/intent_picker_tab_helper.h +++ b/chrome/browser/ui/intent_picker_tab_helper.h
@@ -7,7 +7,7 @@ #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/scoped_observation.h"
diff --git a/chrome/browser/ui/interventions/intervention_infobar_delegate.h b/chrome/browser/ui/interventions/intervention_infobar_delegate.h index 5a97b08..1cdf781 100644 --- a/chrome/browser/ui/interventions/intervention_infobar_delegate.h +++ b/chrome/browser/ui/interventions/intervention_infobar_delegate.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_INTERVENTIONS_INTERVENTION_INFOBAR_DELEGATE_H_ #define CHROME_BROWSER_UI_INTERVENTIONS_INTERVENTION_INFOBAR_DELEGATE_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "components/infobars/core/infobar_delegate.h"
diff --git a/chrome/browser/ui/javascript_dialogs/javascript_dialog_browsertest.cc b/chrome/browser/ui/javascript_dialogs/javascript_dialog_browsertest.cc index 1be2e508..e6feb5ff 100644 --- a/chrome/browser/ui/javascript_dialogs/javascript_dialog_browsertest.cc +++ b/chrome/browser/ui/javascript_dialogs/javascript_dialog_browsertest.cc
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/ui/javascript_dialogs/javascript_tab_modal_dialog_manager_delegate_desktop.h b/chrome/browser/ui/javascript_dialogs/javascript_tab_modal_dialog_manager_delegate_desktop.h index ecd88b5..872198f 100644 --- a/chrome/browser/ui/javascript_dialogs/javascript_tab_modal_dialog_manager_delegate_desktop.h +++ b/chrome/browser/ui/javascript_dialogs/javascript_tab_modal_dialog_manager_delegate_desktop.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/ui/browser_list_observer.h" #include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
diff --git a/chrome/browser/ui/lens/lens_side_panel_helper.h b/chrome/browser/ui/lens/lens_side_panel_helper.h index db95b696..be51aba4 100644 --- a/chrome/browser/ui/lens/lens_side_panel_helper.h +++ b/chrome/browser/ui/lens/lens_side_panel_helper.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_LENS_LENS_SIDE_PANEL_HELPER_H_ #define CHROME_BROWSER_UI_LENS_LENS_SIDE_PANEL_HELPER_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "url/gurl.h" namespace content {
diff --git a/chrome/browser/ui/login/login_handler.cc b/chrome/browser/ui/login/login_handler.cc index 126cae8..ed4326e9 100644 --- a/chrome/browser/ui/login/login_handler.cc +++ b/chrome/browser/ui/login/login_handler.cc
@@ -8,9 +8,9 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/command_line.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/login/login_handler.h b/chrome/browser/ui/login/login_handler.h index 8c8cc6e..779d481 100644 --- a/chrome/browser/ui/login/login_handler.h +++ b/chrome/browser/ui/login/login_handler.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" #include "base/memory/raw_ref.h"
diff --git a/chrome/browser/ui/login/login_handler_browsertest.cc b/chrome/browser/ui/login/login_handler_browsertest.cc index f3135438..39f35dc4 100644 --- a/chrome/browser/ui/login/login_handler_browsertest.cc +++ b/chrome/browser/ui/login/login_handler_browsertest.cc
@@ -8,8 +8,8 @@ #include <map> #include <tuple> -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/metrics/field_trial.h" #include "base/ranges/algorithm.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/ui/media_router/cast_dialog_controller.h b/chrome/browser/ui/media_router/cast_dialog_controller.h index 387c62f..2a8de976 100644 --- a/chrome/browser/ui/media_router/cast_dialog_controller.h +++ b/chrome/browser/ui/media_router/cast_dialog_controller.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_MEDIA_ROUTER_CAST_DIALOG_CONTROLLER_H_ #define CHROME_BROWSER_UI_MEDIA_ROUTER_CAST_DIALOG_CONTROLLER_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "chrome/browser/ui/media_router/media_cast_mode.h" #include "components/media_router/common/issue.h" #include "components/media_router/common/media_route.h"
diff --git a/chrome/browser/ui/media_router/media_router_ui.cc b/chrome/browser/ui/media_router/media_router_ui.cc index 6d90161..38e46b7f 100644 --- a/chrome/browser/ui/media_router/media_router_ui.cc +++ b/chrome/browser/ui/media_router/media_router_ui.cc
@@ -7,8 +7,8 @@ #include <utility> #include "base/atomic_sequence_num.h" -#include "base/bind.h" #include "base/containers/cxx20_erase.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "base/strings/strcat.h" #include "base/strings/string_util.h"
diff --git a/chrome/browser/ui/media_router/media_router_ui_service.cc b/chrome/browser/ui/media_router/media_router_ui_service.cc index 4dcc616..409fb3d 100644 --- a/chrome/browser/ui/media_router/media_router_ui_service.cc +++ b/chrome/browser/ui/media_router/media_router_ui_service.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/media_router/media_router_ui_service.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/observer_list.h" #include "chrome/browser/media/router/media_router_feature.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ui/media_router/media_router_ui_service_factory_unittest.cc b/chrome/browser/ui/media_router/media_router_ui_service_factory_unittest.cc index 95148f3..7e5a9e8 100644 --- a/chrome/browser/ui/media_router/media_router_ui_service_factory_unittest.cc +++ b/chrome/browser/ui/media_router/media_router_ui_service_factory_unittest.cc
@@ -4,7 +4,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/values.h" #include "chrome/browser/media/router/chrome_media_router_factory.h" #include "chrome/browser/media/router/media_router_feature.h"
diff --git a/chrome/browser/ui/media_router/presentation_receiver_window_controller.cc b/chrome/browser/ui/media_router/presentation_receiver_window_controller.cc index c76254da..114e765 100644 --- a/chrome/browser/ui/media_router/presentation_receiver_window_controller.cc +++ b/chrome/browser/ui/media_router/presentation_receiver_window_controller.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ui/media_router/presentation_receiver_window_controller.h b/chrome/browser/ui/media_router/presentation_receiver_window_controller.h index 9f36b172..0c8f72c7 100644 --- a/chrome/browser/ui/media_router/presentation_receiver_window_controller.h +++ b/chrome/browser/ui/media_router/presentation_receiver_window_controller.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/scoped_observation.h" #include "chrome/browser/media/router/providers/wired_display/wired_display_presentation_receiver.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 a692bd8e..526a1be 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
@@ -6,9 +6,9 @@ #include <string> -#include "base/bind.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/path_service.h" #include "base/run_loop.h" #include "base/threading/thread_restrictions.h"
diff --git a/chrome/browser/ui/media_router/query_result_manager_unittest.cc b/chrome/browser/ui/media_router/query_result_manager_unittest.cc index 6c1255d66..5f2b96d 100644 --- a/chrome/browser/ui/media_router/query_result_manager_unittest.cc +++ b/chrome/browser/ui/media_router/query_result_manager_unittest.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ui/media_router/query_result_manager.h" -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/json/json_writer.h" #include "components/media_router/browser/media_sinks_observer.h" #include "components/media_router/browser/test/mock_media_router.h"
diff --git a/chrome/browser/ui/network_profile_bubble.cc b/chrome/browser/ui/network_profile_bubble.cc index ff9d92a..58ecb952 100644 --- a/chrome/browser/ui/network_profile_bubble.cc +++ b/chrome/browser/ui/network_profile_bubble.cc
@@ -8,11 +8,11 @@ #include <windows.h> #include <wtsapi32.h> -#include "base/bind.h" #include "base/check_op.h" #include "base/command_line.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "base/time/time.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/ui/omnibox/alternate_nav_infobar_delegate.h b/chrome/browser/ui/omnibox/alternate_nav_infobar_delegate.h index 96aebb2..9d77657 100644 --- a/chrome/browser/ui/omnibox/alternate_nav_infobar_delegate.h +++ b/chrome/browser/ui/omnibox/alternate_nav_infobar_delegate.h
@@ -9,7 +9,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "build/build_config.h" #include "components/infobars/core/infobar_delegate.h"
diff --git a/chrome/browser/ui/omnibox/chrome_omnibox_client.cc b/chrome/browser/ui/omnibox/chrome_omnibox_client.cc index 47d668d..8f06e75 100644 --- a/chrome/browser/ui/omnibox/chrome_omnibox_client.cc +++ b/chrome/browser/ui/omnibox/chrome_omnibox_client.cc
@@ -10,7 +10,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/field_trial_params.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h"
diff --git a/chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer.cc b/chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer.cc index 9af28846..d3f2715 100644 --- a/chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer.cc +++ b/chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/omnibox/chrome_omnibox_navigation_observer.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/trace_event/typed_macros.h" #include "chrome/browser/autocomplete/shortcuts_backend_factory.h" #include "chrome/browser/intranet_redirect_detector.h"
diff --git a/chrome/browser/ui/omnibox/omnibox_pedal_implementations_unittest.cc b/chrome/browser/ui/omnibox/omnibox_pedal_implementations_unittest.cc index 9d4331c5..037013e 100644 --- a/chrome/browser/ui/omnibox/omnibox_pedal_implementations_unittest.cc +++ b/chrome/browser/ui/omnibox/omnibox_pedal_implementations_unittest.cc
@@ -6,7 +6,7 @@ #include <algorithm> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/weak_ptr.h" #include "base/ranges/algorithm.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc index f9a4227..4ee61e3b 100644 --- a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc +++ b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/strings/strcat.h"
diff --git a/chrome/browser/ui/page_info/page_info_dialog.h b/chrome/browser/ui/page_info/page_info_dialog.h index 2698c21..68002c5c2 100644 --- a/chrome/browser/ui/page_info/page_info_dialog.h +++ b/chrome/browser/ui/page_info/page_info_dialog.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_PAGE_INFO_PAGE_INFO_DIALOG_H_ #define CHROME_BROWSER_UI_PAGE_INFO_PAGE_INFO_DIALOG_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/ui/bubble_anchor_util.h" #include "components/security_state/core/security_state.h" #include "ui/views/widget/widget.h"
diff --git a/chrome/browser/ui/page_info/page_info_unittest.cc b/chrome/browser/ui/page_info/page_info_unittest.cc index 4edb114..61620eac 100644 --- a/chrome/browser/ui/page_info/page_info_unittest.cc +++ b/chrome/browser/ui/page_info/page_info_unittest.cc
@@ -11,7 +11,7 @@ #include <vector> #include "base/at_exit.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" #include "base/test/metrics/histogram_tester.h"
diff --git a/chrome/browser/ui/passwords/account_storage_auth_helper.cc b/chrome/browser/ui/passwords/account_storage_auth_helper.cc index 390ee4b..aed7e02f 100644 --- a/chrome/browser/ui/passwords/account_storage_auth_helper.cc +++ b/chrome/browser/ui/passwords/account_storage_auth_helper.cc
@@ -7,7 +7,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/signin/reauth_result.h" #include "components/password_manager/core/browser/password_feature_manager.h" #include "components/signin/public/base/consent_level.h"
diff --git a/chrome/browser/ui/passwords/account_storage_auth_helper.h b/chrome/browser/ui/passwords/account_storage_auth_helper.h index 5cf0e76c..afaa1336 100644 --- a/chrome/browser/ui/passwords/account_storage_auth_helper.h +++ b/chrome/browser/ui/passwords/account_storage_auth_helper.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_PASSWORDS_ACCOUNT_STORAGE_AUTH_HELPER_H_ #define CHROME_BROWSER_UI_PASSWORDS_ACCOUNT_STORAGE_AUTH_HELPER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ui/signin_view_controller.h"
diff --git a/chrome/browser/ui/passwords/account_storage_auth_helper_unittest.cc b/chrome/browser/ui/passwords/account_storage_auth_helper_unittest.cc index 73dab541..074726c9 100644 --- a/chrome/browser/ui/passwords/account_storage_auth_helper_unittest.cc +++ b/chrome/browser/ui/passwords/account_storage_auth_helper_unittest.cc
@@ -6,8 +6,8 @@ #include <string> -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/test/bind.h" #include "base/test/task_environment.h" #include "build/build_config.h"
diff --git a/chrome/browser/ui/passwords/bubble_controllers/save_update_bubble_controller_unittest.cc b/chrome/browser/ui/passwords/bubble_controllers/save_update_bubble_controller_unittest.cc index 8e721bc..8aeafccf 100644 --- a/chrome/browser/ui/passwords/bubble_controllers/save_update_bubble_controller_unittest.cc +++ b/chrome/browser/ui/passwords/bubble_controllers/save_update_bubble_controller_unittest.cc
@@ -9,7 +9,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_samples.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/passwords/manage_passwords_state.h b/chrome/browser/ui/passwords/manage_passwords_state.h index 8ff9de81..c2fdcee 100644 --- a/chrome/browser/ui/passwords/manage_passwords_state.h +++ b/chrome/browser/ui/passwords/manage_passwords_state.h
@@ -8,7 +8,7 @@ #include <memory> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "components/password_manager/core/browser/password_form.h" #include "components/password_manager/core/browser/password_store_change.h"
diff --git a/chrome/browser/ui/passwords/manage_passwords_state_unittest.cc b/chrome/browser/ui/passwords/manage_passwords_state_unittest.cc index 8919ddd..cb267c6 100644 --- a/chrome/browser/ui/passwords/manage_passwords_state_unittest.cc +++ b/chrome/browser/ui/passwords/manage_passwords_state_unittest.cc
@@ -9,7 +9,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/strings/utf_string_conversions.h" #include "base/test/mock_callback.h"
diff --git a/chrome/browser/ui/passwords/manage_passwords_test.cc b/chrome/browser/ui/passwords/manage_passwords_test.cc index 3425f0f..b6f09691 100644 --- a/chrome/browser/ui/passwords/manage_passwords_test.cc +++ b/chrome/browser/ui/passwords/manage_passwords_test.cc
@@ -7,7 +7,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/strings/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h"
diff --git a/chrome/browser/ui/passwords/manage_passwords_ui_controller.cc b/chrome/browser/ui/passwords/manage_passwords_ui_controller.cc index c7a8a3c..1fd20b6 100644 --- a/chrome/browser/ui/passwords/manage_passwords_ui_controller.cc +++ b/chrome/browser/ui/passwords/manage_passwords_ui_controller.cc
@@ -7,7 +7,7 @@ #include <utility> #include "base/auto_reset.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h" #include "base/notreached.h"
diff --git a/chrome/browser/ui/passwords/manage_passwords_ui_controller_unittest.cc b/chrome/browser/ui/passwords/manage_passwords_ui_controller_unittest.cc index acbfefe..84e9d6aa 100644 --- a/chrome/browser/ui/passwords/manage_passwords_ui_controller_unittest.cc +++ b/chrome/browser/ui/passwords/manage_passwords_ui_controller_unittest.cc
@@ -8,7 +8,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/passwords/password_generation_popup_controller_impl.cc b/chrome/browser/ui/passwords/password_generation_popup_controller_impl.cc index ed4370303..18d06cb 100644 --- a/chrome/browser/ui/passwords/password_generation_popup_controller_impl.cc +++ b/chrome/browser/ui/passwords/password_generation_popup_controller_impl.cc
@@ -11,7 +11,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/i18n/rtl.h" #include "base/memory/raw_ptr.h" #include "base/strings/string_split.h"
diff --git a/chrome/browser/ui/passwords/passwords_client_ui_delegate.h b/chrome/browser/ui/passwords/passwords_client_ui_delegate.h index dc1f784..7b36f03b 100644 --- a/chrome/browser/ui/passwords/passwords_client_ui_delegate.h +++ b/chrome/browser/ui/passwords/passwords_client_ui_delegate.h
@@ -9,7 +9,7 @@ #include <memory> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "components/password_manager/core/browser/leak_detection_dialog_utils.h" #include "components/password_manager/core/browser/password_form.h" #include "components/prefs/pref_service.h"
diff --git a/chrome/browser/ui/passwords/passwords_model_delegate.h b/chrome/browser/ui/passwords/passwords_model_delegate.h index 21fc5324..8007cd0c 100644 --- a/chrome/browser/ui/passwords/passwords_model_delegate.h +++ b/chrome/browser/ui/passwords/passwords_model_delegate.h
@@ -8,7 +8,7 @@ #include <memory> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "components/password_manager/core/browser/manage_passwords_referrer.h" #include "components/password_manager/core/browser/ui/password_check_referrer.h"
diff --git a/chrome/browser/ui/passwords/settings/password_manager_porter.cc b/chrome/browser/ui/passwords/settings/password_manager_porter.cc index 6ba0bcb..0e0ea181 100644 --- a/chrome/browser/ui/passwords/settings/password_manager_porter.cc +++ b/chrome/browser/ui/passwords/settings/password_manager_porter.cc
@@ -8,7 +8,7 @@ #include <vector> #include "base/auto_reset.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/metrics/histogram_macros.h" #include "base/path_service.h"
diff --git a/chrome/browser/ui/passwords/settings/password_manager_porter_unittest.cc b/chrome/browser/ui/passwords/settings/password_manager_porter_unittest.cc index 576b7e28..1e59713 100644 --- a/chrome/browser/ui/passwords/settings/password_manager_porter_unittest.cc +++ b/chrome/browser/ui/passwords/settings/password_manager_porter_unittest.cc
@@ -9,9 +9,9 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/strings/string_piece.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/pdf/adobe_reader_info_win.cc b/chrome/browser/ui/pdf/adobe_reader_info_win.cc index 46bbad5..87e6ee5 100644 --- a/chrome/browser/ui/pdf/adobe_reader_info_win.cc +++ b/chrome/browser/ui/pdf/adobe_reader_info_win.cc
@@ -9,10 +9,10 @@ #include <algorithm> #include <vector> -#include "base/bind.h" -#include "base/callback.h" #include "base/file_version_info.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/platform_keys_certificate_selector_chromeos.h b/chrome/browser/ui/platform_keys_certificate_selector_chromeos.h index 8fdff413..2f29c142 100644 --- a/chrome/browser/ui/platform_keys_certificate_selector_chromeos.h +++ b/chrome/browser/ui/platform_keys_certificate_selector_chromeos.h
@@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/ref_counted.h" namespace content {
diff --git a/chrome/browser/ui/prefs/pref_watcher.cc b/chrome/browser/ui/prefs/pref_watcher.cc index 500e568..11a9731 100644 --- a/chrome/browser/ui/prefs/pref_watcher.cc +++ b/chrome/browser/ui/prefs/pref_watcher.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/prefs/pref_watcher.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/ui/prefs/prefs_tab_helper.cc b/chrome/browser/ui/prefs/prefs_tab_helper.cc index 16cfeb2..475a465 100644 --- a/chrome/browser/ui/prefs/prefs_tab_helper.cc +++ b/chrome/browser/ui/prefs/prefs_tab_helper.cc
@@ -10,8 +10,8 @@ #include <set> #include <string> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/profile_error_dialog.cc b/chrome/browser/ui/profile_error_dialog.cc index b6c437b..9e12099f 100644 --- a/chrome/browser/ui/profile_error_dialog.cc +++ b/chrome/browser/ui/profile_error_dialog.cc
@@ -5,9 +5,9 @@ #include "chrome/browser/ui/profile_error_dialog.h" #include "base/base_switches.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/metrics/histogram_macros.h" #include "build/branding_buildflags.h" #include "build/build_config.h"
diff --git a/chrome/browser/ui/profile_picker.h b/chrome/browser/ui/profile_picker.h index f2faf24..fdea02a 100644 --- a/chrome/browser/ui/profile_picker.h +++ b/chrome/browser/ui/profile_picker.h
@@ -5,9 +5,9 @@ #ifndef CHROME_BROWSER_UI_PROFILE_PICKER_H_ #define CHROME_BROWSER_UI_PROFILE_PICKER_H_ -#include "base/callback_forward.h" #include "base/feature_list.h" #include "base/files/file_path.h" +#include "base/functional/callback_forward.h" #include "base/time/time.h" #include "build/buildflag.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/ui/profile_picker_unittest.cc b/chrome/browser/ui/profile_picker_unittest.cc index 2b81212..090f109 100644 --- a/chrome/browser/ui/profile_picker_unittest.cc +++ b/chrome/browser/ui/profile_picker_unittest.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ui/profile_picker.h" -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/test/mock_callback.h" #include "base/test/scoped_feature_list.h" #include "base/test/task_environment.h"
diff --git a/chrome/browser/ui/quick_answers/lacros/quick_answers_state_lacros.cc b/chrome/browser/ui/quick_answers/lacros/quick_answers_state_lacros.cc index 0d33973a..d18bb1a 100644 --- a/chrome/browser/ui/quick_answers/lacros/quick_answers_state_lacros.cc +++ b/chrome/browser/ui/quick_answers/lacros/quick_answers_state_lacros.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/quick_answers/lacros/quick_answers_state_lacros.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "chromeos/components/quick_answers/public/cpp/quick_answers_prefs.h" #include "chromeos/components/quick_answers/public/cpp/quick_answers_state.h"
diff --git a/chrome/browser/ui/quick_answers/quick_answers_ui_controller.cc b/chrome/browser/ui/quick_answers/quick_answers_ui_controller.cc index 7af7d6e6..bb327bc9 100644 --- a/chrome/browser/ui/quick_answers/quick_answers_ui_controller.cc +++ b/chrome/browser/ui/quick_answers/quick_answers_ui_controller.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/quick_answers/quick_answers_ui_controller.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/escape.h" #include "base/strings/stringprintf.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/ui/quick_answers/ui/quick_answers_focus_search.h b/chrome/browser/ui/quick_answers/ui/quick_answers_focus_search.h index e398d01..e2e090f 100644 --- a/chrome/browser/ui/quick_answers/ui/quick_answers_focus_search.h +++ b/chrome/browser/ui/quick_answers/ui/quick_answers_focus_search.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_QUICK_ANSWERS_UI_QUICK_ANSWERS_FOCUS_SEARCH_H_ #define CHROME_BROWSER_UI_QUICK_ANSWERS_UI_QUICK_ANSWERS_FOCUS_SEARCH_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "ui/views/focus/focus_manager.h" #include "ui/views/focus/focus_search.h"
diff --git a/chrome/browser/ui/quick_answers/ui/quick_answers_view.cc b/chrome/browser/ui/quick_answers/ui/quick_answers_view.cc index 435bde8..8ad5d92 100644 --- a/chrome/browser/ui/quick_answers/ui/quick_answers_view.cc +++ b/chrome/browser/ui/quick_answers/ui/quick_answers_view.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/quick_answers/ui/quick_answers_view.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/ui/color/chrome_color_id.h"
diff --git a/chrome/browser/ui/quick_answers/ui/user_consent_view.cc b/chrome/browser/ui/quick_answers/ui/user_consent_view.cc index 771c7b5..67ceaea 100644 --- a/chrome/browser/ui/quick_answers/ui/user_consent_view.cc +++ b/chrome/browser/ui/quick_answers/ui/user_consent_view.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ui/quick_answers/ui/user_consent_view.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "chrome/browser/ui/quick_answers/quick_answers_ui_controller.h" #include "chromeos/components/quick_answers/public/cpp/quick_answers_state.h" #include "chromeos/strings/grit/chromeos_strings.h"
diff --git a/chrome/browser/ui/recently_audible_helper_unittest.cc b/chrome/browser/ui/recently_audible_helper_unittest.cc index 26f7930a..3675668 100644 --- a/chrome/browser/ui/recently_audible_helper_unittest.cc +++ b/chrome/browser/ui/recently_audible_helper_unittest.cc
@@ -6,7 +6,7 @@ #include <list> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/task/current_thread.h"
diff --git a/chrome/browser/ui/screen_capture_notification_ui.h b/chrome/browser/ui/screen_capture_notification_ui.h index 089082a..4f62583 100644 --- a/chrome/browser/ui/screen_capture_notification_ui.h +++ b/chrome/browser/ui/screen_capture_notification_ui.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/media/webrtc/media_stream_capture_indicator.h" // Interface for screen capture notification UI shown when content of the screen
diff --git a/chrome/browser/ui/screen_capture_notification_ui_browsertest.cc b/chrome/browser/ui/screen_capture_notification_ui_browsertest.cc index 572fb96..bb8fbb3a 100644 --- a/chrome/browser/ui/screen_capture_notification_ui_browsertest.cc +++ b/chrome/browser/ui/screen_capture_notification_ui_browsertest.cc
@@ -7,7 +7,7 @@ #include <memory> #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/test/test_browser_dialog.h"
diff --git a/chrome/browser/ui/search/instant_controller.cc b/chrome/browser/ui/search/instant_controller.cc index 0b4fc09..a4507c0 100644 --- a/chrome/browser/ui/search/instant_controller.cc +++ b/chrome/browser/ui/search/instant_controller.cc
@@ -6,8 +6,8 @@ #include <stddef.h> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/search/instant_service.h" #include "chrome/browser/search/instant_service_factory.h"
diff --git a/chrome/browser/ui/search/search_ipc_router_unittest.cc b/chrome/browser/ui/search/search_ipc_router_unittest.cc index 2afe4bde..221f327d 100644 --- a/chrome/browser/ui/search/search_ipc_router_unittest.cc +++ b/chrome/browser/ui/search/search_ipc_router_unittest.cc
@@ -11,8 +11,8 @@ #include <tuple> #include <vector> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/metrics/field_trial.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/search_engines/search_engine_tab_helper_browsertest.cc b/chrome/browser/ui/search_engines/search_engine_tab_helper_browsertest.cc index dd59dbbc..aecd5759 100644 --- a/chrome/browser/ui/search_engines/search_engine_tab_helper_browsertest.cc +++ b/chrome/browser/ui/search_engines/search_engine_tab_helper_browsertest.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/ui/search_engines/template_url_table_model.cc b/chrome/browser/ui/search_engines/template_url_table_model.cc index 12eceb9..73c9ad4 100644 --- a/chrome/browser/ui/search_engines/template_url_table_model.cc +++ b/chrome/browser/ui/search_engines/template_url_table_model.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/i18n/rtl.h" #include "chrome/grit/generated_resources.h" #include "components/omnibox/browser/omnibox_field_trial.h"
diff --git a/chrome/browser/ui/serial/serial_chooser.h b/chrome/browser/ui/serial/serial_chooser.h index 90fad04d..94a14afb 100644 --- a/chrome/browser/ui/serial/serial_chooser.h +++ b/chrome/browser/ui/serial/serial_chooser.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_SERIAL_SERIAL_CHOOSER_H_ #define CHROME_BROWSER_UI_SERIAL_SERIAL_CHOOSER_H_ -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "content/public/browser/serial_chooser.h" // Owns a serial port chooser dialog and closes it when destroyed.
diff --git a/chrome/browser/ui/serial/serial_chooser_controller.cc b/chrome/browser/ui/serial/serial_chooser_controller.cc index 2fa11a1..2e9fa4c2 100644 --- a/chrome/browser/ui/serial/serial_chooser_controller.cc +++ b/chrome/browser/ui/serial/serial_chooser_controller.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "base/ranges/algorithm.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/serial/serial_chooser_controller_unittest.cc b/chrome/browser/ui/serial/serial_chooser_controller_unittest.cc index 446c23fd..e5bb2ed 100644 --- a/chrome/browser/ui/serial/serial_chooser_controller_unittest.cc +++ b/chrome/browser/ui/serial/serial_chooser_controller_unittest.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/strings/utf_string_conversions.h" #include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h"
diff --git a/chrome/browser/ui/sharing_hub/fake_sharing_hub_bubble_controller.h b/chrome/browser/ui/sharing_hub/fake_sharing_hub_bubble_controller.h index 7ec97969..56d1540 100644 --- a/chrome/browser/ui/sharing_hub/fake_sharing_hub_bubble_controller.h +++ b/chrome/browser/ui/sharing_hub/fake_sharing_hub_bubble_controller.h
@@ -7,8 +7,8 @@ #include "chrome/browser/ui/sharing_hub/sharing_hub_bubble_controller.h" -#include "base/callback.h" #include "base/callback_list.h" +#include "base/functional/callback.h" #include "testing/gmock/include/gmock/gmock.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/chrome/browser/ui/sharing_hub/sharing_hub_bubble_controller_desktop_impl.h b/chrome/browser/ui/sharing_hub/sharing_hub_bubble_controller_desktop_impl.h index e1059ea..fdb01dc0 100644 --- a/chrome/browser/ui/sharing_hub/sharing_hub_bubble_controller_desktop_impl.h +++ b/chrome/browser/ui/sharing_hub/sharing_hub_bubble_controller_desktop_impl.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_UI_SHARING_HUB_SHARING_HUB_BUBBLE_CONTROLLER_DESKTOP_IMPL_H_ #define CHROME_BROWSER_UI_SHARING_HUB_SHARING_HUB_BUBBLE_CONTROLLER_DESKTOP_IMPL_H_ -#include "base/callback.h" #include "base/callback_list.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ui/sharing_hub/sharing_hub_bubble_controller.h"
diff --git a/chrome/browser/ui/side_search/side_search_config.h b/chrome/browser/ui/side_search/side_search_config.h index 6190cd6..cd5b0dc 100644 --- a/chrome/browser/ui/side_search/side_search_config.h +++ b/chrome/browser/ui/side_search/side_search_config.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_SIDE_SEARCH_SIDE_SEARCH_CONFIG_H_ #define CHROME_BROWSER_UI_SIDE_SEARCH_SIDE_SEARCH_CONFIG_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/observer_list.h" #include "base/observer_list_types.h"
diff --git a/chrome/browser/ui/signin/dice_web_signin_interceptor_delegate.cc b/chrome/browser/ui/signin/dice_web_signin_interceptor_delegate.cc index ebdab18..ba7732f 100644 --- a/chrome/browser/ui/signin/dice_web_signin_interceptor_delegate.cc +++ b/chrome/browser/ui/signin/dice_web_signin_interceptor_delegate.cc
@@ -6,9 +6,9 @@ #include <memory> -#include "base/callback.h" #include "base/cancelable_callback.h" #include "base/feature_list.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/task/single_thread_task_runner.h" #include "chrome/browser/signin/identity_manager_factory.h"
diff --git a/chrome/browser/ui/signin/dice_web_signin_interceptor_delegate.h b/chrome/browser/ui/signin/dice_web_signin_interceptor_delegate.h index 6210a369..e726334 100644 --- a/chrome/browser/ui/signin/dice_web_signin_interceptor_delegate.h +++ b/chrome/browser/ui/signin/dice_web_signin_interceptor_delegate.h
@@ -7,7 +7,7 @@ #include "chrome/browser/signin/dice_web_signin_interceptor.h" -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" namespace content { class WebContents;
diff --git a/chrome/browser/ui/signin/profile_colors_util.cc b/chrome/browser/ui/signin/profile_colors_util.cc index b3572868..99eb59d7 100644 --- a/chrome/browser/ui/signin/profile_colors_util.cc +++ b/chrome/browser/ui/signin/profile_colors_util.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ui/signin/profile_colors_util.h" -#include "base/callback.h" #include "base/containers/contains.h" +#include "base/functional/callback.h" #include "base/rand_util.h" #include "build/build_config.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/ui/signin/profile_colors_util.h b/chrome/browser/ui/signin/profile_colors_util.h index 659364f5..ec21cc2 100644 --- a/chrome/browser/ui/signin/profile_colors_util.h +++ b/chrome/browser/ui/signin/profile_colors_util.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_SIGNIN_PROFILE_COLORS_UTIL_H_ #define CHROME_BROWSER_UI_SIGNIN_PROFILE_COLORS_UTIL_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "chrome/browser/profiles/profile_attributes_entry.h" #include "third_party/skia/include/core/SkColor.h"
diff --git a/chrome/browser/ui/signin/profile_customization_synced_theme_waiter.cc b/chrome/browser/ui/signin/profile_customization_synced_theme_waiter.cc index 79f8a9e..460c4ab 100644 --- a/chrome/browser/ui/signin/profile_customization_synced_theme_waiter.cc +++ b/chrome/browser/ui/signin/profile_customization_synced_theme_waiter.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/signin/profile_customization_synced_theme_waiter.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/memory/weak_ptr.h" #include "base/task/sequenced_task_runner.h"
diff --git a/chrome/browser/ui/signin/profile_customization_synced_theme_waiter.h b/chrome/browser/ui/signin/profile_customization_synced_theme_waiter.h index 41ddca59..e7d74fa 100644 --- a/chrome/browser/ui/signin/profile_customization_synced_theme_waiter.h +++ b/chrome/browser/ui/signin/profile_customization_synced_theme_waiter.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_UI_SIGNIN_PROFILE_CUSTOMIZATION_SYNCED_THEME_WAITER_H_ #define CHROME_BROWSER_UI_SIGNIN_PROFILE_CUSTOMIZATION_SYNCED_THEME_WAITER_H_ -#include "base/callback_forward.h" #include "base/dcheck_is_on.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "base/scoped_observation.h" #include "chrome/browser/themes/theme_service.h"
diff --git a/chrome/browser/ui/signin_intercept_first_run_experience_dialog.cc b/chrome/browser/ui/signin_intercept_first_run_experience_dialog.cc index f23e139..5918c6e 100644 --- a/chrome/browser/ui/signin_intercept_first_run_experience_dialog.cc +++ b/chrome/browser/ui/signin_intercept_first_run_experience_dialog.cc
@@ -4,9 +4,9 @@ #include "chrome/browser/ui/signin_intercept_first_run_experience_dialog.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/check_op.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/metrics/histogram_functions.h" #include "base/notreached.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/ui/signin_intercept_first_run_experience_dialog.h b/chrome/browser/ui/signin_intercept_first_run_experience_dialog.h index 6967500..fc2f64b 100644 --- a/chrome/browser/ui/signin_intercept_first_run_experience_dialog.h +++ b/chrome/browser/ui/signin_intercept_first_run_experience_dialog.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_SIGNIN_INTERCEPT_FIRST_RUN_EXPERIENCE_DIALOG_H_ #define CHROME_BROWSER_UI_SIGNIN_INTERCEPT_FIRST_RUN_EXPERIENCE_DIALOG_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/scoped_observation.h"
diff --git a/chrome/browser/ui/signin_modal_dialog.h b/chrome/browser/ui/signin_modal_dialog.h index 3137c352..836068a 100644 --- a/chrome/browser/ui/signin_modal_dialog.h +++ b/chrome/browser/ui/signin_modal_dialog.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_SIGNIN_MODAL_DIALOG_H_ #define CHROME_BROWSER_UI_SIGNIN_MODAL_DIALOG_H_ -#include "base/callback.h" +#include "base/functional/callback.h" namespace content { class WebContents;
diff --git a/chrome/browser/ui/signin_modal_dialog_impl.h b/chrome/browser/ui/signin_modal_dialog_impl.h index e0b0bcd2..7992b21 100644 --- a/chrome/browser/ui/signin_modal_dialog_impl.h +++ b/chrome/browser/ui/signin_modal_dialog_impl.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_SIGNIN_MODAL_DIALOG_IMPL_H_ #define CHROME_BROWSER_UI_SIGNIN_MODAL_DIALOG_IMPL_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/scoped_observation.h" #include "chrome/browser/ui/signin_modal_dialog.h"
diff --git a/chrome/browser/ui/signin_reauth_view_controller.h b/chrome/browser/ui/signin_reauth_view_controller.h index 2e48f9b..4c8f239 100644 --- a/chrome/browser/ui/signin_reauth_view_controller.h +++ b/chrome/browser/ui/signin_reauth_view_controller.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_SIGNIN_REAUTH_VIEW_CONTROLLER_H_ #define CHROME_BROWSER_UI_SIGNIN_REAUTH_VIEW_CONTROLLER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h"
diff --git a/chrome/browser/ui/signin_reauth_view_controller_browsertest.cc b/chrome/browser/ui/signin_reauth_view_controller_browsertest.cc index 87ff976..3c53d5b21 100644 --- a/chrome/browser/ui/signin_reauth_view_controller_browsertest.cc +++ b/chrome/browser/ui/signin_reauth_view_controller_browsertest.cc
@@ -4,8 +4,8 @@ #include <memory> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/notreached.h" #include "base/run_loop.h"
diff --git a/chrome/browser/ui/signin_view_controller.cc b/chrome/browser/ui/signin_view_controller.cc index 598effe9..0388d5d 100644 --- a/chrome/browser/ui/signin_view_controller.cc +++ b/chrome/browser/ui/signin_view_controller.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ui/signin_view_controller.h b/chrome/browser/ui/signin_view_controller.h index 2a86a79..70f0f0f5 100644 --- a/chrome/browser/ui/signin_view_controller.h +++ b/chrome/browser/ui/signin_view_controller.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/ui/signin_view_controller_delegate.h b/chrome/browser/ui/signin_view_controller_delegate.h index 9c27320f..e6670b1 100644 --- a/chrome/browser/ui/signin_view_controller_delegate.h +++ b/chrome/browser/ui/signin_view_controller_delegate.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_SIGNIN_VIEW_CONTROLLER_DELEGATE_H_ #define CHROME_BROWSER_UI_SIGNIN_VIEW_CONTROLLER_DELEGATE_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/observer_list.h" #include "base/observer_list_types.h" #include "build/build_config.h"
diff --git a/chrome/browser/ui/signin_view_controller_interactive_uitest.cc b/chrome/browser/ui/signin_view_controller_interactive_uitest.cc index 831c08b4..a0775e14 100644 --- a/chrome/browser/ui/signin_view_controller_interactive_uitest.cc +++ b/chrome/browser/ui/signin_view_controller_interactive_uitest.cc
@@ -4,7 +4,7 @@ #include <utility> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/scoped_observation.h"
diff --git a/chrome/browser/ui/simple_message_box.h b/chrome/browser/ui/simple_message_box.h index b8b0957..5c4e8489 100644 --- a/chrome/browser/ui/simple_message_box.h +++ b/chrome/browser/ui/simple_message_box.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "ui/gfx/native_widget_types.h" namespace chrome {
diff --git a/chrome/browser/ui/startup/credential_provider_signin_dialog_win.cc b/chrome/browser/ui/startup/credential_provider_signin_dialog_win.cc index 7fc07f3..24a0c42b 100644 --- a/chrome/browser/ui/startup/credential_provider_signin_dialog_win.cc +++ b/chrome/browser/ui/startup/credential_provider_signin_dialog_win.cc
@@ -11,8 +11,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/json/json_writer.h" #include "base/memory/raw_ptr.h" #include "base/syslog_logging.h"
diff --git a/chrome/browser/ui/startup/credential_provider_signin_dialog_win.h b/chrome/browser/ui/startup/credential_provider_signin_dialog_win.h index 559edbd1..938125f 100644 --- a/chrome/browser/ui/startup/credential_provider_signin_dialog_win.h +++ b/chrome/browser/ui/startup/credential_provider_signin_dialog_win.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/values.h" #include "chrome/browser/ui/startup/buildflags.h"
diff --git a/chrome/browser/ui/startup/credential_provider_signin_dialog_win_browsertest.cc b/chrome/browser/ui/startup/credential_provider_signin_dialog_win_browsertest.cc index 85228aa..58d96512 100644 --- a/chrome/browser/ui/startup/credential_provider_signin_dialog_win_browsertest.cc +++ b/chrome/browser/ui/startup/credential_provider_signin_dialog_win_browsertest.cc
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/json/json_reader.h" #include "base/memory/raw_ptr.h" #include "base/test/test_switches.h"
diff --git a/chrome/browser/ui/startup/credential_provider_signin_info_fetcher_win.h b/chrome/browser/ui/startup/credential_provider_signin_info_fetcher_win.h index ea436e23..10d4234 100644 --- a/chrome/browser/ui/startup/credential_provider_signin_info_fetcher_win.h +++ b/chrome/browser/ui/startup/credential_provider_signin_info_fetcher_win.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/values.h" #include "google_apis/gaia/gaia_oauth_client.h"
diff --git a/chrome/browser/ui/startup/credential_provider_signin_info_fetcher_win_unittest.cc b/chrome/browser/ui/startup/credential_provider_signin_info_fetcher_win_unittest.cc index ba3ff3c..40af532 100644 --- a/chrome/browser/ui/startup/credential_provider_signin_info_fetcher_win_unittest.cc +++ b/chrome/browser/ui/startup/credential_provider_signin_info_fetcher_win_unittest.cc
@@ -10,7 +10,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/json/json_reader.h" #include "base/run_loop.h" #include "base/strings/string_util.h"
diff --git a/chrome/browser/ui/startup/default_browser_infobar_delegate.cc b/chrome/browser/ui/startup/default_browser_infobar_delegate.cc index bedd28f..dfc28196 100644 --- a/chrome/browser/ui/startup/default_browser_infobar_delegate.cc +++ b/chrome/browser/ui/startup/default_browser_infobar_delegate.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/histogram_macros.h" #include "base/metrics/user_metrics.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/ui/startup/default_browser_prompt.cc b/chrome/browser/ui/startup/default_browser_prompt.cc index ad36c2d8..eb46357 100644 --- a/chrome/browser/ui/startup/default_browser_prompt.cc +++ b/chrome/browser/ui/startup/default_browser_prompt.cc
@@ -7,7 +7,7 @@ #include <limits> #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/weak_ptr.h" #include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/ui/startup/first_run_service_browsertest.cc b/chrome/browser/ui/startup/first_run_service_browsertest.cc index 721ee60..243183b8 100644 --- a/chrome/browser/ui/startup/first_run_service_browsertest.cc +++ b/chrome/browser/ui/startup/first_run_service_browsertest.cc
@@ -4,9 +4,9 @@ #include "chrome/browser/ui/startup/first_run_service.h" -#include "base/callback_forward.h" #include "base/command_line.h" #include "base/feature_list.h" +#include "base/functional/callback_forward.h" #include "base/run_loop.h" #include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h"
diff --git a/chrome/browser/ui/startup/launch_mode_recorder.cc b/chrome/browser/ui/startup/launch_mode_recorder.cc index dbd379d..58d90a6 100644 --- a/chrome/browser/ui/startup/launch_mode_recorder.cc +++ b/chrome/browser/ui/startup/launch_mode_recorder.cc
@@ -9,8 +9,8 @@ #include <vector> #include "base/base_paths.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/functional/callback.h" #include "base/i18n/case_conversion.h" #include "base/metrics/histogram_functions.h"
diff --git a/chrome/browser/ui/startup/startup_browser_creator.cc b/chrome/browser/ui/startup/startup_browser_creator.cc index 434b621..c0976e50 100644 --- a/chrome/browser/ui/startup/startup_browser_creator.cc +++ b/chrome/browser/ui/startup/startup_browser_creator.cc
@@ -11,14 +11,14 @@ #include <utility> #include "apps/switches.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/containers/contains.h" #include "base/debug/dump_without_crashing.h" #include "base/feature_list.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/lazy_instance.h" #include "base/logging.h" #include "base/memory/ptr_util.h"
diff --git a/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc b/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc index 153070e..c4fc5705 100644 --- a/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc +++ b/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc
@@ -124,7 +124,7 @@ #include "url/gurl.h" #if !BUILDFLAG(IS_CHROMEOS_ASH) -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/json/values_util.h" #include "base/run_loop.h" #include "base/values.h"
diff --git a/chrome/browser/ui/startup/startup_browser_creator_corrupt_profiles_browsertest_win.cc b/chrome/browser/ui/startup/startup_browser_creator_corrupt_profiles_browsertest_win.cc index 9348ff3..d934d9a 100644 --- a/chrome/browser/ui/startup/startup_browser_creator_corrupt_profiles_browsertest_win.cc +++ b/chrome/browser/ui/startup/startup_browser_creator_corrupt_profiles_browsertest_win.cc
@@ -6,10 +6,10 @@ #include <vector> #include "base/base_switches.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/path_service.h" #include "base/ranges/algorithm.h" #include "base/run_loop.h"
diff --git a/chrome/browser/ui/startup/startup_browser_creator_impl.cc b/chrome/browser/ui/startup/startup_browser_creator_impl.cc index 0268e498..3448d6c0 100644 --- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc +++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
@@ -12,9 +12,9 @@ #include <utility> #include "base/auto_reset.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/debug/dump_without_crashing.h" +#include "base/functional/bind.h" #include "base/notreached.h" #include "base/values.h" #include "build/branding_buildflags.h"
diff --git a/chrome/browser/ui/startup/startup_browser_creator_triggered_reset_browsertest_win.cc b/chrome/browser/ui/startup/startup_browser_creator_triggered_reset_browsertest_win.cc index 0726422..0b69713 100644 --- a/chrome/browser/ui/startup/startup_browser_creator_triggered_reset_browsertest_win.cc +++ b/chrome/browser/ui/startup/startup_browser_creator_triggered_reset_browsertest_win.cc
@@ -6,9 +6,9 @@ #include <memory> -#include "base/bind.h" #include "base/callback_list.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/threading/thread_restrictions.h" #include "base/win/windows_version.h"
diff --git a/chrome/browser/ui/startup/web_app_info_recorder_utils.cc b/chrome/browser/ui/startup/web_app_info_recorder_utils.cc index d187144..779fef1 100644 --- a/chrome/browser/ui/startup/web_app_info_recorder_utils.cc +++ b/chrome/browser/ui/startup/web_app_info_recorder_utils.cc
@@ -10,11 +10,11 @@ #include <vector> #include "base/barrier_closure.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/containers/flat_map.h" #include "base/files/file_path.h" #include "base/files/important_file_writer.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/json/json_string_value_serializer.h" #include "base/location.h" #include "base/strings/string_piece.h"
diff --git a/chrome/browser/ui/startup/web_app_startup_utils.cc b/chrome/browser/ui/startup/web_app_startup_utils.cc index 80b91851..72d9006 100644 --- a/chrome/browser/ui/startup/web_app_startup_utils.cc +++ b/chrome/browser/ui/startup/web_app_startup_utils.cc
@@ -9,14 +9,14 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" #include "base/check.h" #include "base/command_line.h" #include "base/containers/contains.h" #include "base/containers/fixed_flat_map.h" #include "base/feature_list.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h"
diff --git a/chrome/browser/ui/supervised_user/parent_permission_dialog.h b/chrome/browser/ui/supervised_user/parent_permission_dialog.h index d9743e0..7450335 100644 --- a/chrome/browser/ui/supervised_user/parent_permission_dialog.h +++ b/chrome/browser/ui/supervised_user/parent_permission_dialog.h
@@ -9,7 +9,7 @@ #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "ui/gfx/image/image_skia.h" #include "ui/gfx/native_widget_types.h"
diff --git a/chrome/browser/ui/sync/profile_signin_confirmation_helper.cc b/chrome/browser/ui/sync/profile_signin_confirmation_helper.cc index 3025fa8..fbce2eec 100644 --- a/chrome/browser/ui/sync/profile_signin_confirmation_helper.cc +++ b/chrome/browser/ui/sync/profile_signin_confirmation_helper.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ui/sync/profile_signin_confirmation_helper.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "build/build_config.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h"
diff --git a/chrome/browser/ui/sync/profile_signin_confirmation_helper.h b/chrome/browser/ui/sync/profile_signin_confirmation_helper.h index 65832a1..4f8a8f2 100644 --- a/chrome/browser/ui/sync/profile_signin_confirmation_helper.h +++ b/chrome/browser/ui/sync/profile_signin_confirmation_helper.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_SYNC_PROFILE_SIGNIN_CONFIRMATION_HELPER_H_ #define CHROME_BROWSER_UI_SYNC_PROFILE_SIGNIN_CONFIRMATION_HELPER_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" class Profile;
diff --git a/chrome/browser/ui/sync/profile_signin_confirmation_helper_browsertest.cc b/chrome/browser/ui/sync/profile_signin_confirmation_helper_browsertest.cc index 7dc723b..1e54e0dba 100644 --- a/chrome/browser/ui/sync/profile_signin_confirmation_helper_browsertest.cc +++ b/chrome/browser/ui/sync/profile_signin_confirmation_helper_browsertest.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ui/sync/profile_signin_confirmation_helper.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "build/branding_buildflags.h" #include "build/build_config.h"
diff --git a/chrome/browser/ui/sync/profile_signin_confirmation_helper_unittest.cc b/chrome/browser/ui/sync/profile_signin_confirmation_helper_unittest.cc index bc5352b..2266e41 100644 --- a/chrome/browser/ui/sync/profile_signin_confirmation_helper_unittest.cc +++ b/chrome/browser/ui/sync/profile_signin_confirmation_helper_unittest.cc
@@ -7,11 +7,11 @@ #include <memory> #include <string> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/compiler_specific.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h"
diff --git a/chrome/browser/ui/sync/sync_promo_ui_unittest.cc b/chrome/browser/ui/sync/sync_promo_ui_unittest.cc index ba5fd61..2bf9b5d 100644 --- a/chrome/browser/ui/sync/sync_promo_ui_unittest.cc +++ b/chrome/browser/ui/sync/sync_promo_ui_unittest.cc
@@ -6,9 +6,9 @@ #include <memory> -#include "base/bind.h" #include "base/command_line.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h" #include "chrome/common/chrome_switches.h"
diff --git a/chrome/browser/ui/tab_contents/chrome_web_contents_view_handle_drop_unittest.cc b/chrome/browser/ui/tab_contents/chrome_web_contents_view_handle_drop_unittest.cc index 28a14582..cdaf7a4 100644 --- a/chrome/browser/ui/tab_contents/chrome_web_contents_view_handle_drop_unittest.cc +++ b/chrome/browser/ui/tab_contents/chrome_web_contents_view_handle_drop_unittest.cc
@@ -6,10 +6,10 @@ #include <set> #include <string> -#include "base/bind.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/tab_contents/core_tab_helper.cc b/chrome/browser/ui/tab_contents/core_tab_helper.cc index a82e008..274341b 100644 --- a/chrome/browser/ui/tab_contents/core_tab_helper.cc +++ b/chrome/browser/ui/tab_contents/core_tab_helper.cc
@@ -8,8 +8,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/metrics/histogram_macros.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/ui/tab_contents/core_tab_helper.h b/chrome/browser/ui/tab_contents/core_tab_helper.h index 5d7aa267..ed31334 100644 --- a/chrome/browser/ui/tab_contents/core_tab_helper.h +++ b/chrome/browser/ui/tab_contents/core_tab_helper.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h" #include "chrome/common/chrome_render_frame.mojom.h"
diff --git a/chrome/browser/ui/tab_dialogs.h b/chrome/browser/ui/tab_dialogs.h index ae2c8d4..938193b 100644 --- a/chrome/browser/ui/tab_dialogs.h +++ b/chrome/browser/ui/tab_dialogs.h
@@ -7,7 +7,7 @@ #include <set> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/supports_user_data.h" #include "extensions/common/extension_id.h" #include "ui/gfx/native_widget_types.h"
diff --git a/chrome/browser/ui/tab_modal_confirm_dialog_browsertest.cc b/chrome/browser/ui/tab_modal_confirm_dialog_browsertest.cc index e0d86e70..2f3bd41 100644 --- a/chrome/browser/ui/tab_modal_confirm_dialog_browsertest.cc +++ b/chrome/browser/ui/tab_modal_confirm_dialog_browsertest.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/strings/utf_string_conversions.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/ui/tab_modal_confirm_dialog_delegate.h b/chrome/browser/ui/tab_modal_confirm_dialog_delegate.h index faeea86..d95b8bb9 100644 --- a/chrome/browser/ui/tab_modal_confirm_dialog_delegate.h +++ b/chrome/browser/ui/tab_modal_confirm_dialog_delegate.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "content/public/browser/web_contents_observer.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/chrome/browser/ui/tab_ui_helper.cc b/chrome/browser/ui/tab_ui_helper.cc index f9ecccc..9e31e549 100644 --- a/chrome/browser/ui/tab_ui_helper.cc +++ b/chrome/browser/ui/tab_ui_helper.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/tab_ui_helper.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "build/build_config.h" #include "chrome/browser/favicon/favicon_service_factory.h" #include "chrome/browser/favicon/favicon_utils.h"
diff --git a/chrome/browser/ui/tabs/hover_tab_selector.cc b/chrome/browser/ui/tabs/hover_tab_selector.cc index 469106d2..1790c15 100644 --- a/chrome/browser/ui/tabs/hover_tab_selector.cc +++ b/chrome/browser/ui/tabs/hover_tab_selector.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ui/tabs/hover_tab_selector.h" -#include "base/bind.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/task/single_thread_task_runner.h" #include "chrome/browser/ui/tabs/tab_strip_model.h"
diff --git a/chrome/browser/ui/tabs/pinned_tab_service.cc b/chrome/browser/ui/tabs/pinned_tab_service.cc index 1f68aa7..734b2f0 100644 --- a/chrome/browser/ui/tabs/pinned_tab_service.cc +++ b/chrome/browser/ui/tabs/pinned_tab_service.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/tabs/pinned_tab_service.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/lifetime/application_lifetime_desktop.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h"
diff --git a/chrome/browser/ui/tabs/pinned_tab_service_unittest.cc b/chrome/browser/ui/tabs/pinned_tab_service_unittest.cc index f72ebd1e..7a0eb26 100644 --- a/chrome/browser/ui/tabs/pinned_tab_service_unittest.cc +++ b/chrome/browser/ui/tabs/pinned_tab_service_unittest.cc
@@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_tabstrip.h"
diff --git a/chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_controller.h b/chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_controller.h index 9c9d437..6fd0d2d 100644 --- a/chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_controller.h +++ b/chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_controller.h
@@ -6,6 +6,7 @@ #define CHROME_BROWSER_UI_TABS_SAVED_TAB_GROUPS_SAVED_TAB_GROUP_CONTROLLER_H_ #include "base/guid.h" +#include "components/tab_groups/tab_group_id.h" class Browser; @@ -16,6 +17,21 @@ virtual void OpenSavedTabGroupInBrowser( Browser* browser, const base::GUID& saved_group_guid) = 0; + + // Saves a group. If browser is not defined this function looks for the tab + // group id in all browsers. Finds the TabGroup by groupid from all browsers, + // Constructs the tab group, and starts listening to all tabs. + virtual void SaveGroup(const tab_groups::TabGroupId& group_id, + Browser* browser = nullptr) = 0; + + // Unsaves a group. Finds the group_id in the list of saved tab groups and + // removes it. Stops Listening to all tabs. + virtual void UnsaveGroup(const tab_groups::TabGroupId& group_id) = 0; + + // Stops listening to the Tab Group in the TabStrip. Removes the local tab + // group id and web content tokens. + virtual void DisconnectLocalTabGroup( + const tab_groups::TabGroupId& group_id) = 0; }; #endif // CHROME_BROWSER_UI_TABS_SAVED_TAB_GROUPS_SAVED_TAB_GROUP_CONTROLLER_H_
diff --git a/chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_keyed_service.cc b/chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_keyed_service.cc index 41887caa..ec5a53ad 100644 --- a/chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_keyed_service.cc +++ b/chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_keyed_service.cc
@@ -98,16 +98,14 @@ WindowOpenDisposition::NEW_BACKGROUND_TAB); if (!created_contents) { - return; + continue; } - absl::optional<base::Token> maybe_token = - listener_.TrackWebContents(browser, created_contents); - if (maybe_token.has_value()) { - model_.Get(saved_tab.saved_group_guid()) - ->GetTab(saved_tab.saved_tab_guid()) - ->SetLocalTabID(maybe_token.value()); - } + base::Token token = + listener_.GetOrCreateTrackedIDForWebContents(browser, created_contents); + model_.Get(saved_tab.saved_group_guid()) + ->GetTab(saved_tab.saved_tab_guid()) + ->SetLocalTabID(token); opened_web_contents.emplace_back(created_contents); } @@ -149,3 +147,86 @@ DCHECK(first_tab.has_value()); tab_strip_model_for_creation->ActivateTabAt(first_tab.value()); } + +void SavedTabGroupKeyedService::SaveGroup( + const tab_groups::TabGroupId& group_id, + Browser* browser) { + Browser* browser_owning_tab_group = + browser ? browser : listener_.GetBrowserWithTabGroupId(group_id); + CHECK(browser_owning_tab_group); + + TabStripModel* tab_strip_model = browser_owning_tab_group->tab_strip_model(); + CHECK(tab_strip_model); + CHECK(tab_strip_model->group_model()); + + TabGroup* tab_group = tab_strip_model->group_model()->GetTabGroup(group_id); + CHECK(tab_group); + + SavedTabGroup saved_tab_group(tab_group->visual_data()->title(), + tab_group->visual_data()->color(), {}, + absl::nullopt, absl::nullopt, tab_group->id()); + + // Build the SavedTabGroupTabs, track the webcontents, and add them to the + // group. + const gfx::Range tab_range = tab_group->ListTabs(); + const base::GUID saved_group_guid = base::GUID::GenerateRandomV4(); + for (auto i = tab_range.start(); i < tab_range.end(); ++i) { + content::WebContents* web_contents = tab_strip_model->GetWebContentsAt(i); + CHECK(web_contents); + + SavedTabGroupTab saved_tab_group_tab = + SavedTabGroupUtils::CreateSavedTabGroupTabFromWebContents( + web_contents, saved_tab_group.saved_guid()); + + base::Token token = listener_.GetOrCreateTrackedIDForWebContents( + browser_owning_tab_group, web_contents); + saved_tab_group_tab.SetLocalTabID(token); + + saved_tab_group.AddTab(saved_tab_group.saved_tabs().size(), + std::move(saved_tab_group_tab)); + } + + model_.Add(std::move(saved_tab_group)); +} + +void SavedTabGroupKeyedService::UnsaveGroup( + const tab_groups::TabGroupId& group_id) { + // Get the guid since disconnect removes the local id. + SavedTabGroup* group = model_.Get(group_id); + CHECK(group); + + // Stop listening to the local group. + DisconnectLocalTabGroup(group_id); + + // Unsave the group. + model_.Remove(group->saved_guid()); +} + +void SavedTabGroupKeyedService::DisconnectLocalTabGroup( + const tab_groups::TabGroupId& group_id) { + Browser* browser_owning_tab_group = + listener_.GetBrowserWithTabGroupId(group_id); + CHECK(browser_owning_tab_group); + + TabStripModel* tab_strip_model = browser_owning_tab_group->tab_strip_model(); + CHECK(tab_strip_model); + CHECK(tab_strip_model->group_model()); + + TabGroup* tab_group = tab_strip_model->group_model()->GetTabGroup(group_id); + CHECK(tab_group); + + // Stop listening to all of the webcontents in the group. + const gfx::Range tab_range = tab_group->ListTabs(); + const base::GUID saved_group_guid = base::GUID::GenerateRandomV4(); + for (auto i = tab_range.start(); i < tab_range.end(); ++i) { + content::WebContents* web_contents = + browser_owning_tab_group->tab_strip_model()->GetWebContentsAt(i); + listener_.StopTrackingWebContents(browser_owning_tab_group, web_contents); + } + + SavedTabGroup* group = model_.Get(group_id); + CHECK(group); + + // Stop listening to the current tab group. + group->SetLocalGroupId(absl::nullopt); +}
diff --git a/chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_keyed_service.h b/chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_keyed_service.h index 5aa3a95e..db8b0a6e 100644 --- a/chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_keyed_service.h +++ b/chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_keyed_service.h
@@ -11,6 +11,7 @@ #include "components/keyed_service/core/keyed_service.h" #include "components/saved_tab_groups/saved_tab_group_model.h" #include "components/saved_tab_groups/saved_tab_group_sync_bridge.h" +#include "components/tab_groups/tab_group_id.h" class Profile; @@ -33,6 +34,10 @@ // SavedTabGroupController void OpenSavedTabGroupInBrowser(Browser* browser, const base::GUID& saved_group_guid) override; + void SaveGroup(const tab_groups::TabGroupId& group_id, + Browser* browser = nullptr) override; + void UnsaveGroup(const tab_groups::TabGroupId& group_id) override; + void DisconnectLocalTabGroup(const tab_groups::TabGroupId& group_id) override; private: // Returns the ModelTypeStoreFactory tied to the current profile.
diff --git a/chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_keyed_service_unittest.cc b/chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_keyed_service_unittest.cc new file mode 100644 index 0000000..dc878b59 --- /dev/null +++ b/chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_keyed_service_unittest.cc
@@ -0,0 +1,151 @@ +// Copyright 2022 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_model_listener.h" + +#include <memory> + +#include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_keyed_service.h" +#include "chrome/test/base/browser_with_test_window_test.h" +#include "chrome/test/base/testing_profile.h" +#include "components/tab_groups/tab_group_id.h" +#include "content/public/browser/render_process_host.h" +#include "content/public/browser/render_view_host.h" +#include "content/public/test/browser_task_environment.h" +#include "content/public/test/web_contents_tester.h" +#include "testing/gtest/include/gtest/gtest.h" +#include "ui/base/page_transition_types.h" +#include "ui/base/ui_base_types.h" + +class SavedTabGroupKeyedServiceUnitTest : public BrowserWithTestWindowTest { + public: + SavedTabGroupKeyedServiceUnitTest() = default; + SavedTabGroupKeyedServiceUnitTest(const SavedTabGroupKeyedServiceUnitTest&) = + delete; + SavedTabGroupKeyedServiceUnitTest& operator=( + const SavedTabGroupKeyedServiceUnitTest&) = delete; + + Browser* AddBrowser() { + Browser::CreateParams native_params(profile_.get(), true); + native_params.initial_show_state = ui::SHOW_STATE_DEFAULT; + std::unique_ptr<Browser> browser = + CreateBrowserWithTestWindowForParams(native_params); + Browser* browser_ptr = browser.get(); + browsers_.emplace_back(std::move(browser)); + return browser_ptr; + } + + content::WebContents* AddTabToBrowser(Browser* browser, int index) { + std::unique_ptr<content::WebContents> web_contents = + content::WebContentsTester::CreateTestWebContents(profile_.get(), + nullptr); + + content::WebContents* web_contents_ptr = web_contents.get(); + + browser->tab_strip_model()->AddWebContents( + std::move(web_contents), index, + ui::PageTransition::PAGE_TRANSITION_TYPED, AddTabTypes::ADD_ACTIVE); + + return web_contents_ptr; + } + + SavedTabGroupKeyedService* service() { return service_.get(); } + + private: + void SetUp() override { + profile_ = std::make_unique<TestingProfile>(); + service_ = std::make_unique<SavedTabGroupKeyedService>(profile_.get()); + } + void TearDown() override { + for (auto& browser : browsers_) { + browser->tab_strip_model()->CloseAllTabs(); + } + } + + content::RenderViewHostTestEnabler rvh_test_enabler_; + + std::unique_ptr<TestingProfile> profile_; + std::unique_ptr<SavedTabGroupKeyedService> service_; + + std::vector<std::unique_ptr<Browser>> browsers_; +}; + +TEST_F(SavedTabGroupKeyedServiceUnitTest, CreatesRemovesBrowserListener) { + Browser* browser_1 = AddBrowser(); + Browser* browser_2 = AddBrowser(); + + EXPECT_EQ( + service()->listener()->GetBrowserListenerMapForTesting().count(browser_1), + 1u); + EXPECT_EQ( + service()->listener()->GetBrowserListenerMapForTesting().count(browser_2), + 1u); + + service()->listener()->OnBrowserRemoved(browser_1); + EXPECT_EQ( + service()->listener()->GetBrowserListenerMapForTesting().count(browser_1), + 0u); + EXPECT_EQ( + service()->listener()->GetBrowserListenerMapForTesting().count(browser_2), + 1u); +} + +TEST_F(SavedTabGroupKeyedServiceUnitTest, GetTabStripModelWithTabGroupId) { + Browser* browser_1 = AddBrowser(); + + EXPECT_TRUE(service()->listener()->GetBrowserListenerMapForTesting().count( + browser_1) > 0); + + // Create a new tab and add it to a group. + ASSERT_EQ(0, browser_1->tab_strip_model()->count()); + AddTabToBrowser(browser_1, 0); + ASSERT_EQ(1, browser_1->tab_strip_model()->count()); + tab_groups::TabGroupId group_id = + browser_1->tab_strip_model()->AddToNewGroup({0}); + + EXPECT_EQ(browser_1->tab_strip_model(), + service()->listener()->GetTabStripModelWithTabGroupId(group_id)); +} + +TEST_F(SavedTabGroupKeyedServiceUnitTest, + UngroupingStopsListeningToWebContents) { + Browser* browser_1 = AddBrowser(); + + EXPECT_TRUE(service()->listener()->GetBrowserListenerMapForTesting().count( + browser_1) > 0); + + // Create a new tab and add it to a group. + ASSERT_EQ(0, browser_1->tab_strip_model()->count()); + AddTabToBrowser(browser_1, 0); + content::WebContents* web_contents_ptr = AddTabToBrowser(browser_1, 1); + ASSERT_EQ(2, browser_1->tab_strip_model()->count()); + tab_groups::TabGroupId group_id = + browser_1->tab_strip_model()->AddToNewGroup({0, 1}); + + auto& listener_map = service()->listener()->GetBrowserListenerMapForTesting(); + EXPECT_EQ(1u, listener_map.count(browser_1)); + auto& tab_token_mapping = + listener_map.at(browser_1).GetWebContentsTokenMapForTesting(); + + // Expect that the tabs aren't being listened to yet. + EXPECT_EQ(0u, tab_token_mapping.count(web_contents_ptr)); + + // Save the group. + service()->SaveGroup(group_id); + + // Expect that the listener map is listening to the 2nd tab before it's + // closed. + EXPECT_EQ(1u, tab_token_mapping.count(web_contents_ptr)); + + // Remove a tab and expect it is removed from the listener maps. + web_contents_ptr->Close(); + ASSERT_EQ(1, browser_1->tab_strip_model()->count()); + + // Expect that the browser is not removed from the mapping since there's still + // 1 tab in the group and the browser is not destroyed. + EXPECT_EQ(1u, listener_map.count(browser_1)); + + // Expect that the web_contents ptr was removed from the mapping. + EXPECT_EQ(0u, tab_token_mapping.count(web_contents_ptr)); +}
diff --git a/chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_model_listener.cc b/chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_model_listener.cc index 89bc1db..1e98612 100644 --- a/chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_model_listener.cc +++ b/chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_model_listener.cc
@@ -68,7 +68,7 @@ return browser_->tab_strip_model()->group_model()->ContainsTabGroup(group_id); } -base::Token SavedTabGroupBrowserListener::TrackWebContents( +base::Token SavedTabGroupBrowserListener::GetOrCreateTrackedIDForWebContents( content::WebContents* web_contents) { if (web_contents_to_tab_id_map_.count(web_contents) == 0) { web_contents_to_tab_id_map_.try_emplace( @@ -78,6 +78,12 @@ return web_contents_to_tab_id_map_.at(web_contents).token(); } +void SavedTabGroupBrowserListener::StopTrackingWebContents( + content::WebContents* web_contents) { + CHECK(web_contents_to_tab_id_map_.count(web_contents) > 0); + web_contents_to_tab_id_map_.erase(web_contents); +} + void SavedTabGroupBrowserListener::OnTabGroupChanged( const TabGroupChange& change) { const TabStripModel* tab_strip_model = change.model; @@ -208,13 +214,19 @@ return browser ? browser->tab_strip_model() : nullptr; } -absl::optional<base::Token> SavedTabGroupModelListener::TrackWebContents( +base::Token SavedTabGroupModelListener::GetOrCreateTrackedIDForWebContents( Browser* browser, content::WebContents* web_contents) { - if (observed_browser_listeners_.count(browser) == 0) { - return absl::nullopt; - } - return observed_browser_listeners_.at(browser).TrackWebContents(web_contents); + CHECK(observed_browser_listeners_.count(browser) > 0); + return observed_browser_listeners_.at(browser) + .GetOrCreateTrackedIDForWebContents(web_contents); +} + +void SavedTabGroupModelListener::StopTrackingWebContents( + Browser* browser, + content::WebContents* web_contents) { + CHECK(observed_browser_listeners_.count(browser) > 0); + observed_browser_listeners_.at(browser).StopTrackingWebContents(web_contents); } void SavedTabGroupModelListener::OnBrowserAdded(Browser* browser) {
diff --git a/chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_model_listener.h b/chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_model_listener.h index 244313f3..6e70b94 100644 --- a/chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_model_listener.h +++ b/chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_model_listener.h
@@ -45,7 +45,14 @@ bool ContainsTabGroup(tab_groups::TabGroupId group_id) const; - base::Token TrackWebContents(content::WebContents* web_contents); + // Starts tracking webcontents for changes and return the token. If its + // already tracked, just return the token. + base::Token GetOrCreateTrackedIDForWebContents( + content::WebContents* web_contents); + + // Stops tracking the webcontents for changes. CHECKS if not currently + // tracked. + void StopTrackingWebContents(content::WebContents* web_contents); // TabStripModelObserver: void OnTabGroupChanged(const TabGroupChange& change) override; @@ -56,6 +63,12 @@ Browser* browser() { return browser_; } SavedTabGroupModel* saved_tab_group_model() { return model_; } + // Testing Accessors. + std::unordered_map<content::WebContents*, SavedTabGroupWebContentsListener>& + GetWebContentsTokenMapForTesting() { + return web_contents_to_tab_id_map_; + } + private: std::unordered_map<content::WebContents*, SavedTabGroupWebContentsListener> web_contents_to_tab_id_map_; @@ -80,10 +93,15 @@ TabStripModel* GetTabStripModelWithTabGroupId( tab_groups::TabGroupId group_id); - absl::optional<base::Token> TrackWebContents( + // Starts tracking webcontents on a specific browser. + base::Token GetOrCreateTrackedIDForWebContents( Browser* browser, content::WebContents* web_contents); + // Stops tracking webcontents on a specific browser. + void StopTrackingWebContents(Browser* browser, + content::WebContents* web_contents); + // BrowserListObserver: void OnBrowserAdded(Browser* browser) override; void OnBrowserRemoved(Browser* browser) override;
diff --git a/chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_model_listener_unittest.cc b/chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_model_listener_unittest.cc deleted file mode 100644 index 31747e3..0000000 --- a/chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_model_listener_unittest.cc +++ /dev/null
@@ -1,99 +0,0 @@ -// Copyright 2022 The Chromium Authors -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_model_listener.h" - -#include <memory> - -#include "chrome/test/base/browser_with_test_window_test.h" -#include "chrome/test/base/testing_profile.h" -#include "components/saved_tab_groups/saved_tab_group_model.h" -#include "components/tab_groups/tab_group_id.h" -#include "content/public/browser/render_process_host.h" -#include "content/public/browser/render_view_host.h" -#include "content/public/test/browser_task_environment.h" -#include "content/public/test/web_contents_tester.h" -#include "testing/gtest/include/gtest/gtest.h" -#include "ui/base/page_transition_types.h" -#include "ui/base/ui_base_types.h" - -class SavedTabGroupModelListenerTest : public BrowserWithTestWindowTest { - public: - SavedTabGroupModelListenerTest() = default; - SavedTabGroupModelListenerTest(const SavedTabGroupModelListenerTest&) = - delete; - SavedTabGroupModelListenerTest& operator=( - const SavedTabGroupModelListenerTest&) = delete; - - Browser* AddBrowser() { - Browser::CreateParams native_params(profile_.get(), true); - native_params.initial_show_state = ui::SHOW_STATE_DEFAULT; - std::unique_ptr<Browser> browser = - CreateBrowserWithTestWindowForParams(native_params); - Browser* browser_ptr = browser.get(); - browsers_.emplace_back(std::move(browser)); - return browser_ptr; - } - - void AddTabToBrowser(Browser* browser, int index) { - std::unique_ptr<content::WebContents> web_contents = - content::WebContentsTester::CreateTestWebContents(profile_.get(), - nullptr); - browser->tab_strip_model()->AddWebContents( - std::move(web_contents), index, - ui::PageTransition::PAGE_TRANSITION_TYPED, AddTabTypes::ADD_ACTIVE); - } - - SavedTabGroupModelListener* listener() { return listener_.get(); } - - private: - void SetUp() override { - profile_ = std::make_unique<TestingProfile>(); - model_ = std::make_unique<SavedTabGroupModel>(); - listener_ = std::make_unique<SavedTabGroupModelListener>(model_.get(), - profile_.get()); - } - void TearDown() override { - for (auto& browser : browsers_) { - browser->tab_strip_model()->CloseAllTabs(); - } - } - - content::RenderViewHostTestEnabler rvh_test_enabler_; - - std::unique_ptr<TestingProfile> profile_; - std::unique_ptr<SavedTabGroupModel> model_; - std::unique_ptr<SavedTabGroupModelListener> listener_; - - std::vector<std::unique_ptr<Browser>> browsers_; -}; - -TEST_F(SavedTabGroupModelListenerTest, CreatesRemovesBrowserListener) { - Browser* browser_1 = AddBrowser(); - Browser* browser_2 = AddBrowser(); - - EXPECT_EQ(listener()->GetBrowserListenerMapForTesting().count(browser_1), 1u); - EXPECT_EQ(listener()->GetBrowserListenerMapForTesting().count(browser_2), 1u); - - listener()->OnBrowserRemoved(browser_1); - EXPECT_EQ(listener()->GetBrowserListenerMapForTesting().count(browser_1), 0u); - EXPECT_EQ(listener()->GetBrowserListenerMapForTesting().count(browser_2), 1u); -} - -TEST_F(SavedTabGroupModelListenerTest, GetTabStripModelWithTabGroupId) { - Browser* browser_1 = AddBrowser(); - - EXPECT_TRUE(listener()->GetBrowserListenerMapForTesting().count(browser_1) > - 0); - - // Create a new tab and add it to a group. - ASSERT_EQ(0, browser_1->tab_strip_model()->count()); - AddTabToBrowser(browser_1, 0); - ASSERT_EQ(1, browser_1->tab_strip_model()->count()); - tab_groups::TabGroupId group_id = - browser_1->tab_strip_model()->AddToNewGroup({0}); - - EXPECT_EQ(browser_1->tab_strip_model(), - listener()->GetTabStripModelWithTabGroupId(group_id)); -}
diff --git a/chrome/browser/ui/tabs/tab_group.cc b/chrome/browser/ui/tabs/tab_group.cc index 5798706a7..abcd1d94 100644 --- a/chrome/browser/ui/tabs/tab_group.cc +++ b/chrome/browser/ui/tabs/tab_group.cc
@@ -170,7 +170,7 @@ SavedTabGroupKeyedService* backend = SavedTabGroupServiceFactory::GetForProfile(controller_->GetProfile()); - if (!backend || !backend->model()) - return; - backend->model()->Remove(id_); + CHECK(backend); + + backend->UnsaveGroup(id_); }
diff --git a/chrome/browser/ui/tabs/tab_strip_model.cc b/chrome/browser/ui/tabs/tab_strip_model.cc index b03a849..c1c333c 100644 --- a/chrome/browser/ui/tabs/tab_strip_model.cc +++ b/chrome/browser/ui/tabs/tab_strip_model.cc
@@ -543,7 +543,6 @@ scrubbing_metrics_.IncrementPressCount(user_gesture); - tab_switch_event_latency_recorder_.BeginLatencyTiming(user_gesture); ui::ListSelectionModel new_model = selection_model_; new_model.SetSelectedIndex(index); SetSelection( @@ -1985,10 +1984,8 @@ // thing in this block so that the start time is saved before any changes // that might affect compositing. if (selection.new_contents) { - auto details = tab_switch_event_latency_recorder_.details(); - // input_event_timestamp may be null in some cases, e.g. in tests. selection.new_contents->SetTabSwitchStartTime( - details.has_value() ? details->time_stamp : base::TimeTicks::Now(), + base::TimeTicks::Now(), resource_coordinator::ResourceCoordinatorTabHelper::IsLoaded( selection.new_contents)); } @@ -2005,12 +2002,6 @@ feature_engagement::kIPHTabAudioMutingFeature); } } - - // Record the time to this point. This must be the last thing in this - // block so that all work done when the active tab changes is included in - // the measurement. - tab_switch_event_latency_recorder_.OnWillChangeActiveTab( - base::TimeTicks::Now()); } TabStripModelChange change; auto visibility_tracker = InstallRenderWigetVisibilityTracker(selection);
diff --git a/chrome/browser/ui/tabs/tab_strip_model.h b/chrome/browser/ui/tabs/tab_strip_model.h index 8d241fd..6f68f06 100644 --- a/chrome/browser/ui/tabs/tab_strip_model.h +++ b/chrome/browser/ui/tabs/tab_strip_model.h
@@ -26,7 +26,6 @@ #include "chrome/browser/ui/tabs/tab_group_controller.h" #include "chrome/browser/ui/tabs/tab_strip_scrubbing_metrics.h" #include "chrome/browser/ui/tabs/tab_strip_user_gesture_details.h" -#include "chrome/browser/ui/tabs/tab_switch_event_latency_recorder.h" #include "components/sessions/core/session_id.h" #include "components/tab_groups/tab_group_id.h" #include "components/tab_groups/tab_group_visual_data.h" @@ -825,9 +824,6 @@ // methods that mutate state of |selection_model_| or |contents_data_|. bool reentrancy_guard_ = false; - // A recorder for recording tab switching input latency to UMA - TabSwitchEventLatencyRecorder tab_switch_event_latency_recorder_; - TabStripScrubbingMetrics scrubbing_metrics_; base::WeakPtrFactory<TabStripModel> weak_factory_{this};
diff --git a/chrome/browser/ui/tabs/tab_switch_event_latency_recorder.cc b/chrome/browser/ui/tabs/tab_switch_event_latency_recorder.cc deleted file mode 100644 index a50ee4f..0000000 --- a/chrome/browser/ui/tabs/tab_switch_event_latency_recorder.cc +++ /dev/null
@@ -1,51 +0,0 @@ -// Copyright 2019 The Chromium Authors -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "chrome/browser/ui/tabs/tab_switch_event_latency_recorder.h" - -#include "base/metrics/histogram_macros.h" -#include "chrome/browser/ui/tabs/tab_strip_user_gesture_details.h" - -TabSwitchEventLatencyRecorder::TabSwitchEventLatencyRecorder() = default; - -void TabSwitchEventLatencyRecorder::BeginLatencyTiming( - TabStripUserGestureDetails details) { - details_ = details; -} - -void TabSwitchEventLatencyRecorder::OnWillChangeActiveTab( - const base::TimeTicks change_time) { - if (!details_.has_value()) - return; - - const auto delta = change_time - details_->time_stamp; - switch (details_.value().type) { - case TabStripUserGestureDetails::GestureType::kKeyboard: - UMA_HISTOGRAM_CUSTOM_MICROSECONDS_TIMES( - "Browser.Tabs.InputEventToSelectionTime.Keyboard", delta, - base::Microseconds(100), base::Milliseconds(50), 50); - break; - case TabStripUserGestureDetails::GestureType::kMouse: - UMA_HISTOGRAM_CUSTOM_MICROSECONDS_TIMES( - "Browser.Tabs.InputEventToSelectionTime.Mouse", delta, - base::Microseconds(100), base::Milliseconds(50), 50); - break; - case TabStripUserGestureDetails::GestureType::kTouch: - UMA_HISTOGRAM_CUSTOM_MICROSECONDS_TIMES( - "Browser.Tabs.InputEventToSelectionTime.Touch", delta, - base::Microseconds(100), base::Milliseconds(50), 50); - break; - case TabStripUserGestureDetails::GestureType::kWheel: - UMA_HISTOGRAM_CUSTOM_MICROSECONDS_TIMES( - "Browser.Tabs.InputEventToSelectionTime.Wheel", delta, - base::Microseconds(100), base::Milliseconds(50), 50); - break; - case TabStripUserGestureDetails::GestureType::kTabMenu: - case TabStripUserGestureDetails::GestureType::kOther: - case TabStripUserGestureDetails::GestureType::kNone: - break; - } - - details_ = absl::nullopt; -}
diff --git a/chrome/browser/ui/tabs/tab_switch_event_latency_recorder.h b/chrome/browser/ui/tabs/tab_switch_event_latency_recorder.h deleted file mode 100644 index 9681683..0000000 --- a/chrome/browser/ui/tabs/tab_switch_event_latency_recorder.h +++ /dev/null
@@ -1,41 +0,0 @@ -// Copyright 2019 The Chromium Authors -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_UI_TABS_TAB_SWITCH_EVENT_LATENCY_RECORDER_H_ -#define CHROME_BROWSER_UI_TABS_TAB_SWITCH_EVENT_LATENCY_RECORDER_H_ - -#include "base/gtest_prod_util.h" -#include "base/time/time.h" -#include "chrome/browser/ui/tabs/tab_strip_user_gesture_details.h" -#include "third_party/abseil-cpp/absl/types/optional.h" - -// Store the timestamps related to switching tabs, and generate UMA metrics to -// track the latency between the input event timestamp and the time when the -// tab strip begins processing the tab switch. -class TabSwitchEventLatencyRecorder { - public: - TabSwitchEventLatencyRecorder(); - TabSwitchEventLatencyRecorder(const TabSwitchEventLatencyRecorder&) = delete; - TabSwitchEventLatencyRecorder& operator=( - const TabSwitchEventLatencyRecorder&) = delete; - - // Starts timing the tab switch input event latency. If this is called again - // without a following OnWillChangeActiveTab, this will overwrite the - // previously recorded value. - void BeginLatencyTiming(TabStripUserGestureDetails details); - - // Finishes the latency tracking started by BeginLatencyTiming and record the - // result to UMA. If this is called without a preceding BeginLatencyTiming, - // this do nothing. - void OnWillChangeActiveTab(const base::TimeTicks change_time); - - absl::optional<TabStripUserGestureDetails> details() const { - return details_; - } - - private: - absl::optional<TabStripUserGestureDetails> details_; -}; - -#endif // CHROME_BROWSER_UI_TABS_TAB_SWITCH_EVENT_LATENCY_RECORDER_H_
diff --git a/chrome/browser/ui/tabs/tab_switch_event_latency_recorder_unittest.cc b/chrome/browser/ui/tabs/tab_switch_event_latency_recorder_unittest.cc deleted file mode 100644 index 097aaca..0000000 --- a/chrome/browser/ui/tabs/tab_switch_event_latency_recorder_unittest.cc +++ /dev/null
@@ -1,176 +0,0 @@ -// Copyright 2019 The Chromium Authors -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "chrome/browser/ui/tabs/tab_switch_event_latency_recorder.h" -#include "base/test/metrics/histogram_tester.h" -#include "chrome/browser/ui/tabs/tab_strip_user_gesture_details.h" -#include "testing/gtest/include/gtest/gtest.h" - -class TabSwitchEventLatencyRecorderTest : public testing::Test { - public: - ~TabSwitchEventLatencyRecorderTest() override {} - - void SetUp() override { - EXPECT_EQ(histogram_tester - .GetAllSamples("Browser.Tabs.InputEventToSelectionTime.Mouse") - .size(), - 0ULL); - EXPECT_EQ( - histogram_tester - .GetAllSamples("Browser.Tabs.InputEventToSelectionTime.Keyboard") - .size(), - 0ULL); - EXPECT_EQ(histogram_tester - .GetAllSamples("Browser.Tabs.InputEventToSelectionTime.Touch") - .size(), - 0ULL); - EXPECT_EQ(histogram_tester - .GetAllSamples("Browser.Tabs.InputEventToSelectionTime.Wheel") - .size(), - 0ULL); - } - - protected: - size_t GetHistogramSampleSize( - TabStripUserGestureDetails::GestureType gesture_type) { - switch (gesture_type) { - case TabStripUserGestureDetails::GestureType::kMouse: - return histogram_tester - .GetAllSamples("Browser.Tabs.InputEventToSelectionTime.Mouse") - .size(); - case TabStripUserGestureDetails::GestureType::kKeyboard: - return histogram_tester - .GetAllSamples("Browser.Tabs.InputEventToSelectionTime.Keyboard") - .size(); - case TabStripUserGestureDetails::GestureType::kTouch: - return histogram_tester - .GetAllSamples("Browser.Tabs.InputEventToSelectionTime.Touch") - .size(); - case TabStripUserGestureDetails::GestureType::kWheel: - return histogram_tester - .GetAllSamples("Browser.Tabs.InputEventToSelectionTime.Wheel") - .size(); - default: - return 0; - } - } - - TabSwitchEventLatencyRecorder tab_switch_event_latency_recorder_; - base::HistogramTester histogram_tester; -}; - -// Mouse input event latency is recorded to histogram -TEST_F(TabSwitchEventLatencyRecorderTest, MouseInputLatency) { - const auto now = base::TimeTicks::Now(); - - tab_switch_event_latency_recorder_.BeginLatencyTiming( - TabStripUserGestureDetails( - TabStripUserGestureDetails::GestureType::kMouse, now)); - tab_switch_event_latency_recorder_.OnWillChangeActiveTab( - base::TimeTicks::Now()); - EXPECT_EQ( - GetHistogramSampleSize(TabStripUserGestureDetails::GestureType::kMouse), - 1ULL); - EXPECT_EQ(GetHistogramSampleSize( - TabStripUserGestureDetails::GestureType::kKeyboard), - 0ULL); - EXPECT_EQ( - GetHistogramSampleSize(TabStripUserGestureDetails::GestureType::kTouch), - 0ULL); - EXPECT_EQ( - GetHistogramSampleSize(TabStripUserGestureDetails::GestureType::kWheel), - 0ULL); -} - -// Keyboard input event latency is recorded to histogram -TEST_F(TabSwitchEventLatencyRecorderTest, KeyboardInputLatency) { - const auto now = base::TimeTicks::Now(); - - tab_switch_event_latency_recorder_.BeginLatencyTiming( - TabStripUserGestureDetails( - TabStripUserGestureDetails::GestureType::kKeyboard, now)); - tab_switch_event_latency_recorder_.OnWillChangeActiveTab( - base::TimeTicks::Now()); - EXPECT_EQ( - GetHistogramSampleSize(TabStripUserGestureDetails::GestureType::kMouse), - 0ULL); - EXPECT_EQ(GetHistogramSampleSize( - TabStripUserGestureDetails::GestureType::kKeyboard), - 1ULL); - EXPECT_EQ( - GetHistogramSampleSize(TabStripUserGestureDetails::GestureType::kTouch), - 0ULL); - EXPECT_EQ( - GetHistogramSampleSize(TabStripUserGestureDetails::GestureType::kWheel), - 0ULL); -} - -// Touch input event latency is recorded to histogram -TEST_F(TabSwitchEventLatencyRecorderTest, TouchInputLatency) { - const auto now = base::TimeTicks::Now(); - - tab_switch_event_latency_recorder_.BeginLatencyTiming( - TabStripUserGestureDetails( - TabStripUserGestureDetails::GestureType::kTouch, now)); - tab_switch_event_latency_recorder_.OnWillChangeActiveTab( - base::TimeTicks::Now()); - EXPECT_EQ( - GetHistogramSampleSize(TabStripUserGestureDetails::GestureType::kMouse), - 0ULL); - EXPECT_EQ(GetHistogramSampleSize( - TabStripUserGestureDetails::GestureType::kKeyboard), - 0ULL); - EXPECT_EQ( - GetHistogramSampleSize(TabStripUserGestureDetails::GestureType::kTouch), - 1ULL); - EXPECT_EQ( - GetHistogramSampleSize(TabStripUserGestureDetails::GestureType::kWheel), - 0ULL); -} - -// Scroll wheel input event latency is recorded to histogram -TEST_F(TabSwitchEventLatencyRecorderTest, WheelInputLatency) { - const auto now = base::TimeTicks::Now(); - - tab_switch_event_latency_recorder_.BeginLatencyTiming( - TabStripUserGestureDetails( - TabStripUserGestureDetails::GestureType::kWheel, now)); - tab_switch_event_latency_recorder_.OnWillChangeActiveTab( - base::TimeTicks::Now()); - EXPECT_EQ( - GetHistogramSampleSize(TabStripUserGestureDetails::GestureType::kMouse), - 0ULL); - EXPECT_EQ(GetHistogramSampleSize( - TabStripUserGestureDetails::GestureType::kKeyboard), - 0ULL); - EXPECT_EQ( - GetHistogramSampleSize(TabStripUserGestureDetails::GestureType::kTouch), - 0ULL); - EXPECT_EQ( - GetHistogramSampleSize(TabStripUserGestureDetails::GestureType::kWheel), - 1ULL); -} - -// Other input event type is not recorded to histogram -TEST_F(TabSwitchEventLatencyRecorderTest, OtherInputLatency) { - const auto now = base::TimeTicks::Now(); - - tab_switch_event_latency_recorder_.BeginLatencyTiming( - TabStripUserGestureDetails( - TabStripUserGestureDetails::GestureType::kOther, now)); - tab_switch_event_latency_recorder_.OnWillChangeActiveTab( - base::TimeTicks::Now()); - EXPECT_EQ( - GetHistogramSampleSize(TabStripUserGestureDetails::GestureType::kMouse), - 0ULL); - EXPECT_EQ(GetHistogramSampleSize( - TabStripUserGestureDetails::GestureType::kKeyboard), - 0ULL); - EXPECT_EQ( - GetHistogramSampleSize(TabStripUserGestureDetails::GestureType::kTouch), - 0ULL); - EXPECT_EQ( - GetHistogramSampleSize(TabStripUserGestureDetails::GestureType::kWheel), - 0ULL); -}
diff --git a/chrome/browser/ui/test/test_app_window_icon_observer.h b/chrome/browser/ui/test/test_app_window_icon_observer.h index b9f8d23..fc2bf06 100644 --- a/chrome/browser/ui/test/test_app_window_icon_observer.h +++ b/chrome/browser/ui/test/test_app_window_icon_observer.h
@@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "extensions/browser/app_window/app_window_registry.h" #include "ui/aura/window_observer.h"
diff --git a/chrome/browser/ui/test/test_browser_dialog.cc b/chrome/browser/ui/test/test_browser_dialog.cc index 152620d..7a788b1 100644 --- a/chrome/browser/ui/test/test_browser_dialog.cc +++ b/chrome/browser/ui/test/test_browser_dialog.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ui/test/test_browser_dialog.h" -#include "base/bind.h" #include "base/containers/cxx20_erase.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" @@ -25,7 +25,7 @@ #endif #if defined(TOOLKIT_VIEWS) -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/strings/strcat.h" #include "ui/display/display.h" #include "ui/display/screen.h"
diff --git a/chrome/browser/ui/thumbnails/background_thumbnail_video_capturer.h b/chrome/browser/ui/thumbnails/background_thumbnail_video_capturer.h index 11938c5..5913a4d1 100644 --- a/chrome/browser/ui/thumbnails/background_thumbnail_video_capturer.h +++ b/chrome/browser/ui/thumbnails/background_thumbnail_video_capturer.h
@@ -7,7 +7,7 @@ #include <stdint.h> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/sequence_checker.h" #include "base/time/time.h"
diff --git a/chrome/browser/ui/thumbnails/thumbnail_image.h b/chrome/browser/ui/thumbnails/thumbnail_image.h index 9ca82665..af4f561 100644 --- a/chrome/browser/ui/thumbnails/thumbnail_image.h +++ b/chrome/browser/ui/thumbnails/thumbnail_image.h
@@ -10,7 +10,7 @@ #include <utility> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/ui/thumbnails/thumbnail_readiness_tracker.h b/chrome/browser/ui/thumbnails/thumbnail_readiness_tracker.h index da1542b..d2d8897 100644 --- a/chrome/browser/ui/thumbnails/thumbnail_readiness_tracker.h +++ b/chrome/browser/ui/thumbnails/thumbnail_readiness_tracker.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_THUMBNAILS_THUMBNAIL_READINESS_TRACKER_H_ #define CHROME_BROWSER_UI_THUMBNAILS_THUMBNAIL_READINESS_TRACKER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/ui/thumbnails/thumbnail_image.h" #include "content/public/browser/web_contents.h"
diff --git a/chrome/browser/ui/thumbnails/thumbnail_stats_tracker.cc b/chrome/browser/ui/thumbnails/thumbnail_stats_tracker.cc index 73b1ecf..87da1f1 100644 --- a/chrome/browser/ui/thumbnails/thumbnail_stats_tracker.cc +++ b/chrome/browser/ui/thumbnails/thumbnail_stats_tracker.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/thumbnails/thumbnail_stats_tracker.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/metrics/histogram_macros.h" #include "base/time/time.h"
diff --git a/chrome/browser/ui/thumbnails/thumbnail_stats_tracker_unittest.cc b/chrome/browser/ui/thumbnails/thumbnail_stats_tracker_unittest.cc index 986768ec..7200638 100644 --- a/chrome/browser/ui/thumbnails/thumbnail_stats_tracker_unittest.cc +++ b/chrome/browser/ui/thumbnails/thumbnail_stats_tracker_unittest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/thumbnails/thumbnail_stats_tracker.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/memory/scoped_refptr.h" #include "base/rand_util.h"
diff --git a/chrome/browser/ui/thumbnails/thumbnail_tab_helper.cc b/chrome/browser/ui/thumbnails/thumbnail_tab_helper.cc index 4d63cea..4e722c20 100644 --- a/chrome/browser/ui/thumbnails/thumbnail_tab_helper.cc +++ b/chrome/browser/ui/thumbnails/thumbnail_tab_helper.cc
@@ -9,8 +9,8 @@ #include <set> #include <utility> -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/metrics/histogram_macros.h" #include "base/no_destructor.h"
diff --git a/chrome/browser/ui/toolbar/app_menu_model.cc b/chrome/browser/ui/toolbar/app_menu_model.cc index fa7772dc..f65618c3 100644 --- a/chrome/browser/ui/toolbar/app_menu_model.cc +++ b/chrome/browser/ui/toolbar/app_menu_model.cc
@@ -8,10 +8,10 @@ #include <cmath> #include <memory> -#include "base/bind.h" #include "base/command_line.h" #include "base/debug/debugging_buildflags.h" #include "base/debug/profiler.h" +#include "base/functional/bind.h" #include "base/i18n/number_formatting.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h"
diff --git a/chrome/browser/ui/toolbar/back_forward_menu_model.cc b/chrome/browser/ui/toolbar/back_forward_menu_model.cc index bb286f5..7107b0f 100644 --- a/chrome/browser/ui/toolbar/back_forward_menu_model.cc +++ b/chrome/browser/ui/toolbar/back_forward_menu_model.cc
@@ -6,10 +6,10 @@ #include <stddef.h> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/contains.h" #include "base/cxx17_backports.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/histogram_macros.h" #include "base/metrics/user_metrics.h" #include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/ui/toolbar/location_bar_model_unittest.cc b/chrome/browser/ui/toolbar/location_bar_model_unittest.cc index 6c40c580..8a84f36 100644 --- a/chrome/browser/ui/toolbar/location_bar_model_unittest.cc +++ b/chrome/browser/ui/toolbar/location_bar_model_unittest.cc
@@ -6,8 +6,8 @@ #include <stddef.h> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/no_destructor.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/toolbar/media_router_action_controller.cc b/chrome/browser/ui/toolbar/media_router_action_controller.cc index ae6faea..01040fd 100644 --- a/chrome/browser/ui/toolbar/media_router_action_controller.cc +++ b/chrome/browser/ui/toolbar/media_router_action_controller.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/toolbar/media_router_action_controller.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/observer_list.h" #include "base/ranges/algorithm.h" #include "chrome/browser/media/router/media_router_feature.h"
diff --git a/chrome/browser/ui/toolbar/media_router_contextual_menu_unittest.cc b/chrome/browser/ui/toolbar/media_router_contextual_menu_unittest.cc index e654916..de10c22 100644 --- a/chrome/browser/ui/toolbar/media_router_contextual_menu_unittest.cc +++ b/chrome/browser/ui/toolbar/media_router_contextual_menu_unittest.cc
@@ -5,7 +5,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "build/branding_buildflags.h" #include "chrome/app/chrome_command_ids.h"
diff --git a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc index 4328683..0f41b7e 100644 --- a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc +++ b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc
@@ -9,7 +9,7 @@ #include <algorithm> #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "base/metrics/user_metrics.h" #include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model_unittest.cc b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model_unittest.cc index 62c7e5c..5bcdad63 100644 --- a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model_unittest.cc +++ b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model_unittest.cc
@@ -9,9 +9,9 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h"
diff --git a/chrome/browser/ui/toolbar/test_toolbar_actions_bar_bubble_delegate.cc b/chrome/browser/ui/toolbar/test_toolbar_actions_bar_bubble_delegate.cc index e27e4ac0..931ea5e9 100644 --- a/chrome/browser/ui/toolbar/test_toolbar_actions_bar_bubble_delegate.cc +++ b/chrome/browser/ui/toolbar/test_toolbar_actions_bar_bubble_delegate.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ui/toolbar/test_toolbar_actions_bar_bubble_delegate.h" -#include "base/callback.h" #include "base/check.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/memory/raw_ptr.h" #include "base/threading/thread_restrictions.h"
diff --git a/chrome/browser/ui/toolbar/toolbar_actions_bar_bubble_delegate.h b/chrome/browser/ui/toolbar/toolbar_actions_bar_bubble_delegate.h index 3034cf7..1cf2d319 100644 --- a/chrome/browser/ui/toolbar/toolbar_actions_bar_bubble_delegate.h +++ b/chrome/browser/ui/toolbar/toolbar_actions_bar_bubble_delegate.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "ui/base/ui_base_types.h"
diff --git a/chrome/browser/ui/toolbar/toolbar_actions_model.cc b/chrome/browser/ui/toolbar/toolbar_actions_model.cc index 61c3c23..ee25d8e0 100644 --- a/chrome/browser/ui/toolbar/toolbar_actions_model.cc +++ b/chrome/browser/ui/toolbar/toolbar_actions_model.cc
@@ -8,9 +8,9 @@ #include <memory> #include <string> -#include "base/bind.h" #include "base/containers/contains.h" #include "base/containers/cxx20_erase.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/metrics/histogram_base.h" #include "base/metrics/histogram_functions.h"
diff --git a/chrome/browser/ui/toolbar/toolbar_actions_model_unittest.cc b/chrome/browser/ui/toolbar/toolbar_actions_model_unittest.cc index ccb32d6..fdd850b 100644 --- a/chrome/browser/ui/toolbar/toolbar_actions_model_unittest.cc +++ b/chrome/browser/ui/toolbar/toolbar_actions_model_unittest.cc
@@ -9,10 +9,10 @@ #include <memory> #include <string> -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/containers/contains.h" #include "base/files/file_util.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/json/json_reader.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h"
diff --git a/chrome/browser/ui/unload_controller.cc b/chrome/browser/ui/unload_controller.cc index 019004d..ef84dee 100644 --- a/chrome/browser/ui/unload_controller.cc +++ b/chrome/browser/ui/unload_controller.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ui/unload_controller.h" -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/ranges/algorithm.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/ui/unload_controller.h b/chrome/browser/ui/unload_controller.h index 48fa67e..7983e41a 100644 --- a/chrome/browser/ui/unload_controller.h +++ b/chrome/browser/ui/unload_controller.h
@@ -8,7 +8,7 @@ #include <memory> #include <set> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/tab_contents/web_contents_collection.h"
diff --git a/chrome/browser/ui/user_education/active_tab_tracker.h b/chrome/browser/ui/user_education/active_tab_tracker.h index 54730fa..590fa652 100644 --- a/chrome/browser/ui/user_education/active_tab_tracker.h +++ b/chrome/browser/ui/user_education/active_tab_tracker.h
@@ -7,7 +7,7 @@ #include <unordered_map> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/time/time.h" #include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
diff --git a/chrome/browser/ui/user_education/open_page_and_show_help_bubble.cc b/chrome/browser/ui/user_education/open_page_and_show_help_bubble.cc index 4bd57bb9..ad3e1c8 100644 --- a/chrome/browser/ui/user_education/open_page_and_show_help_bubble.cc +++ b/chrome/browser/ui/user_education/open_page_and_show_help_bubble.cc
@@ -6,9 +6,9 @@ #include <memory> -#include "base/bind.h" -#include "base/callback.h" #include "base/callback_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/no_destructor.h" #include "base/threading/thread_checker.h"
diff --git a/chrome/browser/ui/user_education/open_page_and_show_help_bubble.h b/chrome/browser/ui/user_education/open_page_and_show_help_bubble.h index 95f42d2..502aebd 100644 --- a/chrome/browser/ui/user_education/open_page_and_show_help_bubble.h +++ b/chrome/browser/ui/user_education/open_page_and_show_help_bubble.h
@@ -6,9 +6,9 @@ #define CHROME_BROWSER_UI_USER_EDUCATION_OPEN_PAGE_AND_SHOW_HELP_BUBBLE_H_ #include <string> -#include "base/callback_forward.h" -#include "base/callback_helpers.h" #include "base/callback_list.h" +#include "base/functional/callback_forward.h" +#include "base/functional/callback_helpers.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h" #include "components/user_education/common/help_bubble_params.h"
diff --git a/chrome/browser/ui/user_education/reopen_tab_in_product_help.cc b/chrome/browser/ui/user_education/reopen_tab_in_product_help.cc index 71a84a1..8cc451d2 100644 --- a/chrome/browser/ui/user_education/reopen_tab_in_product_help.cc +++ b/chrome/browser/ui/user_education/reopen_tab_in_product_help.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/time/tick_clock.h" #include "base/time/time.h" #include "chrome/browser/feature_engagement/tracker_factory.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 dab64cf36..da50384f 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
@@ -8,7 +8,7 @@ #include <map> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/time/tick_clock.h" #include "base/time/time.h"
diff --git a/chrome/browser/ui/user_education/reopen_tab_in_product_help_trigger_unittest.cc b/chrome/browser/ui/user_education/reopen_tab_in_product_help_trigger_unittest.cc index b7cadbb..d33f662 100644 --- a/chrome/browser/ui/user_education/reopen_tab_in_product_help_trigger_unittest.cc +++ b/chrome/browser/ui/user_education/reopen_tab_in_product_help_trigger_unittest.cc
@@ -7,8 +7,8 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/test/bind.h" #include "base/test/mock_callback.h" #include "base/test/scoped_feature_list.h"
diff --git a/chrome/browser/ui/user_education/reopen_tab_in_product_help_unittest.cc b/chrome/browser/ui/user_education/reopen_tab_in_product_help_unittest.cc index 412c784..337d7bd 100644 --- a/chrome/browser/ui/user_education/reopen_tab_in_product_help_unittest.cc +++ b/chrome/browser/ui/user_education/reopen_tab_in_product_help_unittest.cc
@@ -9,7 +9,7 @@ #include "chrome/browser/ui/user_education/reopen_tab_in_product_help.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/test/scoped_feature_list.h" #include "base/test/simple_test_tick_clock.h"
diff --git a/chrome/browser/ui/views/accessibility/caption_bubble_controller_views_browsertest.cc b/chrome/browser/ui/views/accessibility/caption_bubble_controller_views_browsertest.cc index afba739..587d06f 100644 --- a/chrome/browser/ui/views/accessibility/caption_bubble_controller_views_browsertest.cc +++ b/chrome/browser/ui/views/accessibility/caption_bubble_controller_views_browsertest.cc
@@ -4,7 +4,7 @@ #include <memory> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/strings/utf_string_conversions.h" #include "base/test/scoped_mock_time_message_loop_task_runner.h" #include "build/build_config.h"
diff --git a/chrome/browser/ui/views/apps/app_dialog/app_uninstall_dialog_view.cc b/chrome/browser/ui/views/apps/app_dialog/app_uninstall_dialog_view.cc index 278b3d1..28f23d2 100644 --- a/chrome/browser/ui/views/apps/app_dialog/app_uninstall_dialog_view.cc +++ b/chrome/browser/ui/views/apps/app_dialog/app_uninstall_dialog_view.cc
@@ -6,8 +6,8 @@ #include <string> -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_container.h b/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_container.h index 4ce87083..9e1a7d0 100644 --- a/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_container.h +++ b/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_container.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "ui/gfx/geometry/size.h" namespace views {
diff --git a/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_views.cc b/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_views.cc index 3455679..c864114 100644 --- a/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_views.cc +++ b/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_views.cc
@@ -7,9 +7,9 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/command_line.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_views_browsertest.cc b/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_views_browsertest.cc index a6f6f76..1bf1398 100644 --- a/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_views_browsertest.cc +++ b/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_views_browsertest.cc
@@ -7,7 +7,7 @@ #include <memory> #include <string> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/test/bind.h" #include "build/build_config.h" #include "chrome/browser/extensions/extension_service.h"
diff --git a/chrome/browser/ui/views/apps/app_info_dialog/app_info_footer_panel.cc b/chrome/browser/ui/views/apps/app_info_dialog/app_info_footer_panel.cc index 3a3649e..598a0b0 100644 --- a/chrome/browser/ui/views/apps/app_info_dialog/app_info_footer_panel.cc +++ b/chrome/browser/ui/views/apps/app_info_dialog/app_info_footer_panel.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/apps/app_info_dialog/app_info_footer_panel.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "build/chromeos_buildflags.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ui/views/apps/app_info_dialog/app_info_header_panel.cc b/chrome/browser/ui/views/apps/app_info_dialog/app_info_header_panel.cc index 118277d..2b8d2f01 100644 --- a/chrome/browser/ui/views/apps/app_info_dialog/app_info_header_panel.cc +++ b/chrome/browser/ui/views/apps/app_info_dialog/app_info_header_panel.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/apps/app_info_dialog/app_info_header_panel.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/extensions/chrome_app_icon.h" #include "chrome/browser/extensions/chrome_app_icon_service.h"
diff --git a/chrome/browser/ui/views/apps/app_info_dialog/app_info_permissions_panel.cc b/chrome/browser/ui/views/apps/app_info_dialog/app_info_permissions_panel.cc index ee2dce6..63c76b9 100644 --- a/chrome/browser/ui/views/apps/app_info_dialog/app_info_permissions_panel.cc +++ b/chrome/browser/ui/views/apps/app_info_dialog/app_info_permissions_panel.cc
@@ -8,9 +8,9 @@ #include <vector> #include "apps/saved_files_service.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/strings/string_split.h" #include "chrome/browser/apps/platform_apps/app_load_service.h"
diff --git a/chrome/browser/ui/views/apps/app_info_dialog/app_info_permissions_panel_unittest.cc b/chrome/browser/ui/views/apps/app_info_dialog/app_info_permissions_panel_unittest.cc index cdffe58e..f76a8dab7c 100644 --- a/chrome/browser/ui/views/apps/app_info_dialog/app_info_permissions_panel_unittest.cc +++ b/chrome/browser/ui/views/apps/app_info_dialog/app_info_permissions_panel_unittest.cc
@@ -8,7 +8,7 @@ #include <utility> #include "apps/saved_files_service.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/test_extension_system.h"
diff --git a/chrome/browser/ui/views/apps/app_info_dialog/app_info_summary_panel.cc b/chrome/browser/ui/views/apps/app_info_dialog/app_info_summary_panel.cc index 5a2e4e7..d27192a9 100644 --- a/chrome/browser/ui/views/apps/app_info_dialog/app_info_summary_panel.cc +++ b/chrome/browser/ui/views/apps/app_info_dialog/app_info_summary_panel.cc
@@ -8,7 +8,7 @@ #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/extensions/launch_util.h"
diff --git a/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc b/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc index f07f574..2694f4a 100644 --- a/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc +++ b/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc
@@ -14,7 +14,7 @@ #include "ash/public/cpp/tablet_mode.h" #include "ash/public/cpp/window_backdrop.h" #include "ash/public/cpp/window_properties.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.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/ui/views/arc_app_dialog_view.cc b/chrome/browser/ui/views/arc_app_dialog_view.cc index d6ef59e2..633bb3d 100644 --- a/chrome/browser/ui/views/arc_app_dialog_view.cc +++ b/chrome/browser/ui/views/arc_app_dialog_view.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ash/app_list/arc/arc_app_dialog.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/ash/app_list/app_list_controller_delegate.h" #include "chrome/browser/ash/app_list/app_service/app_service_app_icon_loader.h"
diff --git a/chrome/browser/ui/views/arc_app_dialog_view_browsertest.cc b/chrome/browser/ui/views/arc_app_dialog_view_browsertest.cc index 6a6958b2..9a8becb 100644 --- a/chrome/browser/ui/views/arc_app_dialog_view_browsertest.cc +++ b/chrome/browser/ui/views/arc_app_dialog_view_browsertest.cc
@@ -8,8 +8,8 @@ #include "ash/components/arc/test/arc_util_test_support.h" #include "ash/components/arc/test/connection_holder_util.h" #include "ash/components/arc/test/fake_app_instance.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/views/autofill/autofill_popup_base_view.cc b/chrome/browser/ui/views/autofill/autofill_popup_base_view.cc index 5631d74..a6570ff 100644 --- a/chrome/browser/ui/views/autofill/autofill_popup_base_view.cc +++ b/chrome/browser/ui/views/autofill/autofill_popup_base_view.cc
@@ -8,8 +8,8 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/dcheck_is_on.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/task/single_thread_task_runner.h" #include "base/threading/thread_task_runner_handle.h"
diff --git a/chrome/browser/ui/views/autofill/payments/card_unmask_prompt_views.cc b/chrome/browser/ui/views/autofill/payments/card_unmask_prompt_views.cc index e296ed0..1333f92 100644 --- a/chrome/browser/ui/views/autofill/payments/card_unmask_prompt_views.cc +++ b/chrome/browser/ui/views/autofill/payments/card_unmask_prompt_views.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/autofill/payments/card_unmask_prompt_views.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/strings/utf_string_conversions.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/ui/views/autofill/payments/local_card_migration_dialog_view.cc b/chrome/browser/ui/views/autofill/payments/local_card_migration_dialog_view.cc index efc4d664..a8a17a8 100644 --- a/chrome/browser/ui/views/autofill/payments/local_card_migration_dialog_view.cc +++ b/chrome/browser/ui/views/autofill/payments/local_card_migration_dialog_view.cc
@@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/i18n/message_formatter.h" #include "base/location.h" #include "base/memory/raw_ptr.h"
diff --git a/chrome/browser/ui/views/autofill/payments/local_card_migration_uitest.cc b/chrome/browser/ui/views/autofill/payments/local_card_migration_uitest.cc index c3c13775..5a1991a9 100644 --- a/chrome/browser/ui/views/autofill/payments/local_card_migration_uitest.cc +++ b/chrome/browser/ui/views/autofill/payments/local_card_migration_uitest.cc
@@ -8,9 +8,9 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/callback_list.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/test/metrics/histogram_tester.h"
diff --git a/chrome/browser/ui/views/autofill/payments/migratable_card_view.cc b/chrome/browser/ui/views/autofill/payments/migratable_card_view.cc index 24c7fc1..5d19626 100644 --- a/chrome/browser/ui/views/autofill/payments/migratable_card_view.cc +++ b/chrome/browser/ui/views/autofill/payments/migratable_card_view.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/autofill/payments/migratable_card_view.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/app/vector_icons/vector_icons.h" #include "chrome/browser/ui/autofill/payments/local_card_migration_dialog_state.h" #include "chrome/browser/ui/views/autofill/payments/local_card_migration_dialog_view.h"
diff --git a/chrome/browser/ui/views/autofill/payments/payments_view_util.cc b/chrome/browser/ui/views/autofill/payments/payments_view_util.cc index 8228108..053ddf1 100644 --- a/chrome/browser/ui/views/autofill/payments/payments_view_util.cc +++ b/chrome/browser/ui/views/autofill/payments/payments_view_util.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/ranges/algorithm.h" #include "build/branding_buildflags.h" #include "chrome/app/vector_icons/vector_icons.h"
diff --git a/chrome/browser/ui/views/autofill/payments/save_card_bubble_views_browsertest.cc b/chrome/browser/ui/views/autofill/payments/save_card_bubble_views_browsertest.cc index 200dfa22..cbe6e048 100644 --- a/chrome/browser/ui/views/autofill/payments/save_card_bubble_views_browsertest.cc +++ b/chrome/browser/ui/views/autofill/payments/save_card_bubble_views_browsertest.cc
@@ -5,9 +5,9 @@ #include <memory> #include <string> -#include "base/bind.h" #include "base/callback_list.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/strings/utf_string_conversions.h" #include "base/test/metrics/histogram_tester.h"
diff --git a/chrome/browser/ui/views/autofill/payments/save_card_offer_bubble_views.cc b/chrome/browser/ui/views/autofill/payments/save_card_offer_bubble_views.cc index 3072da7..0640bf4 100644 --- a/chrome/browser/ui/views/autofill/payments/save_card_offer_bubble_views.cc +++ b/chrome/browser/ui/views/autofill/payments/save_card_offer_bubble_views.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h"
diff --git a/chrome/browser/ui/views/autofill/payments/virtual_card_manual_fallback_bubble_views.cc b/chrome/browser/ui/views/autofill/payments/virtual_card_manual_fallback_bubble_views.cc index 8a743a9e..5db4645 100644 --- a/chrome/browser/ui/views/autofill/payments/virtual_card_manual_fallback_bubble_views.cc +++ b/chrome/browser/ui/views/autofill/payments/virtual_card_manual_fallback_bubble_views.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/autofill/payments/virtual_card_manual_fallback_bubble_views.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/strcat.h" #include "chrome/browser/ui/views/autofill/payments/payments_view_util.h" #include "chrome/browser/ui/views/chrome_layout_provider.h"
diff --git a/chrome/browser/ui/views/autofill/payments/virtual_card_selection_dialog_browsertest.cc b/chrome/browser/ui/views/autofill/payments/virtual_card_selection_dialog_browsertest.cc index 18168a9e..bf5c7970 100644 --- a/chrome/browser/ui/views/autofill/payments/virtual_card_selection_dialog_browsertest.cc +++ b/chrome/browser/ui/views/autofill/payments/virtual_card_selection_dialog_browsertest.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 "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "chrome/browser/ui/autofill/payments/virtual_card_selection_dialog.h" #include "chrome/browser/ui/autofill/payments/virtual_card_selection_dialog_controller_impl.h"
diff --git a/chrome/browser/ui/views/autofill/payments/webauthn_dialog_browsertest.cc b/chrome/browser/ui/views/autofill/payments/webauthn_dialog_browsertest.cc index 871aa42..780add4 100644 --- a/chrome/browser/ui/views/autofill/payments/webauthn_dialog_browsertest.cc +++ b/chrome/browser/ui/views/autofill/payments/webauthn_dialog_browsertest.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 "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "chrome/browser/ui/autofill/payments/webauthn_dialog.h" #include "chrome/browser/ui/autofill/payments/webauthn_dialog_controller_impl.h"
diff --git a/chrome/browser/ui/views/bluetooth_device_credentials_view.cc b/chrome/browser/ui/views/bluetooth_device_credentials_view.cc index ccaa1e1..e89e6aea 100644 --- a/chrome/browser/ui/views/bluetooth_device_credentials_view.cc +++ b/chrome/browser/ui/views/bluetooth_device_credentials_view.cc
@@ -6,8 +6,8 @@ #include <cwctype> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/ranges/algorithm.h" #include "chrome/browser/ui/views/chrome_layout_provider.h" #include "chrome/grit/generated_resources.h"
diff --git a/chrome/browser/ui/views/bluetooth_device_credentials_view_browsertest.cc b/chrome/browser/ui/views/bluetooth_device_credentials_view_browsertest.cc index f50288b..e0c547b 100644 --- a/chrome/browser/ui/views/bluetooth_device_credentials_view_browsertest.cc +++ b/chrome/browser/ui/views/bluetooth_device_credentials_view_browsertest.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 "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_dialogs.h"
diff --git a/chrome/browser/ui/views/bluetooth_device_pair_confirm_view.cc b/chrome/browser/ui/views/bluetooth_device_pair_confirm_view.cc index aa6143a2..4ce2695 100644 --- a/chrome/browser/ui/views/bluetooth_device_pair_confirm_view.cc +++ b/chrome/browser/ui/views/bluetooth_device_pair_confirm_view.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ui/views/bluetooth_device_pair_confirm_view.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "chrome/browser/ui/views/chrome_layout_provider.h" #include "chrome/grit/generated_resources.h" #include "components/constrained_window/constrained_window_views.h"
diff --git a/chrome/browser/ui/views/bluetooth_device_pair_confirm_view_browsertest.cc b/chrome/browser/ui/views/bluetooth_device_pair_confirm_view_browsertest.cc index bdb9165..85ffbcd 100644 --- a/chrome/browser/ui/views/bluetooth_device_pair_confirm_view_browsertest.cc +++ b/chrome/browser/ui/views/bluetooth_device_pair_confirm_view_browsertest.cc
@@ -4,7 +4,7 @@ #include <string> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_dialogs.h"
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc index 6c2e7da1..89756e6 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
@@ -13,10 +13,10 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check_op.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/i18n/rtl.h" #include "base/memory/raw_ptr.h" #include "base/memory/raw_ref.h"
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.h b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.h index ae6114e..b24ca6c 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.h +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.h
@@ -8,7 +8,7 @@ #include <memory> #include <set> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h"
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc index 951f1f3..33d086c 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc
@@ -9,9 +9,9 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/ranges/algorithm.h"
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 ab2cfab..210b2c24 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_unittest.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_unittest.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/guid.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h"
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view_unittest.cc b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view_unittest.cc index 3b6e7b1..51228dd 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view_unittest.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view_unittest.cc
@@ -8,7 +8,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h"
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_context_menu.h b/chrome/browser/ui/views/bookmarks/bookmark_context_menu.h index 19d86274..be430fbb 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_context_menu.h +++ b/chrome/browser/ui/views/bookmarks/bookmark_context_menu.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_CONTEXT_MENU_H_ #define CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_CONTEXT_MENU_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/ui/bookmarks/bookmark_context_menu_controller.h" #include "chrome/browser/ui/bookmarks/bookmark_stats.h"
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_drag_drop_views.cc b/chrome/browser/ui/views/bookmarks/bookmark_drag_drop_views.cc index a4e706e..23b38996 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_drag_drop_views.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_drag_drop_views.cc
@@ -7,7 +7,7 @@ #include "chrome/browser/favicon/favicon_utils.h" #include "chrome/browser/ui/bookmarks/bookmark_drag_drop.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/weak_ptr.h" #include "base/no_destructor.h" #include "base/scoped_observation.h"
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc index fcfeeffc..3d317b1 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc
@@ -7,8 +7,8 @@ #include <set> #include <string> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/ranges/algorithm.h" #include "base/strings/string_util.h"
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.h b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.h index 89f5522..851658b 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.h +++ b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.h
@@ -11,7 +11,7 @@ #include <string> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/ui/bookmarks/bookmark_editor.h" #include "components/bookmarks/browser/bookmark_expanded_state_tracker.h"
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.h b/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.h index de60f39..7d39bfb 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.h +++ b/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.h
@@ -7,7 +7,7 @@ #include <set> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "components/bookmarks/browser/base_bookmark_model_observer.h" #include "components/bookmarks/browser/bookmark_node_data.h"
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc b/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc index f4276b4..c39862f 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/metrics/user_metrics.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.h b/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.h index 15cac1a..77825f4 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.h +++ b/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.h
@@ -8,7 +8,7 @@ #include <map> #include <set> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/ui/bookmarks/bookmark_stats.h" #include "chrome/browser/ui/toolbar/app_menu_model.h"
diff --git a/chrome/browser/ui/views/bookmarks/saved_tab_groups/saved_tab_group_bar.cc b/chrome/browser/ui/views/bookmarks/saved_tab_groups/saved_tab_group_bar.cc index 39cf409ca..651cad0 100644 --- a/chrome/browser/ui/views/bookmarks/saved_tab_groups/saved_tab_group_bar.cc +++ b/chrome/browser/ui/views/bookmarks/saved_tab_groups/saved_tab_group_bar.cc
@@ -5,7 +5,7 @@ #include "chrome/browser/ui/views/bookmarks/saved_tab_groups/saved_tab_group_bar.h" #include <algorithm> -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/ui/bookmarks/bookmark_utils_desktop.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/layout_constants.h"
diff --git a/chrome/browser/ui/views/bookmarks/saved_tab_groups/saved_tab_group_button.cc b/chrome/browser/ui/views/bookmarks/saved_tab_groups/saved_tab_group_button.cc index a0d41b4..d0fc55b 100644 --- a/chrome/browser/ui/views/bookmarks/saved_tab_groups/saved_tab_group_button.cc +++ b/chrome/browser/ui/views/bookmarks/saved_tab_groups/saved_tab_group_button.cc
@@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/favicon/favicon_utils.h" #include "chrome/browser/ui/layout_constants.h" #include "chrome/browser/ui/tabs/tab_group_theme.h"
diff --git a/chrome/browser/ui/views/borealis/borealis_installer_view.cc b/chrome/browser/ui/views/borealis/borealis_installer_view.cc index fde3a70..a640d20 100644 --- a/chrome/browser/ui/views/borealis/borealis_installer_view.cc +++ b/chrome/browser/ui/views/borealis/borealis_installer_view.cc
@@ -10,8 +10,8 @@ #include "ash/public/cpp/style/color_mode_observer.h" #include "ash/public/cpp/style/dark_light_mode_controller.h" #include "ash/public/cpp/window_properties.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/ash/borealis/borealis_app_launcher.h"
diff --git a/chrome/browser/ui/views/borealis/borealis_installer_view.h b/chrome/browser/ui/views/borealis/borealis_installer_view.h index e2f6ad4..98660d5 100644 --- a/chrome/browser/ui/views/borealis/borealis_installer_view.h +++ b/chrome/browser/ui/views/borealis/borealis_installer_view.h
@@ -6,7 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_BOREALIS_BOREALIS_INSTALLER_VIEW_H_ #include "ash/public/cpp/style/color_mode_observer.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/scoped_observation.h" #include "chrome/browser/ash/borealis/borealis_installer.h"
diff --git a/chrome/browser/ui/views/borealis/borealis_installer_view_browsertest.cc b/chrome/browser/ui/views/borealis/borealis_installer_view_browsertest.cc index 13a86d6..e13c185 100644 --- a/chrome/browser/ui/views/borealis/borealis_installer_view_browsertest.cc +++ b/chrome/browser/ui/views/borealis/borealis_installer_view_browsertest.cc
@@ -7,7 +7,7 @@ #include <memory> #include "ash/constants/ash_features.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/test/scoped_feature_list.h" #include "chrome/browser/ash/borealis/borealis_app_launcher_impl.h" #include "chrome/browser/ash/borealis/borealis_context.h"
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 a981195..148ff08 100644 --- a/chrome/browser/ui/views/borealis/borealis_splash_screen_view.cc +++ b/chrome/browser/ui/views/borealis/borealis_splash_screen_view.cc
@@ -5,9 +5,9 @@ #include "chrome/browser/ui/views/borealis/borealis_splash_screen_view.h" #include "ash/public/cpp/window_properties.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted_memory.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/ash/borealis/borealis_service.h"
diff --git a/chrome/browser/ui/views/certificate_selector_browsertest.cc b/chrome/browser/ui/views/certificate_selector_browsertest.cc index beb208c..c1dfae98 100644 --- a/chrome/browser/ui/views/certificate_selector_browsertest.cc +++ b/chrome/browser/ui/views/certificate_selector_browsertest.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ui/views/certificate_selector.h" -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/views/certificate_viewer_win.cc b/chrome/browser/ui/views/certificate_viewer_win.cc index 8eb224c..a877ca1 100644 --- a/chrome/browser/ui/views/certificate_viewer_win.cc +++ b/chrome/browser/ui/views/certificate_viewer_win.cc
@@ -6,8 +6,8 @@ #include <windows.h> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/task/single_thread_task_runner.h" #include "base/task/task_runner.h"
diff --git a/chrome/browser/ui/views/chrome_views_delegate.h b/chrome/browser/ui/views/chrome_views_delegate.h index bdcf5a5b0..2d08ec1 100644 --- a/chrome/browser/ui/views/chrome_views_delegate.h +++ b/chrome/browser/ui/views/chrome_views_delegate.h
@@ -9,7 +9,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h" #include "ui/views/views_delegate.h"
diff --git a/chrome/browser/ui/views/chrome_views_delegate_chromeos.cc b/chrome/browser/ui/views/chrome_views_delegate_chromeos.cc index ef4bee22..7474b09 100644 --- a/chrome/browser/ui/views/chrome_views_delegate_chromeos.cc +++ b/chrome/browser/ui/views/chrome_views_delegate_chromeos.cc
@@ -6,7 +6,7 @@ #include "ash/public/cpp/accelerators.h" #include "ash/shell.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/current_thread.h" #include "base/task/single_thread_task_runner.h" #include "chrome/browser/ui/ash/capture_mode/chrome_capture_mode_delegate.h"
diff --git a/chrome/browser/ui/views/chrome_views_delegate_win.cc b/chrome/browser/ui/views/chrome_views_delegate_win.cc index 1eb66e7..04d5904 100644 --- a/chrome/browser/ui/views/chrome_views_delegate_win.cc +++ b/chrome/browser/ui/views/chrome_views_delegate_win.cc
@@ -9,7 +9,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.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/commander_frontend_views.cc b/chrome/browser/ui/views/commander_frontend_views.cc index cb364ba..734759e 100644 --- a/chrome/browser/ui/views/commander_frontend_views.cc +++ b/chrome/browser/ui/views/commander_frontend_views.cc
@@ -6,8 +6,8 @@ #include <tuple> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/ui/views/commerce/ntp_discount_consent_dialog_view.cc b/chrome/browser/ui/views/commerce/ntp_discount_consent_dialog_view.cc index f118dd68..ef125aef 100644 --- a/chrome/browser/ui/views/commerce/ntp_discount_consent_dialog_view.cc +++ b/chrome/browser/ui/views/commerce/ntp_discount_consent_dialog_view.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/commerce/ntp_discount_consent_dialog_view.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "chrome/browser/cart/chrome_cart.mojom.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h"
diff --git a/chrome/browser/ui/views/commerce/ntp_discount_consent_dialog_view.h b/chrome/browser/ui/views/commerce/ntp_discount_consent_dialog_view.h index 04ece69..7892c614 100644 --- a/chrome/browser/ui/views/commerce/ntp_discount_consent_dialog_view.h +++ b/chrome/browser/ui/views/commerce/ntp_discount_consent_dialog_view.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_COMMERCE_NTP_DISCOUNT_CONSENT_DIALOG_VIEW_H_ #define CHROME_BROWSER_UI_VIEWS_COMMERCE_NTP_DISCOUNT_CONSENT_DIALOG_VIEW_H_ -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "chrome/browser/cart/chrome_cart.mojom.h" #include "ui/views/window/dialog_delegate.h"
diff --git a/chrome/browser/ui/views/commerce/price_tracking_icon_view_integration_test.cc b/chrome/browser/ui/views/commerce/price_tracking_icon_view_integration_test.cc index 14267f9b..2cd7c79 100644 --- a/chrome/browser/ui/views/commerce/price_tracking_icon_view_integration_test.cc +++ b/chrome/browser/ui/views/commerce/price_tracking_icon_view_integration_test.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/test/metrics/user_action_tester.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/bookmarks/managed_bookmark_service_factory.h"
diff --git a/chrome/browser/ui/views/controls/hover_button.cc b/chrome/browser/ui/views/controls/hover_button.cc index 11f865a..eaf0f91 100644 --- a/chrome/browser/ui/views/controls/hover_button.cc +++ b/chrome/browser/ui/views/controls/hover_button.cc
@@ -6,7 +6,7 @@ #include <algorithm> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/views/create_application_shortcut_view.cc b/chrome/browser/ui/views/create_application_shortcut_view.cc index a6a6e43..cc577c0 100644 --- a/chrome/browser/ui/views/create_application_shortcut_view.cc +++ b/chrome/browser/ui/views/create_application_shortcut_view.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "build/build_config.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/views/chrome_layout_provider.h"
diff --git a/chrome/browser/ui/views/create_application_shortcut_view.h b/chrome/browser/ui/views/create_application_shortcut_view.h index 1f9d589..df40729a 100644 --- a/chrome/browser/ui/views/create_application_shortcut_view.h +++ b/chrome/browser/ui/views/create_application_shortcut_view.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/web_applications/os_integration/web_app_shortcut.h"
diff --git a/chrome/browser/ui/views/create_application_shortcut_view_browsertest.cc b/chrome/browser/ui/views/create_application_shortcut_view_browsertest.cc index 85c22723..c601ec4 100644 --- a/chrome/browser/ui/views/create_application_shortcut_view_browsertest.cc +++ b/chrome/browser/ui/views/create_application_shortcut_view_browsertest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/create_application_shortcut_view.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h"
diff --git a/chrome/browser/ui/views/crostini/crostini_ansible_software_config_view.cc b/chrome/browser/ui/views/crostini/crostini_ansible_software_config_view.cc index fa44791e..ec1aaea 100644 --- a/chrome/browser/ui/views/crostini/crostini_ansible_software_config_view.cc +++ b/chrome/browser/ui/views/crostini/crostini_ansible_software_config_view.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/crostini/crostini_ansible_software_config_view.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/ash/crostini/crostini_pref_names.h"
diff --git a/chrome/browser/ui/views/crostini/crostini_ansible_software_config_view_browsertest.cc b/chrome/browser/ui/views/crostini/crostini_ansible_software_config_view_browsertest.cc index c47f8995..ab6bd338 100644 --- a/chrome/browser/ui/views/crostini/crostini_ansible_software_config_view_browsertest.cc +++ b/chrome/browser/ui/views/crostini/crostini_ansible_software_config_view_browsertest.cc
@@ -6,7 +6,7 @@ #include <string> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/strings/utf_string_conversions.h" #include "base/task/thread_pool.h" #include "base/test/bind.h"
diff --git a/chrome/browser/ui/views/crostini/crostini_force_close_view.h b/chrome/browser/ui/views/crostini/crostini_force_close_view.h index bbe57419..6c2341be 100644 --- a/chrome/browser/ui/views/crostini/crostini_force_close_view.h +++ b/chrome/browser/ui/views/crostini/crostini_force_close_view.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_CROSTINI_CROSTINI_FORCE_CLOSE_VIEW_H_ #define CHROME_BROWSER_UI_VIEWS_CROSTINI_CROSTINI_FORCE_CLOSE_VIEW_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "ui/base/metadata/metadata_header_macros.h" #include "ui/base/ui_base_types.h" #include "ui/gfx/geometry/size.h"
diff --git a/chrome/browser/ui/views/crostini/crostini_force_close_view_browsertest.cc b/chrome/browser/ui/views/crostini/crostini_force_close_view_browsertest.cc index 6180b15..94b4a72 100644 --- a/chrome/browser/ui/views/crostini/crostini_force_close_view_browsertest.cc +++ b/chrome/browser/ui/views/crostini/crostini_force_close_view_browsertest.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/weak_ptr.h" #include "base/run_loop.h" #include "chrome/browser/ui/views/crostini/crostini_dialogue_browser_test_util.h"
diff --git a/chrome/browser/ui/views/crostini/crostini_recovery_view_browsertest.cc b/chrome/browser/ui/views/crostini/crostini_recovery_view_browsertest.cc index 6abcb6b..be4e968 100644 --- a/chrome/browser/ui/views/crostini/crostini_recovery_view_browsertest.cc +++ b/chrome/browser/ui/views/crostini/crostini_recovery_view_browsertest.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ui/views/crostini/crostini_recovery_view.h" -#include "base/callback_helpers.h" #include "base/feature_list.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/histogram_base.h" #include "base/run_loop.h" #include "base/test/metrics/histogram_tester.h"
diff --git a/chrome/browser/ui/views/crostini/crostini_uninstaller_view.cc b/chrome/browser/ui/views/crostini/crostini_uninstaller_view.cc index 283a503..841b246 100644 --- a/chrome/browser/ui/views/crostini/crostini_uninstaller_view.cc +++ b/chrome/browser/ui/views/crostini/crostini_uninstaller_view.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/crostini/crostini_uninstaller_view.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/ash/crostini/crostini_features.h"
diff --git a/chrome/browser/ui/views/crostini/crostini_uninstaller_view.h b/chrome/browser/ui/views/crostini/crostini_uninstaller_view.h index ba370710..2158b467 100644 --- a/chrome/browser/ui/views/crostini/crostini_uninstaller_view.h +++ b/chrome/browser/ui/views/crostini/crostini_uninstaller_view.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_CROSTINI_CROSTINI_UNINSTALLER_VIEW_H_ #define CHROME_BROWSER_UI_VIEWS_CROSTINI_CROSTINI_UNINSTALLER_VIEW_H_ -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.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/crostini/crostini_update_filesystem_view.cc b/chrome/browser/ui/views/crostini/crostini_update_filesystem_view.cc index 7237abf..1399581 100644 --- a/chrome/browser/ui/views/crostini/crostini_update_filesystem_view.cc +++ b/chrome/browser/ui/views/crostini/crostini_update_filesystem_view.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/crostini/crostini_update_filesystem_view.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/ash/crostini/crostini_features.h"
diff --git a/chrome/browser/ui/views/crostini/crostini_update_filesystem_view_browsertest.cc b/chrome/browser/ui/views/crostini/crostini_update_filesystem_view_browsertest.cc index 9e2b542c..19a8ee47 100644 --- a/chrome/browser/ui/views/crostini/crostini_update_filesystem_view_browsertest.cc +++ b/chrome/browser/ui/views/crostini/crostini_update_filesystem_view_browsertest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/crostini/crostini_update_filesystem_view.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/histogram_base.h" #include "base/run_loop.h" #include "base/test/metrics/histogram_tester.h"
diff --git a/chrome/browser/ui/views/crypto_module_password_dialog_view_browsertest.cc b/chrome/browser/ui/views/crypto_module_password_dialog_view_browsertest.cc index b346488..54064fc 100644 --- a/chrome/browser/ui/views/crypto_module_password_dialog_view_browsertest.cc +++ b/chrome/browser/ui/views/crypto_module_password_dialog_view_browsertest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/crypto_module_password_dialog_view.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/test/test_browser_dialog.h"
diff --git a/chrome/browser/ui/views/desktop_capture/desktop_media_picker_views.cc b/chrome/browser/ui/views/desktop_capture/desktop_media_picker_views.cc index 8c8b4bd..9549326 100644 --- a/chrome/browser/ui/views/desktop_capture/desktop_media_picker_views.cc +++ b/chrome/browser/ui/views/desktop_capture/desktop_media_picker_views.cc
@@ -7,10 +7,10 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/metrics/histogram_functions.h" #include "base/ranges/algorithm.h" #include "build/build_config.h"
diff --git a/chrome/browser/ui/views/desktop_capture/desktop_media_picker_views_browsertest.cc b/chrome/browser/ui/views/desktop_capture/desktop_media_picker_views_browsertest.cc index 53bda127..1e18016 100644 --- a/chrome/browser/ui/views/desktop_capture/desktop_media_picker_views_browsertest.cc +++ b/chrome/browser/ui/views/desktop_capture/desktop_media_picker_views_browsertest.cc
@@ -7,7 +7,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/strings/utf_string_conversions.h" #include "base/test/bind.h" #include "build/build_config.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 37fd534..130ce44d 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
@@ -9,8 +9,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/strings/strcat.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/views/device_chooser_content_view.cc b/chrome/browser/ui/views/device_chooser_content_view.cc index c2c41b4..db0c241a 100644 --- a/chrome/browser/ui/views/device_chooser_content_view.cc +++ b/chrome/browser/ui/views/device_chooser_content_view.cc
@@ -6,7 +6,7 @@ #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/numerics/safe_conversions.h" #include "base/strings/strcat.h" #include "chrome/browser/ui/views/chrome_layout_provider.h"
diff --git a/chrome/browser/ui/views/download/bubble/download_bubble_row_view.cc b/chrome/browser/ui/views/download/bubble/download_bubble_row_view.cc index c236a77..d5bec54 100644 --- a/chrome/browser/ui/views/download/bubble/download_bubble_row_view.cc +++ b/chrome/browser/ui/views/download/bubble/download_bubble_row_view.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ui/views/download/bubble/download_bubble_row_view.h" -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/metrics/histogram_functions.h" #include "base/time/time.h" #include "chrome/app/chrome_command_ids.h"
diff --git a/chrome/browser/ui/views/download/bubble/download_toolbar_button_view.cc b/chrome/browser/ui/views/download/bubble/download_toolbar_button_view.cc index ae97990..e448349 100644 --- a/chrome/browser/ui/views/download/bubble/download_toolbar_button_view.cc +++ b/chrome/browser/ui/views/download/bubble/download_toolbar_button_view.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/download/bubble/download_toolbar_button_view.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/app/vector_icons/vector_icons.h" #include "chrome/browser/download/bubble/download_bubble_controller.h" #include "chrome/browser/download/bubble/download_display_controller.h"
diff --git a/chrome/browser/ui/views/download/download_item_view.cc b/chrome/browser/ui/views/download/download_item_view.cc index 1aece888..0764829 100644 --- a/chrome/browser/ui/views/download/download_item_view.cc +++ b/chrome/browser/ui/views/download/download_item_view.cc
@@ -13,10 +13,10 @@ #include <numeric> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/fixed_flat_map.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/metrics/histogram_functions.h"
diff --git a/chrome/browser/ui/views/download/download_shelf_context_menu_view.cc b/chrome/browser/ui/views/download/download_shelf_context_menu_view.cc index fe6a6e60..dfc7502 100644 --- a/chrome/browser/ui/views/download/download_shelf_context_menu_view.cc +++ b/chrome/browser/ui/views/download/download_shelf_context_menu_view.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ui/views/download/download_shelf_context_menu_view.h" -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/i18n/rtl.h" #include "base/metrics/histogram_functions.h" #include "chrome/browser/download/bubble/download_bubble_controller.h"
diff --git a/chrome/browser/ui/views/drag_and_drop_interactive_uitest.cc b/chrome/browser/ui/views/drag_and_drop_interactive_uitest.cc index 9a991ae..02d3723 100644 --- a/chrome/browser/ui/views/drag_and_drop_interactive_uitest.cc +++ b/chrome/browser/ui/views/drag_and_drop_interactive_uitest.cc
@@ -9,10 +9,10 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h"
diff --git a/chrome/browser/ui/views/elevation_icon_setter.cc b/chrome/browser/ui/views/elevation_icon_setter.cc index e784de7..0321891 100644 --- a/chrome/browser/ui/views/elevation_icon_setter.cc +++ b/chrome/browser/ui/views/elevation_icon_setter.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ui/views/elevation_icon_setter.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.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/elevation_icon_setter.h b/chrome/browser/ui/views/elevation_icon_setter.h index 1d68eb73..79ea5dc 100644 --- a/chrome/browser/ui/views/elevation_icon_setter.h +++ b/chrome/browser/ui/views/elevation_icon_setter.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_ELEVATION_ICON_SETTER_H_ #define CHROME_BROWSER_UI_VIEWS_ELEVATION_ICON_SETTER_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/ui/views/extensions/extension_dialog.cc b/chrome/browser/ui/views/extensions/extension_dialog.cc index 0793a215..45812bfd 100644 --- a/chrome/browser/ui/views/extensions/extension_dialog.cc +++ b/chrome/browser/ui/views/extensions/extension_dialog.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "build/chromeos_buildflags.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/extension_view_host.h"
diff --git a/chrome/browser/ui/views/extensions/extension_install_blocked_dialog_view_browsertest.cc b/chrome/browser/ui/views/extensions/extension_install_blocked_dialog_view_browsertest.cc index e2120b1..60ab4bcc7 100644 --- a/chrome/browser/ui/views/extensions/extension_install_blocked_dialog_view_browsertest.cc +++ b/chrome/browser/ui/views/extensions/extension_install_blocked_dialog_view_browsertest.cc
@@ -4,7 +4,7 @@ #include <string> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/extensions/extensions_dialogs.h"
diff --git a/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc b/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc index e8376c0..92d593e 100644 --- a/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc +++ b/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc
@@ -7,7 +7,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/i18n/message_formatter.h" #include "base/memory/raw_ptr.h" #include "base/metrics/histogram_functions.h"
diff --git a/chrome/browser/ui/views/extensions/extension_install_dialog_view_browsertest.cc b/chrome/browser/ui/views/extensions/extension_install_dialog_view_browsertest.cc index 58c1b65..6c3ff661 100644 --- a/chrome/browser/ui/views/extensions/extension_install_dialog_view_browsertest.cc +++ b/chrome/browser/ui/views/extensions/extension_install_dialog_view_browsertest.cc
@@ -7,9 +7,9 @@ #include <string> #include <utility> -#include "base/callback_helpers.h" #include "base/feature_list.h" #include "base/files/file_path.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/path_service.h" #include "base/run_loop.h"
diff --git a/chrome/browser/ui/views/extensions/extension_install_friction_dialog_view.cc b/chrome/browser/ui/views/extensions/extension_install_friction_dialog_view.cc index 97be8dac..9adf079f 100644 --- a/chrome/browser/ui/views/extensions/extension_install_friction_dialog_view.cc +++ b/chrome/browser/ui/views/extensions/extension_install_friction_dialog_view.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/extensions/extension_install_friction_dialog_view.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/metrics/histogram_functions.h" #include "base/strings/strcat.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/ui/views/extensions/extension_install_friction_dialog_view.h b/chrome/browser/ui/views/extensions/extension_install_friction_dialog_view.h index 00e9f15c..00da7bb 100644 --- a/chrome/browser/ui/views/extensions/extension_install_friction_dialog_view.h +++ b/chrome/browser/ui/views/extensions/extension_install_friction_dialog_view.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_EXTENSIONS_EXTENSION_INSTALL_FRICTION_DIALOG_VIEW_H_ #define CHROME_BROWSER_UI_VIEWS_EXTENSIONS_EXTENSION_INSTALL_FRICTION_DIALOG_VIEW_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "ui/base/metadata/metadata_header_macros.h"
diff --git a/chrome/browser/ui/views/extensions/extension_install_friction_dialog_view_browsertest.cc b/chrome/browser/ui/views/extensions/extension_install_friction_dialog_view_browsertest.cc index 493d670..cfb5fe0d 100644 --- a/chrome/browser/ui/views/extensions/extension_install_friction_dialog_view_browsertest.cc +++ b/chrome/browser/ui/views/extensions/extension_install_friction_dialog_view_browsertest.cc
@@ -6,7 +6,7 @@ #include "chrome/browser/ui/views/extensions/extension_install_friction_dialog_view.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/platform_util.h"
diff --git a/chrome/browser/ui/views/extensions/extension_popup.cc b/chrome/browser/ui/views/extensions/extension_popup.cc index 6c44e2b..9937d18 100644 --- a/chrome/browser/ui/views/extensions/extension_popup.cc +++ b/chrome/browser/ui/views/extensions/extension_popup.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ui/views/extensions/extension_popup.h" -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/devtools/devtools_window.h" #include "chrome/browser/extensions/extension_view_host.h"
diff --git a/chrome/browser/ui/views/extensions/extension_popup.h b/chrome/browser/ui/views/extensions/extension_popup.h index 1b22c768..e19cef6 100644 --- a/chrome/browser/ui/views/extensions/extension_popup.h +++ b/chrome/browser/ui/views/extensions/extension_popup.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_EXTENSIONS_EXTENSION_POPUP_H_ #define CHROME_BROWSER_UI_VIEWS_EXTENSIONS_EXTENSION_POPUP_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/scoped_observation.h" #include "chrome/browser/ui/extensions/extension_popup_types.h"
diff --git a/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc b/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc index 64047589..4803d67 100644 --- a/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc +++ b/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view.cc
@@ -5,7 +5,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/extensions/extension_uninstall_dialog.h" #include "chrome/browser/ui/views/extensions/extensions_dialogs_utils.h"
diff --git a/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view_browsertest.cc b/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view_browsertest.cc index 793aa59..849bee83 100644 --- a/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view_browsertest.cc +++ b/chrome/browser/ui/views/extensions/extension_uninstall_dialog_view_browsertest.cc
@@ -4,7 +4,7 @@ #include <memory> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "chrome/browser/extensions/browsertest_util.h" #include "chrome/browser/extensions/extension_service.h"
diff --git a/chrome/browser/ui/views/extensions/extensions_menu_button.cc b/chrome/browser/ui/views/extensions/extensions_menu_button.cc index dbcb673..3b18015 100644 --- a/chrome/browser/ui/views/extensions/extensions_menu_button.cc +++ b/chrome/browser/ui/views/extensions/extensions_menu_button.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/extensions/extensions_menu_button.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/user_metrics.h" #include "base/metrics/user_metrics_action.h" #include "chrome/browser/ui/toolbar/toolbar_action_view_controller.h"
diff --git a/chrome/browser/ui/views/extensions/extensions_menu_item_view.cc b/chrome/browser/ui/views/extensions/extensions_menu_item_view.cc index 55d2f0d9..b3fdeab 100644 --- a/chrome/browser/ui/views/extensions/extensions_menu_item_view.cc +++ b/chrome/browser/ui/views/extensions/extensions_menu_item_view.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/user_metrics.h" #include "base/metrics/user_metrics_action.h" #include "chrome/app/vector_icons/vector_icons.h"
diff --git a/chrome/browser/ui/views/extensions/extensions_request_access_button.cc b/chrome/browser/ui/views/extensions/extensions_request_access_button.cc index d93b52d1..61703bd1 100644 --- a/chrome/browser/ui/views/extensions/extensions_request_access_button.cc +++ b/chrome/browser/ui/views/extensions/extensions_request_access_button.cc
@@ -8,8 +8,8 @@ #include <iterator> #include <memory> -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/metrics/user_metrics.h" #include "base/metrics/user_metrics_action.h" #include "chrome/browser/extensions/extension_action_runner.h"
diff --git a/chrome/browser/ui/views/extensions/extensions_request_access_button_hover_card.cc b/chrome/browser/ui/views/extensions/extensions_request_access_button_hover_card.cc index fcf378a..9636aad 100644 --- a/chrome/browser/ui/views/extensions/extensions_request_access_button_hover_card.cc +++ b/chrome/browser/ui/views/extensions/extensions_request_access_button_hover_card.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/extensions/extensions_request_access_button_hover_card.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/ui/toolbar/toolbar_action_view_controller.h" #include "chrome/browser/ui/views/chrome_widget_sublevel.h" #include "chrome/browser/ui/views/extensions/extensions_dialogs_utils.h"
diff --git a/chrome/browser/ui/views/extensions/extensions_tabbed_menu_view.cc b/chrome/browser/ui/views/extensions/extensions_tabbed_menu_view.cc index a28a21a0..2efb708d 100644 --- a/chrome/browser/ui/views/extensions/extensions_tabbed_menu_view.cc +++ b/chrome/browser/ui/views/extensions/extensions_tabbed_menu_view.cc
@@ -7,9 +7,9 @@ #include <memory> #include <string> -#include "base/bind.h" #include "base/check.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/i18n/case_conversion.h" #include "base/notreached.h" #include "base/ranges/algorithm.h"
diff --git a/chrome/browser/ui/views/extensions/extensions_toolbar_container.cc b/chrome/browser/ui/views/extensions/extensions_toolbar_container.cc index d0b2bd1..3615f13 100644 --- a/chrome/browser/ui/views/extensions/extensions_toolbar_container.cc +++ b/chrome/browser/ui/views/extensions/extensions_toolbar_container.cc
@@ -6,10 +6,10 @@ #include <memory> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/cxx17_backports.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/no_destructor.h" #include "base/ranges/algorithm.h" #include "build/build_config.h"
diff --git a/chrome/browser/ui/views/extensions/extensions_toolbar_container.h b/chrome/browser/ui/views/extensions/extensions_toolbar_container.h index 5c837695..2cbda5ac 100644 --- a/chrome/browser/ui/views/extensions/extensions_toolbar_container.h +++ b/chrome/browser/ui/views/extensions/extensions_toolbar_container.h
@@ -11,7 +11,7 @@ #include <string> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/scoped_observation.h" #include "chrome/browser/ui/extensions/extensions_container.h"
diff --git a/chrome/browser/ui/views/extensions/media_galleries_dialog_views.cc b/chrome/browser/ui/views/extensions/media_galleries_dialog_views.cc index f2fd79d..2a7433a 100644 --- a/chrome/browser/ui/views/extensions/media_galleries_dialog_views.cc +++ b/chrome/browser/ui/views/extensions/media_galleries_dialog_views.cc
@@ -6,7 +6,7 @@ #include <stddef.h> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h" #include "chrome/browser/ui/views/chrome_layout_provider.h"
diff --git a/chrome/browser/ui/views/extensions/print_job_confirmation_dialog.cc b/chrome/browser/ui/views/extensions/print_job_confirmation_dialog.cc index afbc647c..b11af023 100644 --- a/chrome/browser/ui/views/extensions/print_job_confirmation_dialog.cc +++ b/chrome/browser/ui/views/extensions/print_job_confirmation_dialog.cc
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/bind.h" -#include "base/callback_forward.h" +#include "base/functional/bind.h" +#include "base/functional/callback_forward.h" #include "chrome/browser/ui/views/extensions/extensions_dialogs_utils.h" #include "chrome/grit/generated_resources.h" #include "extensions/common/constants.h"
diff --git a/chrome/browser/ui/views/extensions/reload_page_dialog.cc b/chrome/browser/ui/views/extensions/reload_page_dialog.cc index 42b3bc2..3fc8a82 100644 --- a/chrome/browser/ui/views/extensions/reload_page_dialog.cc +++ b/chrome/browser/ui/views/extensions/reload_page_dialog.cc
@@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/bind.h" -#include "base/callback_forward.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback_forward.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/toolbar/toolbar_action_view_controller.h" #include "chrome/browser/ui/views/extensions/extensions_dialogs_utils.h"
diff --git a/chrome/browser/ui/views/extensions/request_file_system_dialog_browsertest.cc b/chrome/browser/ui/views/extensions/request_file_system_dialog_browsertest.cc index 0a3044f5..990db9d 100644 --- a/chrome/browser/ui/views/extensions/request_file_system_dialog_browsertest.cc +++ b/chrome/browser/ui/views/extensions/request_file_system_dialog_browsertest.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 "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_dialogs.h" #include "chrome/browser/ui/tabs/tab_strip_model.h"
diff --git a/chrome/browser/ui/views/extensions/request_file_system_dialog_view.h b/chrome/browser/ui/views/extensions/request_file_system_dialog_view.h index e8f1bbf..9538e925 100644 --- a/chrome/browser/ui/views/extensions/request_file_system_dialog_view.h +++ b/chrome/browser/ui/views/extensions/request_file_system_dialog_view.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "ui/base/metadata/metadata_header_macros.h" #include "ui/base/ui_base_types.h" #include "ui/views/window/dialog_delegate.h"
diff --git a/chrome/browser/ui/views/extensions/site_settings_expand_button.cc b/chrome/browser/ui/views/extensions/site_settings_expand_button.cc index abe769b..6ffc731 100644 --- a/chrome/browser/ui/views/extensions/site_settings_expand_button.cc +++ b/chrome/browser/ui/views/extensions/site_settings_expand_button.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/app/vector_icons/vector_icons.h" #include "chrome/browser/ui/views/chrome_layout_provider.h" #include "chrome/grit/generated_resources.h"
diff --git a/chrome/browser/ui/views/first_run_dialog.cc b/chrome/browser/ui/views/first_run_dialog.cc index 45ec09a..47e05091 100644 --- a/chrome/browser/ui/views/first_run_dialog.cc +++ b/chrome/browser/ui/views/first_run_dialog.cc
@@ -6,7 +6,7 @@ #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/ui/views/first_run_dialog.h b/chrome/browser/ui/views/first_run_dialog.h index 7df68ed9..1795411 100644 --- a/chrome/browser/ui/views/first_run_dialog.h +++ b/chrome/browser/ui/views/first_run_dialog.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_FIRST_RUN_DIALOG_H_ #define CHROME_BROWSER_UI_VIEWS_FIRST_RUN_DIALOG_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "ui/base/metadata/metadata_header_macros.h" #include "ui/views/window/dialog_delegate.h"
diff --git a/chrome/browser/ui/views/first_run_dialog_browsertest.cc b/chrome/browser/ui/views/first_run_dialog_browsertest.cc index 33f01e6..f446984 100644 --- a/chrome/browser/ui/views/first_run_dialog_browsertest.cc +++ b/chrome/browser/ui/views/first_run_dialog_browsertest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/first_run_dialog.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "chrome/browser/ui/test/test_browser_dialog.h" #include "content/public/test/browser_test.h"
diff --git a/chrome/browser/ui/views/flying_indicator.h b/chrome/browser/ui/views/flying_indicator.h index 73dc000a..6cda671 100644 --- a/chrome/browser/ui/views/flying_indicator.h +++ b/chrome/browser/ui/views/flying_indicator.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_FLYING_INDICATOR_H_ #define CHROME_BROWSER_UI_VIEWS_FLYING_INDICATOR_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/scoped_observation.h" #include "ui/gfx/animation/animation_delegate.h"
diff --git a/chrome/browser/ui/views/folder_upload_confirmation_view_browsertest.cc b/chrome/browser/ui/views/folder_upload_confirmation_view_browsertest.cc index e9c6612..5538c3f 100644 --- a/chrome/browser/ui/views/folder_upload_confirmation_view_browsertest.cc +++ b/chrome/browser/ui/views/folder_upload_confirmation_view_browsertest.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ui/views/folder_upload_confirmation_view.h" -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/browser.h"
diff --git a/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_win.cc b/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_win.cc index 1e6cb8b0..4f11e08 100644 --- a/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_win.cc +++ b/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_win.cc
@@ -12,8 +12,8 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted_delete_on_sequence.h" #include "base/process/process_handle.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/views/frame/browser_frame.cc b/chrome/browser/ui/views/frame/browser_frame.cc index 59f895b5..f30c6d5 100644 --- a/chrome/browser/ui/views/frame/browser_frame.cc +++ b/chrome/browser/ui/views/frame/browser_frame.cc
@@ -7,9 +7,9 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/command_line.h" #include "base/debug/leak_annotations.h" +#include "base/functional/bind.h" #include "base/i18n/rtl.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/ui/views/frame/browser_frame_header_chromeos.h b/chrome/browser/ui/views/frame/browser_frame_header_chromeos.h index 4a5e160..2a55ec72 100644 --- a/chrome/browser/ui/views/frame/browser_frame_header_chromeos.h +++ b/chrome/browser/ui/views/frame/browser_frame_header_chromeos.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_HEADER_CHROMEOS_H_ #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_HEADER_CHROMEOS_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "chromeos/ui/frame/frame_header.h" #include "ui/gfx/image/image_skia.h"
diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view_chromeos_browsertest.cc b/chrome/browser/ui/views/frame/browser_non_client_frame_view_chromeos_browsertest.cc index eadc1645..03a8240 100644 --- a/chrome/browser/ui/views/frame/browser_non_client_frame_view_chromeos_browsertest.cc +++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view_chromeos_browsertest.cc
@@ -42,7 +42,7 @@ #include "ash/shell.h" #include "ash/wm/overview/overview_controller.h" #include "ash/wm/tablet_mode/tablet_mode_controller.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/ranges/algorithm.h" #include "base/run_loop.h" #include "base/scoped_observation.h"
diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view_mac.mm b/chrome/browser/ui/views/frame/browser_non_client_frame_view_mac.mm index 4afe3bf..a861357 100644 --- a/chrome/browser/ui/views/frame/browser_non_client_frame_view_mac.mm +++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view_mac.mm
@@ -4,9 +4,9 @@ #include "chrome/browser/ui/views/frame/browser_non_client_frame_view_mac.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/containers/fixed_flat_map.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "base/numerics/safe_conversions.h" #include "chrome/browser/themes/theme_properties.h"
diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view_unittest.cc b/chrome/browser/ui/views/frame/browser_non_client_frame_view_unittest.cc index fe3e6e0..395176bc 100644 --- a/chrome/browser/ui/views/frame/browser_non_client_frame_view_unittest.cc +++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view_unittest.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/ui/views/frame/browser_root_view.cc b/chrome/browser/ui/views/frame/browser_root_view.cc index fee9018..15ce1bd 100644 --- a/chrome/browser/ui/views/frame/browser_root_view.cc +++ b/chrome/browser/ui/views/frame/browser_root_view.cc
@@ -9,8 +9,8 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/user_metrics.h" #include "base/task/thread_pool.h" #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h"
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc index d87f3e9..8e8aa983 100644 --- a/chrome/browser/ui/views/frame/browser_view.cc +++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -11,7 +11,6 @@ #include <utility> #include "base/auto_reset.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/containers/contains.h" #include "base/containers/flat_set.h"
diff --git a/chrome/browser/ui/views/frame/browser_window_property_manager_win.cc b/chrome/browser/ui/views/frame/browser_window_property_manager_win.cc index 04843052..1a62480 100644 --- a/chrome/browser/ui/views/frame/browser_window_property_manager_win.cc +++ b/chrome/browser/ui/views/frame/browser_window_property_manager_win.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ui/views/frame/browser_window_property_manager_win.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "base/win/windows_version.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/ui/views/frame/dbus_appmenu.cc b/chrome/browser/ui/views/frame/dbus_appmenu.cc index eae32bc..126c519 100644 --- a/chrome/browser/ui/views/frame/dbus_appmenu.cc +++ b/chrome/browser/ui/views/frame/dbus_appmenu.cc
@@ -12,10 +12,10 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/check_op.h" #include "base/containers/contains.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/views/frame/dbus_appmenu_registrar.cc b/chrome/browser/ui/views/frame/dbus_appmenu_registrar.cc index 40d3f88..7d4f30b 100644 --- a/chrome/browser/ui/views/frame/dbus_appmenu_registrar.cc +++ b/chrome/browser/ui/views/frame/dbus_appmenu_registrar.cc
@@ -4,10 +4,10 @@ #include "chrome/browser/ui/views/frame/dbus_appmenu_registrar.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check_op.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/no_destructor.h" #include "base/notreached.h" #include "chrome/browser/ui/views/frame/dbus_appmenu.h"
diff --git a/chrome/browser/ui/views/frame/desktop_browser_frame_aura_linux.cc b/chrome/browser/ui/views/frame/desktop_browser_frame_aura_linux.cc index 58c4cbc1..edbe89d 100644 --- a/chrome/browser/ui/views/frame/desktop_browser_frame_aura_linux.cc +++ b/chrome/browser/ui/views/frame/desktop_browser_frame_aura_linux.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ui/views/frame/desktop_browser_frame_aura_linux.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "chrome/browser/shell_integration_linux.h" #include "chrome/browser/ui/views/frame/browser_desktop_window_tree_host_linux.h" #include "chrome/browser/ui/views/frame/browser_frame.h" @@ -13,8 +13,8 @@ #include "chrome/browser/ui/views/frame/native_browser_frame_factory.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" -#include "ui/views/widget/widget.h" #include "ui/ozone/public/ozone_platform.h" +#include "ui/views/widget/widget.h" DesktopBrowserFrameAuraLinux::DesktopBrowserFrameAuraLinux( BrowserFrame* browser_frame,
diff --git a/chrome/browser/ui/views/frame/glass_browser_frame_view_browsertest_win.cc b/chrome/browser/ui/views/frame/glass_browser_frame_view_browsertest_win.cc index a463ec9..4f36605a 100644 --- a/chrome/browser/ui/views/frame/glass_browser_frame_view_browsertest_win.cc +++ b/chrome/browser/ui/views/frame/glass_browser_frame_view_browsertest_win.cc
@@ -6,8 +6,8 @@ #include <tuple> -#include "base/bind.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/test/bind.h" #include "base/test/test_future.h"
diff --git a/chrome/browser/ui/views/frame/tab_strip_region_view.cc b/chrome/browser/ui/views/frame/tab_strip_region_view.cc index 22f6912..4b7cdb5 100644 --- a/chrome/browser/ui/views/frame/tab_strip_region_view.cc +++ b/chrome/browser/ui/views/frame/tab_strip_region_view.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/frame/tab_strip_region_view.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h" #include "chrome/browser/themes/theme_properties.h"
diff --git a/chrome/browser/ui/views/frame/test_with_browser_view.cc b/chrome/browser/ui/views/frame/test_with_browser_view.cc index 9c54b895..ce4d935 100644 --- a/chrome/browser/ui/views/frame/test_with_browser_view.cc +++ b/chrome/browser/ui/views/frame/test_with_browser_view.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/threading/sequenced_task_runner_handle.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/ui/views/frame/top_controls_slide_controller_chromeos.cc b/chrome/browser/ui/views/frame/top_controls_slide_controller_chromeos.cc index 9bcfa64..f97d47a 100644 --- a/chrome/browser/ui/views/frame/top_controls_slide_controller_chromeos.cc +++ b/chrome/browser/ui/views/frame/top_controls_slide_controller_chromeos.cc
@@ -7,7 +7,7 @@ #include <vector> #include "base/auto_reset.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "cc/input/browser_controls_state.h" #include "chrome/browser/search/search.h"
diff --git a/chrome/browser/ui/views/frame/top_controls_slide_controller_chromeos_browsertest.cc b/chrome/browser/ui/views/frame/top_controls_slide_controller_chromeos_browsertest.cc index 87f5100a..817d8a9 100644 --- a/chrome/browser/ui/views/frame/top_controls_slide_controller_chromeos_browsertest.cc +++ b/chrome/browser/ui/views/frame/top_controls_slide_controller_chromeos_browsertest.cc
@@ -13,9 +13,9 @@ #include "ash/public/ash_interfaces.h" #include "ash/public/cpp/tablet_mode.h" #include "ash/public/cpp/test/shell_test_api.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/path_service.h" #include "base/strings/safe_sprintf.h" #include "build/build_config.h"
diff --git a/chrome/browser/ui/views/frame/webui_tab_strip_container_view_unittest.cc b/chrome/browser/ui/views/frame/webui_tab_strip_container_view_unittest.cc index a6e9cb0..d2269f6 100644 --- a/chrome/browser/ui/views/frame/webui_tab_strip_container_view_unittest.cc +++ b/chrome/browser/ui/views/frame/webui_tab_strip_container_view_unittest.cc
@@ -5,7 +5,7 @@ #include "chrome/browser/ui/views/frame/webui_tab_strip_container_view.h" #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/test/scoped_feature_list.h" #include "chrome/browser/extensions/extension_tab_util.h" #include "chrome/browser/feature_engagement/tracker_factory.h"
diff --git a/chrome/browser/ui/views/frame/webui_tab_strip_interactive_uitest.cc b/chrome/browser/ui/views/frame/webui_tab_strip_interactive_uitest.cc index a46362d..54ab0dba 100644 --- a/chrome/browser/ui/views/frame/webui_tab_strip_interactive_uitest.cc +++ b/chrome/browser/ui/views/frame/webui_tab_strip_interactive_uitest.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 "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "base/strings/utf_string_conversions.h" #include "base/test/bind.h"
diff --git a/chrome/browser/ui/views/fullscreen_control/fullscreen_control_host.cc b/chrome/browser/ui/views/fullscreen_control/fullscreen_control_host.cc index 43f2da0..a623904a 100644 --- a/chrome/browser/ui/views/fullscreen_control/fullscreen_control_host.cc +++ b/chrome/browser/ui/views/fullscreen_control/fullscreen_control_host.cc
@@ -4,9 +4,9 @@ #include "chrome/browser/ui/views/fullscreen_control/fullscreen_control_host.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/time/time.h" #include "build/build_config.h" #include "chrome/browser/app_mode/app_mode_utils.h"
diff --git a/chrome/browser/ui/views/fullscreen_control/fullscreen_control_host.h b/chrome/browser/ui/views/fullscreen_control/fullscreen_control_host.h index 24ba0da..02ad9e8 100644 --- a/chrome/browser/ui/views/fullscreen_control/fullscreen_control_host.h +++ b/chrome/browser/ui/views/fullscreen_control/fullscreen_control_host.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_FULLSCREEN_CONTROL_FULLSCREEN_CONTROL_HOST_H_ #define CHROME_BROWSER_UI_VIEWS_FULLSCREEN_CONTROL_FULLSCREEN_CONTROL_HOST_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/timer/timer.h" #include "components/fullscreen_control/fullscreen_control_popup.h"
diff --git a/chrome/browser/ui/views/fullscreen_control/fullscreen_control_view_interactive_uitest.cc b/chrome/browser/ui/views/fullscreen_control/fullscreen_control_view_interactive_uitest.cc index 57dfa21..1d64485 100644 --- a/chrome/browser/ui/views/fullscreen_control/fullscreen_control_view_interactive_uitest.cc +++ b/chrome/browser/ui/views/fullscreen_control/fullscreen_control_view_interactive_uitest.cc
@@ -5,8 +5,8 @@ #include <memory> #include <utility> -#include "base/callback.h" #include "base/containers/flat_set.h" +#include "base/functional/callback.h" #include "base/task/single_thread_task_runner.h" #include "base/test/scoped_feature_list.h" #include "build/build_config.h"
diff --git a/chrome/browser/ui/views/global_error_bubble_view.cc b/chrome/browser/ui/views/global_error_bubble_view.cc index a06462f..698666d 100644 --- a/chrome/browser/ui/views/global_error_bubble_view.cc +++ b/chrome/browser/ui/views/global_error_bubble_view.cc
@@ -8,7 +8,7 @@ #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h" #include "chrome/browser/platform_util.h"
diff --git a/chrome/browser/ui/views/global_media_controls/media_dialog_ui_for_test.h b/chrome/browser/ui/views/global_media_controls/media_dialog_ui_for_test.h index 4f056026..2c9f9e1 100644 --- a/chrome/browser/ui/views/global_media_controls/media_dialog_ui_for_test.h +++ b/chrome/browser/ui/views/global_media_controls/media_dialog_ui_for_test.h
@@ -5,7 +5,7 @@ #define CHROME_BROWSER_UI_VIEWS_GLOBAL_MEDIA_CONTROLS_MEDIA_DIALOG_UI_FOR_TEST_H_ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" class Browser; class MediaToolbarButtonView;
diff --git a/chrome/browser/ui/views/global_media_controls/media_dialog_view.cc b/chrome/browser/ui/views/global_media_controls/media_dialog_view.cc index 2628a9e..bbcfd53c 100644 --- a/chrome/browser/ui/views/global_media_controls/media_dialog_view.cc +++ b/chrome/browser/ui/views/global_media_controls/media_dialog_view.cc
@@ -8,7 +8,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "base/observer_list.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/views/global_media_controls/media_dialog_view_interactive_browsertest.cc b/chrome/browser/ui/views/global_media_controls/media_dialog_view_interactive_browsertest.cc index 3dc5aae0..5d4df44 100644 --- a/chrome/browser/ui/views/global_media_controls/media_dialog_view_interactive_browsertest.cc +++ b/chrome/browser/ui/views/global_media_controls/media_dialog_view_interactive_browsertest.cc
@@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/cxx20_erase.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/path_service.h" #include "base/run_loop.h"
diff --git a/chrome/browser/ui/views/global_media_controls/media_item_ui_device_selector_view.cc b/chrome/browser/ui/views/global_media_controls/media_item_ui_device_selector_view.cc index dbdfa9e..34dad466 100644 --- a/chrome/browser/ui/views/global_media_controls/media_item_ui_device_selector_view.cc +++ b/chrome/browser/ui/views/global_media_controls/media_item_ui_device_selector_view.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ui/views/global_media_controls/media_item_ui_device_selector_view.h" -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "base/observer_list.h" #include "base/ranges/algorithm.h"
diff --git a/chrome/browser/ui/views/global_media_controls/media_item_ui_footer_view.h b/chrome/browser/ui/views/global_media_controls/media_item_ui_footer_view.h index 7c8cb7c7..850e80d 100644 --- a/chrome/browser/ui/views/global_media_controls/media_item_ui_footer_view.h +++ b/chrome/browser/ui/views/global_media_controls/media_item_ui_footer_view.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_GLOBAL_MEDIA_CONTROLS_MEDIA_ITEM_UI_FOOTER_VIEW_H_ #define CHROME_BROWSER_UI_VIEWS_GLOBAL_MEDIA_CONTROLS_MEDIA_ITEM_UI_FOOTER_VIEW_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/ui/views/global_media_controls/media_item_ui_device_selector_observer.h" #include "components/global_media_controls/public/views/media_item_ui_footer.h"
diff --git a/chrome/browser/ui/views/global_media_controls/media_item_ui_legacy_cast_footer_view.h b/chrome/browser/ui/views/global_media_controls/media_item_ui_legacy_cast_footer_view.h index ad23d5fe..cded6d4 100644 --- a/chrome/browser/ui/views/global_media_controls/media_item_ui_legacy_cast_footer_view.h +++ b/chrome/browser/ui/views/global_media_controls/media_item_ui_legacy_cast_footer_view.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_GLOBAL_MEDIA_CONTROLS_MEDIA_ITEM_UI_LEGACY_CAST_FOOTER_VIEW_H_ #define CHROME_BROWSER_UI_VIEWS_GLOBAL_MEDIA_CONTROLS_MEDIA_ITEM_UI_LEGACY_CAST_FOOTER_VIEW_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "components/global_media_controls/public/constants.h" #include "components/global_media_controls/public/views/media_item_ui_footer.h"
diff --git a/chrome/browser/ui/views/global_media_controls/media_notification_device_entry_ui.cc b/chrome/browser/ui/views/global_media_controls/media_notification_device_entry_ui.cc index 4c99d8b..2730cde1 100644 --- a/chrome/browser/ui/views/global_media_controls/media_notification_device_entry_ui.cc +++ b/chrome/browser/ui/views/global_media_controls/media_notification_device_entry_ui.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/global_media_controls/media_notification_device_entry_ui.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "components/vector_icons/vector_icons.h" #include "ui/base/metadata/metadata_impl_macros.h"
diff --git a/chrome/browser/ui/views/hats/hats_browsertest.cc b/chrome/browser/ui/views/hats/hats_browsertest.cc index e10b261..292f990 100644 --- a/chrome/browser/ui/views/hats/hats_browsertest.cc +++ b/chrome/browser/ui/views/hats/hats_browsertest.cc
@@ -5,9 +5,9 @@ #include <memory> #include <string> -#include "base/callback_helpers.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/callback_helpers.h" #include "base/json/values_util.h" #include "base/memory/raw_ptr.h" #include "base/path_service.h"
diff --git a/chrome/browser/ui/views/hung_renderer_view.h b/chrome/browser/ui/views/hung_renderer_view.h index 47c628e..326f0176 100644 --- a/chrome/browser/ui/views/hung_renderer_view.h +++ b/chrome/browser/ui/views/hung_renderer_view.h
@@ -8,7 +8,7 @@ #include <memory> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/scoped_observation.h" #include "components/favicon/content/content_favicon_driver.h"
diff --git a/chrome/browser/ui/views/hung_renderer_view_browsertest.cc b/chrome/browser/ui/views/hung_renderer_view_browsertest.cc index 6ab099e..86b32a7 100644 --- a/chrome/browser/ui/views/hung_renderer_view_browsertest.cc +++ b/chrome/browser/ui/views/hung_renderer_view_browsertest.cc
@@ -6,7 +6,7 @@ #include <string> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "chrome/browser/platform_util.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h"
diff --git a/chrome/browser/ui/views/importer/import_lock_dialog_view.cc b/chrome/browser/ui/views/importer/import_lock_dialog_view.cc index dba0119..d3974a7 100644 --- a/chrome/browser/ui/views/importer/import_lock_dialog_view.cc +++ b/chrome/browser/ui/views/importer/import_lock_dialog_view.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/importer/import_lock_dialog_view.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/metrics/user_metrics.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/views/importer/import_lock_dialog_view.h b/chrome/browser/ui/views/importer/import_lock_dialog_view.h index a6d5200..3406308 100644 --- a/chrome/browser/ui/views/importer/import_lock_dialog_view.h +++ b/chrome/browser/ui/views/importer/import_lock_dialog_view.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_IMPORTER_IMPORT_LOCK_DIALOG_VIEW_H_ #define CHROME_BROWSER_UI_VIEWS_IMPORTER_IMPORT_LOCK_DIALOG_VIEW_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "ui/base/metadata/metadata_header_macros.h" #include "ui/views/window/dialog_delegate.h"
diff --git a/chrome/browser/ui/views/infobars/confirm_infobar.cc b/chrome/browser/ui/views/infobars/confirm_infobar.cc index 3f1597b..cabef56 100644 --- a/chrome/browser/ui/views/infobars/confirm_infobar.cc +++ b/chrome/browser/ui/views/infobars/confirm_infobar.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "build/build_config.h" #include "chrome/browser/ui/views/chrome_layout_provider.h" #include "chrome/browser/ui/views/elevation_icon_setter.h"
diff --git a/chrome/browser/ui/views/intent_picker_bubble_view.cc b/chrome/browser/ui/views/intent_picker_bubble_view.cc index b54406b..31b81262 100644 --- a/chrome/browser/ui/views/intent_picker_bubble_view.cc +++ b/chrome/browser/ui/views/intent_picker_bubble_view.cc
@@ -7,10 +7,10 @@ #include <utility> #include "base/auto_reset.h" -#include "base/bind.h" #include "base/check_op.h" #include "base/debug/dump_without_crashing.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/i18n/rtl.h" #include "base/ranges/algorithm.h" #include "base/strings/string_piece.h"
diff --git a/chrome/browser/ui/views/intent_picker_bubble_view_browsertest.cc b/chrome/browser/ui/views/intent_picker_bubble_view_browsertest.cc index 34664c46..d2505c2f 100644 --- a/chrome/browser/ui/views/intent_picker_bubble_view_browsertest.cc +++ b/chrome/browser/ui/views/intent_picker_bubble_view_browsertest.cc
@@ -4,7 +4,7 @@ #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/test/scoped_feature_list.h" #include "build/build_config.h"
diff --git a/chrome/browser/ui/views/intent_picker_bubble_view_unittest.cc b/chrome/browser/ui/views/intent_picker_bubble_view_unittest.cc index b936547a..c55e7d4 100644 --- a/chrome/browser/ui/views/intent_picker_bubble_view_unittest.cc +++ b/chrome/browser/ui/views/intent_picker_bubble_view_unittest.cc
@@ -6,10 +6,10 @@ #include <string> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/test/scoped_feature_list.h" #include "build/build_config.h"
diff --git a/chrome/browser/ui/views/javascript_tab_modal_dialog_view_views.cc b/chrome/browser/ui/views/javascript_tab_modal_dialog_view_views.cc index c4eb85b..28f5e905 100644 --- a/chrome/browser/ui/views/javascript_tab_modal_dialog_view_views.cc +++ b/chrome/browser/ui/views/javascript_tab_modal_dialog_view_views.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/javascript_tab_modal_dialog_view_views.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/ui/javascript_dialogs/javascript_tab_modal_dialog_manager_delegate_desktop.h" #include "chrome/browser/ui/views/title_origin_label.h" #include "components/constrained_window/constrained_window_views.h"
diff --git a/chrome/browser/ui/views/javascript_tab_modal_dialog_view_views_browsertest.cc b/chrome/browser/ui/views/javascript_tab_modal_dialog_view_views_browsertest.cc index 27bb16f..7d00409 100644 --- a/chrome/browser/ui/views/javascript_tab_modal_dialog_view_views_browsertest.cc +++ b/chrome/browser/ui/views/javascript_tab_modal_dialog_view_views_browsertest.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 "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/views/javascript_tab_modal_dialog_view_views.h" #include "chrome/test/base/in_process_browser_test.h"
diff --git a/chrome/browser/ui/views/javascript_tab_modal_dialog_view_views_browsertest_mac.mm b/chrome/browser/ui/views/javascript_tab_modal_dialog_view_views_browsertest_mac.mm index 513edf17..765c8fc 100644 --- a/chrome/browser/ui/views/javascript_tab_modal_dialog_view_views_browsertest_mac.mm +++ b/chrome/browser/ui/views/javascript_tab_modal_dialog_view_views_browsertest_mac.mm
@@ -4,7 +4,7 @@ #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/views/javascript_tab_modal_dialog_view_views.h" #include "chrome/test/base/in_process_browser_test.h"
diff --git a/chrome/browser/ui/views/layout_provider_unittest.cc b/chrome/browser/ui/views/layout_provider_unittest.cc index d04c2946..b265961f 100644 --- a/chrome/browser/ui/views/layout_provider_unittest.cc +++ b/chrome/browser/ui/views/layout_provider_unittest.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 "base/callback.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h"
diff --git a/chrome/browser/ui/views/lens/lens_region_search_instructions_view.cc b/chrome/browser/ui/views/lens/lens_region_search_instructions_view.cc index 225111f3..bc50f9e 100644 --- a/chrome/browser/ui/views/lens/lens_region_search_instructions_view.cc +++ b/chrome/browser/ui/views/lens/lens_region_search_instructions_view.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/lens/lens_region_search_instructions_view.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/app/vector_icons/vector_icons.h" #include "chrome/browser/ui/color/chrome_color_id.h" #include "chrome/browser/ui/views/chrome_layout_provider.h"
diff --git a/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc b/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc index e9437b12..bc4462b 100644 --- a/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc +++ b/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc
@@ -8,7 +8,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/ui/color/chrome_color_id.h" #include "chrome/browser/ui/layout_constants.h" #include "chrome/browser/ui/omnibox/omnibox_theme.h"
diff --git a/chrome/browser/ui/views/location_bar/icon_label_bubble_view.h b/chrome/browser/ui/views/location_bar/icon_label_bubble_view.h index fafbcf3..f4b0dadf 100644 --- a/chrome/browser/ui/views/location_bar/icon_label_bubble_view.h +++ b/chrome/browser/ui/views/location_bar/icon_label_bubble_view.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/scoped_observation.h" #include "base/time/time.h"
diff --git a/chrome/browser/ui/views/location_bar/intent_chip_button.cc b/chrome/browser/ui/views/location_bar/intent_chip_button.cc index 8ebe7e2..20c9dee 100644 --- a/chrome/browser/ui/views/location_bar/intent_chip_button.cc +++ b/chrome/browser/ui/views/location_bar/intent_chip_button.cc
@@ -4,9 +4,9 @@ #include "chrome/browser/ui/views/location_bar/intent_chip_button.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "build/build_config.h" #include "chrome/browser/apps/intent_helper/intent_picker_helpers.h" #include "chrome/browser/feature_engagement/tracker_factory.h"
diff --git a/chrome/browser/ui/views/location_bar/intent_chip_button_browsertest.cc b/chrome/browser/ui/views/location_bar/intent_chip_button_browsertest.cc index db694cc..da32bce9 100644 --- a/chrome/browser/ui/views/location_bar/intent_chip_button_browsertest.cc +++ b/chrome/browser/ui/views/location_bar/intent_chip_button_browsertest.cc
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/callback.h" -#include "base/callback_forward.h" +#include "base/functional/callback.h" +#include "base/functional/callback_forward.h" #include "base/scoped_observation.h" #include "base/test/bind.h" #include "base/test/scoped_feature_list.h"
diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc index f46f5359..64c602c6 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_view.cc +++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc
@@ -9,10 +9,10 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/adapters.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/i18n/rtl.h" #include "base/metrics/field_trial_params.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/views/location_bar/location_bar_view_browsertest.cc b/chrome/browser/ui/views/location_bar/location_bar_view_browsertest.cc index df59dfb..fbff228c 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_view_browsertest.cc +++ b/chrome/browser/ui/views/location_bar/location_bar_view_browsertest.cc
@@ -4,9 +4,9 @@ #include "chrome/browser/ui/views/location_bar/location_bar_view.h" -#include "base/bind.h" #include "base/feature_list.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/path_service.h" #include "base/ranges/algorithm.h" #include "base/run_loop.h"
diff --git a/chrome/browser/ui/views/location_bar/location_icon_view.cc b/chrome/browser/ui/views/location_bar/location_icon_view.cc index a679245..807ec69 100644 --- a/chrome/browser/ui/views/location_bar/location_icon_view.cc +++ b/chrome/browser/ui/views/location_bar/location_icon_view.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/location_bar/location_icon_view.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "build/build_config.h" #include "chrome/browser/extensions/extension_ui_util.h" #include "chrome/browser/ui/browser_element_identifiers.h"
diff --git a/chrome/browser/ui/views/location_bar/star_view.cc b/chrome/browser/ui/views/location_bar/star_view.cc index c9232ce..4b1f8b4 100644 --- a/chrome/browser/ui/views/location_bar/star_view.cc +++ b/chrome/browser/ui/views/location_bar/star_view.cc
@@ -6,7 +6,7 @@ #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h" #include "base/metrics/user_metrics.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 dac0869fc..e588748 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
@@ -8,7 +8,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.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/media_router/cast_dialog_sink_button.h b/chrome/browser/ui/views/media_router/cast_dialog_sink_button.h index 9ffbc593..84e03025 100644 --- a/chrome/browser/ui/views/media_router/cast_dialog_sink_button.h +++ b/chrome/browser/ui/views/media_router/cast_dialog_sink_button.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/gtest_prod_util.h" #include "chrome/browser/ui/media_router/ui_media_sink.h" #include "chrome/browser/ui/views/controls/hover_button.h"
diff --git a/chrome/browser/ui/views/media_router/cast_dialog_view.cc b/chrome/browser/ui/views/media_router/cast_dialog_view.cc index 0462dff..e3c7dadb 100644 --- a/chrome/browser/ui/views/media_router/cast_dialog_view.cc +++ b/chrome/browser/ui/views/media_router/cast_dialog_view.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ui/views/media_router/cast_dialog_view.h" -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/observer_list.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/views/media_router/cast_toolbar_button.cc b/chrome/browser/ui/views/media_router/cast_toolbar_button.cc index 71e147c..17da174 100644 --- a/chrome/browser/ui/views/media_router/cast_toolbar_button.cc +++ b/chrome/browser/ui/views/media_router/cast_toolbar_button.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ui/views/media_router/cast_toolbar_button.h" -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "chrome/browser/themes/theme_properties.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/color/chrome_color_id.h"
diff --git a/chrome/browser/ui/views/media_router/cast_toolbar_button_unittest.cc b/chrome/browser/ui/views/media_router/cast_toolbar_button_unittest.cc index ea1eddd..06be7876 100644 --- a/chrome/browser/ui/views/media_router/cast_toolbar_button_unittest.cc +++ b/chrome/browser/ui/views/media_router/cast_toolbar_button_unittest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/media_router/cast_toolbar_button.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/media/router/chrome_media_router_factory.h"
diff --git a/chrome/browser/ui/views/media_router/media_router_ui_browsertest.cc b/chrome/browser/ui/views/media_router/media_router_ui_browsertest.cc index 55b6a4c3..212c11f 100644 --- a/chrome/browser/ui/views/media_router/media_router_ui_browsertest.cc +++ b/chrome/browser/ui/views/media_router/media_router_ui_browsertest.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 "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/threading/thread_task_runner_handle.h"
diff --git a/chrome/browser/ui/views/media_router/media_router_ui_interactive_uitest.cc b/chrome/browser/ui/views/media_router/media_router_ui_interactive_uitest.cc index a2c52357..7afcff5 100644 --- a/chrome/browser/ui/views/media_router/media_router_ui_interactive_uitest.cc +++ b/chrome/browser/ui/views/media_router/media_router_ui_interactive_uitest.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 "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/threading/thread_task_runner_handle.h"
diff --git a/chrome/browser/ui/views/media_router/presentation_receiver_window_view.cc b/chrome/browser/ui/views/media_router/presentation_receiver_window_view.cc index 93cca7d..46c51eb 100644 --- a/chrome/browser/ui/views/media_router/presentation_receiver_window_view.cc +++ b/chrome/browser/ui/views/media_router/presentation_receiver_window_view.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ui/views/media_router/presentation_receiver_window_view.h" -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/notreached.h" #include "base/ranges/algorithm.h" #include "build/build_config.h" @@ -51,7 +51,7 @@ #if BUILDFLAG(IS_CHROMEOS_ASH) #include "ash/public/cpp/window_properties.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/scoped_observation.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/window.h"
diff --git a/chrome/browser/ui/views/media_router/presentation_receiver_window_view_browsertest.cc b/chrome/browser/ui/views/media_router/presentation_receiver_window_view_browsertest.cc index 58f3b00f..f34745b 100644 --- a/chrome/browser/ui/views/media_router/presentation_receiver_window_view_browsertest.cc +++ b/chrome/browser/ui/views/media_router/presentation_receiver_window_view_browsertest.cc
@@ -5,7 +5,7 @@ #include "base/memory/raw_ptr.h" #include "chrome/browser/ui/views/media_router/presentation_receiver_window_view.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/run_loop.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/ui/views/media_router/web_contents_display_observer_view.h b/chrome/browser/ui/views/media_router/web_contents_display_observer_view.h index d1bcc51..69fc5d0 100644 --- a/chrome/browser/ui/views/media_router/web_contents_display_observer_view.h +++ b/chrome/browser/ui/views/media_router/web_contents_display_observer_view.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_MEDIA_ROUTER_WEB_CONTENTS_DISPLAY_OBSERVER_VIEW_H_ #define CHROME_BROWSER_UI_VIEWS_MEDIA_ROUTER_WEB_CONTENTS_DISPLAY_OBSERVER_VIEW_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/ui/browser_list_observer.h" #include "chrome/browser/ui/webui/media_router/web_contents_display_observer.h"
diff --git a/chrome/browser/ui/views/media_router/web_contents_display_observer_view_unittest.cc b/chrome/browser/ui/views/media_router/web_contents_display_observer_view_unittest.cc index 4bb1455d..641aab0 100644 --- a/chrome/browser/ui/views/media_router/web_contents_display_observer_view_unittest.cc +++ b/chrome/browser/ui/views/media_router/web_contents_display_observer_view_unittest.cc
@@ -5,7 +5,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/ui/views/media_router/web_contents_display_observer_view.h" #include "chrome/test/base/chrome_render_view_host_test_harness.h" #include "content/public/browser/web_contents.h"
diff --git a/chrome/browser/ui/views/menu_model_adapter_test.cc b/chrome/browser/ui/views/menu_model_adapter_test.cc index c87f821..ea2b112 100644 --- a/chrome/browser/ui/views/menu_model_adapter_test.cc +++ b/chrome/browser/ui/views/menu_model_adapter_test.cc
@@ -3,7 +3,7 @@ // found in the LICENSE file. #include "ui/views/controls/menu/menu_model_adapter.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/views/menu_test_base.h b/chrome/browser/ui/views/menu_test_base.h index a17e5f6..9ae14e9 100644 --- a/chrome/browser/ui/views/menu_test_base.h +++ b/chrome/browser/ui/views/menu_test_base.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/ui/views/test/view_event_test_base.h" #include "ui/accessibility/ax_enums.mojom.h"
diff --git a/chrome/browser/ui/views/menu_view_drag_and_drop_test.cc b/chrome/browser/ui/views/menu_view_drag_and_drop_test.cc index d2cfa63c..b29dc47 100644 --- a/chrome/browser/ui/views/menu_view_drag_and_drop_test.cc +++ b/chrome/browser/ui/views/menu_view_drag_and_drop_test.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 "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/scoped_observation.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/views/message_box_dialog.cc b/chrome/browser/ui/views/message_box_dialog.cc index d8714da..fa7753a 100644 --- a/chrome/browser/ui/views/message_box_dialog.cc +++ b/chrome/browser/ui/views/message_box_dialog.cc
@@ -6,9 +6,9 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/run_loop.h" #include "base/task/current_thread.h" #include "build/build_config.h"
diff --git a/chrome/browser/ui/views/notifications/request_pin_view_chromeos.cc b/chrome/browser/ui/views/notifications/request_pin_view_chromeos.cc index 8bee79f..ec5fffa 100644 --- a/chrome/browser/ui/views/notifications/request_pin_view_chromeos.cc +++ b/chrome/browser/ui/views/notifications/request_pin_view_chromeos.cc
@@ -8,7 +8,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/i18n/number_formatting.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/views/notifications/request_pin_view_chromeos.h b/chrome/browser/ui/views/notifications/request_pin_view_chromeos.h index 541e43681..637954f 100644 --- a/chrome/browser/ui/views/notifications/request_pin_view_chromeos.h +++ b/chrome/browser/ui/views/notifications/request_pin_view_chromeos.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/certificate_provider/security_token_pin_dialog_host.h"
diff --git a/chrome/browser/ui/views/omnibox/omnibox_mouse_enter_exit_handler.h b/chrome/browser/ui/views/omnibox/omnibox_mouse_enter_exit_handler.h index 1db5b6b..7c9ab4ff 100644 --- a/chrome/browser/ui/views/omnibox/omnibox_mouse_enter_exit_handler.h +++ b/chrome/browser/ui/views/omnibox/omnibox_mouse_enter_exit_handler.h
@@ -7,7 +7,7 @@ #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "ui/events/event_handler.h" namespace views {
diff --git a/chrome/browser/ui/views/omnibox/omnibox_popup_view_views.cc b/chrome/browser/ui/views/omnibox/omnibox_popup_view_views.cc index c0ec62ad..da9ba333 100644 --- a/chrome/browser/ui/views/omnibox/omnibox_popup_view_views.cc +++ b/chrome/browser/ui/views/omnibox/omnibox_popup_view_views.cc
@@ -8,8 +8,8 @@ #include <numeric> #include "base/auto_reset.h" -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "build/build_config.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/color/chrome_color_id.h"
diff --git a/chrome/browser/ui/views/omnibox/omnibox_result_view.cc b/chrome/browser/ui/views/omnibox/omnibox_result_view.cc index ba21f70..a066aee 100644 --- a/chrome/browser/ui/views/omnibox/omnibox_result_view.cc +++ b/chrome/browser/ui/views/omnibox/omnibox_result_view.cc
@@ -8,7 +8,7 @@ #include <algorithm> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/views/omnibox/omnibox_row_view.cc b/chrome/browser/ui/views/omnibox/omnibox_row_view.cc index ae777d1..7c05ce6 100644 --- a/chrome/browser/ui/views/omnibox/omnibox_row_view.cc +++ b/chrome/browser/ui/views/omnibox/omnibox_row_view.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/omnibox/omnibox_row_view.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/i18n/case_conversion.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/ui/color/chrome_color_id.h"
diff --git a/chrome/browser/ui/views/omnibox/omnibox_suggestion_button_row_view.cc b/chrome/browser/ui/views/omnibox/omnibox_suggestion_button_row_view.cc index 727c5b3c..7c0904f 100644 --- a/chrome/browser/ui/views/omnibox/omnibox_suggestion_button_row_view.cc +++ b/chrome/browser/ui/views/omnibox/omnibox_suggestion_button_row_view.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/omnibox/omnibox_suggestion_button_row_view.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/ranges/algorithm.h" #include "chrome/browser/ui/color/chrome_color_id.h"
diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc index b2837f1..8fbd327 100644 --- a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc +++ b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc
@@ -9,10 +9,10 @@ #include <utility> #include "base/auto_reset.h" -#include "base/bind.h" #include "base/check_op.h" #include "base/command_line.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/i18n/rtl.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h"
diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_views_unittest.cc b/chrome/browser/ui/views/omnibox/omnibox_view_views_unittest.cc index babb7af3..f1208be 100644 --- a/chrome/browser/ui/views/omnibox/omnibox_view_views_unittest.cc +++ b/chrome/browser/ui/views/omnibox/omnibox_view_views_unittest.cc
@@ -12,8 +12,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/containers/adapters.h" +#include "base/functional/bind.h" #include "base/i18n/rtl.h" #include "base/memory/raw_ptr.h" #include "base/strings/strcat.h"
diff --git a/chrome/browser/ui/views/omnibox/remove_suggestion_bubble.h b/chrome/browser/ui/views/omnibox/remove_suggestion_bubble.h index 0c4d872d..2edc0b7 100644 --- a/chrome/browser/ui/views/omnibox/remove_suggestion_bubble.h +++ b/chrome/browser/ui/views/omnibox/remove_suggestion_bubble.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_OMNIBOX_REMOVE_SUGGESTION_BUBBLE_H_ #define CHROME_BROWSER_UI_VIEWS_OMNIBOX_REMOVE_SUGGESTION_BUBBLE_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" class TemplateURLService; struct AutocompleteMatch;
diff --git a/chrome/browser/ui/views/overlay/video_overlay_window_views.cc b/chrome/browser/ui/views/overlay/video_overlay_window_views.cc index 4c83c6a..1ef7ade 100644 --- a/chrome/browser/ui/views/overlay/video_overlay_window_views.cc +++ b/chrome/browser/ui/views/overlay/video_overlay_window_views.cc
@@ -7,7 +7,7 @@ #include <memory> #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/metrics/histogram_macros.h"
diff --git a/chrome/browser/ui/views/page_action/page_action_icon_controller.cc b/chrome/browser/ui/views/page_action/page_action_icon_controller.cc index e7e5373..41a4aa1 100644 --- a/chrome/browser/ui/views/page_action/page_action_icon_controller.cc +++ b/chrome/browser/ui/views/page_action/page_action_icon_controller.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ui/views/page_action/page_action_icon_controller.h" -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/immediate_crash.h" #include "base/metrics/histogram_functions.h" #include "base/ranges/algorithm.h"
diff --git a/chrome/browser/ui/views/page_action/pwa_install_view.cc b/chrome/browser/ui/views/page_action/pwa_install_view.cc index 358cbf6..aa57535 100644 --- a/chrome/browser/ui/views/page_action/pwa_install_view.cc +++ b/chrome/browser/ui/views/page_action/pwa_install_view.cc
@@ -6,7 +6,7 @@ #include <string> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/field_trial_params.h" #include "base/metrics/user_metrics.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/views/page_info/chosen_object_view.cc b/chrome/browser/ui/views/page_info/chosen_object_view.cc index ea56b31..8f8fb36 100644 --- a/chrome/browser/ui/views/page_info/chosen_object_view.cc +++ b/chrome/browser/ui/views/page_info/chosen_object_view.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/observer_list.h" #include "chrome/browser/ui/color/chrome_color_id.h" #include "chrome/browser/ui/views/chrome_layout_provider.h"
diff --git a/chrome/browser/ui/views/page_info/page_info_navigation_handler.h b/chrome/browser/ui/views/page_info/page_info_navigation_handler.h index 17721726..8fa7772 100644 --- a/chrome/browser/ui/views/page_info/page_info_navigation_handler.h +++ b/chrome/browser/ui/views/page_info/page_info_navigation_handler.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_PAGE_INFO_PAGE_INFO_NAVIGATION_HANDLER_H_ #define CHROME_BROWSER_UI_VIEWS_PAGE_INFO_PAGE_INFO_NAVIGATION_HANDLER_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "components/content_settings/core/common/content_settings_types.h" namespace page_info::proto {
diff --git a/chrome/browser/ui/views/page_info/safety_tip_page_info_bubble_view.cc b/chrome/browser/ui/views/page_info/safety_tip_page_info_bubble_view.cc index 6beb8611..94adfaab 100644 --- a/chrome/browser/ui/views/page_info/safety_tip_page_info_bubble_view.cc +++ b/chrome/browser/ui/views/page_info/safety_tip_page_info_bubble_view.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/page_info/safety_tip_page_info_bubble_view.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/platform_util.h" #include "chrome/browser/reputation/reputation_service.h" #include "chrome/browser/reputation/safety_tip_ui_helper.h"
diff --git a/chrome/browser/ui/views/page_info/safety_tip_page_info_bubble_view_browsertest.cc b/chrome/browser/ui/views/page_info/safety_tip_page_info_bubble_view_browsertest.cc index dccb179d4..1133fb0 100644 --- a/chrome/browser/ui/views/page_info/safety_tip_page_info_bubble_view_browsertest.cc +++ b/chrome/browser/ui/views/page_info/safety_tip_page_info_bubble_view_browsertest.cc
@@ -6,7 +6,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/ranges/algorithm.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/ui/views/page_info/safety_tip_page_info_bubble_view_unittest.cc b/chrome/browser/ui/views/page_info/safety_tip_page_info_bubble_view_unittest.cc index 2f3e281b..d318b3fc 100644 --- a/chrome/browser/ui/views/page_info/safety_tip_page_info_bubble_view_unittest.cc +++ b/chrome/browser/ui/views/page_info/safety_tip_page_info_bubble_view_unittest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/page_info/safety_tip_page_info_bubble_view.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/content_settings/page_specific_content_settings_delegate.h" #include "chrome/test/base/testing_profile.h"
diff --git a/chrome/browser/ui/views/passwords/biometric_authentication_confirmation_bubble_view.cc b/chrome/browser/ui/views/passwords/biometric_authentication_confirmation_bubble_view.cc index 0e7b763..a88dfa6 100644 --- a/chrome/browser/ui/views/passwords/biometric_authentication_confirmation_bubble_view.cc +++ b/chrome/browser/ui/views/passwords/biometric_authentication_confirmation_bubble_view.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/passwords/biometric_authentication_confirmation_bubble_view.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/ui/passwords/passwords_model_delegate.h" #include "chrome/browser/ui/passwords/ui_utils.h" #include "chrome/browser/ui/views/chrome_layout_provider.h"
diff --git a/chrome/browser/ui/views/passwords/biometric_authentication_for_filling_bubble_view.cc b/chrome/browser/ui/views/passwords/biometric_authentication_for_filling_bubble_view.cc index a5ee622..71a90a4c 100644 --- a/chrome/browser/ui/views/passwords/biometric_authentication_for_filling_bubble_view.cc +++ b/chrome/browser/ui/views/passwords/biometric_authentication_for_filling_bubble_view.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/passwords/biometric_authentication_for_filling_bubble_view.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/ui/passwords/passwords_model_delegate.h" #include "chrome/browser/ui/passwords/ui_utils.h" #include "chrome/browser/ui/views/chrome_layout_provider.h"
diff --git a/chrome/browser/ui/views/passwords/move_to_account_store_bubble_view.cc b/chrome/browser/ui/views/passwords/move_to_account_store_bubble_view.cc index 070e6fcd..e9405668 100644 --- a/chrome/browser/ui/views/passwords/move_to_account_store_bubble_view.cc +++ b/chrome/browser/ui/views/passwords/move_to_account_store_bubble_view.cc
@@ -6,7 +6,7 @@ #include <algorithm> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/strings/utf_string_conversions.h" #include "chrome/app/vector_icons/vector_icons.h"
diff --git a/chrome/browser/ui/views/passwords/password_bubble_interactive_uitest.cc b/chrome/browser/ui/views/passwords/password_bubble_interactive_uitest.cc index 80c4f7c..5dc365d1c 100644 --- a/chrome/browser/ui/views/passwords/password_bubble_interactive_uitest.cc +++ b/chrome/browser/ui/views/passwords/password_bubble_interactive_uitest.cc
@@ -7,9 +7,9 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/command_line.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_samples.h" #include "base/strings/utf_string_conversions.h" #include "base/task/sequenced_task_runner.h"
diff --git a/chrome/browser/ui/views/passwords/password_dialog_view_browsertest.cc b/chrome/browser/ui/views/passwords/password_dialog_view_browsertest.cc index 434f2b34..ae4797d 100644 --- a/chrome/browser/ui/views/passwords/password_dialog_view_browsertest.cc +++ b/chrome/browser/ui/views/passwords/password_dialog_view_browsertest.cc
@@ -4,8 +4,8 @@ #include <memory> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h"
diff --git a/chrome/browser/ui/views/passwords/password_generation_confirmation_view.cc b/chrome/browser/ui/views/passwords/password_generation_confirmation_view.cc index de4022a2..f3f9ec7 100644 --- a/chrome/browser/ui/views/passwords/password_generation_confirmation_view.cc +++ b/chrome/browser/ui/views/passwords/password_generation_confirmation_view.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/ui/passwords/passwords_model_delegate.h" #include "chrome/browser/ui/passwords/ui_utils.h" #include "chrome/browser/ui/views/chrome_layout_provider.h"
diff --git a/chrome/browser/ui/views/passwords/post_save_compromised_bubble_view.cc b/chrome/browser/ui/views/passwords/post_save_compromised_bubble_view.cc index 088488e..62ee412 100644 --- a/chrome/browser/ui/views/passwords/post_save_compromised_bubble_view.cc +++ b/chrome/browser/ui/views/passwords/post_save_compromised_bubble_view.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/passwords/post_save_compromised_bubble_view.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/ui/passwords/passwords_model_delegate.h" #include "chrome/browser/ui/passwords/ui_utils.h" #include "chrome/browser/ui/views/chrome_layout_provider.h"
diff --git a/chrome/browser/ui/views/passwords/views_utils.h b/chrome/browser/ui/views/passwords/views_utils.h index ec4ffaa..f97ea70 100644 --- a/chrome/browser/ui/views/passwords/views_utils.h +++ b/chrome/browser/ui/views/passwords/views_utils.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" namespace views { class StyledLabel;
diff --git a/chrome/browser/ui/views/payments/payment_method_view_controller.cc b/chrome/browser/ui/views/payments/payment_method_view_controller.cc index 299b1ea..29dcab2fb 100644 --- a/chrome/browser/ui/views/payments/payment_method_view_controller.cc +++ b/chrome/browser/ui/views/payments/payment_method_view_controller.cc
@@ -9,9 +9,9 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/ui/views/chrome_typography.h" #include "chrome/browser/ui/views/payments/payment_request_dialog_view.h"
diff --git a/chrome/browser/ui/views/payments/payment_request_browsertest_base.cc b/chrome/browser/ui/views/payments/payment_request_browsertest_base.cc index 06953a0..7a3adb3 100644 --- a/chrome/browser/ui/views/payments/payment_request_browsertest_base.cc +++ b/chrome/browser/ui/views/payments/payment_request_browsertest_base.cc
@@ -11,9 +11,9 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/autofill/personal_data_manager_factory.h"
diff --git a/chrome/browser/ui/views/payments/payment_request_dialog_view.cc b/chrome/browser/ui/views/payments/payment_request_dialog_view.cc index 023bfd6..42fe3a1 100644 --- a/chrome/browser/ui/views/payments/payment_request_dialog_view.cc +++ b/chrome/browser/ui/views/payments/payment_request_dialog_view.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser_dialogs.h"
diff --git a/chrome/browser/ui/views/payments/payment_request_dialog_view.h b/chrome/browser/ui/views/payments/payment_request_dialog_view.h index 1a26710..516afc9c 100644 --- a/chrome/browser/ui/views/payments/payment_request_dialog_view.h +++ b/chrome/browser/ui/views/payments/payment_request_dialog_view.h
@@ -8,7 +8,7 @@ #include <map> #include <memory> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ui/views/payments/view_stack.h"
diff --git a/chrome/browser/ui/views/payments/payment_request_item_list.cc b/chrome/browser/ui/views/payments/payment_request_item_list.cc index 34a415c0..07dece98 100644 --- a/chrome/browser/ui/views/payments/payment_request_item_list.cc +++ b/chrome/browser/ui/views/payments/payment_request_item_list.cc
@@ -7,7 +7,7 @@ #include <algorithm> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/ui/views/payments/payment_request_dialog_view.h" #include "chrome/browser/ui/views/payments/payment_request_dialog_view_ids.h" #include "chrome/browser/ui/views/payments/payment_request_views_util.h"
diff --git a/chrome/browser/ui/views/payments/payment_request_sheet_controller.cc b/chrome/browser/ui/views/payments/payment_request_sheet_controller.cc index ed7f569c..b3da85ff 100644 --- a/chrome/browser/ui/views/payments/payment_request_sheet_controller.cc +++ b/chrome/browser/ui/views/payments/payment_request_sheet_controller.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "build/build_config.h" #include "chrome/browser/ui/color/chrome_color_id.h"
diff --git a/chrome/browser/ui/views/payments/payment_sheet_view_controller.cc b/chrome/browser/ui/views/payments/payment_sheet_view_controller.cc index 9ca9b63..16bab4c 100644 --- a/chrome/browser/ui/views/payments/payment_sheet_view_controller.cc +++ b/chrome/browser/ui/views/payments/payment_sheet_view_controller.cc
@@ -11,8 +11,8 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/i18n/message_formatter.h" #include "base/memory/raw_ptr.h" #include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/ui/views/payments/profile_list_view_controller.cc b/chrome/browser/ui/views/payments/profile_list_view_controller.cc index d4fa17a..b7c879e 100644 --- a/chrome/browser/ui/views/payments/profile_list_view_controller.cc +++ b/chrome/browser/ui/views/payments/profile_list_view_controller.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/payments/profile_list_view_controller.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/views/payments/secure_payment_confirmation_no_creds_dialog_view_browsertest.cc b/chrome/browser/ui/views/payments/secure_payment_confirmation_no_creds_dialog_view_browsertest.cc index 938a14f..f045802 100644 --- a/chrome/browser/ui/views/payments/secure_payment_confirmation_no_creds_dialog_view_browsertest.cc +++ b/chrome/browser/ui/views/payments/secure_payment_confirmation_no_creds_dialog_view_browsertest.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 "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/test/test_browser_dialog.h"
diff --git a/chrome/browser/ui/views/payments/secure_payment_confirmation_views_util.h b/chrome/browser/ui/views/payments/secure_payment_confirmation_views_util.h index 4f9e231..e70d1017 100644 --- a/chrome/browser/ui/views/payments/secure_payment_confirmation_views_util.h +++ b/chrome/browser/ui/views/payments/secure_payment_confirmation_views_util.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "third_party/abseil-cpp/absl/types/optional.h" namespace views {
diff --git a/chrome/browser/ui/views/payments/shipping_address_editor_view_controller.cc b/chrome/browser/ui/views/payments/shipping_address_editor_view_controller.cc index 76c49d7..341fae7c 100644 --- a/chrome/browser/ui/views/payments/shipping_address_editor_view_controller.cc +++ b/chrome/browser/ui/views/payments/shipping_address_editor_view_controller.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ui/views/payments/shipping_address_editor_view_controller.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/strings/utf_string_conversions.h" #include "base/task/single_thread_task_runner.h" #include "chrome/browser/ui/views/payments/payment_request_dialog_view.h"
diff --git a/chrome/browser/ui/views/payments/test_secure_payment_confirmation_payment_request_delegate.cc b/chrome/browser/ui/views/payments/test_secure_payment_confirmation_payment_request_delegate.cc index d1f2091..5bd006b 100644 --- a/chrome/browser/ui/views/payments/test_secure_payment_confirmation_payment_request_delegate.cc +++ b/chrome/browser/ui/views/payments/test_secure_payment_confirmation_payment_request_delegate.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/payments/test_secure_payment_confirmation_payment_request_delegate.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "content/public/browser/render_frame_host.h" #include "content/public/browser/render_process_host.h" #include "content/public/browser/web_contents.h"
diff --git a/chrome/browser/ui/views/performance_controls/battery_saver_bubble_view.cc b/chrome/browser/ui/views/performance_controls/battery_saver_bubble_view.cc index 0f2c6e8..3b9f3220 100644 --- a/chrome/browser/ui/views/performance_controls/battery_saver_bubble_view.cc +++ b/chrome/browser/ui/views/performance_controls/battery_saver_bubble_view.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/performance_controls/battery_saver_bubble_view.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/performance_controls/battery_saver_bubble_delegate.h" #include "chrome/browser/ui/performance_controls/battery_saver_bubble_observer.h"
diff --git a/chrome/browser/ui/views/performance_controls/high_efficiency_bubble_view.cc b/chrome/browser/ui/views/performance_controls/high_efficiency_bubble_view.cc index 1bb8c91..c0578f3 100644 --- a/chrome/browser/ui/views/performance_controls/high_efficiency_bubble_view.cc +++ b/chrome/browser/ui/views/performance_controls/high_efficiency_bubble_view.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/performance_controls/high_efficiency_bubble_view.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h" #include "chrome/browser/ui/browser_element_identifiers.h"
diff --git a/chrome/browser/ui/views/performance_controls/high_efficiency_chip_view_browsertest.cc b/chrome/browser/ui/views/performance_controls/high_efficiency_chip_view_browsertest.cc index a7614b5..a9d0c92 100644 --- a/chrome/browser/ui/views/performance_controls/high_efficiency_chip_view_browsertest.cc +++ b/chrome/browser/ui/views/performance_controls/high_efficiency_chip_view_browsertest.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 "base/bind.h" +#include "base/functional/bind.h" #include "base/test/bind.h" #include "chrome/browser/performance_manager/public/user_tuning/user_performance_tuning_manager.h" #include "chrome/browser/ui/browser_element_identifiers.h"
diff --git a/chrome/browser/ui/views/permissions/chip_controller.cc b/chrome/browser/ui/views/permissions/chip_controller.cc index 7db7f48..e96d419 100644 --- a/chrome/browser/ui/views/permissions/chip_controller.cc +++ b/chrome/browser/ui/views/permissions/chip_controller.cc
@@ -7,11 +7,10 @@ #include <memory> #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback_forward.h" #include "base/check.h" #include "base/feature_list.h" #include "base/functional/bind.h" +#include "base/functional/callback_forward.h" #include "base/logging.h" #include "base/memory/raw_ptr.h" #include "base/time/time.h"
diff --git a/chrome/browser/ui/views/permissions/chooser_bubble_ui.cc b/chrome/browser/ui/views/permissions/chooser_bubble_ui.cc index abc4297..1aff5bd 100644 --- a/chrome/browser/ui/views/permissions/chooser_bubble_ui.cc +++ b/chrome/browser/ui/views/permissions/chooser_bubble_ui.cc
@@ -4,7 +4,7 @@ #include <string> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ui/browser_dialogs.h"
diff --git a/chrome/browser/ui/views/permissions/permission_prompt_bubble_view_browsertest.cc b/chrome/browser/ui/views/permissions/permission_prompt_bubble_view_browsertest.cc index 583f51c76..b099bf6 100644 --- a/chrome/browser/ui/views/permissions/permission_prompt_bubble_view_browsertest.cc +++ b/chrome/browser/ui/views/permissions/permission_prompt_bubble_view_browsertest.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ui/views/permissions/permission_prompt_bubble_view.h" -#include "base/callback_helpers.h" #include "base/feature_list.h" +#include "base/functional/callback_helpers.h" #include "base/ranges/algorithm.h" #include "base/run_loop.h" #include "base/test/metrics/histogram_tester.h"
diff --git a/chrome/browser/ui/views/permissions/permission_prompt_chip.cc b/chrome/browser/ui/views/permissions/permission_prompt_chip.cc index 1ac8109..949ba5e 100644 --- a/chrome/browser/ui/views/permissions/permission_prompt_chip.cc +++ b/chrome/browser/ui/views/permissions/permission_prompt_chip.cc
@@ -5,8 +5,8 @@ #include "chrome/browser/ui/views/permissions/permission_prompt_chip.h" #include <algorithm> #include <memory> -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "base/ranges/algorithm.h" #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
diff --git a/chrome/browser/ui/views/plugin_vm/plugin_vm_installer_view.cc b/chrome/browser/ui/views/plugin_vm/plugin_vm_installer_view.cc index 9da111b..ae52225 100644 --- a/chrome/browser/ui/views/plugin_vm/plugin_vm_installer_view.cc +++ b/chrome/browser/ui/views/plugin_vm/plugin_vm_installer_view.cc
@@ -8,8 +8,8 @@ #include "ash/public/cpp/shelf_types.h" #include "ash/public/cpp/window_properties.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/ash/plugin_vm/plugin_vm_installer_factory.h"
diff --git a/chrome/browser/ui/views/plugin_vm/plugin_vm_installer_view.h b/chrome/browser/ui/views/plugin_vm/plugin_vm_installer_view.h index 916d740..4ccffbc 100644 --- a/chrome/browser/ui/views/plugin_vm/plugin_vm_installer_view.h +++ b/chrome/browser/ui/views/plugin_vm/plugin_vm_installer_view.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_PLUGIN_VM_PLUGIN_VM_INSTALLER_VIEW_H_ #define CHROME_BROWSER_UI_VIEWS_PLUGIN_VM_PLUGIN_VM_INSTALLER_VIEW_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/ash/plugin_vm/plugin_vm_installer.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/plugin_vm/plugin_vm_installer_view_browsertest.cc b/chrome/browser/ui/views/plugin_vm/plugin_vm_installer_view_browsertest.cc index 73ddcca3..44286f8c 100644 --- a/chrome/browser/ui/views/plugin_vm/plugin_vm_installer_view_browsertest.cc +++ b/chrome/browser/ui/views/plugin_vm/plugin_vm_installer_view_browsertest.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ui/views/plugin_vm/plugin_vm_installer_view.h" -#include "base/bind.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/test/scoped_feature_list.h" #include "base/threading/thread_restrictions.h" #include "chrome/browser/ash/login/users/fake_chrome_user_manager.h"
diff --git a/chrome/browser/ui/views/policy/enterprise_startup_dialog_unittest.cc b/chrome/browser/ui/views/policy/enterprise_startup_dialog_unittest.cc index 614bb94..c7ae998 100644 --- a/chrome/browser/ui/views/policy/enterprise_startup_dialog_unittest.cc +++ b/chrome/browser/ui/views/policy/enterprise_startup_dialog_unittest.cc
@@ -4,8 +4,8 @@ #include <memory> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/test/mock_callback.h" #include "chrome/browser/headless/headless_mode_util.h" #include "chrome/browser/ui/enterprise_startup_dialog.h"
diff --git a/chrome/browser/ui/views/policy/enterprise_startup_dialog_view.cc b/chrome/browser/ui/views/policy/enterprise_startup_dialog_view.cc index e52f329..374982a 100644 --- a/chrome/browser/ui/views/policy/enterprise_startup_dialog_view.cc +++ b/chrome/browser/ui/views/policy/enterprise_startup_dialog_view.cc
@@ -7,7 +7,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/i18n/message_formatter.h" #include "base/strings/utf_string_conversions.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/ui/views/policy/enterprise_startup_dialog_view.h b/chrome/browser/ui/views/policy/enterprise_startup_dialog_view.h index 6c4be59..157c016b 100644 --- a/chrome/browser/ui/views/policy/enterprise_startup_dialog_view.h +++ b/chrome/browser/ui/views/policy/enterprise_startup_dialog_view.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ui/enterprise_startup_dialog.h"
diff --git a/chrome/browser/ui/views/policy/enterprise_startup_dialog_view_browsertest.cc b/chrome/browser/ui/views/policy/enterprise_startup_dialog_view_browsertest.cc index 007e5e7..d8f4145 100644 --- a/chrome/browser/ui/views/policy/enterprise_startup_dialog_view_browsertest.cc +++ b/chrome/browser/ui/views/policy/enterprise_startup_dialog_view_browsertest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/policy/enterprise_startup_dialog_view.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h"
diff --git a/chrome/browser/ui/views/policy/idle_dialog_view.cc b/chrome/browser/ui/views/policy/idle_dialog_view.cc index 77e10ccf..bd422b8 100644 --- a/chrome/browser/ui/views/policy/idle_dialog_view.cc +++ b/chrome/browser/ui/views/policy/idle_dialog_view.cc
@@ -8,7 +8,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/user_metrics.h" #include "base/metrics/user_metrics_action.h" #include "chrome/browser/ui/browser.h"
diff --git a/chrome/browser/ui/views/policy/idle_dialog_view.h b/chrome/browser/ui/views/policy/idle_dialog_view.h index c82b7b38..ce8c08f 100644 --- a/chrome/browser/ui/views/policy/idle_dialog_view.h +++ b/chrome/browser/ui/views/policy/idle_dialog_view.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_POLICY_IDLE_DIALOG_VIEW_H_ #define CHROME_BROWSER_UI_VIEWS_POLICY_IDLE_DIALOG_VIEW_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/time/time.h" #include "base/timer/timer.h"
diff --git a/chrome/browser/ui/views/profiles/dice_web_signin_interception_bubble_view.cc b/chrome/browser/ui/views/profiles/dice_web_signin_interception_bubble_view.cc index d8d46a8e..c3e6bba 100644 --- a/chrome/browser/ui/views/profiles/dice_web_signin_interception_bubble_view.cc +++ b/chrome/browser/ui/views/profiles/dice_web_signin_interception_bubble_view.cc
@@ -6,10 +6,10 @@ #include <memory> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/metrics/histogram_functions.h" #include "chrome/browser/profiles/keep_alive/profile_keep_alive_types.h"
diff --git a/chrome/browser/ui/views/profiles/dice_web_signin_interception_bubble_view.h b/chrome/browser/ui/views/profiles/dice_web_signin_interception_bubble_view.h index 9c99843..d595f84 100644 --- a/chrome/browser/ui/views/profiles/dice_web_signin_interception_bubble_view.h +++ b/chrome/browser/ui/views/profiles/dice_web_signin_interception_bubble_view.h
@@ -7,7 +7,7 @@ #include "ui/views/bubble/bubble_dialog_delegate_view.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/ui/views/profiles/dice_web_signin_interception_bubble_view_browsertest.cc b/chrome/browser/ui/views/profiles/dice_web_signin_interception_bubble_view_browsertest.cc index 1f67039..5fbf51e 100644 --- a/chrome/browser/ui/views/profiles/dice_web_signin_interception_bubble_view_browsertest.cc +++ b/chrome/browser/ui/views/profiles/dice_web_signin_interception_bubble_view_browsertest.cc
@@ -6,7 +6,7 @@ #include <string> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/test/metrics/histogram_tester.h" #include "chrome/browser/enterprise/browser_management/management_service_factory.h" #include "chrome/browser/profiles/keep_alive/profile_keep_alive_types.h"
diff --git a/chrome/browser/ui/views/profiles/incognito_menu_view.cc b/chrome/browser/ui/views/profiles/incognito_menu_view.cc index 0d0b99b..723920ef 100644 --- a/chrome/browser/ui/views/profiles/incognito_menu_view.cc +++ b/chrome/browser/ui/views/profiles/incognito_menu_view.cc
@@ -8,8 +8,8 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/histogram_macros.h" #include "base/metrics/user_metrics.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/views/profiles/profile_bubble_interactive_uitest.cc b/chrome/browser/ui/views/profiles/profile_bubble_interactive_uitest.cc index 161c6950..dcbfcbf 100644 --- a/chrome/browser/ui/views/profiles/profile_bubble_interactive_uitest.cc +++ b/chrome/browser/ui/views/profiles/profile_bubble_interactive_uitest.cc
@@ -4,9 +4,9 @@ #include "chrome/browser/ui/views/profiles/profile_customization_bubble_view.h" -#include "base/callback_helpers.h" #include "base/check.h" #include "base/files/file_util.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/test/metrics/histogram_tester.h" #include "build/build_config.h"
diff --git a/chrome/browser/ui/views/profiles/profile_customization_bubble_sync_controller.h b/chrome/browser/ui/views/profiles/profile_customization_bubble_sync_controller.h index 0d399e6..14eea9f 100644 --- a/chrome/browser/ui/views/profiles/profile_customization_bubble_sync_controller.h +++ b/chrome/browser/ui/views/profiles/profile_customization_bubble_sync_controller.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_PROFILES_PROFILE_CUSTOMIZATION_BUBBLE_SYNC_CONTROLLER_H_ #define CHROME_BROWSER_UI_VIEWS_PROFILES_PROFILE_CUSTOMIZATION_BUBBLE_SYNC_CONTROLLER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/scoped_observation.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ui/views/profiles/profile_customization_bubble_view.cc b/chrome/browser/ui/views/profiles/profile_customization_bubble_view.cc index 42ba0f2..65ac21da 100644 --- a/chrome/browser/ui/views/profiles/profile_customization_bubble_view.cc +++ b/chrome/browser/ui/views/profiles/profile_customization_bubble_view.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ui/views/profiles/profile_customization_bubble_view.h" -#include "base/callback_helpers.h" #include "base/feature_list.h" +#include "base/functional/callback_helpers.h" #include "chrome/browser/signin/signin_features.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/signin/dice_web_signin_interceptor_delegate.h"
diff --git a/chrome/browser/ui/views/profiles/profile_menu_view_base.cc b/chrome/browser/ui/views/profiles/profile_menu_view_base.cc index 4e48e2a..93d6a18d 100644 --- a/chrome/browser/ui/views/profiles/profile_menu_view_base.cc +++ b/chrome/browser/ui/views/profiles/profile_menu_view_base.cc
@@ -8,8 +8,8 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/memory/raw_ref.h" #include "base/metrics/histogram_functions.h"
diff --git a/chrome/browser/ui/views/profiles/profile_picker_dice_sign_in_toolbar.h b/chrome/browser/ui/views/profiles/profile_picker_dice_sign_in_toolbar.h index 72443bad..2645056 100644 --- a/chrome/browser/ui/views/profiles/profile_picker_dice_sign_in_toolbar.h +++ b/chrome/browser/ui/views/profiles/profile_picker_dice_sign_in_toolbar.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_PROFILES_PROFILE_PICKER_DICE_SIGN_IN_TOOLBAR_H_ #define CHROME_BROWSER_UI_VIEWS_PROFILES_PROFILE_PICKER_DICE_SIGN_IN_TOOLBAR_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "ui/views/view.h" // Class responsible for the top toolbar shown during the GAIA sign-in within
diff --git a/chrome/browser/ui/views/profiles/profile_picker_test_base.cc b/chrome/browser/ui/views/profiles/profile_picker_test_base.cc index 6dfa9b47..b3b37f1 100644 --- a/chrome/browser/ui/views/profiles/profile_picker_test_base.cc +++ b/chrome/browser/ui/views/profiles/profile_picker_test_base.cc
@@ -5,7 +5,7 @@ #include "chrome/browser/ui/views/profiles/profile_picker_test_base.h" #include "base/memory/raw_ptr.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/run_loop.h" #include "base/scoped_observation.h" #include "chrome/browser/profiles/profile_test_util.h"
diff --git a/chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc b/chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc index 086f4a5..ff39c29 100644 --- a/chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc +++ b/chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/weak_ptr.h" #include "build/build_config.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h b/chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h index b3bb839..2994e115 100644 --- a/chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h +++ b/chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_PROFILES_SIGNIN_VIEW_CONTROLLER_DELEGATE_VIEWS_H_ #define CHROME_BROWSER_UI_VIEWS_PROFILES_SIGNIN_VIEW_CONTROLLER_DELEGATE_VIEWS_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/types/strong_alias.h" #include "build/build_config.h"
diff --git a/chrome/browser/ui/views/qrcode_generator/qrcode_generator_bubble.cc b/chrome/browser/ui/views/qrcode_generator/qrcode_generator_bubble.cc index cc76601..2bb4e36 100644 --- a/chrome/browser/ui/views/qrcode_generator/qrcode_generator_bubble.cc +++ b/chrome/browser/ui/views/qrcode_generator/qrcode_generator_bubble.cc
@@ -127,8 +127,14 @@ } void QRCodeGeneratorBubble::UpdateQRContent() { + if (textfield_url_->GetText().empty()) { + DisplayPlaceholderImage(); + HideErrors(false); + return; + } + mojom::GenerateQRCodeRequestPtr request = mojom::GenerateQRCodeRequest::New(); - request->data = url_.spec(); + request->data = base::UTF16ToASCII(textfield_url_->GetText()); request->should_render = true; request->center_image = mojom::CenterImage::CHROME_DINO; request->render_module_style = mojom::ModuleStyle::CIRCLES; @@ -338,14 +344,7 @@ const std::u16string& new_contents) { DCHECK_EQ(sender, textfield_url_); if (sender == textfield_url_) { - if (bottom_error_label_->GetVisible()) - HideErrors(false); - GURL new_url(new_contents); - if (!new_url.is_valid()) { - textfield_url_->SetText(base::UTF8ToUTF16(url_.spec())); - return; - } - url_ = new_url; + url_ = GURL(base::UTF16ToUTF8(new_contents)); UpdateQRContent(); static bool first_edit = true;
diff --git a/chrome/browser/ui/views/qrcode_generator/qrcode_generator_bubble.h b/chrome/browser/ui/views/qrcode_generator/qrcode_generator_bubble.h index 27b448c..8fa9b46 100644 --- a/chrome/browser/ui/views/qrcode_generator/qrcode_generator_bubble.h +++ b/chrome/browser/ui/views/qrcode_generator/qrcode_generator_bubble.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/ui/qrcode_generator/qrcode_generator_bubble_view.h" #include "chrome/browser/ui/views/location_bar/location_bar_bubble_delegate_view.h"
diff --git a/chrome/browser/ui/views/qrcode_generator/qrcode_generator_bubble_unittest.cc b/chrome/browser/ui/views/qrcode_generator/qrcode_generator_bubble_unittest.cc index 9cd0d095..ac12b453 100644 --- a/chrome/browser/ui/views/qrcode_generator/qrcode_generator_bubble_unittest.cc +++ b/chrome/browser/ui/views/qrcode_generator/qrcode_generator_bubble_unittest.cc
@@ -228,7 +228,7 @@ } TEST_F(QRCodeGeneratorBubbleUITest, - PreviousImageShowsAfterAttemptDeleteAllText) { + PlaceholderImageShowsAfterTextFieldEmptied) { bubble()->Show(); EXPECT_TRUE(ImagePlaceholderShowing()); @@ -270,14 +270,12 @@ EXPECT_TRUE(download_button()->GetEnabled()); } - // Deleting all text is not allowed, which makes invalid URL. textfield()->SelectAll(false); textfield()->DeleteRange(textfield()->GetSelectedRange()); - // Still shows previous state. EXPECT_TRUE(ImageShowing()); - EXPECT_FALSE(ImagePlaceholderShowing()); - EXPECT_TRUE(download_button()->GetEnabled()); + EXPECT_TRUE(ImagePlaceholderShowing()); + EXPECT_FALSE(download_button()->GetEnabled()); } TEST_F(QRCodeGeneratorBubbleUITest, LabelHidesAfterErrorState) {
diff --git a/chrome/browser/ui/views/relaunch_notification/relaunch_notification_controller.cc b/chrome/browser/ui/views/relaunch_notification/relaunch_notification_controller.cc index 3184d18..06a5805 100644 --- a/chrome/browser/ui/views/relaunch_notification/relaunch_notification_controller.cc +++ b/chrome/browser/ui/views/relaunch_notification/relaunch_notification_controller.cc
@@ -7,8 +7,8 @@ #include <algorithm> #include <utility> -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/time/default_clock.h" #include "base/time/default_tick_clock.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/ui/views/relaunch_notification/relaunch_notification_controller.h b/chrome/browser/ui/views/relaunch_notification/relaunch_notification_controller.h index 45f18a58..9efdf22 100644 --- a/chrome/browser/ui/views/relaunch_notification/relaunch_notification_controller.h +++ b/chrome/browser/ui/views/relaunch_notification/relaunch_notification_controller.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_RELAUNCH_NOTIFICATION_RELAUNCH_NOTIFICATION_CONTROLLER_H_ #define CHROME_BROWSER_UI_VIEWS_RELAUNCH_NOTIFICATION_RELAUNCH_NOTIFICATION_CONTROLLER_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/time/time.h" #include "base/timer/wall_clock_timer.h"
diff --git a/chrome/browser/ui/views/relaunch_notification/relaunch_notification_controller_platform_impl_chromeos.cc b/chrome/browser/ui/views/relaunch_notification/relaunch_notification_controller_platform_impl_chromeos.cc index 4987a8980..92b16e2a 100644 --- a/chrome/browser/ui/views/relaunch_notification/relaunch_notification_controller_platform_impl_chromeos.cc +++ b/chrome/browser/ui/views/relaunch_notification/relaunch_notification_controller_platform_impl_chromeos.cc
@@ -8,8 +8,8 @@ #include "ash/public/cpp/update_types.h" #include "ash/shell.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/scoped_observation.h" #include "base/time/time.h" #include "chrome/browser/ui/ash/system_tray_client_impl.h"
diff --git a/chrome/browser/ui/views/relaunch_notification/relaunch_notification_controller_platform_impl_chromeos.h b/chrome/browser/ui/views/relaunch_notification/relaunch_notification_controller_platform_impl_chromeos.h index aac57af..6d4279f 100644 --- a/chrome/browser/ui/views/relaunch_notification/relaunch_notification_controller_platform_impl_chromeos.h +++ b/chrome/browser/ui/views/relaunch_notification/relaunch_notification_controller_platform_impl_chromeos.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/scoped_observation.h" #include "base/time/time.h" #include "components/session_manager/core/session_manager.h"
diff --git a/chrome/browser/ui/views/relaunch_notification/relaunch_notification_controller_platform_impl_desktop.cc b/chrome/browser/ui/views/relaunch_notification/relaunch_notification_controller_platform_impl_desktop.cc index 7e52ea2..85d9fa3 100644 --- a/chrome/browser/ui/views/relaunch_notification/relaunch_notification_controller_platform_impl_desktop.cc +++ b/chrome/browser/ui/views/relaunch_notification/relaunch_notification_controller_platform_impl_desktop.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/relaunch_notification/relaunch_notification_controller_platform_impl_desktop.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/lifetime/application_lifetime.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h"
diff --git a/chrome/browser/ui/views/relaunch_notification/relaunch_notification_controller_platform_impl_desktop.h b/chrome/browser/ui/views/relaunch_notification/relaunch_notification_controller_platform_impl_desktop.h index 3271acf..ca3155e8 100644 --- a/chrome/browser/ui/views/relaunch_notification/relaunch_notification_controller_platform_impl_desktop.h +++ b/chrome/browser/ui/views/relaunch_notification/relaunch_notification_controller_platform_impl_desktop.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_RELAUNCH_NOTIFICATION_RELAUNCH_NOTIFICATION_CONTROLLER_PLATFORM_IMPL_DESKTOP_H_ #define CHROME_BROWSER_UI_VIEWS_RELAUNCH_NOTIFICATION_RELAUNCH_NOTIFICATION_CONTROLLER_PLATFORM_IMPL_DESKTOP_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/time/time.h" #include "chrome/browser/ui/browser_list_observer.h" #include "ui/views/widget/widget_observer.h"
diff --git a/chrome/browser/ui/views/relaunch_notification/relaunch_notification_controller_unittest.cc b/chrome/browser/ui/views/relaunch_notification/relaunch_notification_controller_unittest.cc index 7811720d..12c9a5b 100644 --- a/chrome/browser/ui/views/relaunch_notification/relaunch_notification_controller_unittest.cc +++ b/chrome/browser/ui/views/relaunch_notification/relaunch_notification_controller_unittest.cc
@@ -8,7 +8,7 @@ #include <utility> #include "ash/public/cpp/update_types.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/numerics/safe_conversions.h"
diff --git a/chrome/browser/ui/views/relaunch_notification/relaunch_recommended_bubble_view.cc b/chrome/browser/ui/views/relaunch_notification/relaunch_recommended_bubble_view.cc index b2a12b3..e70a249e 100644 --- a/chrome/browser/ui/views/relaunch_notification/relaunch_recommended_bubble_view.cc +++ b/chrome/browser/ui/views/relaunch_notification/relaunch_recommended_bubble_view.cc
@@ -7,7 +7,7 @@ #include <tuple> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/metrics/user_metrics.h" #include "base/metrics/user_metrics_action.h"
diff --git a/chrome/browser/ui/views/relaunch_notification/relaunch_recommended_bubble_view.h b/chrome/browser/ui/views/relaunch_notification/relaunch_recommended_bubble_view.h index 89f4453..d89017b7 100644 --- a/chrome/browser/ui/views/relaunch_notification/relaunch_recommended_bubble_view.h +++ b/chrome/browser/ui/views/relaunch_notification/relaunch_recommended_bubble_view.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_RELAUNCH_NOTIFICATION_RELAUNCH_RECOMMENDED_BUBBLE_VIEW_H_ #define CHROME_BROWSER_UI_VIEWS_RELAUNCH_NOTIFICATION_RELAUNCH_RECOMMENDED_BUBBLE_VIEW_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/time/time.h" #include "chrome/browser/ui/views/location_bar/location_bar_bubble_delegate_view.h" #include "chrome/browser/ui/views/relaunch_notification/relaunch_recommended_timer.h"
diff --git a/chrome/browser/ui/views/relaunch_notification/relaunch_recommended_bubble_view_browsertest.cc b/chrome/browser/ui/views/relaunch_notification/relaunch_recommended_bubble_view_browsertest.cc index cd57dc0..56fa0042 100644 --- a/chrome/browser/ui/views/relaunch_notification/relaunch_recommended_bubble_view_browsertest.cc +++ b/chrome/browser/ui/views/relaunch_notification/relaunch_recommended_bubble_view_browsertest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/relaunch_notification/relaunch_recommended_bubble_view.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/time/time.h" #include "chrome/browser/ui/test/test_browser_dialog.h" #include "content/public/test/browser_test.h"
diff --git a/chrome/browser/ui/views/relaunch_notification/relaunch_recommended_timer.h b/chrome/browser/ui/views/relaunch_notification/relaunch_recommended_timer.h index 57e554f..740ab65 100644 --- a/chrome/browser/ui/views/relaunch_notification/relaunch_recommended_timer.h +++ b/chrome/browser/ui/views/relaunch_notification/relaunch_recommended_timer.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_RELAUNCH_NOTIFICATION_RELAUNCH_RECOMMENDED_TIMER_H_ #define CHROME_BROWSER_UI_VIEWS_RELAUNCH_NOTIFICATION_RELAUNCH_RECOMMENDED_TIMER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/time/time.h" #include "base/timer/wall_clock_timer.h"
diff --git a/chrome/browser/ui/views/relaunch_notification/relaunch_required_dialog_view.cc b/chrome/browser/ui/views/relaunch_notification/relaunch_required_dialog_view.cc index d89b2a3d..ad41e7c0 100644 --- a/chrome/browser/ui/views/relaunch_notification/relaunch_required_dialog_view.cc +++ b/chrome/browser/ui/views/relaunch_notification/relaunch_required_dialog_view.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/user_metrics.h" #include "base/metrics/user_metrics_action.h" #include "chrome/browser/ui/browser.h"
diff --git a/chrome/browser/ui/views/relaunch_notification/relaunch_required_dialog_view.h b/chrome/browser/ui/views/relaunch_notification/relaunch_required_dialog_view.h index 4b3afb2..1fed4af 100644 --- a/chrome/browser/ui/views/relaunch_notification/relaunch_required_dialog_view.h +++ b/chrome/browser/ui/views/relaunch_notification/relaunch_required_dialog_view.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_RELAUNCH_NOTIFICATION_RELAUNCH_REQUIRED_DIALOG_VIEW_H_ #define CHROME_BROWSER_UI_VIEWS_RELAUNCH_NOTIFICATION_RELAUNCH_REQUIRED_DIALOG_VIEW_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/time/time.h" #include "chrome/browser/ui/views/relaunch_notification/relaunch_required_timer.h" #include "ui/views/window/dialog_delegate.h"
diff --git a/chrome/browser/ui/views/relaunch_notification/relaunch_required_dialog_view_browsertest.cc b/chrome/browser/ui/views/relaunch_notification/relaunch_required_dialog_view_browsertest.cc index 49bdd9df4..e637a77 100644 --- a/chrome/browser/ui/views/relaunch_notification/relaunch_required_dialog_view_browsertest.cc +++ b/chrome/browser/ui/views/relaunch_notification/relaunch_required_dialog_view_browsertest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/relaunch_notification/relaunch_required_dialog_view.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/time/time.h" #include "chrome/browser/ui/test/test_browser_dialog.h" #include "content/public/test/browser_test.h"
diff --git a/chrome/browser/ui/views/relaunch_notification/relaunch_required_timer.cc b/chrome/browser/ui/views/relaunch_notification/relaunch_required_timer.cc index 5f37e20..ef7b745 100644 --- a/chrome/browser/ui/views/relaunch_notification/relaunch_required_timer.cc +++ b/chrome/browser/ui/views/relaunch_notification/relaunch_required_timer.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/time/time.h" #include "chrome/browser/ui/views/relaunch_notification/relaunch_required_timer_internal.h"
diff --git a/chrome/browser/ui/views/relaunch_notification/relaunch_required_timer.h b/chrome/browser/ui/views/relaunch_notification/relaunch_required_timer.h index fbcd1f8..1b015ee 100644 --- a/chrome/browser/ui/views/relaunch_notification/relaunch_required_timer.h +++ b/chrome/browser/ui/views/relaunch_notification/relaunch_required_timer.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_RELAUNCH_NOTIFICATION_RELAUNCH_REQUIRED_TIMER_H_ #define CHROME_BROWSER_UI_VIEWS_RELAUNCH_NOTIFICATION_RELAUNCH_REQUIRED_TIMER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/time/time.h" #include "base/timer/wall_clock_timer.h"
diff --git a/chrome/browser/ui/views/safe_browsing/deep_scanning_failure_modal_dialog.h b/chrome/browser/ui/views/safe_browsing/deep_scanning_failure_modal_dialog.h index a30cee2..510d51e 100644 --- a/chrome/browser/ui/views/safe_browsing/deep_scanning_failure_modal_dialog.h +++ b/chrome/browser/ui/views/safe_browsing/deep_scanning_failure_modal_dialog.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_UI_VIEWS_SAFE_BROWSING_DEEP_SCANNING_FAILURE_MODAL_DIALOG_H_ #define CHROME_BROWSER_UI_VIEWS_SAFE_BROWSING_DEEP_SCANNING_FAILURE_MODAL_DIALOG_H_ -#include "base/callback.h" -#include "base/callback_forward.h" +#include "base/functional/callback.h" +#include "base/functional/callback_forward.h" #include "ui/base/metadata/metadata_header_macros.h" #include "ui/base/ui_base_types.h" #include "ui/views/controls/button/button.h"
diff --git a/chrome/browser/ui/views/safe_browsing/deep_scanning_failure_modal_dialog_browsertest.cc b/chrome/browser/ui/views/safe_browsing/deep_scanning_failure_modal_dialog_browsertest.cc index 4e40b83..9131da7f 100644 --- a/chrome/browser/ui/views/safe_browsing/deep_scanning_failure_modal_dialog_browsertest.cc +++ b/chrome/browser/ui/views/safe_browsing/deep_scanning_failure_modal_dialog_browsertest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/safe_browsing/deep_scanning_failure_modal_dialog.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/browser/ui/test/test_browser_dialog.h"
diff --git a/chrome/browser/ui/views/safe_browsing/deep_scanning_modal_dialog.h b/chrome/browser/ui/views/safe_browsing/deep_scanning_modal_dialog.h index 5348ee3..1b81639 100644 --- a/chrome/browser/ui/views/safe_browsing/deep_scanning_modal_dialog.h +++ b/chrome/browser/ui/views/safe_browsing/deep_scanning_modal_dialog.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_SAFE_BROWSING_DEEP_SCANNING_MODAL_DIALOG_H_ #define CHROME_BROWSER_UI_VIEWS_SAFE_BROWSING_DEEP_SCANNING_MODAL_DIALOG_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "chrome/browser/ui/tab_modal_confirm_dialog_delegate.h" namespace content {
diff --git a/chrome/browser/ui/views/safe_browsing/password_reuse_modal_warning_dialog.cc b/chrome/browser/ui/views/safe_browsing/password_reuse_modal_warning_dialog.cc index 8a73eb50..fa81a17 100644 --- a/chrome/browser/ui/views/safe_browsing/password_reuse_modal_warning_dialog.cc +++ b/chrome/browser/ui/views/safe_browsing/password_reuse_modal_warning_dialog.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/safe_browsing/password_reuse_modal_warning_dialog.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/i18n/rtl.h" #include "base/strings/utf_string_conversions.h" #include "chrome/app/vector_icons/vector_icons.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 f7bd19a..6fd08f2 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
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_SAFE_BROWSING_PASSWORD_REUSE_MODAL_WARNING_DIALOG_H_ #define CHROME_BROWSER_UI_VIEWS_SAFE_BROWSING_PASSWORD_REUSE_MODAL_WARNING_DIALOG_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/time/time.h" #include "chrome/browser/safe_browsing/chrome_password_protection_service.h"
diff --git a/chrome/browser/ui/views/safe_browsing/password_reuse_modal_warning_dialog_browsertest.cc b/chrome/browser/ui/views/safe_browsing/password_reuse_modal_warning_dialog_browsertest.cc index c6017106..94d5f43d 100644 --- a/chrome/browser/ui/views/safe_browsing/password_reuse_modal_warning_dialog_browsertest.cc +++ b/chrome/browser/ui/views/safe_browsing/password_reuse_modal_warning_dialog_browsertest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/safe_browsing/password_reuse_modal_warning_dialog.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "chrome/browser/ui/browser.h"
diff --git a/chrome/browser/ui/views/safe_browsing/prompt_for_scanning_modal_dialog.cc b/chrome/browser/ui/views/safe_browsing/prompt_for_scanning_modal_dialog.cc index 649c92d..7e3290e 100644 --- a/chrome/browser/ui/views/safe_browsing/prompt_for_scanning_modal_dialog.cc +++ b/chrome/browser/ui/views/safe_browsing/prompt_for_scanning_modal_dialog.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/views/chrome_layout_provider.h"
diff --git a/chrome/browser/ui/views/safe_browsing/prompt_for_scanning_modal_dialog.h b/chrome/browser/ui/views/safe_browsing/prompt_for_scanning_modal_dialog.h index 2cbe181..7657970 100644 --- a/chrome/browser/ui/views/safe_browsing/prompt_for_scanning_modal_dialog.h +++ b/chrome/browser/ui/views/safe_browsing/prompt_for_scanning_modal_dialog.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_UI_VIEWS_SAFE_BROWSING_PROMPT_FOR_SCANNING_MODAL_DIALOG_H_ #define CHROME_BROWSER_UI_VIEWS_SAFE_BROWSING_PROMPT_FOR_SCANNING_MODAL_DIALOG_H_ -#include "base/callback.h" -#include "base/callback_forward.h" +#include "base/functional/callback.h" +#include "base/functional/callback_forward.h" #include "ui/base/metadata/metadata_header_macros.h" #include "ui/base/ui_base_types.h" #include "ui/views/controls/styled_label.h"
diff --git a/chrome/browser/ui/views/safe_browsing/prompt_for_scanning_modal_dialog_browsertest.cc b/chrome/browser/ui/views/safe_browsing/prompt_for_scanning_modal_dialog_browsertest.cc index 6a1a0d8..81e54059 100644 --- a/chrome/browser/ui/views/safe_browsing/prompt_for_scanning_modal_dialog_browsertest.cc +++ b/chrome/browser/ui/views/safe_browsing/prompt_for_scanning_modal_dialog_browsertest.cc
@@ -6,7 +6,7 @@ #include <string> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/browser/ui/test/test_browser_dialog.h"
diff --git a/chrome/browser/ui/views/safe_browsing/tailored_security_desktop_dialog_manager.cc b/chrome/browser/ui/views/safe_browsing/tailored_security_desktop_dialog_manager.cc index d4f9afea..2bd1b76 100644 --- a/chrome/browser/ui/views/safe_browsing/tailored_security_desktop_dialog_manager.cc +++ b/chrome/browser/ui/views/safe_browsing/tailored_security_desktop_dialog_manager.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/user_metrics.h" #include "base/metrics/user_metrics_action.h"
diff --git a/chrome/browser/ui/views/safe_browsing/tailored_security_desktop_dialog_manager.h b/chrome/browser/ui/views/safe_browsing/tailored_security_desktop_dialog_manager.h index 94a8e41..ec51768 100644 --- a/chrome/browser/ui/views/safe_browsing/tailored_security_desktop_dialog_manager.h +++ b/chrome/browser/ui/views/safe_browsing/tailored_security_desktop_dialog_manager.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_SAFE_BROWSING_TAILORED_SECURITY_DESKTOP_DIALOG_MANAGER_H_ #define CHROME_BROWSER_UI_VIEWS_SAFE_BROWSING_TAILORED_SECURITY_DESKTOP_DIALOG_MANAGER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" class Browser;
diff --git a/chrome/browser/ui/views/safe_browsing/tailored_security_unconsented_modal.h b/chrome/browser/ui/views/safe_browsing/tailored_security_unconsented_modal.h index 55e6876..e226890 100644 --- a/chrome/browser/ui/views/safe_browsing/tailored_security_unconsented_modal.h +++ b/chrome/browser/ui/views/safe_browsing/tailored_security_unconsented_modal.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_SAFE_BROWSING_TAILORED_SECURITY_UNCONSENTED_MODAL_H_ #define CHROME_BROWSER_UI_VIEWS_SAFE_BROWSING_TAILORED_SECURITY_UNCONSENTED_MODAL_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "ui/views/window/dialog_delegate.h"
diff --git a/chrome/browser/ui/views/screen_capture_notification_ui_views.cc b/chrome/browser/ui/views/screen_capture_notification_ui_views.cc index 69a9222..00f449b3 100644 --- a/chrome/browser/ui/views/screen_capture_notification_ui_views.cc +++ b/chrome/browser/ui/views/screen_capture_notification_ui_views.cc
@@ -7,7 +7,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/scoped_multi_source_observation.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/ui/views/select_file_dialog_extension_browsertest.cc b/chrome/browser/ui/views/select_file_dialog_extension_browsertest.cc index 058746da..78bb613d 100644 --- a/chrome/browser/ui/views/select_file_dialog_extension_browsertest.cc +++ b/chrome/browser/ui/views/select_file_dialog_extension_browsertest.cc
@@ -10,9 +10,9 @@ #include "ash/public/cpp/keyboard/keyboard_switches.h" #include "ash/public/cpp/style/dark_light_mode_controller.h" #include "ash/public/cpp/test/shell_test_api.h" -#include "base/callback_helpers.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/path_service.h" #include "base/run_loop.h"
diff --git a/chrome/browser/ui/views/send_tab_to_self/manage_account_devices_link_view.cc b/chrome/browser/ui/views/send_tab_to_self/manage_account_devices_link_view.cc index 19afcce..563410b 100644 --- a/chrome/browser/ui/views/send_tab_to_self/manage_account_devices_link_view.cc +++ b/chrome/browser/ui/views/send_tab_to_self/manage_account_devices_link_view.cc
@@ -8,8 +8,8 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/views/chrome_layout_provider.h" #include "chrome/browser/ui/views/send_tab_to_self/send_tab_to_self_bubble_controller.h"
diff --git a/chrome/browser/ui/views/send_tab_to_self/send_tab_to_self_bubble_browsertest.cc b/chrome/browser/ui/views/send_tab_to_self/send_tab_to_self_bubble_browsertest.cc index cc26cbf..0239af0 100644 --- a/chrome/browser/ui/views/send_tab_to_self/send_tab_to_self_bubble_browsertest.cc +++ b/chrome/browser/ui/views/send_tab_to_self/send_tab_to_self_bubble_browsertest.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 "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/time/time.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sync/send_tab_to_self_sync_service_factory.h"
diff --git a/chrome/browser/ui/views/send_tab_to_self/send_tab_to_self_bubble_device_button.h b/chrome/browser/ui/views/send_tab_to_self/send_tab_to_self_bubble_device_button.h index 02a7b7c..d0d6c29 100644 --- a/chrome/browser/ui/views/send_tab_to_self/send_tab_to_self_bubble_device_button.h +++ b/chrome/browser/ui/views/send_tab_to_self/send_tab_to_self_bubble_device_button.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/ui/views/controls/hover_button.h" #include "components/sync_device_info/device_info.h" #include "ui/base/metadata/metadata_header_macros.h"
diff --git a/chrome/browser/ui/views/send_tab_to_self/send_tab_to_self_toolbar_bubble_view_unittest.cc b/chrome/browser/ui/views/send_tab_to_self/send_tab_to_self_toolbar_bubble_view_unittest.cc index 8af84529..37af872 100644 --- a/chrome/browser/ui/views/send_tab_to_self/send_tab_to_self_toolbar_bubble_view_unittest.cc +++ b/chrome/browser/ui/views/send_tab_to_self/send_tab_to_self_toolbar_bubble_view_unittest.cc
@@ -6,7 +6,7 @@ #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/test/bind.h" #include "chrome/browser/ui/browser_navigator.h" #include "chrome/browser/ui/browser_navigator_params.h"
diff --git a/chrome/browser/ui/views/session_crashed_bubble_view.cc b/chrome/browser/ui/views/session_crashed_bubble_view.cc index 12b66165..d5d8602 100644 --- a/chrome/browser/ui/views/session_crashed_bubble_view.cc +++ b/chrome/browser/ui/views/session_crashed_bubble_view.cc
@@ -10,8 +10,8 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/metrics/histogram_macros.h" #include "build/branding_buildflags.h"
diff --git a/chrome/browser/ui/views/settings_reset_prompt_dialog_browsertest.cc b/chrome/browser/ui/views/settings_reset_prompt_dialog_browsertest.cc index 8dfd838..f802cda 100644 --- a/chrome/browser/ui/views/settings_reset_prompt_dialog_browsertest.cc +++ b/chrome/browser/ui/views/settings_reset_prompt_dialog_browsertest.cc
@@ -13,7 +13,7 @@ #include <utility> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h"
diff --git a/chrome/browser/ui/views/sharing/click_to_call_browsertest.cc b/chrome/browser/ui/views/sharing/click_to_call_browsertest.cc index d65877ea..b82f997 100644 --- a/chrome/browser/ui/views/sharing/click_to_call_browsertest.cc +++ b/chrome/browser/ui/views/sharing/click_to_call_browsertest.cc
@@ -5,7 +5,7 @@ #include <memory> #include <string> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/strings/strcat.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/views/sharing/sharing_browsertest.cc b/chrome/browser/ui/views/sharing/sharing_browsertest.cc index 41e78219..775fc78 100644 --- a/chrome/browser/ui/views/sharing/sharing_browsertest.cc +++ b/chrome/browser/ui/views/sharing/sharing_browsertest.cc
@@ -6,7 +6,7 @@ #include <map> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/run_loop.h" #include "base/strings/strcat.h"
diff --git a/chrome/browser/ui/views/sharing/sharing_dialog_view.cc b/chrome/browser/ui/views/sharing/sharing_dialog_view.cc index e70152e..c153a185 100644 --- a/chrome/browser/ui/views/sharing/sharing_dialog_view.cc +++ b/chrome/browser/ui/views/sharing/sharing_dialog_view.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/sharing/sharing_dialog_view.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/ui/views/sharing_hub/screenshot/screenshot_captured_bubble.cc b/chrome/browser/ui/views/sharing_hub/screenshot/screenshot_captured_bubble.cc index ac6c7d2..54367993d 100644 --- a/chrome/browser/ui/views/sharing_hub/screenshot/screenshot_captured_bubble.cc +++ b/chrome/browser/ui/views/sharing_hub/screenshot/screenshot_captured_bubble.cc
@@ -8,11 +8,11 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/containers/span.h" #include "base/feature_list.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/metrics/user_metrics.h" #include "base/strings/strcat.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/ui/views/sharing_hub/screenshot/screenshot_captured_bubble_unittest.cc b/chrome/browser/ui/views/sharing_hub/screenshot/screenshot_captured_bubble_unittest.cc index f5f7081..bec5d5b1 100644 --- a/chrome/browser/ui/views/sharing_hub/screenshot/screenshot_captured_bubble_unittest.cc +++ b/chrome/browser/ui/views/sharing_hub/screenshot/screenshot_captured_bubble_unittest.cc
@@ -6,7 +6,7 @@ #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/test/bind.h" #include "chrome/browser/image_editor/image_editor_component_info.h"
diff --git a/chrome/browser/ui/views/sharing_hub/sharing_hub_bubble_action_button.h b/chrome/browser/ui/views/sharing_hub/sharing_hub_bubble_action_button.h index 58e5064..febeb8d2 100644 --- a/chrome/browser/ui/views/sharing_hub/sharing_hub_bubble_action_button.h +++ b/chrome/browser/ui/views/sharing_hub/sharing_hub_bubble_action_button.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_SHARING_HUB_SHARING_HUB_BUBBLE_ACTION_BUTTON_H_ #define CHROME_BROWSER_UI_VIEWS_SHARING_HUB_SHARING_HUB_BUBBLE_ACTION_BUTTON_H_ -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "ui/views/controls/button/button.h"
diff --git a/chrome/browser/ui/views/sharing_hub/sharing_hub_bubble_util.cc b/chrome/browser/ui/views/sharing_hub/sharing_hub_bubble_util.cc index 42952b9..8d488d1 100644 --- a/chrome/browser/ui/views/sharing_hub/sharing_hub_bubble_util.cc +++ b/chrome/browser/ui/views/sharing_hub/sharing_hub_bubble_util.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/sharing_hub/sharing_hub_bubble_util.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/grit/generated_resources.h" #include "components/strings/grit/components_strings.h" #include "components/vector_icons/vector_icons.h"
diff --git a/chrome/browser/ui/views/side_panel/bookmarks/bookmarks_side_panel_coordinator.cc b/chrome/browser/ui/views/side_panel/bookmarks/bookmarks_side_panel_coordinator.cc index fd8c4f24..4f313e0 100644 --- a/chrome/browser/ui/views/side_panel/bookmarks/bookmarks_side_panel_coordinator.cc +++ b/chrome/browser/ui/views/side_panel/bookmarks/bookmarks_side_panel_coordinator.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/side_panel/bookmarks/bookmarks_side_panel_coordinator.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_element_identifiers.h"
diff --git a/chrome/browser/ui/views/side_panel/customize_chrome/customize_chrome_side_panel_controller.cc b/chrome/browser/ui/views/side_panel/customize_chrome/customize_chrome_side_panel_controller.cc index a048b59..81be7eb 100644 --- a/chrome/browser/ui/views/side_panel/customize_chrome/customize_chrome_side_panel_controller.cc +++ b/chrome/browser/ui/views/side_panel/customize_chrome/customize_chrome_side_panel_controller.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ui/views/side_panel/customize_chrome/customize_chrome_side_panel_controller.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "chrome/app/vector_icons/vector_icons.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser_finder.h"
diff --git a/chrome/browser/ui/views/side_panel/history_clusters/history_clusters_side_panel_coordinator.cc b/chrome/browser/ui/views/side_panel/history_clusters/history_clusters_side_panel_coordinator.cc index 668caac..04277f1 100644 --- a/chrome/browser/ui/views/side_panel/history_clusters/history_clusters_side_panel_coordinator.cc +++ b/chrome/browser/ui/views/side_panel/history_clusters/history_clusters_side_panel_coordinator.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/side_panel/history_clusters/history_clusters_side_panel_coordinator.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/strings/escape.h" #include "base/strings/stringprintf.h" #include "chrome/app/vector_icons/vector_icons.h"
diff --git a/chrome/browser/ui/views/side_panel/lens/lens_side_panel_coordinator.cc b/chrome/browser/ui/views/side_panel/lens/lens_side_panel_coordinator.cc index 3d4893c4..3d68305 100644 --- a/chrome/browser/ui/views/side_panel/lens/lens_side_panel_coordinator.cc +++ b/chrome/browser/ui/views/side_panel/lens/lens_side_panel_coordinator.cc
@@ -5,7 +5,7 @@ #include "chrome/browser/ui/views/side_panel/lens/lens_side_panel_coordinator.h" #include <iostream> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/metrics/user_metrics.h" #include "base/metrics/user_metrics_action.h" #include "base/scoped_observation.h"
diff --git a/chrome/browser/ui/views/side_panel/lens/lens_unified_side_panel_view.cc b/chrome/browser/ui/views/side_panel/lens/lens_unified_side_panel_view.cc index b9afacb..d8885f9c 100644 --- a/chrome/browser/ui/views/side_panel/lens/lens_unified_side_panel_view.cc +++ b/chrome/browser/ui/views/side_panel/lens/lens_unified_side_panel_view.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/side_panel/lens/lens_unified_side_panel_view.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/user_metrics.h" #include "base/metrics/user_metrics_action.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ui/views/side_panel/read_anything/read_anything_button_view.h b/chrome/browser/ui/views/side_panel/read_anything/read_anything_button_view.h index dc6479e8..83a4a924 100644 --- a/chrome/browser/ui/views/side_panel/read_anything/read_anything_button_view.h +++ b/chrome/browser/ui/views/side_panel/read_anything/read_anything_button_view.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_SIDE_PANEL_READ_ANYTHING_READ_ANYTHING_BUTTON_VIEW_H_ #define CHROME_BROWSER_UI_VIEWS_SIDE_PANEL_READ_ANYTHING_READ_ANYTHING_BUTTON_VIEW_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "ui/gfx/image/image_skia.h" #include "ui/views/controls/button/image_button.h" #include "ui/views/view.h"
diff --git a/chrome/browser/ui/views/side_panel/read_later_side_panel_web_view.h b/chrome/browser/ui/views/side_panel/read_later_side_panel_web_view.h index d452624..b936728 100644 --- a/chrome/browser/ui/views/side_panel/read_later_side_panel_web_view.h +++ b/chrome/browser/ui/views/side_panel/read_later_side_panel_web_view.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_SIDE_PANEL_READ_LATER_SIDE_PANEL_WEB_VIEW_H_ #define CHROME_BROWSER_UI_VIEWS_SIDE_PANEL_READ_LATER_SIDE_PANEL_WEB_VIEW_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" #include "chrome/browser/ui/views/bubble/bubble_contents_wrapper.h"
diff --git a/chrome/browser/ui/views/side_panel/reading_list/reading_list_side_panel_coordinator.cc b/chrome/browser/ui/views/side_panel/reading_list/reading_list_side_panel_coordinator.cc index 0fd59c83..784eb9d0 100644 --- a/chrome/browser/ui/views/side_panel/reading_list/reading_list_side_panel_coordinator.cc +++ b/chrome/browser/ui/views/side_panel/reading_list/reading_list_side_panel_coordinator.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/app/vector_icons/vector_icons.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/views/frame/browser_view.h"
diff --git a/chrome/browser/ui/views/side_panel/search_companion/search_companion_side_panel_coordinator.cc b/chrome/browser/ui/views/side_panel/search_companion/search_companion_side_panel_coordinator.cc index 9b126ac..dfa0cdc4 100644 --- a/chrome/browser/ui/views/side_panel/search_companion/search_companion_side_panel_coordinator.cc +++ b/chrome/browser/ui/views/side_panel/search_companion/search_companion_side_panel_coordinator.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/side_panel/search_companion/search_companion_side_panel_coordinator.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/strings/escape.h" #include "base/strings/stringprintf.h" #include "chrome/app/vector_icons/vector_icons.h"
diff --git a/chrome/browser/ui/views/side_panel/search_companion/search_companion_side_panel_view.cc b/chrome/browser/ui/views/side_panel/search_companion/search_companion_side_panel_view.cc index 176a620..2a25ebb 100644 --- a/chrome/browser/ui/views/side_panel/search_companion/search_companion_side_panel_view.cc +++ b/chrome/browser/ui/views/side_panel/search_companion/search_companion_side_panel_view.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/side_panel/search_companion/search_companion_side_panel_view.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_key.h" #include "chrome/browser/search/search.h"
diff --git a/chrome/browser/ui/views/side_panel/side_panel.cc b/chrome/browser/ui/views/side_panel/side_panel.cc index 6067e874..87ad34f 100644 --- a/chrome/browser/ui/views/side_panel/side_panel.cc +++ b/chrome/browser/ui/views/side_panel/side_panel.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/i18n/rtl.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/ui/browser_element_identifiers.h"
diff --git a/chrome/browser/ui/views/side_panel/side_panel_content_proxy.h b/chrome/browser/ui/views/side_panel/side_panel_content_proxy.h index d9a915a..1ba3306 100644 --- a/chrome/browser/ui/views/side_panel/side_panel_content_proxy.h +++ b/chrome/browser/ui/views/side_panel/side_panel_content_proxy.h
@@ -8,7 +8,7 @@ #include <algorithm> #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "ui/views/view.h" // SidePanelContentProxy is used by the SidePanelCoordinator to check that the
diff --git a/chrome/browser/ui/views/side_panel/side_panel_coordinator.cc b/chrome/browser/ui/views/side_panel/side_panel_coordinator.cc index bbe5593f..041279b4 100644 --- a/chrome/browser/ui/views/side_panel/side_panel_coordinator.cc +++ b/chrome/browser/ui/views/side_panel/side_panel_coordinator.cc
@@ -5,9 +5,9 @@ #include "chrome/browser/ui/views/side_panel/side_panel_coordinator.h" #include <memory> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_forward.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_forward.h" #include "chrome/browser/feature_engagement/tracker_factory.h" #include "chrome/browser/themes/theme_properties.h" #include "chrome/browser/ui/browser_element_identifiers.h"
diff --git a/chrome/browser/ui/views/side_panel/side_panel_entry.h b/chrome/browser/ui/views/side_panel/side_panel_entry.h index 6356db2..40b76aa 100644 --- a/chrome/browser/ui/views/side_panel/side_panel_entry.h +++ b/chrome/browser/ui/views/side_panel/side_panel_entry.h
@@ -9,7 +9,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/functional/callback_forward.h" #include "base/observer_list.h" #include "base/time/time.h"
diff --git a/chrome/browser/ui/views/side_panel/side_panel_web_ui_view.h b/chrome/browser/ui/views/side_panel/side_panel_web_ui_view.h index a44d3d62..a17b5cc9 100644 --- a/chrome/browser/ui/views/side_panel/side_panel_web_ui_view.h +++ b/chrome/browser/ui/views/side_panel/side_panel_web_ui_view.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/ui/views/bubble/bubble_contents_wrapper.h" #include "ui/views/controls/webview/unhandled_keyboard_event_handler.h"
diff --git a/chrome/browser/ui/views/side_search/default_search_icon_source.h b/chrome/browser/ui/views/side_search/default_search_icon_source.h index 108bb76..a74d8ca 100644 --- a/chrome/browser/ui/views/side_search/default_search_icon_source.h +++ b/chrome/browser/ui/views/side_search/default_search_icon_source.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_UI_VIEWS_SIDE_SEARCH_DEFAULT_SEARCH_ICON_SOURCE_H_ #define CHROME_BROWSER_UI_VIEWS_SIDE_SEARCH_DEFAULT_SEARCH_ICON_SOURCE_H_ -#include "base/callback_forward.h" #include "base/callback_list.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/scoped_observation.h" #include "chrome/browser/ui/browser_user_data.h"
diff --git a/chrome/browser/ui/views/side_search/side_search_browser_controller.cc b/chrome/browser/ui/views/side_search/side_search_browser_controller.cc index 238a1ad..d92ba824 100644 --- a/chrome/browser/ui/views/side_search/side_search_browser_controller.cc +++ b/chrome/browser/ui/views/side_search/side_search_browser_controller.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/side_search/side_search_browser_controller.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/memory/raw_ref.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/views/side_search/unified_side_search_controller.cc b/chrome/browser/ui/views/side_search/unified_side_search_controller.cc index 6f5ecd5d..c113e3ea 100644 --- a/chrome/browser/ui/views/side_search/unified_side_search_controller.cc +++ b/chrome/browser/ui/views/side_search/unified_side_search_controller.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/side_search/unified_side_search_controller.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/app/vector_icons/vector_icons.h" #include "chrome/browser/feature_engagement/tracker_factory.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ui/views/ssl_client_certificate_selector.cc b/chrome/browser/ui/views/ssl_client_certificate_selector.cc index 5f7cd9e9..d75cecb 100644 --- a/chrome/browser/ui/views/ssl_client_certificate_selector.cc +++ b/chrome/browser/ui/views/ssl_client_certificate_selector.cc
@@ -7,9 +7,9 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/no_destructor.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h"
diff --git a/chrome/browser/ui/views/ssl_client_certificate_selector_browsertest.cc b/chrome/browser/ui/views/ssl_client_certificate_selector_browsertest.cc index 4d4da0a..1713bd7 100644 --- a/chrome/browser/ui/views/ssl_client_certificate_selector_browsertest.cc +++ b/chrome/browser/ui/views/ssl_client_certificate_selector_browsertest.cc
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/test/metrics/histogram_tester.h" #include "build/build_config.h"
diff --git a/chrome/browser/ui/views/status_bubble_views.cc b/chrome/browser/ui/views/status_bubble_views.cc index 9442af3..254f687 100644 --- a/chrome/browser/ui/views/status_bubble_views.cc +++ b/chrome/browser/ui/views/status_bubble_views.cc
@@ -7,7 +7,7 @@ #include <algorithm> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/i18n/rtl.h" #include "base/location.h" #include "base/memory/raw_ptr.h"
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 166f6cf..0199c79a 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
@@ -9,10 +9,10 @@ #include <memory> #include <string> -#include "base/bind.h" #include "base/check_op.h" #include "base/environment.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted_memory.h" #include "base/nix/xdg_util.h" #include "base/notreached.h"
diff --git a/chrome/browser/ui/views/status_icons/status_icon_linux_dbus.h b/chrome/browser/ui/views/status_icons/status_icon_linux_dbus.h index e7628de..8b2dd07d3 100644 --- a/chrome/browser/ui/views/status_icons/status_icon_linux_dbus.h +++ b/chrome/browser/ui/views/status_icons/status_icon_linux_dbus.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/callback_forward.h" #include "base/files/file_path.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.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 a7d4295..cfb2a2fb 100644 --- a/chrome/browser/ui/views/status_icons/status_tray_win.cc +++ b/chrome/browser/ui/views/status_icons/status_tray_win.cc
@@ -9,7 +9,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/sequence_checker.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/ui/views/supervised_user/extension_install_blocked_by_parent_dialog_browsertest.cc b/chrome/browser/ui/views/supervised_user/extension_install_blocked_by_parent_dialog_browsertest.cc index 298bcb1..5c17e78 100644 --- a/chrome/browser/ui/views/supervised_user/extension_install_blocked_by_parent_dialog_browsertest.cc +++ b/chrome/browser/ui/views/supervised_user/extension_install_blocked_by_parent_dialog_browsertest.cc
@@ -4,7 +4,7 @@ #include <string> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/memory/scoped_refptr.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/extensions/extensions_dialogs.h"
diff --git a/chrome/browser/ui/views/supervised_user/parent_permission_dialog_view.cc b/chrome/browser/ui/views/supervised_user/parent_permission_dialog_view.cc index a6e28e8..3a8b47f 100644 --- a/chrome/browser/ui/views/supervised_user/parent_permission_dialog_view.cc +++ b/chrome/browser/ui/views/supervised_user/parent_permission_dialog_view.cc
@@ -7,8 +7,8 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/strings/utf_string_conversions.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/ui/views/supervised_user/parent_permission_dialog_view_browsertest.cc b/chrome/browser/ui/views/supervised_user/parent_permission_dialog_view_browsertest.cc index a95b5455..7bd7ed3fb 100644 --- a/chrome/browser/ui/views/supervised_user/parent_permission_dialog_view_browsertest.cc +++ b/chrome/browser/ui/views/supervised_user/parent_permission_dialog_view_browsertest.cc
@@ -7,7 +7,7 @@ #include <memory> #include <vector> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/memory/scoped_refptr.h" #include "base/path_service.h" #include "base/run_loop.h"
diff --git a/chrome/browser/ui/views/sync/bubble_sync_promo_view.cc b/chrome/browser/ui/views/sync/bubble_sync_promo_view.cc index fc8acda..e744938 100644 --- a/chrome/browser/ui/views/sync/bubble_sync_promo_view.cc +++ b/chrome/browser/ui/views/sync/bubble_sync_promo_view.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/notreached.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_avatar_icon_util.h"
diff --git a/chrome/browser/ui/views/sync/inline_login_ui_browsertest.cc b/chrome/browser/ui/views/sync/inline_login_ui_browsertest.cc index ecd8019f..f8b516698 100644 --- a/chrome/browser/ui/views/sync/inline_login_ui_browsertest.cc +++ b/chrome/browser/ui/views/sync/inline_login_ui_browsertest.cc
@@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/bind.h" #include "base/command_line.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/ranges/algorithm.h"
diff --git a/chrome/browser/ui/views/sync/one_click_signin_dialog_view.cc b/chrome/browser/ui/views/sync/one_click_signin_dialog_view.cc index 1de7a83..01fe47de 100644 --- a/chrome/browser/ui/views/sync/one_click_signin_dialog_view.cc +++ b/chrome/browser/ui/views/sync/one_click_signin_dialog_view.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/views/chrome_layout_provider.h"
diff --git a/chrome/browser/ui/views/sync/one_click_signin_dialog_view.h b/chrome/browser/ui/views/sync/one_click_signin_dialog_view.h index 805ef45..fddd2e02 100644 --- a/chrome/browser/ui/views/sync/one_click_signin_dialog_view.h +++ b/chrome/browser/ui/views/sync/one_click_signin_dialog_view.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/gtest_prod_util.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/sync/one_click_signin_links_delegate.h"
diff --git a/chrome/browser/ui/views/sync/one_click_signin_dialog_view_unittest.cc b/chrome/browser/ui/views/sync/one_click_signin_dialog_view_unittest.cc index b2a1f4d..4bd0dc1 100644 --- a/chrome/browser/ui/views/sync/one_click_signin_dialog_view_unittest.cc +++ b/chrome/browser/ui/views/sync/one_click_signin_dialog_view_unittest.cc
@@ -7,8 +7,8 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "chrome/browser/ui/views/chrome_constrained_window_views_client.h"
diff --git a/chrome/browser/ui/views/tab_search_bubble_host.cc b/chrome/browser/ui/views/tab_search_bubble_host.cc index 4d856a2..6f0a9c2 100644 --- a/chrome/browser/ui/views/tab_search_bubble_host.cc +++ b/chrome/browser/ui/views/tab_search_bubble_host.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/tab_search_bubble_host.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/i18n/rtl.h" #include "base/metrics/histogram_functions.h" #include "chrome/app/vector_icons/vector_icons.h"
diff --git a/chrome/browser/ui/views/tab_sharing/tab_sharing_ui_views.h b/chrome/browser/ui/views/tab_sharing/tab_sharing_ui_views.h index 20732f3..45fd0809 100644 --- a/chrome/browser/ui/views/tab_sharing/tab_sharing_ui_views.h +++ b/chrome/browser/ui/views/tab_sharing/tab_sharing_ui_views.h
@@ -9,7 +9,7 @@ #include <set> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/media/webrtc/media_stream_capture_indicator.h"
diff --git a/chrome/browser/ui/views/tab_sharing/tab_sharing_ui_views_browsertest.cc b/chrome/browser/ui/views/tab_sharing/tab_sharing_ui_views_browsertest.cc index 7a9d781..2d381847 100644 --- a/chrome/browser/ui/views/tab_sharing/tab_sharing_ui_views_browsertest.cc +++ b/chrome/browser/ui/views/tab_sharing/tab_sharing_ui_views_browsertest.cc
@@ -7,7 +7,7 @@ #include <map> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/test/scoped_feature_list.h" #include "build/chromeos_buildflags.h" #include "chrome/browser/browser_features.h"
diff --git a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc index 9b29b45b..4f04525 100644 --- a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc +++ b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
@@ -9,10 +9,10 @@ #include <utility> #include "base/auto_reset.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h"
diff --git a/chrome/browser/ui/views/tabs/color_picker_view.cc b/chrome/browser/ui/views/tabs/color_picker_view.cc index 86a71ce..5224911 100644 --- a/chrome/browser/ui/views/tabs/color_picker_view.cc +++ b/chrome/browser/ui/views/tabs/color_picker_view.cc
@@ -7,9 +7,9 @@ #include <memory> #include <vector> -#include "base/bind.h" -#include "base/callback.h" #include "base/containers/span.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/themes/theme_properties.h" #include "chrome/browser/ui/tabs/tab_group_theme.h"
diff --git a/chrome/browser/ui/views/tabs/color_picker_view.h b/chrome/browser/ui/views/tabs/color_picker_view.h index 79de187e..0b7e496 100644 --- a/chrome/browser/ui/views/tabs/color_picker_view.h +++ b/chrome/browser/ui/views/tabs/color_picker_view.h
@@ -8,7 +8,7 @@ #include <utility> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/ui/views/tabs/tab_group_editor_bubble_view.h" #include "components/tab_groups/tab_group_color.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/chrome/browser/ui/views/tabs/compound_tab_container.cc b/chrome/browser/ui/views/tabs/compound_tab_container.cc index 43e1b74..de0ab06 100644 --- a/chrome/browser/ui/views/tabs/compound_tab_container.cc +++ b/chrome/browser/ui/views/tabs/compound_tab_container.cc
@@ -6,7 +6,7 @@ #include <memory> #include "base/auto_reset.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/trace_event/trace_event.h" #include "chrome/browser/ui/tabs/tab_style.h" #include "chrome/browser/ui/tabs/tab_types.h"
diff --git a/chrome/browser/ui/views/tabs/overflow_view_unittest.cc b/chrome/browser/ui/views/tabs/overflow_view_unittest.cc index df7e46c..c6f9507 100644 --- a/chrome/browser/ui/views/tabs/overflow_view_unittest.cc +++ b/chrome/browser/ui/views/tabs/overflow_view_unittest.cc
@@ -8,7 +8,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/numerics/safe_conversions.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/ui/views/tabs/tab.cc b/chrome/browser/ui/views/tabs/tab.cc index fe22bf7..2653af5 100644 --- a/chrome/browser/ui/views/tabs/tab.cc +++ b/chrome/browser/ui/views/tabs/tab.cc
@@ -11,8 +11,8 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/debug/alias.h" +#include "base/functional/bind.h" #include "base/i18n/rtl.h" #include "base/memory/raw_ptr.h" #include "base/metrics/user_metrics.h"
diff --git a/chrome/browser/ui/views/tabs/tab_close_button.h b/chrome/browser/ui/views/tabs/tab_close_button.h index 25d06b0e..333637a 100644 --- a/chrome/browser/ui/views/tabs/tab_close_button.h +++ b/chrome/browser/ui/views/tabs/tab_close_button.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_TABS_TAB_CLOSE_BUTTON_H_ #define CHROME_BROWSER_UI_VIEWS_TABS_TAB_CLOSE_BUTTON_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "chrome/browser/ui/views/tabs/tab_style_views.h" #include "ui/base/metadata/metadata_header_macros.h" #include "ui/views/controls/button/image_button.h"
diff --git a/chrome/browser/ui/views/tabs/tab_drag_context.h b/chrome/browser/ui/views/tabs/tab_drag_context.h index 3e4e533..5af7b21 100644 --- a/chrome/browser/ui/views/tabs/tab_drag_context.h +++ b/chrome/browser/ui/views/tabs/tab_drag_context.h
@@ -8,7 +8,7 @@ #include <memory> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "third_party/abseil-cpp/absl/types/optional.h" #include "ui/base/models/list_selection_model.h" #include "ui/gfx/geometry/rect.h"
diff --git a/chrome/browser/ui/views/tabs/tab_drag_controller.cc b/chrome/browser/ui/views/tabs/tab_drag_controller.cc index 4f30eb4..cad410e 100644 --- a/chrome/browser/ui/views/tabs/tab_drag_controller.cc +++ b/chrome/browser/ui/views/tabs/tab_drag_controller.cc
@@ -9,11 +9,11 @@ #include <utility> #include "base/auto_reset.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/containers/adapters.h" #include "base/containers/contains.h" #include "base/cxx17_backports.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/i18n/rtl.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_auto_reset.h"
diff --git a/chrome/browser/ui/views/tabs/tab_drag_controller.h b/chrome/browser/ui/views/tabs/tab_drag_controller.h index b8909a3..9e914fc 100644 --- a/chrome/browser/ui/views/tabs/tab_drag_controller.h +++ b/chrome/browser/ui/views/tabs/tab_drag_controller.h
@@ -10,7 +10,7 @@ #include <memory> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/scoped_observation.h"
diff --git a/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc b/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc index 492019e..b968c3a 100644 --- a/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc +++ b/chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.cc
@@ -12,12 +12,12 @@ #include <set> #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/dcheck_is_on.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h"
diff --git a/chrome/browser/ui/views/tabs/tab_group_editor_bubble_view.cc b/chrome/browser/ui/views/tabs/tab_group_editor_bubble_view.cc index 329fcd5..4055fe8a 100644 --- a/chrome/browser/ui/views/tabs/tab_group_editor_bubble_view.cc +++ b/chrome/browser/ui/views/tabs/tab_group_editor_bubble_view.cc
@@ -7,11 +7,11 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/containers/adapters.h" #include "base/containers/flat_map.h" #include "base/containers/span.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/raw_ptr.h" #include "base/metrics/histogram_macros.h" @@ -25,6 +25,8 @@ #include "chrome/browser/ui/browser_element_identifiers.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/chrome_pages.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_service_factory.h" #include "chrome/browser/ui/tabs/tab_group.h" #include "chrome/browser/ui/tabs/tab_group_model.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" @@ -150,6 +152,8 @@ if (!model->group_model()) return; + // TODO(dpenning): When adding saved groups to TabGroupEditorBubbleDelegate + // disconnect the tab groups first. base::RecordAction( base::UserMetricsAction("TabGroups_TabGroupBubble_Ungroup")); if (header_view) { @@ -632,16 +636,18 @@ } void TabGroupEditorBubbleView::OnSaveTogglePressed() { - auto* group = browser_->tab_strip_model()->group_model()->GetTabGroup(group_); + SavedTabGroupKeyedService* saved_tab_group_service = + SavedTabGroupServiceFactory::GetForProfile(browser_->profile()); + CHECK(saved_tab_group_service); if (save_group_toggle_->GetIsOn()) { base::RecordAction( base::UserMetricsAction("TabGroups_TabGroupBubble_GroupSaved")); - group->SaveGroup(); + saved_tab_group_service->SaveGroup(group_); } else { base::RecordAction( base::UserMetricsAction("TabGroups_TabGroupBubble_GroupUnsaved")); - group->UnsaveGroup(); + saved_tab_group_service->UnsaveGroup(group_); } } @@ -659,6 +665,14 @@ void TabGroupEditorBubbleView::UngroupPressed(TabGroupHeader* header_view) { base::RecordAction( base::UserMetricsAction("TabGroups_TabGroupBubble_Ungroup")); + if (base::FeatureList::IsEnabled(features::kTabGroupsSave) && + browser_->profile()->IsRegularProfile() && + save_group_toggle_->GetIsOn()) { + SavedTabGroupKeyedService* saved_tab_group_service = + SavedTabGroupServiceFactory::GetForProfile(browser_->profile()); + CHECK(saved_tab_group_service); + saved_tab_group_service->DisconnectLocalTabGroup(group_); + } if (header_view) header_view->RemoveObserverFromWidget(GetWidget()); TabStripModel* const model = browser_->tab_strip_model(); @@ -679,6 +693,14 @@ void TabGroupEditorBubbleView::CloseGroupPressed() { base::RecordAction( base::UserMetricsAction("TabGroups_TabGroupBubble_CloseGroup")); + if (base::FeatureList::IsEnabled(features::kTabGroupsSave) && + browser_->profile()->IsRegularProfile() && + save_group_toggle_->GetIsOn()) { + SavedTabGroupKeyedService* saved_tab_group_service = + SavedTabGroupServiceFactory::GetForProfile(browser_->profile()); + CHECK(saved_tab_group_service); + saved_tab_group_service->DisconnectLocalTabGroup(group_); + } browser_->tab_strip_model()->CloseAllTabsInGroup(group_); // Close the widget because it is no longer applicable. GetWidget()->CloseWithReason(views::Widget::ClosedReason::kUnspecified);
diff --git a/chrome/browser/ui/views/tabs/tab_hover_card_controller.cc b/chrome/browser/ui/views/tabs/tab_hover_card_controller.cc index ee21c6e..bc8cb126 100644 --- a/chrome/browser/ui/views/tabs/tab_hover_card_controller.cc +++ b/chrome/browser/ui/views/tabs/tab_hover_card_controller.cc
@@ -4,10 +4,10 @@ #include "chrome/browser/ui/views/tabs/tab_hover_card_controller.h" -#include "base/bind.h" #include "base/callback_list.h" #include "base/command_line.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/memory/memory_pressure_listener.h" #include "base/memory/raw_ptr.h" #include "base/time/time.h"
diff --git a/chrome/browser/ui/views/tabs/tab_hover_card_thumbnail_observer.h b/chrome/browser/ui/views/tabs/tab_hover_card_thumbnail_observer.h index 0728942..537fa5f 100644 --- a/chrome/browser/ui/views/tabs/tab_hover_card_thumbnail_observer.h +++ b/chrome/browser/ui/views/tabs/tab_hover_card_thumbnail_observer.h
@@ -7,8 +7,8 @@ #include <memory> -#include "base/bind.h" #include "base/callback_list.h" +#include "base/functional/bind.h" #include "chrome/browser/ui/tabs/tab_style.h" #include "chrome/browser/ui/thumbnails/thumbnail_image.h"
diff --git a/chrome/browser/ui/views/tabs/tab_scrubber_chromeos.cc b/chrome/browser/ui/views/tabs/tab_scrubber_chromeos.cc index fa40ad2..f29fb84 100644 --- a/chrome/browser/ui/views/tabs/tab_scrubber_chromeos.cc +++ b/chrome/browser/ui/views/tabs/tab_scrubber_chromeos.cc
@@ -8,8 +8,8 @@ #include <algorithm> -#include "base/bind.h" #include "base/cxx17_backports.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h"
diff --git a/chrome/browser/ui/views/tabs/tab_strip.cc b/chrome/browser/ui/views/tabs/tab_strip.cc index 07b133a..fd8c9386 100644 --- a/chrome/browser/ui/views/tabs/tab_strip.cc +++ b/chrome/browser/ui/views/tabs/tab_strip.cc
@@ -14,14 +14,14 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" #include "base/compiler_specific.h" #include "base/containers/adapters.h" #include "base/containers/contains.h" #include "base/containers/flat_map.h" #include "base/cxx17_backports.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/i18n/rtl.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/ui/views/tabs/tab_strip_layout_helper.h b/chrome/browser/ui/views/tabs/tab_strip_layout_helper.h index d996b86..87e4f0f 100644 --- a/chrome/browser/ui/views/tabs/tab_strip_layout_helper.h +++ b/chrome/browser/ui/views/tabs/tab_strip_layout_helper.h
@@ -7,8 +7,8 @@ #include <vector> -#include "base/callback.h" -#include "base/callback_forward.h" +#include "base/functional/callback.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ref.h" #include "chrome/browser/ui/tabs/tab_types.h" #include "chrome/browser/ui/views/tabs/tab_layout_state.h"
diff --git a/chrome/browser/ui/views/tabs/tab_strip_scroll_container.cc b/chrome/browser/ui/views/tabs/tab_strip_scroll_container.cc index 1285a3c..11aa6c9 100644 --- a/chrome/browser/ui/views/tabs/tab_strip_scroll_container.cc +++ b/chrome/browser/ui/views/tabs/tab_strip_scroll_container.cc
@@ -7,7 +7,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "cc/paint/paint_shader.h" #include "chrome/app/vector_icons/vector_icons.h"
diff --git a/chrome/browser/ui/views/tabs/tab_strip_unittest.cc b/chrome/browser/ui/views/tabs/tab_strip_unittest.cc index 5bb5c7c..48772fed 100644 --- a/chrome/browser/ui/views/tabs/tab_strip_unittest.cc +++ b/chrome/browser/ui/views/tabs/tab_strip_unittest.cc
@@ -7,8 +7,8 @@ #include <memory> #include <string> -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/test/scoped_feature_list.h" #include "base/test/task_environment.h"
diff --git a/chrome/browser/ui/views/task_manager_view.cc b/chrome/browser/ui/views/task_manager_view.cc index 7ff8a9d..1a9f40d 100644 --- a/chrome/browser/ui/views/task_manager_view.cc +++ b/chrome/browser/ui/views/task_manager_view.cc
@@ -6,8 +6,8 @@ #include <stddef.h> -#include "base/callback_helpers.h" #include "base/containers/adapters.h" +#include "base/functional/callback_helpers.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/ui/views/task_manager_view_browsertest.cc b/chrome/browser/ui/views/task_manager_view_browsertest.cc index 655983a..841b0391 100644 --- a/chrome/browser/ui/views/task_manager_view_browsertest.cc +++ b/chrome/browser/ui/views/task_manager_view_browsertest.cc
@@ -4,7 +4,7 @@ #include <stddef.h> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/ranges/algorithm.h" #include "base/strings/pattern.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/views/test/view_event_test_base.cc b/chrome/browser/ui/views/test/view_event_test_base.cc index 419c36d..632ab1b7 100644 --- a/chrome/browser/ui/views/test/view_event_test_base.cc +++ b/chrome/browser/ui/views/test/view_event_test_base.cc
@@ -5,7 +5,7 @@ #include "chrome/browser/ui/views/test/view_event_test_base.h" #include "base/memory/raw_ptr.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/task/single_thread_task_runner.h" #include "build/build_config.h"
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 6d613a3..f35547bb 100644 --- a/chrome/browser/ui/views/test/view_event_test_base.h +++ b/chrome/browser/ui/views/test/view_event_test_base.h
@@ -16,8 +16,8 @@ #include <memory> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/run_loop.h" #include "base/threading/thread.h" #include "build/build_config.h"
diff --git a/chrome/browser/ui/views/toolbar/app_menu.cc b/chrome/browser/ui/views/toolbar/app_menu.cc index 71b6c4b..8d7e86c 100644 --- a/chrome/browser/ui/views/toolbar/app_menu.cc +++ b/chrome/browser/ui/views/toolbar/app_menu.cc
@@ -11,8 +11,8 @@ #include <memory> #include <set> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/i18n/number_formatting.h" #include "base/memory/raw_ptr.h" #include "base/metrics/histogram_macros.h"
diff --git a/chrome/browser/ui/views/toolbar/browser_app_menu_button.cc b/chrome/browser/ui/views/toolbar/browser_app_menu_button.cc index e4bd4ca..e99b2eca 100644 --- a/chrome/browser/ui/views/toolbar/browser_app_menu_button.cc +++ b/chrome/browser/ui/views/toolbar/browser_app_menu_button.cc
@@ -6,7 +6,7 @@ #include <set> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/task/single_thread_task_runner.h" #include "base/threading/thread_task_runner_handle.h"
diff --git a/chrome/browser/ui/views/toolbar/browser_app_menu_button_interactive_uitest_chromeos.cc b/chrome/browser/ui/views/toolbar/browser_app_menu_button_interactive_uitest_chromeos.cc index 581fe2e..33715b3 100644 --- a/chrome/browser/ui/views/toolbar/browser_app_menu_button_interactive_uitest_chromeos.cc +++ b/chrome/browser/ui/views/toolbar/browser_app_menu_button_interactive_uitest_chromeos.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ui/views/toolbar/browser_app_menu_button.h" -#include "base/callback_forward.h" #include "base/files/file_path.h" +#include "base/functional/callback_forward.h" #include "base/run_loop.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tabs/tab_strip_model.h"
diff --git a/chrome/browser/ui/views/toolbar/chrome_labs_bubble_view.cc b/chrome/browser/ui/views/toolbar/chrome_labs_bubble_view.cc index f1a81ac..7238015 100644 --- a/chrome/browser/ui/views/toolbar/chrome_labs_bubble_view.cc +++ b/chrome/browser/ui/views/toolbar/chrome_labs_bubble_view.cc
@@ -4,9 +4,9 @@ #include "chrome/browser/ui/views/toolbar/chrome_labs_bubble_view.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/callback_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "build/build_config.h" #include "build/buildflag.h" #include "chrome/browser/about_flags.h"
diff --git a/chrome/browser/ui/views/toolbar/chrome_labs_bubble_view.h b/chrome/browser/ui/views/toolbar/chrome_labs_bubble_view.h index bd2f1c26..dabeeaf 100644 --- a/chrome/browser/ui/views/toolbar/chrome_labs_bubble_view.h +++ b/chrome/browser/ui/views/toolbar/chrome_labs_bubble_view.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_UI_VIEWS_TOOLBAR_CHROME_LABS_BUBBLE_VIEW_H_ #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_CHROME_LABS_BUBBLE_VIEW_H_ -#include "base/callback.h" #include "base/callback_list.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "build/chromeos_buildflags.h" #include "components/flags_ui/feature_entry.h"
diff --git a/chrome/browser/ui/views/toolbar/chrome_labs_item_view.h b/chrome/browser/ui/views/toolbar/chrome_labs_item_view.h index 463d6ab..5c3a12ca 100644 --- a/chrome/browser/ui/views/toolbar/chrome_labs_item_view.h +++ b/chrome/browser/ui/views/toolbar/chrome_labs_item_view.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_TOOLBAR_CHROME_LABS_ITEM_VIEW_H_ #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_CHROME_LABS_ITEM_VIEW_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "ui/base/metadata/metadata_header_macros.h" #include "ui/views/view.h"
diff --git a/chrome/browser/ui/views/toolbar/home_button.cc b/chrome/browser/ui/views/toolbar/home_button.cc index fcdeec3345..0df5541 100644 --- a/chrome/browser/ui/views/toolbar/home_button.cc +++ b/chrome/browser/ui/views/toolbar/home_button.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ui/views/toolbar/home_button.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/views/toolbar/toolbar_action_hover_card_controller.cc b/chrome/browser/ui/views/toolbar/toolbar_action_hover_card_controller.cc index af963b5..7394ec3a 100644 --- a/chrome/browser/ui/views/toolbar/toolbar_action_hover_card_controller.cc +++ b/chrome/browser/ui/views/toolbar/toolbar_action_hover_card_controller.cc
@@ -4,9 +4,9 @@ #include "chrome/browser/ui/views/toolbar/toolbar_action_hover_card_controller.h" -#include "base/bind.h" #include "base/callback_list.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/time/time.h" #include "build/build_config.h"
diff --git a/chrome/browser/ui/views/toolbar/toolbar_action_view.cc b/chrome/browser/ui/views/toolbar/toolbar_action_view.cc index 52f2b3a2..fe84a4fb 100644 --- a/chrome/browser/ui/views/toolbar/toolbar_action_view.cc +++ b/chrome/browser/ui/views/toolbar/toolbar_action_view.cc
@@ -7,8 +7,8 @@ #include <string> #include "base/auto_reset.h" -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/metrics/user_metrics.h" #include "base/metrics/user_metrics_action.h" #include "chrome/browser/chrome_notification_types.h"
diff --git a/chrome/browser/ui/views/toolbar/toolbar_action_view.h b/chrome/browser/ui/views/toolbar/toolbar_action_view.h index 6e333159..8f1ad89 100644 --- a/chrome/browser/ui/views/toolbar/toolbar_action_view.h +++ b/chrome/browser/ui/views/toolbar/toolbar_action_view.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_ACTION_VIEW_H_ #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_TOOLBAR_ACTION_VIEW_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/ui/views/toolbar/toolbar_action_hover_card_controller.h" #include "chrome/browser/ui/views/toolbar/toolbar_action_view_delegate_views.h"
diff --git a/chrome/browser/ui/views/toolbar/toolbar_actions_bar_bubble_views.cc b/chrome/browser/ui/views/toolbar/toolbar_actions_bar_bubble_views.cc index c86ed83..e3908ce 100644 --- a/chrome/browser/ui/views/toolbar/toolbar_actions_bar_bubble_views.cc +++ b/chrome/browser/ui/views/toolbar/toolbar_actions_bar_bubble_views.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/toolbar/toolbar_actions_bar_bubble_views.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/ui/views/chrome_layout_provider.h" #include "chrome/grit/locale_settings.h" #include "components/vector_icons/vector_icons.h"
diff --git a/chrome/browser/ui/views/toolbar/toolbar_button.cc b/chrome/browser/ui/views/toolbar/toolbar_button.cc index b0344e4..bfe35d0 100644 --- a/chrome/browser/ui/views/toolbar/toolbar_button.cc +++ b/chrome/browser/ui/views/toolbar/toolbar_button.cc
@@ -7,8 +7,8 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/ui/views/toolbar/toolbar_button.h b/chrome/browser/ui/views/toolbar/toolbar_button.h index 8fdacdbb..634b521d 100644 --- a/chrome/browser/ui/views/toolbar/toolbar_button.h +++ b/chrome/browser/ui/views/toolbar/toolbar_button.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/ui/views/chrome_views_export.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/chrome/browser/ui/views/toolbar/toolbar_icon_container_view.cc b/chrome/browser/ui/views/toolbar/toolbar_icon_container_view.cc index 584e7f9..f4b7bc02 100644 --- a/chrome/browser/ui/views/toolbar/toolbar_icon_container_view.cc +++ b/chrome/browser/ui/views/toolbar/toolbar_icon_container_view.cc
@@ -6,9 +6,9 @@ #include <memory> -#include "base/bind.h" #include "base/containers/contains.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/observer_list.h" #include "base/scoped_observation.h"
diff --git a/chrome/browser/ui/views/toolbar/toolbar_ink_drop_util.cc b/chrome/browser/ui/views/toolbar/toolbar_ink_drop_util.cc index 059e6a8..8dcc905 100644 --- a/chrome/browser/ui/views/toolbar/toolbar_ink_drop_util.cc +++ b/chrome/browser/ui/views/toolbar/toolbar_ink_drop_util.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/toolbar/toolbar_ink_drop_util.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/themes/theme_properties.h" #include "chrome/browser/ui/color/chrome_color_id.h" #include "chrome/browser/ui/layout_constants.h"
diff --git a/chrome/browser/ui/views/toolbar/toolbar_view.cc b/chrome/browser/ui/views/toolbar/toolbar_view.cc index dbe08461..51e79dda 100644 --- a/chrome/browser/ui/views/toolbar/toolbar_view.cc +++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc
@@ -7,10 +7,10 @@ #include <algorithm> #include <utility> -#include "base/bind.h" #include "base/command_line.h" #include "base/containers/fixed_flat_map.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/i18n/number_formatting.h" #include "base/metrics/user_metrics.h" #include "base/ranges/algorithm.h"
diff --git a/chrome/browser/ui/views/toolbar/toolbar_view_interactive_uitest.cc b/chrome/browser/ui/views/toolbar/toolbar_view_interactive_uitest.cc index 904edaa..686eee6 100644 --- a/chrome/browser/ui/views/toolbar/toolbar_view_interactive_uitest.cc +++ b/chrome/browser/ui/views/toolbar/toolbar_view_interactive_uitest.cc
@@ -6,7 +6,7 @@ #include <stddef.h> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/views/toolbar/webui_tab_counter_button.cc b/chrome/browser/ui/views/toolbar/webui_tab_counter_button.cc index d76ea6b0..a699d27 100644 --- a/chrome/browser/ui/views/toolbar/webui_tab_counter_button.cc +++ b/chrome/browser/ui/views/toolbar/webui_tab_counter_button.cc
@@ -7,7 +7,7 @@ #include <memory> #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/i18n/message_formatter.h" #include "base/i18n/number_formatting.h" #include "base/memory/raw_ptr.h"
diff --git a/chrome/browser/ui/views/translate/partial_translate_bubble_view.cc b/chrome/browser/ui/views/translate/partial_translate_bubble_view.cc index ce5ab87..35a68bd 100644 --- a/chrome/browser/ui/views/translate/partial_translate_bubble_view.cc +++ b/chrome/browser/ui/views/translate/partial_translate_bubble_view.cc
@@ -11,7 +11,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/i18n/rtl.h" #include "base/i18n/string_compare.h" #include "base/memory/singleton.h"
diff --git a/chrome/browser/ui/views/translate/translate_bubble_controller.cc b/chrome/browser/ui/views/translate/translate_bubble_controller.cc index f77d0491..3958b4b 100644 --- a/chrome/browser/ui/views/translate/translate_bubble_controller.cc +++ b/chrome/browser/ui/views/translate/translate_bubble_controller.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/search_engines/template_url_service_factory.h"
diff --git a/chrome/browser/ui/views/translate/translate_bubble_controller.h b/chrome/browser/ui/views/translate/translate_bubble_controller.h index 2f318661..5781f1c 100644 --- a/chrome/browser/ui/views/translate/translate_bubble_controller.h +++ b/chrome/browser/ui/views/translate/translate_bubble_controller.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_TRANSLATE_TRANSLATE_BUBBLE_CONTROLLER_H_ #define CHROME_BROWSER_UI_VIEWS_TRANSLATE_TRANSLATE_BUBBLE_CONTROLLER_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ui/views/translate/partial_translate_bubble_view.h" #include "chrome/browser/ui/views/translate/translate_bubble_view.h"
diff --git a/chrome/browser/ui/views/translate/translate_bubble_view.h b/chrome/browser/ui/views/translate/translate_bubble_view.h index 9bf777a..018c797 100644 --- a/chrome/browser/ui/views/translate/translate_bubble_view.h +++ b/chrome/browser/ui/views/translate/translate_bubble_view.h
@@ -9,7 +9,7 @@ #include <memory> #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/views/translate/translate_bubble_view_browsertest.cc b/chrome/browser/ui/views/translate/translate_bubble_view_browsertest.cc index 899809c..b6fa888 100644 --- a/chrome/browser/ui/views/translate/translate_bubble_view_browsertest.cc +++ b/chrome/browser/ui/views/translate/translate_bubble_view_browsertest.cc
@@ -7,8 +7,8 @@ #include <memory> #include <string> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h" #include "chrome/browser/translate/chrome_translate_client.h"
diff --git a/chrome/browser/ui/views/translate/translate_bubble_view_interactive_uitest.cc b/chrome/browser/ui/views/translate/translate_bubble_view_interactive_uitest.cc index 1b486a3ad..86a1e14 100644 --- a/chrome/browser/ui/views/translate/translate_bubble_view_interactive_uitest.cc +++ b/chrome/browser/ui/views/translate/translate_bubble_view_interactive_uitest.cc
@@ -6,9 +6,9 @@ #include "base/strings/string_piece_forward.h" #include "chrome/browser/ui/views/translate/translate_bubble_view.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/i18n/base_i18n_switches.h" #include "base/strings/utf_string_conversions.h" #include "base/test/bind.h"
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 a9df19e..1776b8ec 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
@@ -11,9 +11,9 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check_op.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/notreached.h"
diff --git a/chrome/browser/ui/views/try_chrome_dialog_win/try_chrome_dialog.h b/chrome/browser/ui/views/try_chrome_dialog_win/try_chrome_dialog.h index 2e762d0..85512c1 100644 --- a/chrome/browser/ui/views/try_chrome_dialog_win/try_chrome_dialog.h +++ b/chrome/browser/ui/views/try_chrome_dialog_win/try_chrome_dialog.h
@@ -9,7 +9,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/sequence_checker.h" #include "chrome/installer/util/experiment_metrics.h"
diff --git a/chrome/browser/ui/views/try_chrome_dialog_win/try_chrome_dialog_browsertest.cc b/chrome/browser/ui/views/try_chrome_dialog_win/try_chrome_dialog_browsertest.cc index cbdfe15..80c2bea 100644 --- a/chrome/browser/ui/views/try_chrome_dialog_win/try_chrome_dialog_browsertest.cc +++ b/chrome/browser/ui/views/try_chrome_dialog_win/try_chrome_dialog_browsertest.cc
@@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/ptr_util.h" #include "base/run_loop.h" #include "base/task/sequenced_task_runner.h"
diff --git a/chrome/browser/ui/views/uninstall_view.h b/chrome/browser/ui/views/uninstall_view.h index 4ea69a7..db3b926 100644 --- a/chrome/browser/ui/views/uninstall_view.h +++ b/chrome/browser/ui/views/uninstall_view.h
@@ -8,7 +8,7 @@ #include <map> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ref.h" #include "ui/base/metadata/metadata_header_macros.h" #include "ui/base/models/combobox_model.h"
diff --git a/chrome/browser/ui/views/uninstall_view_unittest.cc b/chrome/browser/ui/views/uninstall_view_unittest.cc index 5faf76d..9b025f9 100644 --- a/chrome/browser/ui/views/uninstall_view_unittest.cc +++ b/chrome/browser/ui/views/uninstall_view_unittest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/uninstall_view.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "chrome/common/chrome_result_codes.h" #include "chrome/test/views/chrome_views_test_base.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/ui/views/user_education/browser_feature_promo_controller_unittest.cc b/chrome/browser/ui/views/user_education/browser_feature_promo_controller_unittest.cc index 51e963757..e8bb863 100644 --- a/chrome/browser/ui/views/user_education/browser_feature_promo_controller_unittest.cc +++ b/chrome/browser/ui/views/user_education/browser_feature_promo_controller_unittest.cc
@@ -4,9 +4,9 @@ #include "chrome/browser/ui/views/user_education/browser_feature_promo_controller.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/task/single_thread_task_runner.h" #include "base/test/bind.h"
diff --git a/chrome/browser/ui/views/user_education/feature_promo_dialog_interactive_uitest.cc b/chrome/browser/ui/views/user_education/feature_promo_dialog_interactive_uitest.cc index 4e4d07f..a24f00a 100644 --- a/chrome/browser/ui/views/user_education/feature_promo_dialog_interactive_uitest.cc +++ b/chrome/browser/ui/views/user_education/feature_promo_dialog_interactive_uitest.cc
@@ -6,8 +6,8 @@ #include <vector> #include "base/auto_reset.h" -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/ranges/algorithm.h" #include "base/test/scoped_feature_list.h" #include "build/build_config.h"
diff --git a/chrome/browser/ui/views/user_education/help_bubble_factory_views_browsertest.cc b/chrome/browser/ui/views/user_education/help_bubble_factory_views_browsertest.cc index 6c34fd2..155f11ba 100644 --- a/chrome/browser/ui/views/user_education/help_bubble_factory_views_browsertest.cc +++ b/chrome/browser/ui/views/user_education/help_bubble_factory_views_browsertest.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 "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/i18n/rtl.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/views/user_education/help_bubble_factory_views_interactive_uitest.cc b/chrome/browser/ui/views/user_education/help_bubble_factory_views_interactive_uitest.cc index 5f6cd46..f68456da 100644 --- a/chrome/browser/ui/views/user_education/help_bubble_factory_views_interactive_uitest.cc +++ b/chrome/browser/ui/views/user_education/help_bubble_factory_views_interactive_uitest.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 "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "build/build_config.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/ui/browser.h"
diff --git a/chrome/browser/ui/views/user_education/help_bubble_view_timeout_unittest.cc b/chrome/browser/ui/views/user_education/help_bubble_view_timeout_unittest.cc index 25f1239a..c0446b9b 100644 --- a/chrome/browser/ui/views/user_education/help_bubble_view_timeout_unittest.cc +++ b/chrome/browser/ui/views/user_education/help_bubble_view_timeout_unittest.cc
@@ -4,9 +4,9 @@ #include <memory> -#include "base/bind.h" -#include "base/callback_forward.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_forward.h" +#include "base/functional/callback_helpers.h" #include "base/strings/utf_string_conversions.h" #include "base/test/mock_callback.h" #include "base/test/task_environment.h"
diff --git a/chrome/browser/ui/views/user_education/tip_marquee_view.cc b/chrome/browser/ui/views/user_education/tip_marquee_view.cc index 4afccac..37289154 100644 --- a/chrome/browser/ui/views/user_education/tip_marquee_view.cc +++ b/chrome/browser/ui/views/user_education/tip_marquee_view.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/resources_util.h"
diff --git a/chrome/browser/ui/views/user_education/tip_marquee_view.h b/chrome/browser/ui/views/user_education/tip_marquee_view.h index 21c5b5978..e7e0e1c8 100644 --- a/chrome/browser/ui/views/user_education/tip_marquee_view.h +++ b/chrome/browser/ui/views/user_education/tip_marquee_view.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_UI_VIEWS_USER_EDUCATION_TIP_MARQUEE_VIEW_H_ #define CHROME_BROWSER_UI_VIEWS_USER_EDUCATION_TIP_MARQUEE_VIEW_H_ -#include "base/callback.h" -#include "base/callback_forward.h" +#include "base/functional/callback.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/scoped_observation.h" #include "ui/base/metadata/metadata_header_macros.h"
diff --git a/chrome/browser/ui/views/user_education/tip_marquee_view_unittest.cc b/chrome/browser/ui/views/user_education/tip_marquee_view_unittest.cc index 8aeea02..226527db 100644 --- a/chrome/browser/ui/views/user_education/tip_marquee_view_unittest.cc +++ b/chrome/browser/ui/views/user_education/tip_marquee_view_unittest.cc
@@ -5,7 +5,7 @@ #include "chrome/browser/ui/views/user_education/tip_marquee_view.h" #include <cstddef> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/scoped_observation.h"
diff --git a/chrome/browser/ui/views/user_education/tutorial_interactive_uitest.cc b/chrome/browser/ui/views/user_education/tutorial_interactive_uitest.cc index 50172672..f834009 100644 --- a/chrome/browser/ui/views/user_education/tutorial_interactive_uitest.cc +++ b/chrome/browser/ui/views/user_education/tutorial_interactive_uitest.cc
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/test/bind.h" #include "base/test/mock_callback.h" #include "chrome/app/chrome_command_ids.h"
diff --git a/chrome/browser/ui/views/user_education/views_tutorial_unittest.cc b/chrome/browser/ui/views/user_education/views_tutorial_unittest.cc index b2cb01af..462b564 100644 --- a/chrome/browser/ui/views/user_education/views_tutorial_unittest.cc +++ b/chrome/browser/ui/views/user_education/views_tutorial_unittest.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/bind.h" #include "base/functional/bind.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h"
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 2a808cb..697ef0b6 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
@@ -10,7 +10,7 @@ #include <string> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ui/tab_dialogs.h"
diff --git a/chrome/browser/ui/views/web_apps/deprecated_apps_dialog_view_browsertest.cc b/chrome/browser/ui/views/web_apps/deprecated_apps_dialog_view_browsertest.cc index bf0d6e6..f9e2748 100644 --- a/chrome/browser/ui/views/web_apps/deprecated_apps_dialog_view_browsertest.cc +++ b/chrome/browser/ui/views/web_apps/deprecated_apps_dialog_view_browsertest.cc
@@ -6,8 +6,8 @@ #include <set> -#include "base/callback_helpers.h" #include "base/feature_list.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/test/bind.h" #include "base/test/mock_callback.h"
diff --git a/chrome/browser/ui/views/web_apps/file_handler_launch_dialog_view.h b/chrome/browser/ui/views/web_apps/file_handler_launch_dialog_view.h index aaea91a2d..c27aefb0 100644 --- a/chrome/browser/ui/views/web_apps/file_handler_launch_dialog_view.h +++ b/chrome/browser/ui/views/web_apps/file_handler_launch_dialog_view.h
@@ -8,8 +8,8 @@ #include <memory> #include <vector> -#include "base/callback_forward.h" #include "base/files/file_path.h" +#include "base/functional/callback_forward.h" #include "chrome/browser/ui/browser_dialogs.h" #include "chrome/browser/ui/views/web_apps/launch_app_user_choice_dialog_view.h" #include "chrome/browser/web_applications/web_app_id.h"
diff --git a/chrome/browser/ui/views/web_apps/frame_toolbar/web_app_menu_button.cc b/chrome/browser/ui/views/web_apps/frame_toolbar/web_app_menu_button.cc index 7b732a7..823dd3f 100644 --- a/chrome/browser/ui/views/web_apps/frame_toolbar/web_app_menu_button.cc +++ b/chrome/browser/ui/views/web_apps/frame_toolbar/web_app_menu_button.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/web_apps/frame_toolbar/web_app_menu_button.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/user_metrics.h" #include "base/strings/utf_string_conversions.h" #include "base/time/time.h"
diff --git a/chrome/browser/ui/views/web_apps/frame_toolbar/web_app_origin_text.cc b/chrome/browser/ui/views/web_apps/frame_toolbar/web_app_origin_text.cc index 2378db0..c4fa9b57 100644 --- a/chrome/browser/ui/views/web_apps/frame_toolbar/web_app_origin_text.cc +++ b/chrome/browser/ui/views/web_apps/frame_toolbar/web_app_origin_text.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/views/web_apps/frame_toolbar/web_app_origin_text.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/i18n/rtl.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/view_ids.h"
diff --git a/chrome/browser/ui/views/web_apps/launch_app_user_choice_dialog_view.h b/chrome/browser/ui/views/web_apps/launch_app_user_choice_dialog_view.h index b7bc2a7..e9d4c3c 100644 --- a/chrome/browser/ui/views/web_apps/launch_app_user_choice_dialog_view.h +++ b/chrome/browser/ui/views/web_apps/launch_app_user_choice_dialog_view.h
@@ -8,7 +8,7 @@ #include <memory> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ui/browser_dialogs.h"
diff --git a/chrome/browser/ui/views/web_apps/protocol_handler_launch_dialog_view.h b/chrome/browser/ui/views/web_apps/protocol_handler_launch_dialog_view.h index be87edd..a924c87 100644 --- a/chrome/browser/ui/views/web_apps/protocol_handler_launch_dialog_view.h +++ b/chrome/browser/ui/views/web_apps/protocol_handler_launch_dialog_view.h
@@ -8,7 +8,7 @@ #include <memory> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "chrome/browser/ui/browser_dialogs.h" #include "chrome/browser/ui/views/web_apps/launch_app_user_choice_dialog_view.h" #include "chrome/browser/web_applications/web_app_id.h"
diff --git a/chrome/browser/ui/views/web_apps/pwa_confirmation_bubble_view_browsertest.cc b/chrome/browser/ui/views/web_apps/pwa_confirmation_bubble_view_browsertest.cc index f656071c..2ba48263 100644 --- a/chrome/browser/ui/views/web_apps/pwa_confirmation_bubble_view_browsertest.cc +++ b/chrome/browser/ui/views/web_apps/pwa_confirmation_bubble_view_browsertest.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 "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/strings/utf_string_conversions.h" #include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h"
diff --git a/chrome/browser/ui/views/web_apps/web_app_confirmation_view.cc b/chrome/browser/ui/views/web_apps/web_app_confirmation_view.cc index aed3eaad..b2f53a61 100644 --- a/chrome/browser/ui/views/web_apps/web_app_confirmation_view.cc +++ b/chrome/browser/ui/views/web_apps/web_app_confirmation_view.cc
@@ -8,8 +8,8 @@ #include <string> #include <utility> -#include "base/callback_helpers.h" #include "base/feature_list.h" +#include "base/functional/callback_helpers.h" #include "base/strings/string_util.h" #include "build/build_config.h" #include "chrome/browser/ui/views/chrome_layout_provider.h"
diff --git a/chrome/browser/ui/views/web_apps/web_app_detailed_install_dialog.cc b/chrome/browser/ui/views/web_apps/web_app_detailed_install_dialog.cc index a93525ed..06ff414 100644 --- a/chrome/browser/ui/views/web_apps/web_app_detailed_install_dialog.cc +++ b/chrome/browser/ui/views/web_apps/web_app_detailed_install_dialog.cc
@@ -6,8 +6,8 @@ #include <numeric> #include <vector> -#include "base/bind.h" -#include "base/callback_forward.h" +#include "base/functional/bind.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ref.h" #include "base/metrics/user_metrics.h" #include "base/metrics/user_metrics_action.h"
diff --git a/chrome/browser/ui/views/web_apps/web_app_identity_update_confirmation_view_browsertest.cc b/chrome/browser/ui/views/web_apps/web_app_identity_update_confirmation_view_browsertest.cc index 9bd7bff1..e33282d8 100644 --- a/chrome/browser/ui/views/web_apps/web_app_identity_update_confirmation_view_browsertest.cc +++ b/chrome/browser/ui/views/web_apps/web_app_identity_update_confirmation_view_browsertest.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 "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/test/bind.h" #include "chrome/browser/ui/browser.h"
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 469d66a6..b28e23b 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
@@ -8,14 +8,14 @@ #include <ostream> #include <string> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/containers/contains.h" #include "base/containers/flat_map.h" #include "base/containers/flat_set.h" #include "base/files/file_enumerator.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/notreached.h" #include "base/path_service.h"
diff --git a/chrome/browser/ui/views/web_apps/web_app_uninstall_dialog_browsertest.cc b/chrome/browser/ui/views/web_apps/web_app_uninstall_dialog_browsertest.cc index 71e583b2..b57844cd 100644 --- a/chrome/browser/ui/views/web_apps/web_app_uninstall_dialog_browsertest.cc +++ b/chrome/browser/ui/views/web_apps/web_app_uninstall_dialog_browsertest.cc
@@ -5,7 +5,7 @@ #include <memory> #include "base/barrier_closure.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/test/bind.h" #include "build/build_config.h"
diff --git a/chrome/browser/ui/views/web_apps/web_app_uninstall_dialog_view.cc b/chrome/browser/ui/views/web_apps/web_app_uninstall_dialog_view.cc index dba3ad53..80b524f 100644 --- a/chrome/browser/ui/views/web_apps/web_app_uninstall_dialog_view.cc +++ b/chrome/browser/ui/views/web_apps/web_app_uninstall_dialog_view.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ui/views/web_apps/web_app_uninstall_dialog_view.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/histogram_macros.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/views/web_apps/web_app_uninstall_dialog_view.h b/chrome/browser/ui/views/web_apps/web_app_uninstall_dialog_view.h index 5399f96..eeb28c3d 100644 --- a/chrome/browser/ui/views/web_apps/web_app_uninstall_dialog_view.h +++ b/chrome/browser/ui/views/web_apps/web_app_uninstall_dialog_view.h
@@ -8,7 +8,7 @@ #include <map> #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/scoped_observation.h"
diff --git a/chrome/browser/ui/views/web_dialog_view_browsertest.cc b/chrome/browser/ui/views/web_dialog_view_browsertest.cc index 84b3154..3cdda3c8d 100644 --- a/chrome/browser/ui/views/web_dialog_view_browsertest.cc +++ b/chrome/browser/ui/views/web_dialog_view_browsertest.cc
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h"
diff --git a/chrome/browser/ui/views/webauthn/authenticator_qr_sheet_view.cc b/chrome/browser/ui/views/webauthn/authenticator_qr_sheet_view.cc index 7a09175..caa12d17 100644 --- a/chrome/browser/ui/views/webauthn/authenticator_qr_sheet_view.cc +++ b/chrome/browser/ui/views/webauthn/authenticator_qr_sheet_view.cc
@@ -4,9 +4,9 @@ #include "chrome/browser/ui/views/webauthn/authenticator_qr_sheet_view.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/ui/color/chrome_color_id.h" #include "chrome/services/qrcode_generator/public/cpp/qrcode_generator_service.h"
diff --git a/chrome/browser/ui/views/webid/account_selection_bubble_view.h b/chrome/browser/ui/views/webid/account_selection_bubble_view.h index fd81b6d..4a4239d 100644 --- a/chrome/browser/ui/views/webid/account_selection_bubble_view.h +++ b/chrome/browser/ui/views/webid/account_selection_bubble_view.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_VIEWS_WEBID_ACCOUNT_SELECTION_BUBBLE_VIEW_H_ #define CHROME_BROWSER_UI_VIEWS_WEBID_ACCOUNT_SELECTION_BUBBLE_VIEW_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/ui/views/webid/account_selection_bubble_view_interface.h" #include "components/image_fetcher/core/image_fetcher.h"
diff --git a/chrome/browser/ui/views/webid/account_selection_bubble_view_unittest.cc b/chrome/browser/ui/views/webid/account_selection_bubble_view_unittest.cc index 3e02df3..db438b6 100644 --- a/chrome/browser/ui/views/webid/account_selection_bubble_view_unittest.cc +++ b/chrome/browser/ui/views/webid/account_selection_bubble_view_unittest.cc
@@ -6,8 +6,8 @@ #include <string> -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/strings/utf_string_conversions.h" #include "base/test/scoped_feature_list.h"
diff --git a/chrome/browser/ui/web_applications/app_browser_controller.cc b/chrome/browser/ui/web_applications/app_browser_controller.cc index 393180bf..2237b6fc 100644 --- a/chrome/browser/ui/web_applications/app_browser_controller.cc +++ b/chrome/browser/ui/web_applications/app_browser_controller.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ui/web_applications/app_browser_controller.h" -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/strings/escape.h" #include "base/strings/string_piece.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/web_applications/app_browser_controller.h b/chrome/browser/ui/web_applications/app_browser_controller.h index 61d41c4..dd928055 100644 --- a/chrome/browser/ui/web_applications/app_browser_controller.h +++ b/chrome/browser/ui/web_applications/app_browser_controller.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/themes/theme_service.h" #include "chrome/browser/ui/page_action/page_action_icon_type.h"
diff --git a/chrome/browser/ui/web_applications/diagnostics/callback_utils.h b/chrome/browser/ui/web_applications/diagnostics/callback_utils.h index 7353af0..8737017 100644 --- a/chrome/browser/ui/web_applications/diagnostics/callback_utils.h +++ b/chrome/browser/ui/web_applications/diagnostics/callback_utils.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEB_APPLICATIONS_DIAGNOSTICS_CALLBACK_UTILS_H_ #define CHROME_BROWSER_UI_WEB_APPLICATIONS_DIAGNOSTICS_CALLBACK_UTILS_H_ -#include "base/callback.h" +#include "base/functional/callback.h" namespace web_app {
diff --git a/chrome/browser/ui/web_applications/diagnostics/web_app_icon_diagnostic.h b/chrome/browser/ui/web_applications/diagnostics/web_app_icon_diagnostic.h index 4a29d1a..de25fb99 100644 --- a/chrome/browser/ui/web_applications/diagnostics/web_app_icon_diagnostic.h +++ b/chrome/browser/ui/web_applications/diagnostics/web_app_icon_diagnostic.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEB_APPLICATIONS_DIAGNOSTICS_WEB_APP_ICON_DIAGNOSTIC_H_ #define CHROME_BROWSER_UI_WEB_APPLICATIONS_DIAGNOSTICS_WEB_APP_ICON_DIAGNOSTIC_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/web_applications/web_app_icon_manager.h"
diff --git a/chrome/browser/ui/web_applications/diagnostics/web_app_icon_health_checks.cc b/chrome/browser/ui/web_applications/diagnostics/web_app_icon_health_checks.cc index a7b82caf..7ea2a4e 100644 --- a/chrome/browser/ui/web_applications/diagnostics/web_app_icon_health_checks.cc +++ b/chrome/browser/ui/web_applications/diagnostics/web_app_icon_health_checks.cc
@@ -5,7 +5,7 @@ #include "chrome/browser/ui/web_applications/diagnostics/web_app_icon_health_checks.h" #include "base/barrier_closure.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/metrics/histogram_functions.h" #include "base/ranges/algorithm.h"
diff --git a/chrome/browser/ui/web_applications/diagnostics/web_app_icon_health_checks.h b/chrome/browser/ui/web_applications/diagnostics/web_app_icon_health_checks.h index 43686435..d92415e5 100644 --- a/chrome/browser/ui/web_applications/diagnostics/web_app_icon_health_checks.h +++ b/chrome/browser/ui/web_applications/diagnostics/web_app_icon_health_checks.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEB_APPLICATIONS_DIAGNOSTICS_WEB_APP_ICON_HEALTH_CHECKS_H_ #define CHROME_BROWSER_UI_WEB_APPLICATIONS_DIAGNOSTICS_WEB_APP_ICON_HEALTH_CHECKS_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ui/web_applications/diagnostics/app_type_initialized_event.h"
diff --git a/chrome/browser/ui/web_applications/sub_apps_service_impl.cc b/chrome/browser/ui/web_applications/sub_apps_service_impl.cc index 1d6757da..6ed8e19f 100644 --- a/chrome/browser/ui/web_applications/sub_apps_service_impl.cc +++ b/chrome/browser/ui/web_applications/sub_apps_service_impl.cc
@@ -7,8 +7,8 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/web_applications/commands/sub_app_install_command.h" #include "chrome/browser/web_applications/web_app.h"
diff --git a/chrome/browser/ui/web_applications/test/system_web_app_interactive_uitest.cc b/chrome/browser/ui/web_applications/test/system_web_app_interactive_uitest.cc index 66c91832..e8dc952 100644 --- a/chrome/browser/ui/web_applications/test/system_web_app_interactive_uitest.cc +++ b/chrome/browser/ui/web_applications/test/system_web_app_interactive_uitest.cc
@@ -13,7 +13,7 @@ #include "ash/public/cpp/shelf_model.h" #include "ash/shell.h" #include "ash/wm/window_util.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/scoped_observation.h" #include "base/strings/utf_string_conversions.h"
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 5bacd4a..959cb8b 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
@@ -9,11 +9,11 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check.h" #include "base/check_op.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/test/bind.h" #include "build/build_config.h"
diff --git a/chrome/browser/ui/web_applications/test/web_app_browsertest_util.h b/chrome/browser/ui/web_applications/test/web_app_browsertest_util.h index 20bb36b3..2f6c30d 100644 --- a/chrome/browser/ui/web_applications/test/web_app_browsertest_util.h +++ b/chrome/browser/ui/web_applications/test/web_app_browsertest_util.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEB_APPLICATIONS_TEST_WEB_APP_BROWSERTEST_UTIL_H_ #define CHROME_BROWSER_UI_WEB_APPLICATIONS_TEST_WEB_APP_BROWSERTEST_UTIL_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/scoped_observation.h"
diff --git a/chrome/browser/ui/web_applications/test/web_app_navigation_browsertest.cc b/chrome/browser/ui/web_applications/test/web_app_navigation_browsertest.cc index c4e806e..7b6b657 100644 --- a/chrome/browser/ui/web_applications/test/web_app_navigation_browsertest.cc +++ b/chrome/browser/ui/web_applications/test/web_app_navigation_browsertest.cc
@@ -6,8 +6,8 @@ #include <vector> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/run_loop.h" #include "base/strings/escape.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/ui/web_applications/test/web_app_navigation_browsertest.h b/chrome/browser/ui/web_applications/test/web_app_navigation_browsertest.h index fc3d117..9ddd1b7 100644 --- a/chrome/browser/ui/web_applications/test/web_app_navigation_browsertest.h +++ b/chrome/browser/ui/web_applications/test/web_app_navigation_browsertest.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/test/metrics/histogram_tester.h" #include "chrome/browser/web_applications/web_app_id.h"
diff --git a/chrome/browser/ui/web_applications/web_app_browser_controller.cc b/chrome/browser/ui/web_applications/web_app_browser_controller.cc index 6beca771..02c6dfac 100644 --- a/chrome/browser/ui/web_applications/web_app_browser_controller.cc +++ b/chrome/browser/ui/web_applications/web_app_browser_controller.cc
@@ -4,9 +4,9 @@ #include "chrome/browser/ui/web_applications/web_app_browser_controller.h" -#include "base/callback_helpers.h" #include "base/containers/flat_set.h" #include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/strings/strcat.h" #include "base/strings/string_util.h"
diff --git a/chrome/browser/ui/web_applications/web_app_browser_controller.h b/chrome/browser/ui/web_applications/web_app_browser_controller.h index 6c883b5..5645ff7 100644 --- a/chrome/browser/ui/web_applications/web_app_browser_controller.h +++ b/chrome/browser/ui/web_applications/web_app_browser_controller.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/raw_ref.h"
diff --git a/chrome/browser/ui/web_applications/web_app_dialog_manager.cc b/chrome/browser/ui/web_applications/web_app_dialog_manager.cc index ab610d38..48dafceb 100644 --- a/chrome/browser/ui/web_applications/web_app_dialog_manager.cc +++ b/chrome/browser/ui/web_applications/web_app_dialog_manager.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ui/web_applications/web_app_dialog_manager.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/metrics/histogram_functions.h" #include "base/threading/thread_task_runner_handle.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ui/web_applications/web_app_dialog_manager.h b/chrome/browser/ui/web_applications/web_app_dialog_manager.h index 81539f3f..f2948f7 100644 --- a/chrome/browser/ui/web_applications/web_app_dialog_manager.h +++ b/chrome/browser/ui/web_applications/web_app_dialog_manager.h
@@ -7,9 +7,9 @@ #include <memory> -#include "base/callback_forward.h" #include "base/containers/flat_set.h" #include "base/containers/unique_ptr_adapters.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/web_applications/web_app_id.h" #include "ui/gfx/native_widget_types.h"
diff --git a/chrome/browser/ui/web_applications/web_app_dialog_utils.cc b/chrome/browser/ui/web_applications/web_app_dialog_utils.cc index 414dd56..1367738 100644 --- a/chrome/browser/ui/web_applications/web_app_dialog_utils.cc +++ b/chrome/browser/ui/web_applications/web_app_dialog_utils.cc
@@ -7,10 +7,10 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/no_destructor.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h"
diff --git a/chrome/browser/ui/web_applications/web_app_dialog_utils.h b/chrome/browser/ui/web_applications/web_app_dialog_utils.h index 4d71e25a..a96d198 100644 --- a/chrome/browser/ui/web_applications/web_app_dialog_utils.h +++ b/chrome/browser/ui/web_applications/web_app_dialog_utils.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEB_APPLICATIONS_WEB_APP_DIALOG_UTILS_H_ #define CHROME_BROWSER_UI_WEB_APPLICATIONS_WEB_APP_DIALOG_UTILS_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "chrome/browser/ui/browser_dialogs.h" #include "chrome/browser/web_applications/web_app_id.h" #include "chrome/browser/web_applications/web_app_install_manager.h"
diff --git a/chrome/browser/ui/web_applications/web_app_file_handling_browsertest.cc b/chrome/browser/ui/web_applications/web_app_file_handling_browsertest.cc index b5502a0..fba8ab0 100644 --- a/chrome/browser/ui/web_applications/web_app_file_handling_browsertest.cc +++ b/chrome/browser/ui/web_applications/web_app_file_handling_browsertest.cc
@@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/bind.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/strings/strcat.h"
diff --git a/chrome/browser/ui/web_applications/web_app_launch_manager.h b/chrome/browser/ui/web_applications/web_app_launch_manager.h index 58e49abb8..ef8e1a3b 100644 --- a/chrome/browser/ui/web_applications/web_app_launch_manager.h +++ b/chrome/browser/ui/web_applications/web_app_launch_manager.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEB_APPLICATIONS_WEB_APP_LAUNCH_MANAGER_H_ #define CHROME_BROWSER_UI_WEB_APPLICATIONS_WEB_APP_LAUNCH_MANAGER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "components/services/app_service/public/cpp/app_launch_util.h"
diff --git a/chrome/browser/ui/web_applications/web_app_metrics.cc b/chrome/browser/ui/web_applications/web_app_metrics.cc index c33cb8b9..c58fef1 100644 --- a/chrome/browser/ui/web_applications/web_app_metrics.cc +++ b/chrome/browser/ui/web_applications/web_app_metrics.cc
@@ -4,9 +4,9 @@ #include "chrome/browser/ui/web_applications/web_app_metrics.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/debug/dump_without_crashing.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/histogram_functions.h" #include "base/power_monitor/power_monitor.h" #include "base/time/time.h"
diff --git a/chrome/browser/ui/web_applications/web_app_profile_deletion_browsertest.cc b/chrome/browser/ui/web_applications/web_app_profile_deletion_browsertest.cc index ecce23d..77b2d49 100644 --- a/chrome/browser/ui/web_applications/web_app_profile_deletion_browsertest.cc +++ b/chrome/browser/ui/web_applications/web_app_profile_deletion_browsertest.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 "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/test/bind.h" #include "build/build_config.h"
diff --git a/chrome/browser/ui/web_applications/web_app_ui_manager_impl.h b/chrome/browser/ui/web_applications/web_app_ui_manager_impl.h index 5800774..d9a6594 100644 --- a/chrome/browser/ui/web_applications/web_app_ui_manager_impl.h +++ b/chrome/browser/ui/web_applications/web_app_ui_manager_impl.h
@@ -9,7 +9,7 @@ #include <memory> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "build/build_config.h"
diff --git a/chrome/browser/ui/web_applications/web_app_uninstall_dialog.h b/chrome/browser/ui/web_applications/web_app_uninstall_dialog.h index e92d548..c865cc0 100644 --- a/chrome/browser/ui/web_applications/web_app_uninstall_dialog.h +++ b/chrome/browser/ui/web_applications/web_app_uninstall_dialog.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "chrome/browser/web_applications/web_app_id.h" #include "ui/gfx/native_widget_types.h"
diff --git a/chrome/browser/ui/webauthn/account_hover_list_model.cc b/chrome/browser/ui/webauthn/account_hover_list_model.cc index a1b0a51..f7a4f28e 100644 --- a/chrome/browser/ui/webauthn/account_hover_list_model.cc +++ b/chrome/browser/ui/webauthn/account_hover_list_model.cc
@@ -6,8 +6,8 @@ #include <string> -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "chrome/app/vector_icons/vector_icons.h" #include "chrome/grit/generated_resources.h"
diff --git a/chrome/browser/ui/webauthn/authenticator_dialog_browsertest.cc b/chrome/browser/ui/webauthn/authenticator_dialog_browsertest.cc index d65fc3d..2facbab 100644 --- a/chrome/browser/ui/webauthn/authenticator_dialog_browsertest.cc +++ b/chrome/browser/ui/webauthn/authenticator_dialog_browsertest.cc
@@ -5,7 +5,7 @@ #include <memory> #include <utility> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "base/test/with_feature_override.h"
diff --git a/chrome/browser/ui/webid/identity_dialog_controller.h b/chrome/browser/ui/webid/identity_dialog_controller.h index 77575b9..c904fbd 100644 --- a/chrome/browser/ui/webid/identity_dialog_controller.h +++ b/chrome/browser/ui/webid/identity_dialog_controller.h
@@ -8,7 +8,7 @@ #include <memory> #include <utility> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/ui/webid/account_selection_view.h" #include "content/public/browser/identity_request_dialog_controller.h"
diff --git a/chrome/browser/ui/webui/about_ui.cc b/chrome/browser/ui/webui/about_ui.cc index eed7ddf..da082c9 100644 --- a/chrome/browser/ui/webui/about_ui.cc +++ b/chrome/browser/ui/webui/about_ui.cc
@@ -13,13 +13,13 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/format_macros.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ref_counted_memory.h" #include "base/strings/escape.h" #include "base/strings/string_split.h"
diff --git a/chrome/browser/ui/webui/about_ui_unittest.cc b/chrome/browser/ui/webui/about_ui_unittest.cc index bf295464..456ffa4 100644 --- a/chrome/browser/ui/webui/about_ui_unittest.cc +++ b/chrome/browser/ui/webui/about_ui_unittest.cc
@@ -8,11 +8,11 @@ #include <string> #include "base/base64.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ref_counted_memory.h" #include "base/strings/strcat.h" #include "base/strings/string_piece.h"
diff --git a/chrome/browser/ui/webui/app_home/app_home_page_handler.cc b/chrome/browser/ui/webui/app_home/app_home_page_handler.cc index e23f884..5389988f 100644 --- a/chrome/browser/ui/webui/app_home/app_home_page_handler.cc +++ b/chrome/browser/ui/webui/app_home/app_home_page_handler.cc
@@ -3,10 +3,9 @@ // found in the LICENSE file. #include "chrome/browser/ui/webui/app_home/app_home_page_handler.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/flat_set.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/functional/callback_helpers.h" #include "base/metrics/histogram_functions.h" #include "base/time/time.h"
diff --git a/chrome/browser/ui/webui/app_management/app_management_page_handler_factory.cc b/chrome/browser/ui/webui/app_management/app_management_page_handler_factory.cc index 0525e756..cb0715e 100644 --- a/chrome/browser/ui/webui/app_management/app_management_page_handler_factory.cc +++ b/chrome/browser/ui/webui/app_management/app_management_page_handler_factory.cc
@@ -7,8 +7,8 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "chrome/browser/apps/app_service/app_icon/app_icon_source.h" #include "chrome/browser/profiles/profile.h" #include "chrome/grit/browser_resources.h"
diff --git a/chrome/browser/ui/webui/ash/account_manager/account_manager_error_ui.cc b/chrome/browser/ui/webui/ash/account_manager/account_manager_error_ui.cc index 41ff147..a535ed09 100644 --- a/chrome/browser/ui/webui/ash/account_manager/account_manager_error_ui.cc +++ b/chrome/browser/ui/webui/ash/account_manager/account_manager_error_ui.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/webui/ash/account_manager/account_manager_error_ui.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "build/branding_buildflags.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/url_constants.h"
diff --git a/chrome/browser/ui/webui/ash/account_manager/account_migration_welcome_ui.cc b/chrome/browser/ui/webui/ash/account_manager/account_migration_welcome_ui.cc index de4ff15..78c3b94 100644 --- a/chrome/browser/ui/webui/ash/account_manager/account_migration_welcome_ui.cc +++ b/chrome/browser/ui/webui/ash/account_manager/account_migration_welcome_ui.cc
@@ -7,8 +7,8 @@ #include <memory> #include <string> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/strings/utf_string_conversions.h" #include "build/branding_buildflags.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ui/webui/ash/add_supervision/add_supervision_handler.h b/chrome/browser/ui/webui/ash/add_supervision/add_supervision_handler.h index 4c9f1ccf..4c560478 100644 --- a/chrome/browser/ui/webui/ash/add_supervision/add_supervision_handler.h +++ b/chrome/browser/ui/webui/ash/add_supervision/add_supervision_handler.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_ASH_ADD_SUPERVISION_ADD_SUPERVISION_HANDLER_H_ #define CHROME_BROWSER_UI_WEBUI_ASH_ADD_SUPERVISION_ADD_SUPERVISION_HANDLER_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ui/webui/ash/add_supervision/add_supervision.mojom.h" #include "mojo/public/cpp/bindings/pending_receiver.h"
diff --git a/chrome/browser/ui/webui/ash/add_supervision/add_supervision_ui.cc b/chrome/browser/ui/webui/ash/add_supervision/add_supervision_ui.cc index 60fb46b7..43f6526d 100644 --- a/chrome/browser/ui/webui/ash/add_supervision/add_supervision_ui.cc +++ b/chrome/browser/ui/webui/ash/add_supervision/add_supervision_ui.cc
@@ -7,8 +7,8 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/system/sys_info.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile_manager.h"
diff --git a/chrome/browser/ui/webui/ash/arc_graphics_tracing/arc_graphics_tracing_handler.cc b/chrome/browser/ui/webui/ash/arc_graphics_tracing/arc_graphics_tracing_handler.cc index 6fac3bc80..03579070 100644 --- a/chrome/browser/ui/webui/ash/arc_graphics_tracing/arc_graphics_tracing_handler.cc +++ b/chrome/browser/ui/webui/ash/arc_graphics_tracing/arc_graphics_tracing_handler.cc
@@ -10,9 +10,9 @@ #include "ash/components/arc/arc_prefs.h" #include "ash/components/arc/arc_util.h" #include "ash/public/cpp/shell_window_ids.h" -#include "base/bind.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/linux_util.h"
diff --git a/chrome/browser/ui/webui/ash/arc_power_control/arc_power_control_handler.cc b/chrome/browser/ui/webui/ash/arc_power_control/arc_power_control_handler.cc index e3c9582..d743ab9 100644 --- a/chrome/browser/ui/webui/ash/arc_power_control/arc_power_control_handler.cc +++ b/chrome/browser/ui/webui/ash/arc_power_control/arc_power_control_handler.cc
@@ -7,7 +7,7 @@ #include "ash/components/arc/mojom/power.mojom.h" #include "ash/components/arc/session/arc_bridge_service.h" #include "ash/components/arc/session/arc_service_manager.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/linux_util.h" #include "base/process/launch.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/ui/webui/ash/assistant_optin/assistant_optin_ui.cc b/chrome/browser/ui/webui/ash/assistant_optin/assistant_optin_ui.cc index 2f927bd..ef2cce5 100644 --- a/chrome/browser/ui/webui/ash/assistant_optin/assistant_optin_ui.cc +++ b/chrome/browser/ui/webui/ash/assistant_optin/assistant_optin_ui.cc
@@ -10,7 +10,7 @@ #include "ash/constants/ash_features.h" #include "ash/public/cpp/shelf_config.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/string_number_conversions.h" #include "base/values.h" #include "build/buildflag.h"
diff --git a/chrome/browser/ui/webui/ash/assistant_optin/assistant_optin_ui.h b/chrome/browser/ui/webui/ash/assistant_optin/assistant_optin_ui.h index 8848037..9898141c 100644 --- a/chrome/browser/ui/webui/ash/assistant_optin/assistant_optin_ui.h +++ b/chrome/browser/ui/webui/ash/assistant_optin/assistant_optin_ui.h
@@ -8,8 +8,8 @@ #include <vector> #include "ash/public/cpp/assistant/assistant_setup.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "chrome/browser/ui/webui/ash/assistant_optin/assistant_optin_utils.h" #include "chrome/browser/ui/webui/ash/login/assistant_optin_flow_screen_handler.h" #include "chrome/browser/ui/webui/ash/login/base_webui_handler.h"
diff --git a/chrome/browser/ui/webui/ash/cellular_setup/mobile_setup_ui.cc b/chrome/browser/ui/webui/ash/cellular_setup/mobile_setup_ui.cc index b0d9398..3e0eb46 100644 --- a/chrome/browser/ui/webui/ash/cellular_setup/mobile_setup_ui.cc +++ b/chrome/browser/ui/webui/ash/cellular_setup/mobile_setup_ui.cc
@@ -10,7 +10,7 @@ #include <string> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/ref_counted_memory.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/ui/webui/ash/chromebox_for_meetings/network_settings_dialog.cc b/chrome/browser/ui/webui/ash/chromebox_for_meetings/network_settings_dialog.cc index 28365d7..dc205ce4 100644 --- a/chrome/browser/ui/webui/ash/chromebox_for_meetings/network_settings_dialog.cc +++ b/chrome/browser/ui/webui/ash/chromebox_for_meetings/network_settings_dialog.cc
@@ -5,8 +5,8 @@ #include "chrome/browser/ui/webui/ash/chromebox_for_meetings/network_settings_dialog.h" #include "ash/public/cpp/network_config_service.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "chrome/browser/ash/app_mode/certificate_manager_dialog.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h"
diff --git a/chrome/browser/ui/webui/ash/cloud_upload/cloud_upload_dialog.cc b/chrome/browser/ui/webui/ash/cloud_upload/cloud_upload_dialog.cc index 1ebf52c..a39aa476 100644 --- a/chrome/browser/ui/webui/ash/cloud_upload/cloud_upload_dialog.cc +++ b/chrome/browser/ui/webui/ash/cloud_upload/cloud_upload_dialog.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ui/webui/ash/cloud_upload/cloud_upload_dialog.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/json/json_writer.h" #include "base/logging.h" #include "base/memory/ref_counted.h"
diff --git a/chrome/browser/ui/webui/ash/cloud_upload/cloud_upload_page_handler.h b/chrome/browser/ui/webui/ash/cloud_upload/cloud_upload_page_handler.h index a7c7a5b..9e51071 100644 --- a/chrome/browser/ui/webui/ash/cloud_upload/cloud_upload_page_handler.h +++ b/chrome/browser/ui/webui/ash/cloud_upload/cloud_upload_page_handler.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_UI_WEBUI_ASH_CLOUD_UPLOAD_CLOUD_UPLOAD_PAGE_HANDLER_H_ #define CHROME_BROWSER_UI_WEBUI_ASH_CLOUD_UPLOAD_CLOUD_UPLOAD_PAGE_HANDLER_H_ -#include "base/callback.h" #include "base/files/file.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/webui/ash/cloud_upload/cloud_upload.mojom-shared.h"
diff --git a/chrome/browser/ui/webui/ash/cloud_upload/cloud_upload_util.h b/chrome/browser/ui/webui/ash/cloud_upload/cloud_upload_util.h index 1225f15..682fc8d 100644 --- a/chrome/browser/ui/webui/ash/cloud_upload/cloud_upload_util.h +++ b/chrome/browser/ui/webui/ash/cloud_upload/cloud_upload_util.h
@@ -5,9 +5,9 @@ #ifndef CHROME_BROWSER_UI_WEBUI_ASH_CLOUD_UPLOAD_CLOUD_UPLOAD_UTIL_H_ #define CHROME_BROWSER_UI_WEBUI_ASH_CLOUD_UPLOAD_CLOUD_UPLOAD_UTIL_H_ -#include "base/callback.h" #include "base/files/file.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "chrome/browser/platform_util.h" #include "storage/browser/file_system/file_system_context.h" #include "storage/browser/file_system/file_system_url.h"
diff --git a/chrome/browser/ui/webui/ash/crostini_installer/crostini_installer_dialog.cc b/chrome/browser/ui/webui/ash/crostini_installer/crostini_installer_dialog.cc index aadc7ea..cefa26ae 100644 --- a/chrome/browser/ui/webui/ash/crostini_installer/crostini_installer_dialog.cc +++ b/chrome/browser/ui/webui/ash/crostini_installer/crostini_installer_dialog.cc
@@ -6,7 +6,7 @@ #include "ash/public/cpp/shelf_types.h" #include "ash/public/cpp/window_properties.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/ash/crostini/crostini_features.h" #include "chrome/browser/ash/crostini/crostini_manager.h"
diff --git a/chrome/browser/ui/webui/ash/crostini_installer/crostini_installer_dialog.h b/chrome/browser/ui/webui/ash/crostini_installer/crostini_installer_dialog.h index 78be8f8..2218673 100644 --- a/chrome/browser/ui/webui/ash/crostini_installer/crostini_installer_dialog.h +++ b/chrome/browser/ui/webui/ash/crostini_installer/crostini_installer_dialog.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_ASH_CROSTINI_INSTALLER_CROSTINI_INSTALLER_DIALOG_H_ #define CHROME_BROWSER_UI_WEBUI_ASH_CROSTINI_INSTALLER_CROSTINI_INSTALLER_DIALOG_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ui/webui/ash/system_web_dialog_delegate.h"
diff --git a/chrome/browser/ui/webui/ash/crostini_installer/crostini_installer_page_handler.cc b/chrome/browser/ui/webui/ash/crostini_installer/crostini_installer_page_handler.cc index 54ecdf8..07be898 100644 --- a/chrome/browser/ui/webui/ash/crostini_installer/crostini_installer_page_handler.cc +++ b/chrome/browser/ui/webui/ash/crostini_installer/crostini_installer_page_handler.cc
@@ -8,7 +8,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/ui/webui/ash/crostini_installer/crostini_installer_page_handler.h b/chrome/browser/ui/webui/ash/crostini_installer/crostini_installer_page_handler.h index 2d3330d1..80fdeb9 100644 --- a/chrome/browser/ui/webui/ash/crostini_installer/crostini_installer_page_handler.h +++ b/chrome/browser/ui/webui/ash/crostini_installer/crostini_installer_page_handler.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_ASH_CROSTINI_INSTALLER_CROSTINI_INSTALLER_PAGE_HANDLER_H_ #define CHROME_BROWSER_UI_WEBUI_ASH_CROSTINI_INSTALLER_CROSTINI_INSTALLER_PAGE_HANDLER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ash/crostini/crostini_types.mojom-forward.h" #include "chrome/browser/ui/webui/ash/crostini_installer/crostini_installer.mojom.h"
diff --git a/chrome/browser/ui/webui/ash/crostini_installer/crostini_installer_ui.cc b/chrome/browser/ui/webui/ash/crostini_installer/crostini_installer_ui.cc index c38f61f..68847503 100644 --- a/chrome/browser/ui/webui/ash/crostini_installer/crostini_installer_ui.cc +++ b/chrome/browser/ui/webui/ash/crostini_installer/crostini_installer_ui.cc
@@ -7,8 +7,8 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/strings/utf_string_conversions.h" #include "base/system/sys_info.h" #include "chrome/browser/ash/crostini/crostini_disk.h"
diff --git a/chrome/browser/ui/webui/ash/crostini_upgrader/crostini_upgrader_dialog_browsertest.cc b/chrome/browser/ui/webui/ash/crostini_upgrader/crostini_upgrader_dialog_browsertest.cc index bc7fcb86..47a34d3 100644 --- a/chrome/browser/ui/webui/ash/crostini_upgrader/crostini_upgrader_dialog_browsertest.cc +++ b/chrome/browser/ui/webui/ash/crostini_upgrader/crostini_upgrader_dialog_browsertest.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ui/webui/ash/crostini_upgrader/crostini_upgrader_dialog.h" -#include "base/callback_helpers.h" #include "base/feature_list.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/histogram_base.h" #include "base/run_loop.h" #include "base/test/metrics/histogram_tester.h"
diff --git a/chrome/browser/ui/webui/ash/crostini_upgrader/crostini_upgrader_page_handler.cc b/chrome/browser/ui/webui/ash/crostini_upgrader/crostini_upgrader_page_handler.cc index 67d9b63..3c4c03e 100644 --- a/chrome/browser/ui/webui/ash/crostini_upgrader/crostini_upgrader_page_handler.cc +++ b/chrome/browser/ui/webui/ash/crostini_upgrader/crostini_upgrader_page_handler.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/histogram_functions.h" #include "chrome/browser/ash/crostini/crostini_simple_types.h" #include "chrome/browser/ash/crostini/crostini_util.h"
diff --git a/chrome/browser/ui/webui/ash/crostini_upgrader/crostini_upgrader_page_handler.h b/chrome/browser/ui/webui/ash/crostini_upgrader/crostini_upgrader_page_handler.h index 506ba4d..ecc2c7f 100644 --- a/chrome/browser/ui/webui/ash/crostini_upgrader/crostini_upgrader_page_handler.h +++ b/chrome/browser/ui/webui/ash/crostini_upgrader/crostini_upgrader_page_handler.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_ASH_CROSTINI_UPGRADER_CROSTINI_UPGRADER_PAGE_HANDLER_H_ #define CHROME_BROWSER_UI_WEBUI_ASH_CROSTINI_UPGRADER_CROSTINI_UPGRADER_PAGE_HANDLER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ash/crostini/crostini_upgrader_ui_delegate.h" #include "chrome/browser/ui/webui/ash/crostini_upgrader/crostini_upgrader.mojom.h"
diff --git a/chrome/browser/ui/webui/ash/crostini_upgrader/crostini_upgrader_ui.cc b/chrome/browser/ui/webui/ash/crostini_upgrader/crostini_upgrader_ui.cc index 725ba0e..663d852 100644 --- a/chrome/browser/ui/webui/ash/crostini_upgrader/crostini_upgrader_ui.cc +++ b/chrome/browser/ui/webui/ash/crostini_upgrader/crostini_upgrader_ui.cc
@@ -8,7 +8,7 @@ #include <utility> #include "ash/constants/ash_features.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "base/system/sys_info.h" #include "chrome/browser/ash/crostini/crostini_upgrader.h"
diff --git a/chrome/browser/ui/webui/ash/crostini_upgrader/crostini_upgrader_ui.h b/chrome/browser/ui/webui/ash/crostini_upgrader/crostini_upgrader_ui.h index 394c07d..bdb3a878 100644 --- a/chrome/browser/ui/webui/ash/crostini_upgrader/crostini_upgrader_ui.h +++ b/chrome/browser/ui/webui/ash/crostini_upgrader/crostini_upgrader_ui.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_ASH_CROSTINI_UPGRADER_CROSTINI_UPGRADER_UI_H_ #define CHROME_BROWSER_UI_WEBUI_ASH_CROSTINI_UPGRADER_CROSTINI_UPGRADER_UI_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ui/webui/ash/crostini_upgrader/crostini_upgrader.mojom.h" #include "chrome/common/webui_url_constants.h"
diff --git a/chrome/browser/ui/webui/ash/cryptohome_web_ui_handler.cc b/chrome/browser/ui/webui/ash/cryptohome_web_ui_handler.cc index 523c1e7..cb00443 100644 --- a/chrome/browser/ui/webui/ash/cryptohome_web_ui_handler.cc +++ b/chrome/browser/ui/webui/ash/cryptohome_web_ui_handler.cc
@@ -6,7 +6,7 @@ #include <numeric> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/values.h" #include "chromeos/ash/components/dbus/cryptohome/rpc.pb.h"
diff --git a/chrome/browser/ui/webui/ash/drive_internals_ui.cc b/chrome/browser/ui/webui/ash/drive_internals_ui.cc index 35605d00..70e01f9b 100644 --- a/chrome/browser/ui/webui/ash/drive_internals_ui.cc +++ b/chrome/browser/ui/webui/ash/drive_internals_ui.cc
@@ -17,11 +17,11 @@ #include <vector> #include "ash/constants/ash_features.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/files/file_enumerator.h" #include "base/files/file_util.h" #include "base/format_macros.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/weak_ptr.h" #include "base/path_service.h" #include "base/process/launch.h"
diff --git a/chrome/browser/ui/webui/ash/edu_account_login_handler.cc b/chrome/browser/ui/webui/ash/edu_account_login_handler.cc index a19f123e..1abd86d 100644 --- a/chrome/browser/ui/webui/ash/edu_account_login_handler.cc +++ b/chrome/browser/ui/webui/ash/edu_account_login_handler.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/metrics/histogram_functions.h" #include "base/values.h"
diff --git a/chrome/browser/ui/webui/ash/edu_account_login_handler_unittest.cc b/chrome/browser/ui/webui/ash/edu_account_login_handler_unittest.cc index e7a8416b..a2fc828 100644 --- a/chrome/browser/ui/webui/ash/edu_account_login_handler_unittest.cc +++ b/chrome/browser/ui/webui/ash/edu_account_login_handler_unittest.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/json/json_writer.h" #include "base/test/bind.h" #include "base/test/task_environment.h"
diff --git a/chrome/browser/ui/webui/ash/edu_coexistence/edu_coexistence_login_handler.cc b/chrome/browser/ui/webui/ash/edu_coexistence/edu_coexistence_login_handler.cc index 9658e41..78eed6c1 100644 --- a/chrome/browser/ui/webui/ash/edu_coexistence/edu_coexistence_login_handler.cc +++ b/chrome/browser/ui/webui/ash/edu_coexistence/edu_coexistence_login_handler.cc
@@ -9,11 +9,11 @@ #include "ash/constants/ash_features.h" #include "ash/constants/ash_pref_names.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/check.h" #include "base/command_line.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/guid.h" #include "base/metrics/histogram_functions.h" #include "base/system/sys_info.h"
diff --git a/chrome/browser/ui/webui/ash/edu_coexistence/edu_coexistence_login_handler_browsertest.cc b/chrome/browser/ui/webui/ash/edu_coexistence/edu_coexistence_login_handler_browsertest.cc index 2d77db40..2922fd3 100644 --- a/chrome/browser/ui/webui/ash/edu_coexistence/edu_coexistence_login_handler_browsertest.cc +++ b/chrome/browser/ui/webui/ash/edu_coexistence/edu_coexistence_login_handler_browsertest.cc
@@ -7,7 +7,7 @@ #include <memory> #include <string> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/test/metrics/histogram_tester.h" #include "base/time/time.h" #include "base/values.h"
diff --git a/chrome/browser/ui/webui/ash/edu_coexistence/edu_coexistence_state_tracker.h b/chrome/browser/ui/webui/ash/edu_coexistence/edu_coexistence_state_tracker.h index 41a98f00..2b594bdb 100644 --- a/chrome/browser/ui/webui/ash/edu_coexistence/edu_coexistence_state_tracker.h +++ b/chrome/browser/ui/webui/ash/edu_coexistence/edu_coexistence_state_tracker.h
@@ -8,7 +8,7 @@ #include <map> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/no_destructor.h" namespace content {
diff --git a/chrome/browser/ui/webui/ash/emulator/device_emulator_message_handler.cc b/chrome/browser/ui/webui/ash/emulator/device_emulator_message_handler.cc index 3171240..b7dc77d 100644 --- a/chrome/browser/ui/webui/ash/emulator/device_emulator_message_handler.cc +++ b/chrome/browser/ui/webui/ash/emulator/device_emulator_message_handler.cc
@@ -10,8 +10,8 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_piece.h" #include "base/values.h"
diff --git a/chrome/browser/ui/webui/ash/human_presence_internals_ui.cc b/chrome/browser/ui/webui/ash/human_presence_internals_ui.cc index be090d25..efc140c 100644 --- a/chrome/browser/ui/webui/ash/human_presence_internals_ui.cc +++ b/chrome/browser/ui/webui/ash/human_presence_internals_ui.cc
@@ -6,9 +6,9 @@ #include <memory> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/weak_ptr.h" #include "base/scoped_observation.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/ui/webui/ash/image_source.cc b/chrome/browser/ui/webui/ash/image_source.cc index f1dd210..2a28267 100644 --- a/chrome/browser/ui/webui/ash/image_source.cc +++ b/chrome/browser/ui/webui/ash/image_source.cc
@@ -8,8 +8,8 @@ #include <vector> -#include "base/bind.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/ref_counted_memory.h" #include "base/task/sequenced_task_runner.h"
diff --git a/chrome/browser/ui/webui/ash/in_session_password_change/password_change_dialogs.cc b/chrome/browser/ui/webui/ash/in_session_password_change/password_change_dialogs.cc index 7b724b0d..d93b6c1 100644 --- a/chrome/browser/ui/webui/ash/in_session_password_change/password_change_dialogs.cc +++ b/chrome/browser/ui/webui/ash/in_session_password_change/password_change_dialogs.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/json/json_writer.h" #include "chrome/browser/ui/webui/ash/in_session_password_change/confirm_password_change_handler.h" #include "chrome/common/webui_url_constants.h"
diff --git a/chrome/browser/ui/webui/ash/in_session_password_change/password_change_ui.cc b/chrome/browser/ui/webui/ash/in_session_password_change/password_change_ui.cc index 1cfb67c..16bfc97 100644 --- a/chrome/browser/ui/webui/ash/in_session_password_change/password_change_ui.cc +++ b/chrome/browser/ui/webui/ash/in_session_password_change/password_change_ui.cc
@@ -7,8 +7,8 @@ #include <memory> #include "ash/constants/ash_switches.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/json/json_writer.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/ash/login/login_pref_names.h"
diff --git a/chrome/browser/ui/webui/ash/lock_screen_reauth/lock_screen_captive_portal_dialog.h b/chrome/browser/ui/webui/ash/lock_screen_reauth/lock_screen_captive_portal_dialog.h index 0136723..825e8f14 100644 --- a/chrome/browser/ui/webui/ash/lock_screen_reauth/lock_screen_captive_portal_dialog.h +++ b/chrome/browser/ui/webui/ash/lock_screen_reauth/lock_screen_captive_portal_dialog.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/callback.h" -#include "base/callback_forward.h" +#include "base/functional/callback.h" +#include "base/functional/callback_forward.h" #include "chrome/browser/ui/webui/ash/lock_screen_reauth/base_lock_dialog.h" #include "ui/views/widget/widget.h"
diff --git a/chrome/browser/ui/webui/ash/lock_screen_reauth/lock_screen_network_dialog.cc b/chrome/browser/ui/webui/ash/lock_screen_reauth/lock_screen_network_dialog.cc index cba0c81..3c92682 100644 --- a/chrome/browser/ui/webui/ash/lock_screen_reauth/lock_screen_network_dialog.cc +++ b/chrome/browser/ui/webui/ash/lock_screen_reauth/lock_screen_network_dialog.cc
@@ -7,7 +7,7 @@ #include <memory> #include "ash/constants/ash_features.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/task_traits.h" #include "chrome/browser/ash/profiles/profile_helper.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ui/webui/ash/lock_screen_reauth/lock_screen_network_dialog.h b/chrome/browser/ui/webui/ash/lock_screen_reauth/lock_screen_network_dialog.h index 674fb5d..a1d74589 100644 --- a/chrome/browser/ui/webui/ash/lock_screen_reauth/lock_screen_network_dialog.h +++ b/chrome/browser/ui/webui/ash/lock_screen_reauth/lock_screen_network_dialog.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_ASH_LOCK_SCREEN_REAUTH_LOCK_SCREEN_NETWORK_DIALOG_H_ #define CHROME_BROWSER_UI_WEBUI_ASH_LOCK_SCREEN_REAUTH_LOCK_SCREEN_NETWORK_DIALOG_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "chrome/browser/ui/webui/ash/lock_screen_reauth/base_lock_dialog.h" class Profile;
diff --git a/chrome/browser/ui/webui/ash/lock_screen_reauth/lock_screen_network_handler.cc b/chrome/browser/ui/webui/ash/lock_screen_reauth/lock_screen_network_handler.cc index 7a24b9e..444d042 100644 --- a/chrome/browser/ui/webui/ash/lock_screen_reauth/lock_screen_network_handler.cc +++ b/chrome/browser/ui/webui/ash/lock_screen_reauth/lock_screen_network_handler.cc
@@ -9,7 +9,7 @@ #include <utility> #include "ash/public/cpp/network_config_service.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/weak_ptr.h" #include "base/values.h" #include "chrome/browser/ash/profiles/profile_helper.h"
diff --git a/chrome/browser/ui/webui/ash/lock_screen_reauth/lock_screen_network_ui.cc b/chrome/browser/ui/webui/ash/lock_screen_reauth/lock_screen_network_ui.cc index c0265110..03046fc 100644 --- a/chrome/browser/ui/webui/ash/lock_screen_reauth/lock_screen_network_ui.cc +++ b/chrome/browser/ui/webui/ash/lock_screen_reauth/lock_screen_network_ui.cc
@@ -9,7 +9,7 @@ #include <utility> #include "ash/public/cpp/network_config_service.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/weak_ptr.h" #include "base/values.h" #include "chrome/browser/ash/profiles/profile_helper.h"
diff --git a/chrome/browser/ui/webui/ash/lock_screen_reauth/lock_screen_reauth_dialogs.cc b/chrome/browser/ui/webui/ash/lock_screen_reauth/lock_screen_reauth_dialogs.cc index fb6d904..37f0d9f2 100644 --- a/chrome/browser/ui/webui/ash/lock_screen_reauth/lock_screen_reauth_dialogs.cc +++ b/chrome/browser/ui/webui/ash/lock_screen_reauth/lock_screen_reauth_dialogs.cc
@@ -8,8 +8,8 @@ #include <string> #include "ash/constants/ash_features.h" -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/functional/callback_helpers.h" #include "base/json/json_writer.h" #include "base/task/sequenced_task_runner.h"
diff --git a/chrome/browser/ui/webui/ash/login/assistant_optin_flow_screen_handler.cc b/chrome/browser/ui/webui/ash/login/assistant_optin_flow_screen_handler.cc index f4de968..f4efbc4 100644 --- a/chrome/browser/ui/webui/ash/login/assistant_optin_flow_screen_handler.cc +++ b/chrome/browser/ui/webui/ash/login/assistant_optin_flow_screen_handler.cc
@@ -8,9 +8,9 @@ #include "ash/constants/ash_switches.h" #include "ash/public/cpp/tablet_mode.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/histogram_macros.h" #include "base/values.h" #include "chrome/browser/ash/login/oobe_screen.h"
diff --git a/chrome/browser/ui/webui/ash/login/base_screen_handler.cc b/chrome/browser/ui/webui/ash/login/base_screen_handler.cc index 9c4b0bb..07ec8e5 100644 --- a/chrome/browser/ui/webui/ash/login/base_screen_handler.cc +++ b/chrome/browser/ui/webui/ash/login/base_screen_handler.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ui/webui/ash/login/base_screen_handler.h" -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/strings/strcat.h" #include "chrome/browser/ash/login/oobe_screen.h" #include "chrome/browser/ash/login/screens/base_screen.h"
diff --git a/chrome/browser/ui/webui/ash/login/base_webui_handler.h b/chrome/browser/ui/webui/ash/login/base_webui_handler.h index e2cfbab..1e15833 100644 --- a/chrome/browser/ui/webui/ash/login/base_webui_handler.h +++ b/chrome/browser/ui/webui/ash/login/base_webui_handler.h
@@ -9,9 +9,9 @@ #include <string> #include <vector> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/values.h" #include "chrome/browser/ash/login/oobe_screen.h" #include "components/login/base_screen_handler_utils.h"
diff --git a/chrome/browser/ui/webui/ash/login/check_passwords_against_cryptohome_helper.h b/chrome/browser/ui/webui/ash/login/check_passwords_against_cryptohome_helper.h index ee1ff09..400aeea 100644 --- a/chrome/browser/ui/webui/ash/login/check_passwords_against_cryptohome_helper.h +++ b/chrome/browser/ui/webui/ash/login/check_passwords_against_cryptohome_helper.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_ASH_LOGIN_CHECK_PASSWORDS_AGAINST_CRYPTOHOME_HELPER_H_ #define CHROME_BROWSER_UI_WEBUI_ASH_LOGIN_CHECK_PASSWORDS_AGAINST_CRYPTOHOME_HELPER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/values.h" #include "chromeos/ash/components/login/auth/auth_status_consumer.h" #include "chromeos/ash/components/login/auth/public/user_context.h"
diff --git a/chrome/browser/ui/webui/ash/login/cookie_waiter.h b/chrome/browser/ui/webui/ash/login/cookie_waiter.h index e4eec6b..c4d6db4 100644 --- a/chrome/browser/ui/webui/ash/login/cookie_waiter.h +++ b/chrome/browser/ui/webui/ash/login/cookie_waiter.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/timer/timer.h" #include "mojo/public/cpp/bindings/receiver.h" #include "services/network/public/mojom/cookie_manager.mojom.h"
diff --git a/chrome/browser/ui/webui/ash/login/core_oobe_handler.cc b/chrome/browser/ui/webui/ash/login/core_oobe_handler.cc index bb22618f..f9f5d4b2 100644 --- a/chrome/browser/ui/webui/ash/login/core_oobe_handler.cc +++ b/chrome/browser/ui/webui/ash/login/core_oobe_handler.cc
@@ -12,8 +12,8 @@ #include "ash/public/cpp/shelf_config.h" #include "ash/public/cpp/tablet_mode.h" #include "ash/shell.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "build/branding_buildflags.h"
diff --git a/chrome/browser/ui/webui/ash/login/core_oobe_handler.h b/chrome/browser/ui/webui/ash/login/core_oobe_handler.h index d087d976..9e32317 100644 --- a/chrome/browser/ui/webui/ash/login/core_oobe_handler.h +++ b/chrome/browser/ui/webui/ash/login/core_oobe_handler.h
@@ -10,7 +10,7 @@ #include <vector> #include "ash/public/cpp/tablet_mode_observer.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/values.h" #include "chrome/browser/ash/login/help_app_launcher.h" #include "chrome/browser/ash/login/oobe_configuration.h"
diff --git a/chrome/browser/ui/webui/ash/login/debug/debug_overlay_handler.cc b/chrome/browser/ui/webui/ash/login/debug/debug_overlay_handler.cc index 307a525..fe24c60 100644 --- a/chrome/browser/ui/webui/ash/login/debug/debug_overlay_handler.cc +++ b/chrome/browser/ui/webui/ash/login/debug/debug_overlay_handler.cc
@@ -7,11 +7,11 @@ #include "ash/constants/ash_switches.h" #include "ash/public/cpp/style/dark_light_mode_controller.h" #include "ash/shell.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/path_service.h" #include "base/strings/stringprintf.h" #include "base/system/sys_info.h"
diff --git a/chrome/browser/ui/webui/ash/login/enrollment_screen_handler.cc b/chrome/browser/ui/webui/ash/login/enrollment_screen_handler.cc index 9433927c..7ca484bf 100644 --- a/chrome/browser/ui/webui/ash/login/enrollment_screen_handler.cc +++ b/chrome/browser/ui/webui/ash/login/enrollment_screen_handler.cc
@@ -9,7 +9,7 @@ #include <vector> #include "ash/constants/ash_features.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/json/json_reader.h" #include "base/logging.h" #include "base/metrics/histogram_functions.h"
diff --git a/chrome/browser/ui/webui/ash/login/eula_screen_handler.cc b/chrome/browser/ui/webui/ash/login/eula_screen_handler.cc index 48f849e..561ef6d 100644 --- a/chrome/browser/ui/webui/ash/login/eula_screen_handler.cc +++ b/chrome/browser/ui/webui/ash/login/eula_screen_handler.cc
@@ -8,8 +8,8 @@ #include <string> #include "ash/constants/ash_switches.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/strings/stringprintf.h" #include "base/values.h" #include "chrome/browser/ash/login/help_app_launcher.h"
diff --git a/chrome/browser/ui/webui/ash/login/gaia_screen_handler.cc b/chrome/browser/ui/webui/ash/login/gaia_screen_handler.cc index 3cabfa5..ae0c6e5 100644 --- a/chrome/browser/ui/webui/ash/login/gaia_screen_handler.cc +++ b/chrome/browser/ui/webui/ash/login/gaia_screen_handler.cc
@@ -12,13 +12,13 @@ #include "ash/constants/ash_features.h" #include "ash/constants/ash_switches.h" #include "ash/public/cpp/login_screen.h" -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/check_op.h" #include "base/containers/contains.h" #include "base/containers/flat_set.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/guid.h" #include "base/i18n/message_formatter.h" #include "base/i18n/number_formatting.h"
diff --git a/chrome/browser/ui/webui/ash/login/hid_detection_screen_handler.cc b/chrome/browser/ui/webui/ash/login/hid_detection_screen_handler.cc index 3c586a9..7a57fc6 100644 --- a/chrome/browser/ui/webui/ash/login/hid_detection_screen_handler.cc +++ b/chrome/browser/ui/webui/ash/login/hid_detection_screen_handler.cc
@@ -7,9 +7,9 @@ #include <string> #include "ash/constants/ash_features.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/login/oobe_screen.h" #include "chrome/browser/ash/login/screens/hid_detection_screen.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/ui/webui/ash/login/kiosk_enable_screen_handler.cc b/chrome/browser/ui/webui/ash/login/kiosk_enable_screen_handler.cc index 58f3db4..8f0b8b25 100644 --- a/chrome/browser/ui/webui/ash/login/kiosk_enable_screen_handler.cc +++ b/chrome/browser/ui/webui/ash/login/kiosk_enable_screen_handler.cc
@@ -6,7 +6,7 @@ #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/login/screens/kiosk_enable_screen.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/ui/webui/ash/login/oobe_ui.h"
diff --git a/chrome/browser/ui/webui/ash/login/l10n_util.cc b/chrome/browser/ui/webui/ash/login/l10n_util.cc index 14fa3e1..72c132f 100644 --- a/chrome/browser/ui/webui/ash/login/l10n_util.cc +++ b/chrome/browser/ui/webui/ash/login/l10n_util.cc
@@ -13,9 +13,9 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/check_op.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/i18n/rtl.h" #include "base/location.h" #include "base/memory/ref_counted.h"
diff --git a/chrome/browser/ui/webui/ash/login/l10n_util.h b/chrome/browser/ui/webui/ash/login/l10n_util.h index 097b5dc..3f12db0 100644 --- a/chrome/browser/ui/webui/ash/login/l10n_util.h +++ b/chrome/browser/ui/webui/ash/login/l10n_util.h
@@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/values.h" #include "chrome/browser/ash/base/locale_util.h" #include "ui/base/ime/ash/input_method_manager.h"
diff --git a/chrome/browser/ui/webui/ash/login/network_state_informer.cc b/chrome/browser/ui/webui/ash/login/network_state_informer.cc index be4b849b..ada62b3 100644 --- a/chrome/browser/ui/webui/ash/login/network_state_informer.cc +++ b/chrome/browser/ui/webui/ash/login/network_state_informer.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/webui/ash/login/network_state_informer.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/notreached.h" #include "chrome/browser/ash/login/screens/network_error.h" #include "chrome/browser/ash/policy/core/browser_policy_connector_ash.h"
diff --git a/chrome/browser/ui/webui/ash/login/oobe_display_chooser.cc b/chrome/browser/ui/webui/ash/login/oobe_display_chooser.cc index b7051e6..7cf1a4ae4 100644 --- a/chrome/browser/ui/webui/ash/login/oobe_display_chooser.cc +++ b/chrome/browser/ui/webui/ash/login/oobe_display_chooser.cc
@@ -7,9 +7,9 @@ #include <stdint.h> #include "ash/public/ash_interfaces.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/strings/string_number_conversions.h" #include "chrome/browser/ui/ash/ash_util.h" #include "content/public/browser/browser_task_traits.h"
diff --git a/chrome/browser/ui/webui/ash/login/oobe_ui.cc b/chrome/browser/ui/webui/ash/login/oobe_ui.cc index dc5854bd..5438491 100644 --- a/chrome/browser/ui/webui/ash/login/oobe_ui.cc +++ b/chrome/browser/ui/webui/ash/login/oobe_ui.cc
@@ -17,9 +17,9 @@ #include "ash/public/cpp/network_config_service.h" #include "ash/public/cpp/resources/grit/ash_public_unscaled_resources.h" #include "ash/shell.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/notreached.h" #include "base/system/sys_info.h"
diff --git a/chrome/browser/ui/webui/ash/login/saml_challenge_key_handler.cc b/chrome/browser/ui/webui/ash/login/saml_challenge_key_handler.cc index 886816f..45b564bc8 100644 --- a/chrome/browser/ui/webui/ash/login/saml_challenge_key_handler.cc +++ b/chrome/browser/ui/webui/ash/login/saml_challenge_key_handler.cc
@@ -5,7 +5,7 @@ #include "chrome/browser/ui/webui/ash/login/saml_challenge_key_handler.h" #include "base/base64.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/metrics/histogram_functions.h" #include "base/values.h"
diff --git a/chrome/browser/ui/webui/ash/login/saml_challenge_key_handler.h b/chrome/browser/ui/webui/ash/login/saml_challenge_key_handler.h index 651388a..21fc8ad2 100644 --- a/chrome/browser/ui/webui/ash/login/saml_challenge_key_handler.h +++ b/chrome/browser/ui/webui/ash/login/saml_challenge_key_handler.h
@@ -8,8 +8,8 @@ #include <memory> #include <string> -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h" #include "chrome/browser/ash/attestation/tpm_challenge_key_with_timeout.h"
diff --git a/chrome/browser/ui/webui/ash/login/signin_screen_handler.cc b/chrome/browser/ui/webui/ash/login/signin_screen_handler.cc index ab1694b..bbdaf974 100644 --- a/chrome/browser/ui/webui/ash/login/signin_screen_handler.cc +++ b/chrome/browser/ui/webui/ash/login/signin_screen_handler.cc
@@ -11,7 +11,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/ui/webui/ash/login/signin_screen_handler.h b/chrome/browser/ui/webui/ash/login/signin_screen_handler.h index 9c5d51b..15e1fe0e 100644 --- a/chrome/browser/ui/webui/ash/login/signin_screen_handler.h +++ b/chrome/browser/ui/webui/ash/login/signin_screen_handler.h
@@ -10,7 +10,7 @@ #include <set> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h"
diff --git a/chrome/browser/ui/webui/ash/login/terms_of_service_screen_handler.cc b/chrome/browser/ui/webui/ash/login/terms_of_service_screen_handler.cc index 3ce1d6e1..b5398b4 100644 --- a/chrome/browser/ui/webui/ash/login/terms_of_service_screen_handler.cc +++ b/chrome/browser/ui/webui/ash/login/terms_of_service_screen_handler.cc
@@ -7,8 +7,8 @@ #include <memory> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/strings/string_split.h" #include "base/values.h" #include "chrome/browser/ash/base/locale_util.h"
diff --git a/chrome/browser/ui/webui/ash/login/testapi/oobe_test_api_handler.cc b/chrome/browser/ui/webui/ash/login/testapi/oobe_test_api_handler.cc index 6f3bbdf7..c59091e 100644 --- a/chrome/browser/ui/webui/ash/login/testapi/oobe_test_api_handler.cc +++ b/chrome/browser/ui/webui/ash/login/testapi/oobe_test_api_handler.cc
@@ -8,8 +8,8 @@ #include "ash/constants/ash_switches.h" #include "ash/public/ash_interfaces.h" #include "ash/public/cpp/tablet_mode.h" -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/notreached.h" #include "base/values.h"
diff --git a/chrome/browser/ui/webui/ash/login/welcome_screen_handler.cc b/chrome/browser/ui/webui/ash/login/welcome_screen_handler.cc index 0e219a4..f454efd 100644 --- a/chrome/browser/ui/webui/ash/login/welcome_screen_handler.cc +++ b/chrome/browser/ui/webui/ash/login/welcome_screen_handler.cc
@@ -10,9 +10,9 @@ #include "ash/constants/ash_features.h" #include "ash/constants/ash_switches.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/histogram_functions.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h"
diff --git a/chrome/browser/ui/webui/ash/manage_mirrorsync/manage_mirrorsync_page_handler.h b/chrome/browser/ui/webui/ash/manage_mirrorsync/manage_mirrorsync_page_handler.h index 962d6b9..7f5abbb 100644 --- a/chrome/browser/ui/webui/ash/manage_mirrorsync/manage_mirrorsync_page_handler.h +++ b/chrome/browser/ui/webui/ash/manage_mirrorsync/manage_mirrorsync_page_handler.h
@@ -7,8 +7,8 @@ #include <vector> -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ui/webui/ash/manage_mirrorsync/manage_mirrorsync.mojom.h"
diff --git a/chrome/browser/ui/webui/ash/multidevice_internals/multidevice_internals_logs_handler.cc b/chrome/browser/ui/webui/ash/multidevice_internals/multidevice_internals_logs_handler.cc index ecbdaaa6..ae4c461e 100644 --- a/chrome/browser/ui/webui/ash/multidevice_internals/multidevice_internals_logs_handler.cc +++ b/chrome/browser/ui/webui/ash/multidevice_internals/multidevice_internals_logs_handler.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/webui/ash/multidevice_internals/multidevice_internals_logs_handler.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/i18n/time_formatting.h" #include "base/values.h" #include "chromeos/ash/components/multidevice/logging/log_buffer.h"
diff --git a/chrome/browser/ui/webui/ash/multidevice_setup/multidevice_setup_dialog.cc b/chrome/browser/ui/webui/ash/multidevice_setup/multidevice_setup_dialog.cc index d046fed..41015f9 100644 --- a/chrome/browser/ui/webui/ash/multidevice_setup/multidevice_setup_dialog.cc +++ b/chrome/browser/ui/webui/ash/multidevice_setup/multidevice_setup_dialog.cc
@@ -8,7 +8,7 @@ #include "ash/public/cpp/shell_window_ids.h" #include "ash/public/cpp/window_backdrop.h" #include "ash/public/cpp/window_properties.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "base/system/sys_info.h" #include "chrome/browser/ash/login/ui/oobe_dialog_size_utils.h"
diff --git a/chrome/browser/ui/webui/ash/multidevice_setup/multidevice_setup_dialog.h b/chrome/browser/ui/webui/ash/multidevice_setup/multidevice_setup_dialog.h index 59b9c54..ee6d56b 100644 --- a/chrome/browser/ui/webui/ash/multidevice_setup/multidevice_setup_dialog.h +++ b/chrome/browser/ui/webui/ash/multidevice_setup/multidevice_setup_dialog.h
@@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/ui/webui/ash/system_web_dialog_delegate.h" #include "chrome/common/webui_url_constants.h" #include "chromeos/ash/services/multidevice_setup/public/mojom/multidevice_setup.mojom-forward.h"
diff --git a/chrome/browser/ui/webui/ash/multidevice_setup/multidevice_setup_handler.cc b/chrome/browser/ui/webui/ash/multidevice_setup/multidevice_setup_handler.cc index d653d7d..199426ce 100644 --- a/chrome/browser/ui/webui/ash/multidevice_setup/multidevice_setup_handler.cc +++ b/chrome/browser/ui/webui/ash/multidevice_setup/multidevice_setup_handler.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ui/webui/ash/multidevice_setup/multidevice_setup_handler.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "chrome/browser/ash/profiles/profile_helper.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/settings_window_manager_chromeos.h"
diff --git a/chrome/browser/ui/webui/ash/network_ui.cc b/chrome/browser/ui/webui/ash/network_ui.cc index dbaed5e..6e29121 100644 --- a/chrome/browser/ui/webui/ash/network_ui.cc +++ b/chrome/browser/ui/webui/ash/network_ui.cc
@@ -14,7 +14,7 @@ #include "ash/webui/network_ui/network_diagnostics_resource_provider.h" #include "ash/webui/network_ui/network_health_resource_provider.h" #include "ash/webui/network_ui/traffic_counters_resource_provider.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/json/json_reader.h" #include "base/memory/weak_ptr.h" #include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/ui/webui/ash/notification_tester/notification_tester_handler.cc b/chrome/browser/ui/webui/ash/notification_tester/notification_tester_handler.cc index 074918e..32cca0435 100644 --- a/chrome/browser/ui/webui/ash/notification_tester/notification_tester_handler.cc +++ b/chrome/browser/ui/webui/ash/notification_tester/notification_tester_handler.cc
@@ -7,7 +7,7 @@ #include <string> #include "ash/constants/notifier_catalogs.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" #include "chrome/app/vector_icons/vector_icons.h"
diff --git a/chrome/browser/ui/webui/ash/office_fallback/office_fallback_page_handler.h b/chrome/browser/ui/webui/ash/office_fallback/office_fallback_page_handler.h index b49c496..bebdfe7 100644 --- a/chrome/browser/ui/webui/ash/office_fallback/office_fallback_page_handler.h +++ b/chrome/browser/ui/webui/ash/office_fallback/office_fallback_page_handler.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_ASH_OFFICE_FALLBACK_OFFICE_FALLBACK_PAGE_HANDLER_H_ #define CHROME_BROWSER_UI_WEBUI_ASH_OFFICE_FALLBACK_OFFICE_FALLBACK_PAGE_HANDLER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ui/webui/ash/office_fallback/office_fallback.mojom-shared.h" #include "chrome/browser/ui/webui/ash/office_fallback/office_fallback.mojom.h"
diff --git a/chrome/browser/ui/webui/ash/office_fallback/office_fallback_ui.cc b/chrome/browser/ui/webui/ash/office_fallback/office_fallback_ui.cc index bfdd83285..0d8094d 100644 --- a/chrome/browser/ui/webui/ash/office_fallback/office_fallback_ui.cc +++ b/chrome/browser/ui/webui/ash/office_fallback/office_fallback_ui.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/webui/webui_util.h" #include "chrome/common/webui_url_constants.h"
diff --git a/chrome/browser/ui/webui/ash/onc_import_message_handler.cc b/chrome/browser/ui/webui/ash/onc_import_message_handler.cc index 1ea26ed..8e22d4d2 100644 --- a/chrome/browser/ui/webui/ash/onc_import_message_handler.cc +++ b/chrome/browser/ui/webui/ash/onc_import_message_handler.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ui/webui/ash/onc_import_message_handler.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/strings/stringprintf.h" #include "base/task/bind_post_task.h" #include "base/task/sequenced_task_runner.h"
diff --git a/chrome/browser/ui/webui/ash/parent_access/parent_access_dialog.h b/chrome/browser/ui/webui/ash/parent_access/parent_access_dialog.h index 05d867c..e0914e3 100644 --- a/chrome/browser/ui/webui/ash/parent_access/parent_access_dialog.h +++ b/chrome/browser/ui/webui/ash/parent_access/parent_access_dialog.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/time/time.h" #include "chrome/browser/ui/webui/ash/parent_access/parent_access_ui.mojom.h" #include "chrome/browser/ui/webui/ash/parent_access/parent_access_ui_handler_delegate.h"
diff --git a/chrome/browser/ui/webui/ash/parent_access/parent_access_dialog_browsertest.cc b/chrome/browser/ui/webui/ash/parent_access/parent_access_dialog_browsertest.cc index c690a74..65b0428 100644 --- a/chrome/browser/ui/webui/ash/parent_access/parent_access_dialog_browsertest.cc +++ b/chrome/browser/ui/webui/ash/parent_access/parent_access_dialog_browsertest.cc
@@ -7,7 +7,7 @@ #include <memory> #include "ash/shell.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h"
diff --git a/chrome/browser/ui/webui/ash/parent_access/parent_access_ui_handler_impl_unittest.cc b/chrome/browser/ui/webui/ash/parent_access/parent_access_ui_handler_impl_unittest.cc index 4c67ad2..990090a1 100644 --- a/chrome/browser/ui/webui/ash/parent_access/parent_access_ui_handler_impl_unittest.cc +++ b/chrome/browser/ui/webui/ash/parent_access/parent_access_ui_handler_impl_unittest.cc
@@ -9,7 +9,7 @@ #include <string> #include "base/base64.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/system/sys_info.h"
diff --git a/chrome/browser/ui/webui/ash/power_ui.cc b/chrome/browser/ui/webui/ash/power_ui.cc index 03820328..b5d8e3c 100644 --- a/chrome/browser/ui/webui/ash/power_ui.cc +++ b/chrome/browser/ui/webui/ash/power_ui.cc
@@ -11,10 +11,10 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/compiler_specific.h" #include "base/containers/circular_deque.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/strings/string_number_conversions.h" #include "base/time/time.h" #include "base/values.h"
diff --git a/chrome/browser/ui/webui/ash/set_time_ui.cc b/chrome/browser/ui/webui/ash/set_time_ui.cc index cd8ff46..879b2c5 100644 --- a/chrome/browser/ui/webui/ash/set_time_ui.cc +++ b/chrome/browser/ui/webui/ash/set_time_ui.cc
@@ -11,9 +11,9 @@ #include "ash/public/cpp/child_accounts/parent_access_controller.h" #include "ash/public/cpp/login_screen.h" -#include "base/bind.h" #include "base/build_time.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/scoped_observation.h" #include "base/values.h" #include "chrome/browser/ash/child_accounts/parent_access_code/parent_access_service.h"
diff --git a/chrome/browser/ui/webui/ash/slow_trace_ui.cc b/chrome/browser/ui/webui/ash/slow_trace_ui.cc index 77a7a70..d6d6cbe 100644 --- a/chrome/browser/ui/webui/ash/slow_trace_ui.cc +++ b/chrome/browser/ui/webui/ash/slow_trace_ui.cc
@@ -8,7 +8,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted_memory.h" #include "base/strings/string_number_conversions.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ui/webui/ash/slow_ui.cc b/chrome/browser/ui/webui/ash/slow_ui.cc index 18c64484..670befe2 100644 --- a/chrome/browser/ui/webui/ash/slow_ui.cc +++ b/chrome/browser/ui/webui/ash/slow_ui.cc
@@ -7,7 +7,7 @@ #include <memory> #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/values.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/webui/webui_util.h"
diff --git a/chrome/browser/ui/webui/ash/smb_shares/smb_credentials_dialog.cc b/chrome/browser/ui/webui/ash/smb_shares/smb_credentials_dialog.cc index 5841a7d..445fe02c 100644 --- a/chrome/browser/ui/webui/ash/smb_shares/smb_credentials_dialog.cc +++ b/chrome/browser/ui/webui/ash/smb_shares/smb_credentials_dialog.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/json/json_writer.h" #include "base/values.h" #include "chrome/browser/ui/webui/ash/smb_shares/smb_handler.h"
diff --git a/chrome/browser/ui/webui/ash/smb_shares/smb_credentials_dialog.h b/chrome/browser/ui/webui/ash/smb_shares/smb_credentials_dialog.h index cdb517c..5a966dce 100644 --- a/chrome/browser/ui/webui/ash/smb_shares/smb_credentials_dialog.h +++ b/chrome/browser/ui/webui/ash/smb_shares/smb_credentials_dialog.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/ui/webui/ash/system_web_dialog_delegate.h" #include "chrome/common/webui_url_constants.h" #include "content/public/browser/webui_config.h"
diff --git a/chrome/browser/ui/webui/ash/smb_shares/smb_handler.cc b/chrome/browser/ui/webui/ash/smb_shares/smb_handler.cc index 86eb400..77b1f12d 100644 --- a/chrome/browser/ui/webui/ash/smb_shares/smb_handler.cc +++ b/chrome/browser/ui/webui/ash/smb_shares/smb_handler.cc
@@ -7,7 +7,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/values.h" #include "chrome/browser/ash/file_system_provider/provided_file_system_info.h" #include "chrome/browser/ash/smb_client/smb_service_factory.h"
diff --git a/chrome/browser/ui/webui/ash/smb_shares/smb_handler.h b/chrome/browser/ui/webui/ash/smb_shares/smb_handler.h index 674aaeaf..ee5a5c9 100644 --- a/chrome/browser/ui/webui/ash/smb_shares/smb_handler.h +++ b/chrome/browser/ui/webui/ash/smb_shares/smb_handler.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ash/smb_client/smb_service.h" #include "content/public/browser/web_ui_message_handler.h"
diff --git a/chrome/browser/ui/webui/ash/smb_shares/smb_share_dialog.cc b/chrome/browser/ui/webui/ash/smb_shares/smb_share_dialog.cc index 6d441d5..39d5081 100644 --- a/chrome/browser/ui/webui/ash/smb_shares/smb_share_dialog.cc +++ b/chrome/browser/ui/webui/ash/smb_shares/smb_share_dialog.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/webui/ash/smb_shares/smb_share_dialog.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "chrome/browser/ash/profiles/profile_helper.h" #include "chrome/browser/ash/smb_client/smb_service.h" #include "chrome/browser/ash/smb_client/smb_service_factory.h"
diff --git a/chrome/browser/ui/webui/ash/sync/os_sync_handler.cc b/chrome/browser/ui/webui/ash/sync/os_sync_handler.cc index 1b2d9861..c1a052c 100644 --- a/chrome/browser/ui/webui/ash/sync/os_sync_handler.cc +++ b/chrome/browser/ui/webui/ash/sync/os_sync_handler.cc
@@ -5,8 +5,8 @@ #include "chrome/browser/ui/webui/ash/sync/os_sync_handler.h" #include "base/auto_reset.h" -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/values.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sync/sync_service_factory.h"
diff --git a/chrome/browser/ui/webui/ash/sync/os_sync_handler_unittest.cc b/chrome/browser/ui/webui/ash/sync/os_sync_handler_unittest.cc index dbf7cde17..c0f0e9bf 100644 --- a/chrome/browser/ui/webui/ash/sync/os_sync_handler_unittest.cc +++ b/chrome/browser/ui/webui/ash/sync/os_sync_handler_unittest.cc
@@ -7,7 +7,7 @@ #include <memory> #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/values.h" #include "chrome/browser/signin/identity_test_environment_profile_adaptor.h" #include "chrome/browser/sync/sync_service_factory.h"
diff --git a/chrome/browser/ui/webui/ash/sys_internals/sys_internals_message_handler.cc b/chrome/browser/ui/webui/ash/sys_internals/sys_internals_message_handler.cc index b34c515..56ea952e 100644 --- a/chrome/browser/ui/webui/ash/sys_internals/sys_internals_message_handler.cc +++ b/chrome/browser/ui/webui/ash/sys_internals/sys_internals_message_handler.cc
@@ -11,9 +11,9 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/process/process_metrics.h" #include "base/system/sys_info.h"
diff --git a/chrome/browser/ui/webui/ash/vm/vm_ui.cc b/chrome/browser/ui/webui/ash/vm/vm_ui.cc index b681a16..9098734 100644 --- a/chrome/browser/ui/webui/ash/vm/vm_ui.cc +++ b/chrome/browser/ui/webui/ash/vm/vm_ui.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/plugin_vm/plugin_vm_diagnostics.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/webui/ash/vm/vm.mojom.h"
diff --git a/chrome/browser/ui/webui/autofill_and_password_manager_internals/autofill_internals_ui.cc b/chrome/browser/ui/webui/autofill_and_password_manager_internals/autofill_internals_ui.cc index 82505bab..6d419c8 100644 --- a/chrome/browser/ui/webui/autofill_and_password_manager_internals/autofill_internals_ui.cc +++ b/chrome/browser/ui/webui/autofill_and_password_manager_internals/autofill_internals_ui.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/webui/autofill_and_password_manager_internals/autofill_internals_ui.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/webui/autofill_and_password_manager_internals/internals_ui_handler.h" #include "chrome/common/url_constants.h"
diff --git a/chrome/browser/ui/webui/autofill_and_password_manager_internals/internals_ui_handler.h b/chrome/browser/ui/webui/autofill_and_password_manager_internals/internals_ui_handler.h index c499ab5..8300758 100644 --- a/chrome/browser/ui/webui/autofill_and_password_manager_internals/internals_ui_handler.h +++ b/chrome/browser/ui/webui/autofill_and_password_manager_internals/internals_ui_handler.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "components/autofill/core/browser/logging/log_receiver.h" #include "content/public/browser/browsing_data_remover.h" #include "content/public/browser/web_ui_message_handler.h"
diff --git a/chrome/browser/ui/webui/autofill_and_password_manager_internals/password_manager_internals_ui.cc b/chrome/browser/ui/webui/autofill_and_password_manager_internals/password_manager_internals_ui.cc index 66855326..4c76c67 100644 --- a/chrome/browser/ui/webui/autofill_and_password_manager_internals/password_manager_internals_ui.cc +++ b/chrome/browser/ui/webui/autofill_and_password_manager_internals/password_manager_internals_ui.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/webui/autofill_and_password_manager_internals/password_manager_internals_ui.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/webui/autofill_and_password_manager_internals/internals_ui_handler.h" #include "chrome/common/url_constants.h"
diff --git a/chrome/browser/ui/webui/bluetooth_internals/bluetooth_internals_handler.cc b/chrome/browser/ui/webui/bluetooth_internals/bluetooth_internals_handler.cc index 6fd9de9..4580e15c 100644 --- a/chrome/browser/ui/webui/bluetooth_internals/bluetooth_internals_handler.cc +++ b/chrome/browser/ui/webui/bluetooth_internals/bluetooth_internals_handler.cc
@@ -6,7 +6,7 @@ #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/ui/webui/bluetooth_internals/bluetooth_internals_ui.cc b/chrome/browser/ui/webui/bluetooth_internals/bluetooth_internals_ui.cc index e83df78..c464eca 100644 --- a/chrome/browser/ui/webui/bluetooth_internals/bluetooth_internals_ui.cc +++ b/chrome/browser/ui/webui/bluetooth_internals/bluetooth_internals_ui.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/webui/bluetooth_internals/bluetooth_internals_ui.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "build/chromeos_buildflags.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/webui/bluetooth_internals/bluetooth_internals_handler.h"
diff --git a/chrome/browser/ui/webui/bookmarks/bookmarks_message_handler.cc b/chrome/browser/ui/webui/bookmarks/bookmarks_message_handler.cc index 7aa1ef4..5e774f36 100644 --- a/chrome/browser/ui/webui/bookmarks/bookmarks_message_handler.cc +++ b/chrome/browser/ui/webui/bookmarks/bookmarks_message_handler.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/webui/bookmarks/bookmarks_message_handler.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/values.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/pref_names.h"
diff --git a/chrome/browser/ui/webui/browser_command/browser_command_handler_unittest.cc b/chrome/browser/ui/webui/browser_command/browser_command_handler_unittest.cc index 617415a..09deb68 100644 --- a/chrome/browser/ui/webui/browser_command/browser_command_handler_unittest.cc +++ b/chrome/browser/ui/webui/browser_command/browser_command_handler_unittest.cc
@@ -4,7 +4,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/test/metrics/histogram_tester.h"
diff --git a/chrome/browser/ui/webui/browser_switch/browser_switch_ui.cc b/chrome/browser/ui/webui/browser_switch/browser_switch_ui.cc index 111a21ff..c6b6932 100644 --- a/chrome/browser/ui/webui/browser_switch/browser_switch_ui.cc +++ b/chrome/browser/ui/webui/browser_switch/browser_switch_ui.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "base/task/single_thread_task_runner.h" #include "base/time/time.h"
diff --git a/chrome/browser/ui/webui/certificate_provisioning_ui_handler.cc b/chrome/browser/ui/webui/certificate_provisioning_ui_handler.cc index 63afde0f..3cfdbe27d 100644 --- a/chrome/browser/ui/webui/certificate_provisioning_ui_handler.cc +++ b/chrome/browser/ui/webui/certificate_provisioning_ui_handler.cc
@@ -7,8 +7,8 @@ #include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/webui/certificate_provisioning_ui_handler.h" -#include "base/bind.h" #include "base/containers/span.h" +#include "base/functional/bind.h" #include "base/threading/thread_task_runner_handle.h" #include "base/time/time.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/ui/webui/certificate_provisioning_ui_handler_unittest.cc b/chrome/browser/ui/webui/certificate_provisioning_ui_handler_unittest.cc index 77e55a4b..4878fcc 100644 --- a/chrome/browser/ui/webui/certificate_provisioning_ui_handler_unittest.cc +++ b/chrome/browser/ui/webui/certificate_provisioning_ui_handler_unittest.cc
@@ -11,7 +11,7 @@ #include <vector> #include "base/base64.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/webui/certificate_viewer_webui.cc b/chrome/browser/ui/webui/certificate_viewer_webui.cc index 6ca6469ac..45098787 100644 --- a/chrome/browser/ui/webui/certificate_viewer_webui.cc +++ b/chrome/browser/ui/webui/certificate_viewer_webui.cc
@@ -7,8 +7,8 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/i18n/time_formatting.h" #include "base/json/json_writer.h" #include "base/memory/ptr_util.h"
diff --git a/chrome/browser/ui/webui/certificates_handler.cc b/chrome/browser/ui/webui/certificates_handler.cc index 8ee92507..da8c5d6 100644 --- a/chrome/browser/ui/webui/certificates_handler.cc +++ b/chrome/browser/ui/webui/certificates_handler.cc
@@ -13,9 +13,9 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/files/file_util.h" // for FileAccessProvider +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/i18n/string_compare.h" #include "base/memory/raw_ptr.h" #include "base/posix/safe_strerror.h"
diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc index e8b41507..7527ca4 100644 --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
@@ -8,8 +8,8 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/ptr_util.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/ui/webui/commander/commander_handler.cc b/chrome/browser/ui/webui/commander/commander_handler.cc index e4628d7..cd62a2b0 100644 --- a/chrome/browser/ui/webui/commander/commander_handler.cc +++ b/chrome/browser/ui/webui/commander/commander_handler.cc
@@ -7,7 +7,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/commander/commander_view_model.h"
diff --git a/chrome/browser/ui/webui/components/components_handler.cc b/chrome/browser/ui/webui/components/components_handler.cc index 85b6b739..5e12a35 100644 --- a/chrome/browser/ui/webui/components/components_handler.cc +++ b/chrome/browser/ui/webui/components/components_handler.cc
@@ -7,8 +7,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/notreached.h" #include "base/values.h" #include "build/build_config.h"
diff --git a/chrome/browser/ui/webui/components/components_ui.cc b/chrome/browser/ui/webui/components/components_ui.cc index 8e56585..86f6f2b 100644 --- a/chrome/browser/ui/webui/components/components_ui.cc +++ b/chrome/browser/ui/webui/components/components_ui.cc
@@ -12,7 +12,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/values.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/ui/webui/conflicts/conflicts_data_fetcher.h b/chrome/browser/ui/webui/conflicts/conflicts_data_fetcher.h index 747d7ea..73575042 100644 --- a/chrome/browser/ui/webui/conflicts/conflicts_data_fetcher.h +++ b/chrome/browser/ui/webui/conflicts/conflicts_data_fetcher.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/sequence_checker.h" #include "base/task/sequenced_task_runner.h" #include "base/values.h"
diff --git a/chrome/browser/ui/webui/conflicts/conflicts_handler.cc b/chrome/browser/ui/webui/conflicts/conflicts_handler.cc index 71e612b..82ad964 100644 --- a/chrome/browser/ui/webui/conflicts/conflicts_handler.cc +++ b/chrome/browser/ui/webui/conflicts/conflicts_handler.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/values.h" #include "chrome/grit/generated_resources.h" #include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/ui/webui/connectors_internals/connectors_internals_ui.cc b/chrome/browser/ui/webui/connectors_internals/connectors_internals_ui.cc index 306c033..c1a5cd5 100644 --- a/chrome/browser/ui/webui/connectors_internals/connectors_internals_ui.cc +++ b/chrome/browser/ui/webui/connectors_internals/connectors_internals_ui.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/webui/connectors_internals/connectors_internals_ui.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "build/build_config.h" #include "chrome/browser/enterprise/connectors/device_trust/device_trust_features.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ui/webui/constrained_web_dialog_ui.cc b/chrome/browser/ui/webui/constrained_web_dialog_ui.cc index ff180eb..d5767fe 100644 --- a/chrome/browser/ui/webui/constrained_web_dialog_ui.cc +++ b/chrome/browser/ui/webui/constrained_web_dialog_ui.cc
@@ -7,8 +7,8 @@ #include <string> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/lazy_instance.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h"
diff --git a/chrome/browser/ui/webui/constrained_web_dialog_ui_browsertest.cc b/chrome/browser/ui/webui/constrained_web_dialog_ui_browsertest.cc index ec5e4bb..b6ef56d5 100644 --- a/chrome/browser/ui/webui/constrained_web_dialog_ui_browsertest.cc +++ b/chrome/browser/ui/webui/constrained_web_dialog_ui_browsertest.cc
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/ui/webui/crashes_ui.cc b/chrome/browser/ui/webui/crashes_ui.cc index 7a924e6..d555af6b 100644 --- a/chrome/browser/ui/webui/crashes_ui.cc +++ b/chrome/browser/ui/webui/crashes_ui.cc
@@ -10,8 +10,8 @@ #include <string> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ref_counted_memory.h" #include "base/strings/utf_string_conversions.h" #include "base/system/sys_info.h"
diff --git a/chrome/browser/ui/webui/device_log_ui.cc b/chrome/browser/ui/webui/device_log_ui.cc index 5597e73d..d8d557a 100644 --- a/chrome/browser/ui/webui/device_log_ui.cc +++ b/chrome/browser/ui/webui/device_log_ui.cc
@@ -7,8 +7,8 @@ #include <memory> #include <string> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/values.h" #include "chrome/browser/ui/webui/webui_util.h" #include "chrome/common/url_constants.h"
diff --git a/chrome/browser/ui/webui/devtools_ui_data_source.cc b/chrome/browser/ui/webui/devtools_ui_data_source.cc index d92e8dd9..f896563 100644 --- a/chrome/browser/ui/webui/devtools_ui_data_source.cc +++ b/chrome/browser/ui/webui/devtools_ui_data_source.cc
@@ -7,9 +7,9 @@ #include <list> #include <utility> -#include "base/bind.h" #include "base/command_line.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted_memory.h" #include "base/path_service.h" #include "base/strings/strcat.h"
diff --git a/chrome/browser/ui/webui/devtools_ui_data_source_unittest.cc b/chrome/browser/ui/webui/devtools_ui_data_source_unittest.cc index 3b09071..2d2b3db 100644 --- a/chrome/browser/ui/webui/devtools_ui_data_source_unittest.cc +++ b/chrome/browser/ui/webui/devtools_ui_data_source_unittest.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted_memory.h" #include "base/strings/strcat.h" #include "base/strings/string_piece.h"
diff --git a/chrome/browser/ui/webui/discards/discards_ui.cc b/chrome/browser/ui/webui/discards/discards_ui.cc index f1f95fd..ea59a09 100644 --- a/chrome/browser/ui/webui/discards/discards_ui.cc +++ b/chrome/browser/ui/webui/discards/discards_ui.cc
@@ -7,10 +7,10 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/check.h" #include "base/containers/flat_map.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/notreached.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h"
diff --git a/chrome/browser/ui/webui/discards/graph_dump_impl.cc b/chrome/browser/ui/webui/discards/graph_dump_impl.cc index 751c09c..0a6f17c 100644 --- a/chrome/browser/ui/webui/discards/graph_dump_impl.cc +++ b/chrome/browser/ui/webui/discards/graph_dump_impl.cc
@@ -8,7 +8,7 @@ #include <utility> #include "base/base64.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/json/json_string_value_serializer.h" #include "base/task/bind_post_task.h" #include "base/task/cancelable_task_tracker.h"
diff --git a/chrome/browser/ui/webui/discards/graph_dump_impl.h b/chrome/browser/ui/webui/discards/graph_dump_impl.h index a9e0d181..72488c00 100644 --- a/chrome/browser/ui/webui/discards/graph_dump_impl.h +++ b/chrome/browser/ui/webui/discards/graph_dump_impl.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_UI_WEBUI_DISCARDS_GRAPH_DUMP_IMPL_H_ #define CHROME_BROWSER_UI_WEBUI_DISCARDS_GRAPH_DUMP_IMPL_H_ -#include "base/callback_forward.h" #include "base/containers/flat_map.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted_memory.h" #include "base/memory/scoped_refptr.h"
diff --git a/chrome/browser/ui/webui/discards/site_data_provider_impl.cc b/chrome/browser/ui/webui/discards/site_data_provider_impl.cc index 8ec1cad..3bb1be5c 100644 --- a/chrome/browser/ui/webui/discards/site_data_provider_impl.cc +++ b/chrome/browser/ui/webui/discards/site_data_provider_impl.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/webui/discards/site_data_provider_impl.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/sequence_checker.h" #include "components/performance_manager/persistence/site_data/site_data.pb.h" #include "components/performance_manager/persistence/site_data/site_data_cache_factory.h"
diff --git a/chrome/browser/ui/webui/download_internals/download_internals_ui_message_handler.cc b/chrome/browser/ui/webui/download_internals/download_internals_ui_message_handler.cc index 951788ef..48482712 100644 --- a/chrome/browser/ui/webui/download_internals/download_internals_ui_message_handler.cc +++ b/chrome/browser/ui/webui/download_internals/download_internals_ui_message_handler.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/webui/download_internals/download_internals_ui_message_handler.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/guid.h" #include "base/values.h" #include "chrome/browser/download/background_download_service_factory.h"
diff --git a/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc b/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc index 0d131dc..b353928 100644 --- a/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc +++ b/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc
@@ -10,8 +10,8 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/i18n/rtl.h" #include "base/logging.h" #include "base/metrics/histogram_macros.h"
diff --git a/chrome/browser/ui/webui/downloads/downloads_list_tracker.cc b/chrome/browser/ui/webui/downloads/downloads_list_tracker.cc index d680134..223774f2 100644 --- a/chrome/browser/ui/webui/downloads/downloads_list_tracker.cc +++ b/chrome/browser/ui/webui/downloads/downloads_list_tracker.cc
@@ -9,9 +9,9 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/i18n/rtl.h" #include "base/i18n/unicodestring.h" #include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/ui/webui/downloads/downloads_list_tracker.h b/chrome/browser/ui/webui/downloads/downloads_list_tracker.h index 465df29..2de77ad4 100644 --- a/chrome/browser/ui/webui/downloads/downloads_list_tracker.h +++ b/chrome/browser/ui/webui/downloads/downloads_list_tracker.h
@@ -11,7 +11,7 @@ #include <set> #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "chrome/browser/ui/webui/downloads/downloads.mojom.h" #include "components/download/content/public/all_download_item_notifier.h" #include "components/download/public/common/download_item.h"
diff --git a/chrome/browser/ui/webui/downloads/downloads_list_tracker_unittest.cc b/chrome/browser/ui/webui/downloads/downloads_list_tracker_unittest.cc index d76ec73..722245b 100644 --- a/chrome/browser/ui/webui/downloads/downloads_list_tracker_unittest.cc +++ b/chrome/browser/ui/webui/downloads/downloads_list_tracker_unittest.cc
@@ -11,8 +11,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/strings/string_number_conversions.h" #include "base/time/time.h"
diff --git a/chrome/browser/ui/webui/downloads/downloads_ui.cc b/chrome/browser/ui/webui/downloads/downloads_ui.cc index b1696fc..97b282fd 100644 --- a/chrome/browser/ui/webui/downloads/downloads_ui.cc +++ b/chrome/browser/ui/webui/downloads/downloads_ui.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted_memory.h" #include "base/memory/singleton.h" #include "base/metrics/histogram_functions.h"
diff --git a/chrome/browser/ui/webui/engagement/site_engagement_ui.cc b/chrome/browser/ui/webui/engagement/site_engagement_ui.cc index 7ff7e54..5d230ac 100644 --- a/chrome/browser/ui/webui/engagement/site_engagement_ui.cc +++ b/chrome/browser/ui/webui/engagement/site_engagement_ui.cc
@@ -9,8 +9,8 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/url_constants.h"
diff --git a/chrome/browser/ui/webui/explore_sites_internals/explore_sites_internals_ui.cc b/chrome/browser/ui/webui/explore_sites_internals/explore_sites_internals_ui.cc index f0922bd..467b723 100644 --- a/chrome/browser/ui/webui/explore_sites_internals/explore_sites_internals_ui.cc +++ b/chrome/browser/ui/webui/explore_sites_internals/explore_sites_internals_ui.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/webui/explore_sites_internals/explore_sites_internals_ui.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "build/build_config.h" #include "chrome/browser/android/explore_sites/explore_sites_service_factory.h" #include "chrome/browser/flags/android/chrome_feature_list.h"
diff --git a/chrome/browser/ui/webui/extensions/ash/kiosk_apps_handler.cc b/chrome/browser/ui/webui/extensions/ash/kiosk_apps_handler.cc index 5dfc532d..3fa4b70 100644 --- a/chrome/browser/ui/webui/extensions/ash/kiosk_apps_handler.cc +++ b/chrome/browser/ui/webui/extensions/ash/kiosk_apps_handler.cc
@@ -13,8 +13,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/strings/string_util.h" #include "base/system/sys_info.h" #include "base/values.h"
diff --git a/chrome/browser/ui/webui/extensions/extension_icon_source.cc b/chrome/browser/ui/webui/extensions/extension_icon_source.cc index 90ff0e8..4582a63 100644 --- a/chrome/browser/ui/webui/extensions/extension_icon_source.cc +++ b/chrome/browser/ui/webui/extensions/extension_icon_source.cc
@@ -8,8 +8,8 @@ #include <memory> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ref_counted_memory.h" #include "base/memory/scoped_refptr.h" #include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/ui/webui/extensions/extensions_internals_unittest.cc b/chrome/browser/ui/webui/extensions/extensions_internals_unittest.cc index 92e156e..2c600be9 100644 --- a/chrome/browser/ui/webui/extensions/extensions_internals_unittest.cc +++ b/chrome/browser/ui/webui/extensions/extensions_internals_unittest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/webui/extensions/extensions_internals_source.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/json/json_reader.h" #include "base/values.h" #include "chrome/browser/extensions/extension_service.h"
diff --git a/chrome/browser/ui/webui/extensions/extensions_ui.cc b/chrome/browser/ui/webui/extensions/extensions_ui.cc index 77c6608b..2dfc03bc 100644 --- a/chrome/browser/ui/webui/extensions/extensions_ui.cc +++ b/chrome/browser/ui/webui/extensions/extensions_ui.cc
@@ -8,8 +8,8 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/metrics/field_trial_params.h" #include "base/metrics/histogram_macros.h" #include "base/strings/string_util.h"
diff --git a/chrome/browser/ui/webui/family_link_user_internals/family_link_user_internals_message_handler.cc b/chrome/browser/ui/webui/family_link_user_internals/family_link_user_internals_message_handler.cc index a5d13f8..e889d93 100644 --- a/chrome/browser/ui/webui/family_link_user_internals/family_link_user_internals_message_handler.cc +++ b/chrome/browser/ui/webui/family_link_user_internals/family_link_user_internals_message_handler.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted.h" #include "base/strings/string_piece.h" #include "base/values.h"
diff --git a/chrome/browser/ui/webui/favicon_source.cc b/chrome/browser/ui/webui/favicon_source.cc index 9b56367c..c33b9c23 100644 --- a/chrome/browser/ui/webui/favicon_source.cc +++ b/chrome/browser/ui/webui/favicon_source.cc
@@ -6,8 +6,8 @@ #include <cmath> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/histogram_functions.h" #include "base/strings/string_number_conversions.h" #include "chrome/browser/favicon/favicon_service_factory.h"
diff --git a/chrome/browser/ui/webui/favicon_source_unittest.cc b/chrome/browser/ui/webui/favicon_source_unittest.cc index eae9270..b7b69099 100644 --- a/chrome/browser/ui/webui/favicon_source_unittest.cc +++ b/chrome/browser/ui/webui/favicon_source_unittest.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/strings/strcat.h"
diff --git a/chrome/browser/ui/webui/feed/feed_handler.cc b/chrome/browser/ui/webui/feed/feed_handler.cc index b297955..c6ffcc4 100644 --- a/chrome/browser/ui/webui/feed/feed_handler.cc +++ b/chrome/browser/ui/webui/feed/feed_handler.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/thread_pool.h" namespace feed {
diff --git a/chrome/browser/ui/webui/feed_internals/feed_internals_ui.cc b/chrome/browser/ui/webui/feed_internals/feed_internals_ui.cc index 1ce544ca..73576ca 100644 --- a/chrome/browser/ui/webui/feed_internals/feed_internals_ui.cc +++ b/chrome/browser/ui/webui/feed_internals/feed_internals_ui.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "chrome/browser/feed/feed_service_factory.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/webui/feed_internals/feed_internals.mojom.h"
diff --git a/chrome/browser/ui/webui/feed_internals/feedv2_internals_page_handler.cc b/chrome/browser/ui/webui/feed_internals/feedv2_internals_page_handler.cc index ded0de7b..bab45f7b 100644 --- a/chrome/browser/ui/webui/feed_internals/feedv2_internals_page_handler.cc +++ b/chrome/browser/ui/webui/feed_internals/feedv2_internals_page_handler.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/callback_helpers.h" #include "base/feature_list.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/statistics_recorder.h" #include "base/time/time.h" #include "chrome/browser/ui/webui/feed_internals/feed_internals.mojom.h"
diff --git a/chrome/browser/ui/webui/feedback/feedback_handler.cc b/chrome/browser/ui/webui/feedback/feedback_handler.cc index 78c1aa6..42ed2e7 100644 --- a/chrome/browser/ui/webui/feedback/feedback_handler.cc +++ b/chrome/browser/ui/webui/feedback/feedback_handler.cc
@@ -7,7 +7,7 @@ #include <memory> #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/strcat.h" #include "base/values.h" #include "build/build_config.h"
diff --git a/chrome/browser/ui/webui/fileicon_source.cc b/chrome/browser/ui/webui/fileicon_source.cc index ded930e..5bd039c 100644 --- a/chrome/browser/ui/webui/fileicon_source.cc +++ b/chrome/browser/ui/webui/fileicon_source.cc
@@ -4,9 +4,9 @@ #include "chrome/browser/ui/webui/fileicon_source.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted_memory.h" #include "base/strings/escape.h" #include "base/strings/string_split.h"
diff --git a/chrome/browser/ui/webui/flags/flags_ui.cc b/chrome/browser/ui/webui/flags/flags_ui.cc index eaffbd2..dcece9da 100644 --- a/chrome/browser/ui/webui/flags/flags_ui.cc +++ b/chrome/browser/ui/webui/flags/flags_ui.cc
@@ -8,8 +8,8 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ref_counted_memory.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h"
diff --git a/chrome/browser/ui/webui/flags/flags_ui_handler.cc b/chrome/browser/ui/webui/flags/flags_ui_handler.cc index 4ba0fb8..39d09f6 100644 --- a/chrome/browser/ui/webui/flags/flags_ui_handler.cc +++ b/chrome/browser/ui/webui/flags/flags_ui_handler.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/webui/flags/flags_ui_handler.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h" #include "chrome/browser/about_flags.h"
diff --git a/chrome/browser/ui/webui/gcm_internals_ui.cc b/chrome/browser/ui/webui/gcm_internals_ui.cc index 753e342..f609b7a 100644 --- a/chrome/browser/ui/webui/gcm_internals_ui.cc +++ b/chrome/browser/ui/webui/gcm_internals_ui.cc
@@ -7,8 +7,8 @@ #include <memory> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/weak_ptr.h" #include "base/values.h" #include "chrome/browser/gcm/gcm_profile_service_factory.h"
diff --git a/chrome/browser/ui/webui/help/version_updater.h b/chrome/browser/ui/webui/help/version_updater.h index 5233030..7cfd8d88 100644 --- a/chrome/browser/ui/webui/help/version_updater.h +++ b/chrome/browser/ui/webui/help/version_updater.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/ui/webui/help/version_updater_chromeos.cc b/chrome/browser/ui/webui/help/version_updater_chromeos.cc index 414f8e37..3b030c9 100644 --- a/chrome/browser/ui/webui/help/version_updater_chromeos.cc +++ b/chrome/browser/ui/webui/help/version_updater_chromeos.cc
@@ -8,8 +8,8 @@ #include <optional> #include <string> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/strings/string_number_conversions.h" #include "chrome/browser/ash/login/startup_utils.h" #include "chrome/browser/ash/login/wizard_controller.h"
diff --git a/chrome/browser/ui/webui/help/version_updater_chromeos_unittest.cc b/chrome/browser/ui/webui/help/version_updater_chromeos_unittest.cc index 9377051..6b8ea2a 100644 --- a/chrome/browser/ui/webui/help/version_updater_chromeos_unittest.cc +++ b/chrome/browser/ui/webui/help/version_updater_chromeos_unittest.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/bind.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/run_loop.h" #include "base/test/mock_callback.h"
diff --git a/chrome/browser/ui/webui/help/version_updater_mac.mm b/chrome/browser/ui/webui/help/version_updater_mac.mm index d544a678..c4ded4d2 100644 --- a/chrome/browser/ui/webui/help/version_updater_mac.mm +++ b/chrome/browser/ui/webui/help/version_updater_mac.mm
@@ -11,11 +11,11 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/cxx17_backports.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/mac/authorization_util.h" #include "base/mac/foundation_util.h"
diff --git a/chrome/browser/ui/webui/help/version_updater_win.cc b/chrome/browser/ui/webui/help/version_updater_win.cc index 90b9898..4c966d07 100644 --- a/chrome/browser/ui/webui/help/version_updater_win.cc +++ b/chrome/browser/ui/webui/help/version_updater_win.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/webui/help/version_updater_win.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/weak_ptr.h" #include "base/task/thread_pool.h" #include "base/win/win_util.h"
diff --git a/chrome/browser/ui/webui/history/browsing_history_handler.cc b/chrome/browser/ui/webui/history/browsing_history_handler.cc index 187e2a1..5fad7d1 100644 --- a/chrome/browser/ui/webui/history/browsing_history_handler.cc +++ b/chrome/browser/ui/webui/history/browsing_history_handler.cc
@@ -8,10 +8,10 @@ #include <set> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check_op.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/i18n/rtl.h" #include "base/i18n/time_formatting.h" #include "base/notreached.h"
diff --git a/chrome/browser/ui/webui/history/browsing_history_handler.h b/chrome/browser/ui/webui/history/browsing_history_handler.h index 2a3f815..d8c89614 100644 --- a/chrome/browser/ui/webui/history/browsing_history_handler.h +++ b/chrome/browser/ui/webui/history/browsing_history_handler.h
@@ -12,7 +12,7 @@ #include <utility> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.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 2f01732a..6cf7fe9 100644 --- a/chrome/browser/ui/webui/history/browsing_history_handler_unittest.cc +++ b/chrome/browser/ui/webui/history/browsing_history_handler_unittest.cc
@@ -9,9 +9,9 @@ #include <set> #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/webui/history/foreign_session_handler.cc b/chrome/browser/ui/webui/history/foreign_session_handler.cc index 68826bfc..94d8992 100644 --- a/chrome/browser/ui/webui/history/foreign_session_handler.cc +++ b/chrome/browser/ui/webui/history/foreign_session_handler.cc
@@ -12,8 +12,8 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/i18n/time_formatting.h" #include "base/metrics/histogram_macros.h" #include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/ui/webui/history/history_login_handler.cc b/chrome/browser/ui/webui/history/history_login_handler.cc index bf925c83..6e0654e 100644 --- a/chrome/browser/ui/webui/history/history_login_handler.cc +++ b/chrome/browser/ui/webui/history/history_login_handler.cc
@@ -4,9 +4,9 @@ #include "chrome/browser/ui/webui/history/history_login_handler.h" -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/values.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/signin/identity_manager_factory.h"
diff --git a/chrome/browser/ui/webui/history/history_login_handler.h b/chrome/browser/ui/webui/history/history_login_handler.h index 28f3b49..3fd823b 100644 --- a/chrome/browser/ui/webui/history/history_login_handler.h +++ b/chrome/browser/ui/webui/history/history_login_handler.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "content/public/browser/web_ui_message_handler.h" class ProfileInfoWatcher;
diff --git a/chrome/browser/ui/webui/history/history_ui.cc b/chrome/browser/ui/webui/history/history_ui.cc index 5f25669..53aa116 100644 --- a/chrome/browser/ui/webui/history/history_ui.cc +++ b/chrome/browser/ui/webui/history/history_ui.cc
@@ -9,9 +9,9 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ref_counted_memory.h" #include "base/values.h" #include "build/build_config.h"
diff --git a/chrome/browser/ui/webui/history/navigation_handler.cc b/chrome/browser/ui/webui/history/navigation_handler.cc index 29888154..884ab3f 100644 --- a/chrome/browser/ui/webui/history/navigation_handler.cc +++ b/chrome/browser/ui/webui/history/navigation_handler.cc
@@ -4,9 +4,9 @@ #include "chrome/browser/ui/webui/history/navigation_handler.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/values.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_ui.h"
diff --git a/chrome/browser/ui/webui/history_clusters/history_clusters_handler.cc b/chrome/browser/ui/webui/history_clusters/history_clusters_handler.cc index 36f5402..09a6cbf8 100644 --- a/chrome/browser/ui/webui/history_clusters/history_clusters_handler.cc +++ b/chrome/browser/ui/webui/history_clusters/history_clusters_handler.cc
@@ -8,7 +8,6 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/containers/contains.h" #include "base/feature_list.h" #include "base/functional/bind.h"
diff --git a/chrome/browser/ui/webui/history_clusters/history_clusters_handler.h b/chrome/browser/ui/webui/history_clusters/history_clusters_handler.h index e3491ef..d16e652 100644 --- a/chrome/browser/ui/webui/history_clusters/history_clusters_handler.h +++ b/chrome/browser/ui/webui/history_clusters/history_clusters_handler.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/scoped_observation.h"
diff --git a/chrome/browser/ui/webui/identity_internals_ui.cc b/chrome/browser/ui/webui/identity_internals_ui.cc index 821bcb99..b9bad54 100644 --- a/chrome/browser/ui/webui/identity_internals_ui.cc +++ b/chrome/browser/ui/webui/identity_internals_ui.cc
@@ -8,7 +8,7 @@ #include <set> #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/i18n/time_formatting.h" #include "base/memory/raw_ptr.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/webui/image_editor/image_editor_untrusted_ui.cc b/chrome/browser/ui/webui/image_editor/image_editor_untrusted_ui.cc index 725b235..6cd841e 100644 --- a/chrome/browser/ui/webui/image_editor/image_editor_untrusted_ui.cc +++ b/chrome/browser/ui/webui/image_editor/image_editor_untrusted_ui.cc
@@ -8,10 +8,10 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted_memory.h" #include "base/memory/scoped_refptr.h" #include "base/metrics/histogram_functions.h"
diff --git a/chrome/browser/ui/webui/inspect_ui.cc b/chrome/browser/ui/webui/inspect_ui.cc index 46dc4e5e..8d52a5f 100644 --- a/chrome/browser/ui/webui/inspect_ui.cc +++ b/chrome/browser/ui/webui/inspect_ui.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/metrics/user_metrics.h"
diff --git a/chrome/browser/ui/webui/internals/lens/lens_internals_ui_message_handler.cc b/chrome/browser/ui/webui/internals/lens/lens_internals_ui_message_handler.cc index 6e956ce..21b4f15d 100644 --- a/chrome/browser/ui/webui/internals/lens/lens_internals_ui_message_handler.cc +++ b/chrome/browser/ui/webui/internals/lens/lens_internals_ui_message_handler.cc
@@ -10,7 +10,7 @@ #include "base/android/jni_array.h" #include "base/android/jni_string.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/values.h" #include "chrome/android/chrome_jni_headers/LensDebugBridge_jni.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ui/webui/internals/notifications/notifications_internals_ui_message_handler.cc b/chrome/browser/ui/webui/internals/notifications/notifications_internals_ui_message_handler.cc index c5aee57..dd0a1149 100644 --- a/chrome/browser/ui/webui/internals/notifications/notifications_internals_ui_message_handler.cc +++ b/chrome/browser/ui/webui/internals/notifications/notifications_internals_ui_message_handler.cc
@@ -8,7 +8,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/notifications/scheduler/notification_schedule_service_factory.h"
diff --git a/chrome/browser/ui/webui/internals/query_tiles/query_tiles_internals_ui_message_handler.cc b/chrome/browser/ui/webui/internals/query_tiles/query_tiles_internals_ui_message_handler.cc index 4f70083..b8079c0 100644 --- a/chrome/browser/ui/webui/internals/query_tiles/query_tiles_internals_ui_message_handler.cc +++ b/chrome/browser/ui/webui/internals/query_tiles/query_tiles_internals_ui_message_handler.cc
@@ -8,7 +8,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/values.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_key.h"
diff --git a/chrome/browser/ui/webui/invalidations/invalidations_message_handler.cc b/chrome/browser/ui/webui/invalidations/invalidations_message_handler.cc index 6991ae7..736a4d2 100644 --- a/chrome/browser/ui/webui/invalidations/invalidations_message_handler.cc +++ b/chrome/browser/ui/webui/invalidations/invalidations_message_handler.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/invalidation/profile_invalidation_provider_factory.h" #include "chrome/browser/profiles/profile.h" #include "components/invalidation/impl/invalidation_logger.h"
diff --git a/chrome/browser/ui/webui/local_state/local_state_ui.cc b/chrome/browser/ui/webui/local_state/local_state_ui.cc index 7794536..94f4d6d 100644 --- a/chrome/browser/ui/webui/local_state/local_state_ui.cc +++ b/chrome/browser/ui/webui/local_state/local_state_ui.cc
@@ -7,7 +7,7 @@ #include <memory> #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/values.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ui/webui/managed_ui_handler.cc b/chrome/browser/ui/webui/managed_ui_handler.cc index 67de876..a3264b9f 100644 --- a/chrome/browser/ui/webui/managed_ui_handler.cc +++ b/chrome/browser/ui/webui/managed_ui_handler.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/values.h" #include "build/chromeos_buildflags.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/ui/webui/management/management_ui_handler.cc b/chrome/browser/ui/webui/management/management_ui_handler.cc index 9db00b6..a2a542f 100644 --- a/chrome/browser/ui/webui/management/management_ui_handler.cc +++ b/chrome/browser/ui/webui/management/management_ui_handler.cc
@@ -12,10 +12,10 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/user_metrics.h" #include "base/strings/escape.h"
diff --git a/chrome/browser/ui/webui/media/media_engagement_ui.cc b/chrome/browser/ui/webui/media/media_engagement_ui.cc index af62d93e..ed3d16d4 100644 --- a/chrome/browser/ui/webui/media/media_engagement_ui.cc +++ b/chrome/browser/ui/webui/media/media_engagement_ui.cc
@@ -7,9 +7,9 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/command_line.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "build/build_config.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/ui/webui/media/media_history_ui.cc b/chrome/browser/ui/webui/media/media_history_ui.cc index 76b77c2..4943afeb 100644 --- a/chrome/browser/ui/webui/media/media_history_ui.cc +++ b/chrome/browser/ui/webui/media/media_history_ui.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/webui/media/media_history_ui.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/media/history/media_history_keyed_service.h"
diff --git a/chrome/browser/ui/webui/media/webrtc_logs_ui.cc b/chrome/browser/ui/webui/media/webrtc_logs_ui.cc index 1f5ddba..18caee4 100644 --- a/chrome/browser/ui/webui/media/webrtc_logs_ui.cc +++ b/chrome/browser/ui/webui/media/webrtc_logs_ui.cc
@@ -9,8 +9,8 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/i18n/time_formatting.h" #include "base/memory/ref_counted_memory.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/ui/webui/media_router/media_router_internals_webui_message_handler.cc b/chrome/browser/ui/webui/media_router/media_router_internals_webui_message_handler.cc index fb28cd65..617f96b 100644 --- a/chrome/browser/ui/webui/media_router/media_router_internals_webui_message_handler.cc +++ b/chrome/browser/ui/webui/media_router/media_router_internals_webui_message_handler.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/webui/media_router/media_router_internals_webui_message_handler.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "components/media_router/browser/media_router.h" namespace media_router {
diff --git a/chrome/browser/ui/webui/media_router/web_contents_display_observer.h b/chrome/browser/ui/webui/media_router/web_contents_display_observer.h index 00de9bc..07cfe225 100644 --- a/chrome/browser/ui/webui/media_router/web_contents_display_observer.h +++ b/chrome/browser/ui/webui/media_router/web_contents_display_observer.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" namespace content { class WebContents;
diff --git a/chrome/browser/ui/webui/memory_internals_ui.cc b/chrome/browser/ui/webui/memory_internals_ui.cc index 7aacfd60..fb7b37f 100644 --- a/chrome/browser/ui/webui/memory_internals_ui.cc +++ b/chrome/browser/ui/webui/memory_internals_ui.cc
@@ -11,7 +11,7 @@ #include <vector> #include "base/allocator/buildflags.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/path_service.h"
diff --git a/chrome/browser/ui/webui/metrics_handler.cc b/chrome/browser/ui/webui/metrics_handler.cc index 70e5b4e..51831807 100644 --- a/chrome/browser/ui/webui/metrics_handler.cc +++ b/chrome/browser/ui/webui/metrics_handler.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ui/webui/metrics_handler.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h" #include "base/metrics/user_metrics.h"
diff --git a/chrome/browser/ui/webui/metrics_internals/metrics_internals_handler.cc b/chrome/browser/ui/webui/metrics_internals/metrics_internals_handler.cc index 3381cc2..b295316f 100644 --- a/chrome/browser/ui/webui/metrics_internals/metrics_internals_handler.cc +++ b/chrome/browser/ui/webui/metrics_internals/metrics_internals_handler.cc
@@ -4,7 +4,6 @@ #include "chrome/browser/ui/webui/metrics_internals/metrics_internals_handler.h" -#include "base/bind.h" #include "base/functional/bind.h" #include "base/values.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/ui/webui/nacl_ui.cc b/chrome/browser/ui/webui/nacl_ui.cc index 0d044aa..4076a08 100644 --- a/chrome/browser/ui/webui/nacl_ui.cc +++ b/chrome/browser/ui/webui/nacl_ui.cc
@@ -11,10 +11,10 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/json/json_file_value_serializer.h" #include "base/memory/weak_ptr.h" #include "base/metrics/user_metrics.h"
diff --git a/chrome/browser/ui/webui/nearby_internals/nearby_internals_contact_handler.cc b/chrome/browser/ui/webui/nearby_internals/nearby_internals_contact_handler.cc index f211606..4bcc22455 100644 --- a/chrome/browser/ui/webui/nearby_internals/nearby_internals_contact_handler.cc +++ b/chrome/browser/ui/webui/nearby_internals/nearby_internals_contact_handler.cc
@@ -7,7 +7,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/json/json_writer.h" #include "base/time/time.h" #include "chrome/browser/nearby_sharing/logging/logging.h"
diff --git a/chrome/browser/ui/webui/nearby_internals/nearby_internals_http_handler.cc b/chrome/browser/ui/webui/nearby_internals/nearby_internals_http_handler.cc index c246ae5..44c8370 100644 --- a/chrome/browser/ui/webui/nearby_internals/nearby_internals_http_handler.cc +++ b/chrome/browser/ui/webui/nearby_internals/nearby_internals_http_handler.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/json/json_writer.h" #include "base/time/time.h" #include "base/values.h"
diff --git a/chrome/browser/ui/webui/nearby_internals/nearby_internals_logs_handler.cc b/chrome/browser/ui/webui/nearby_internals/nearby_internals_logs_handler.cc index 5dc481e..bce692a 100644 --- a/chrome/browser/ui/webui/nearby_internals/nearby_internals_logs_handler.cc +++ b/chrome/browser/ui/webui/nearby_internals/nearby_internals_logs_handler.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/i18n/time_formatting.h" #include "base/values.h"
diff --git a/chrome/browser/ui/webui/nearby_internals/nearby_internals_prefs_handler.cc b/chrome/browser/ui/webui/nearby_internals/nearby_internals_prefs_handler.cc index b7fa2a3..187554f4 100644 --- a/chrome/browser/ui/webui/nearby_internals/nearby_internals_prefs_handler.cc +++ b/chrome/browser/ui/webui/nearby_internals/nearby_internals_prefs_handler.cc
@@ -3,7 +3,7 @@ // found in the LICENSE file. #include "chrome/browser/ui/webui/nearby_internals/nearby_internals_prefs_handler.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/nearby_sharing/common/nearby_share_prefs.h" #include "chrome/browser/nearby_sharing/logging/logging.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ui/webui/nearby_internals/nearby_internals_ui_trigger_handler.cc b/chrome/browser/ui/webui/nearby_internals/nearby_internals_ui_trigger_handler.cc index 84e4845..95ec6e2a 100644 --- a/chrome/browser/ui/webui/nearby_internals/nearby_internals_ui_trigger_handler.cc +++ b/chrome/browser/ui/webui/nearby_internals/nearby_internals_ui_trigger_handler.cc
@@ -8,7 +8,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/time/time.h" #include "chrome/browser/nearby_sharing/attachment.h" #include "chrome/browser/nearby_sharing/logging/logging.h"
diff --git a/chrome/browser/ui/webui/nearby_internals/quick_pair/quick_pair_handler.cc b/chrome/browser/ui/webui/nearby_internals/quick_pair/quick_pair_handler.cc index a4b848ed2..f397c5a 100644 --- a/chrome/browser/ui/webui/nearby_internals/quick_pair/quick_pair_handler.cc +++ b/chrome/browser/ui/webui/nearby_internals/quick_pair/quick_pair_handler.cc
@@ -9,8 +9,8 @@ #include "ash/quick_pair/repository/fast_pair/fast_pair_image_decoder_impl.h" #include "ash/quick_pair/ui/fast_pair/fast_pair_notification_controller.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/i18n/time_formatting.h" #include "base/strings/string_number_conversions.h" #include "base/values.h"
diff --git a/chrome/browser/ui/webui/nearby_internals/quick_pair/quick_pair_handler.h b/chrome/browser/ui/webui/nearby_internals/quick_pair/quick_pair_handler.h index 19cdf11..e2045b01a 100644 --- a/chrome/browser/ui/webui/nearby_internals/quick_pair/quick_pair_handler.h +++ b/chrome/browser/ui/webui/nearby_internals/quick_pair/quick_pair_handler.h
@@ -8,7 +8,7 @@ #include <memory> #include "ash/quick_pair/common/log_buffer.h" #include "ash/quick_pair/common/logging.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/scoped_observation.h" #include "base/values.h"
diff --git a/chrome/browser/ui/webui/net_export_ui.cc b/chrome/browser/ui/webui/net_export_ui.cc index 9fe21ec..f5da7af 100644 --- a/chrome/browser/ui/webui/net_export_ui.cc +++ b/chrome/browser/ui/webui/net_export_ui.cc
@@ -11,8 +11,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/lazy_instance.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h"
diff --git a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc index 821df3c..ce51b5d4 100644 --- a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc +++ b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc
@@ -8,9 +8,9 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/unique_ptr_adapters.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/types/expected.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 cdd44283..696db282 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
@@ -6,12 +6,12 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_file.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/strings/string_split.h"
diff --git a/chrome/browser/ui/webui/new_tab_page/new_tab_page_handler.cc b/chrome/browser/ui/webui/new_tab_page/new_tab_page_handler.cc index d64c2a2..6310f06 100644 --- a/chrome/browser/ui/webui/new_tab_page/new_tab_page_handler.cc +++ b/chrome/browser/ui/webui/new_tab_page/new_tab_page_handler.cc
@@ -11,12 +11,12 @@ #include <vector> #include "base/base64.h" -#include "base/bind.h" #include "base/containers/contains.h" #include "base/containers/fixed_flat_set.h" #include "base/containers/flat_map.h" #include "base/cxx17_backports.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/i18n/rtl.h" #include "base/json/json_reader.h" #include "base/json/json_string_value_serializer.h"
diff --git a/chrome/browser/ui/webui/ntp/app_icon_webui_handler.cc b/chrome/browser/ui/webui/ntp/app_icon_webui_handler.cc index 38e862c5..41faf72 100644 --- a/chrome/browser/ui/webui/ntp/app_icon_webui_handler.cc +++ b/chrome/browser/ui/webui/ntp/app_icon_webui_handler.cc
@@ -6,8 +6,8 @@ #include <stddef.h> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/strings/stringprintf.h" #include "base/values.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ui/webui/ntp/app_launcher_handler.cc b/chrome/browser/ui/webui/ntp/app_launcher_handler.cc index b8322c5..9b58f0f8 100644 --- a/chrome/browser/ui/webui/ntp/app_launcher_handler.cc +++ b/chrome/browser/ui/webui/ntp/app_launcher_handler.cc
@@ -10,10 +10,10 @@ #include <utility> #include "base/auto_reset.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/containers/contains.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/functional/callback_helpers.h" #include "base/i18n/rtl.h" #include "base/metrics/histogram_functions.h"
diff --git a/chrome/browser/ui/webui/ntp/cookie_controls_handler.cc b/chrome/browser/ui/webui/ntp/cookie_controls_handler.cc index 874e9fe..3b808bd 100644 --- a/chrome/browser/ui/webui/ntp/cookie_controls_handler.cc +++ b/chrome/browser/ui/webui/ntp/cookie_controls_handler.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/values.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/cookie_controls/cookie_controls_service.h"
diff --git a/chrome/browser/ui/webui/ntp/core_app_launcher_handler.cc b/chrome/browser/ui/webui/ntp/core_app_launcher_handler.cc index 0714d432..d43cfe4 100644 --- a/chrome/browser/ui/webui/ntp/core_app_launcher_handler.cc +++ b/chrome/browser/ui/webui/ntp/core_app_launcher_handler.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/webui/ntp/core_app_launcher_handler.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/extensions/extension_metrics.h" #include "chrome/common/pref_names.h"
diff --git a/chrome/browser/ui/webui/ntp/new_tab_ui.cc b/chrome/browser/ui/webui/ntp/new_tab_ui.cc index 5998016..42c28c7 100644 --- a/chrome/browser/ui/webui/ntp/new_tab_ui.cc +++ b/chrome/browser/ui/webui/ntp/new_tab_ui.cc
@@ -8,8 +8,8 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/i18n/rtl.h" #include "base/memory/ref_counted_memory.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc index f5ec944..e358dbc 100644 --- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc +++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
@@ -7,7 +7,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted_memory.h" #include "base/no_destructor.h" #include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/ui/webui/ntp_tiles_internals_ui.cc b/chrome/browser/ui/webui/ntp_tiles_internals_ui.cc index edde63a2..d3a27f3 100644 --- a/chrome/browser/ui/webui/ntp_tiles_internals_ui.cc +++ b/chrome/browser/ui/webui/ntp_tiles_internals_ui.cc
@@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "build/build_config.h" #include "chrome/browser/favicon/favicon_service_factory.h" #include "chrome/browser/history/top_sites_factory.h"
diff --git a/chrome/browser/ui/webui/offline/offline_internals_ui_message_handler.cc b/chrome/browser/ui/webui/offline/offline_internals_ui_message_handler.cc index d52657a1..827fbdd 100644 --- a/chrome/browser/ui/webui/offline/offline_internals_ui_message_handler.cc +++ b/chrome/browser/ui/webui/offline/offline_internals_ui_message_handler.cc
@@ -10,7 +10,7 @@ #include <algorithm> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/guid.h" #include "base/json/json_writer.h" #include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/ui/webui/omnibox/omnibox_page_handler.cc b/chrome/browser/ui/webui/omnibox/omnibox_page_handler.cc index 395bc67f..c674589 100644 --- a/chrome/browser/ui/webui/omnibox/omnibox_page_handler.cc +++ b/chrome/browser/ui/webui/omnibox/omnibox_page_handler.cc
@@ -11,7 +11,7 @@ #include "base/auto_reset.h" #include "base/base64.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" #include "base/time/time.h"
diff --git a/chrome/browser/ui/webui/omnibox/omnibox_ui.cc b/chrome/browser/ui/webui/omnibox/omnibox_ui.cc index 753283c0..e4e585f 100644 --- a/chrome/browser/ui/webui/omnibox/omnibox_ui.cc +++ b/chrome/browser/ui/webui/omnibox/omnibox_ui.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "build/build_config.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/webui/omnibox/omnibox_page_handler.h"
diff --git a/chrome/browser/ui/webui/plural_string_handler.cc b/chrome/browser/ui/webui/plural_string_handler.cc index c743174..36af4c7 100644 --- a/chrome/browser/ui/webui/plural_string_handler.cc +++ b/chrome/browser/ui/webui/plural_string_handler.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ui/webui/plural_string_handler.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/values.h" #include "chrome/grit/generated_resources.h" #include "content/public/browser/web_ui.h"
diff --git a/chrome/browser/ui/webui/policy/policy_ui_browsertest.cc b/chrome/browser/ui/webui/policy/policy_ui_browsertest.cc index aabbf7de..bb55d29 100644 --- a/chrome/browser/ui/webui/policy/policy_ui_browsertest.cc +++ b/chrome/browser/ui/webui/policy/policy_ui_browsertest.cc
@@ -8,11 +8,11 @@ #include <utility> #include <vector> -#include "base/callback.h" #include "base/cfi_buildflags.h" #include "base/containers/flat_map.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/callback.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/memory/raw_ptr.h"
diff --git a/chrome/browser/ui/webui/policy/policy_ui_handler.cc b/chrome/browser/ui/webui/policy/policy_ui_handler.cc index 34b880b..483b86a 100644 --- a/chrome/browser/ui/webui/policy/policy_ui_handler.cc +++ b/chrome/browser/ui/webui/policy/policy_ui_handler.cc
@@ -10,12 +10,12 @@ #include <string> #include <utility> -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/check.h" #include "base/compiler_specific.h" #include "base/files/file_util.h" #include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/i18n/time_formatting.h" #include "base/json/json_writer.h" #include "base/memory/raw_ptr.h"
diff --git a/chrome/browser/ui/webui/predictors/predictors_handler.cc b/chrome/browser/ui/webui/predictors/predictors_handler.cc index 2fe00ea..9c0ebd1 100644 --- a/chrome/browser/ui/webui/predictors/predictors_handler.cc +++ b/chrome/browser/ui/webui/predictors/predictors_handler.cc
@@ -8,7 +8,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/values.h" #include "chrome/browser/predictors/autocomplete_action_predictor.h" #include "chrome/browser/predictors/autocomplete_action_predictor_factory.h"
diff --git a/chrome/browser/ui/webui/print_preview/data_request_filter.cc b/chrome/browser/ui/webui/print_preview/data_request_filter.cc index cfdef22..c8c139c 100644 --- a/chrome/browser/ui/webui/print_preview/data_request_filter.cc +++ b/chrome/browser/ui/webui/print_preview/data_request_filter.cc
@@ -8,11 +8,11 @@ #include <utility> #include "base/base_paths.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/check.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted_memory.h" #include "base/memory/scoped_refptr.h" #include "base/path_service.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 1db91445..8c931a5 100644 --- a/chrome/browser/ui/webui/print_preview/extension_printer_handler.cc +++ b/chrome/browser/ui/webui/print_preview/extension_printer_handler.cc
@@ -7,8 +7,8 @@ #include <algorithm> #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/memory/ref_counted.h" #include "base/memory/ref_counted_memory.h"
diff --git a/chrome/browser/ui/webui/print_preview/extension_printer_handler_unittest.cc b/chrome/browser/ui/webui/print_preview/extension_printer_handler_unittest.cc index 6f3a157..25f4fd3b 100644 --- a/chrome/browser/ui/webui/print_preview/extension_printer_handler_unittest.cc +++ b/chrome/browser/ui/webui/print_preview/extension_printer_handler_unittest.cc
@@ -11,9 +11,9 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/containers/contains.h" #include "base/containers/queue.h" +#include "base/functional/bind.h" #include "base/json/json_string_value_serializer.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted_memory.h"
diff --git a/chrome/browser/ui/webui/print_preview/local_printer_handler_chromeos.cc b/chrome/browser/ui/webui/print_preview/local_printer_handler_chromeos.cc index 6f567aba..9859e849 100644 --- a/chrome/browser/ui/webui/print_preview/local_printer_handler_chromeos.cc +++ b/chrome/browser/ui/webui/print_preview/local_printer_handler_chromeos.cc
@@ -9,9 +9,9 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" #include "base/check.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/ui/webui/print_preview/local_printer_handler_chromeos_unittest.cc b/chrome/browser/ui/webui/print_preview/local_printer_handler_chromeos_unittest.cc index 17cfe9ac..b7a830f 100644 --- a/chrome/browser/ui/webui/print_preview/local_printer_handler_chromeos_unittest.cc +++ b/chrome/browser/ui/webui/print_preview/local_printer_handler_chromeos_unittest.cc
@@ -11,7 +11,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted.h" #include "base/strings/string_piece.h" #include "base/test/bind.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 5f2a1d4..1a730f7c 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
@@ -7,7 +7,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/memory/ref_counted_memory.h"
diff --git a/chrome/browser/ui/webui/print_preview/local_printer_handler_default.h b/chrome/browser/ui/webui/print_preview/local_printer_handler_default.h index f4cd3a31..38fbdd0 100644 --- a/chrome/browser/ui/webui/print_preview/local_printer_handler_default.h +++ b/chrome/browser/ui/webui/print_preview/local_printer_handler_default.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/values.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 47cc021..d553833c 100644 --- a/chrome/browser/ui/webui/print_preview/pdf_printer_handler.cc +++ b/chrome/browser/ui/webui/print_preview/pdf_printer_handler.cc
@@ -6,12 +6,12 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" #include "base/containers/contains.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/i18n/file_util_icu.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h"
diff --git a/chrome/browser/ui/webui/print_preview/pdf_printer_handler_posix_unittest.cc b/chrome/browser/ui/webui/print_preview/pdf_printer_handler_posix_unittest.cc index 01b2e50..1f528f7 100644 --- a/chrome/browser/ui/webui/print_preview/pdf_printer_handler_posix_unittest.cc +++ b/chrome/browser/ui/webui/print_preview/pdf_printer_handler_posix_unittest.cc
@@ -10,10 +10,10 @@ #include <ios> #include <memory> -#include "base/callback_helpers.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/memory/ref_counted_memory.h" #include "base/run_loop.h"
diff --git a/chrome/browser/ui/webui/print_preview/pdf_printer_handler_win_unittest.cc b/chrome/browser/ui/webui/print_preview/pdf_printer_handler_win_unittest.cc index 1804e21..1b8f48c 100644 --- a/chrome/browser/ui/webui/print_preview/pdf_printer_handler_win_unittest.cc +++ b/chrome/browser/ui/webui/print_preview/pdf_printer_handler_win_unittest.cc
@@ -8,8 +8,8 @@ #include <commdlg.h> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ref_counted.h" #include "base/memory/ref_counted_memory.h" #include "base/run_loop.h"
diff --git a/chrome/browser/ui/webui/print_preview/print_preview_handler.cc b/chrome/browser/ui/webui/print_preview/print_preview_handler.cc index e05d8e5a..be81d35 100644 --- a/chrome/browser/ui/webui/print_preview/print_preview_handler.cc +++ b/chrome/browser/ui/webui/print_preview/print_preview_handler.cc
@@ -12,11 +12,11 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check.h" #include "base/command_line.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/i18n/number_formatting.h" #include "base/json/json_reader.h" #include "base/lazy_instance.h"
diff --git a/chrome/browser/ui/webui/print_preview/print_preview_handler_chromeos.cc b/chrome/browser/ui/webui/print_preview/print_preview_handler_chromeos.cc index e221c86..66aaf9a 100644 --- a/chrome/browser/ui/webui/print_preview/print_preview_handler_chromeos.cc +++ b/chrome/browser/ui/webui/print_preview/print_preview_handler_chromeos.cc
@@ -11,11 +11,11 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/check.h" #include "base/check_op.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/lazy_instance.h" #include "base/values.h" #include "build/build_config.h"
diff --git a/chrome/browser/ui/webui/print_preview/print_preview_ui.cc b/chrome/browser/ui/webui/print_preview/print_preview_ui.cc index 8fd05c3..c5604a6 100644 --- a/chrome/browser/ui/webui/print_preview/print_preview_ui.cc +++ b/chrome/browser/ui/webui/print_preview/print_preview_ui.cc
@@ -9,10 +9,10 @@ #include <vector> #include "ash/constants/ash_features.h" -#include "base/bind.h" #include "base/containers/flat_map.h" #include "base/containers/id_map.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/lazy_instance.h" #include "base/memory/ref_counted_memory.h" #include "base/metrics/histogram_functions.h"
diff --git a/chrome/browser/ui/webui/print_preview/print_preview_ui.h b/chrome/browser/ui/webui/print_preview/print_preview_ui.h index 2662e73..0fd6400 100644 --- a/chrome/browser/ui/webui/print_preview/print_preview_ui.h +++ b/chrome/browser/ui/webui/print_preview/print_preview_ui.h
@@ -11,7 +11,7 @@ #include <string> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" #include "base/memory/read_only_shared_memory_region.h"
diff --git a/chrome/browser/ui/webui/print_preview/print_preview_ui_browsertest.cc b/chrome/browser/ui/webui/print_preview/print_preview_ui_browsertest.cc index 63a6068f..1b38a45b 100644 --- a/chrome/browser/ui/webui/print_preview/print_preview_ui_browsertest.cc +++ b/chrome/browser/ui/webui/print_preview/print_preview_ui_browsertest.cc
@@ -59,15 +59,7 @@ ASSERT_TRUE(chrome::IsCommandEnabled(browser(), IDC_PRINT)); -#if BUILDFLAG(ENABLE_PRINTING) && !BUILDFLAG(IS_CHROMEOS) - // This is analogous to ENABLE_BASIC_PRINT_DIALOG but helps to verify that it - // is defined as expected. - bool is_basic_print_expected = true; -#else - bool is_basic_print_expected = false; -#endif - - ASSERT_EQ(is_basic_print_expected, + ASSERT_EQ(BUILDFLAG(ENABLE_BASIC_PRINT_DIALOG), chrome::IsCommandEnabled(browser(), IDC_BASIC_PRINT)); // Create the print preview dialog. @@ -75,7 +67,7 @@ ASSERT_FALSE(chrome::IsCommandEnabled(browser(), IDC_PRINT)); - ASSERT_EQ(is_basic_print_expected, + ASSERT_EQ(BUILDFLAG(ENABLE_BASIC_PRINT_DIALOG), chrome::IsCommandEnabled(browser(), IDC_BASIC_PRINT)); content::TestNavigationObserver reload_observer( @@ -85,7 +77,7 @@ ASSERT_TRUE(chrome::IsCommandEnabled(browser(), IDC_PRINT)); - ASSERT_EQ(is_basic_print_expected, + ASSERT_EQ(BUILDFLAG(ENABLE_BASIC_PRINT_DIALOG), chrome::IsCommandEnabled(browser(), IDC_BASIC_PRINT)); }
diff --git a/chrome/browser/ui/webui/print_preview/print_preview_utils.cc b/chrome/browser/ui/webui/print_preview/print_preview_utils.cc index 7109c30..58dce908 100644 --- a/chrome/browser/ui/webui/print_preview/print_preview_utils.cc +++ b/chrome/browser/ui/webui/print_preview/print_preview_utils.cc
@@ -9,8 +9,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/json/json_reader.h" #include "base/logging.h" #include "base/memory/ref_counted_memory.h"
diff --git a/chrome/browser/ui/webui/print_preview/printer_handler.h b/chrome/browser/ui/webui/print_preview/printer_handler.h index a371801..31cf73ec 100644 --- a/chrome/browser/ui/webui/print_preview/printer_handler.h +++ b/chrome/browser/ui/webui/print_preview/printer_handler.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "base/memory/ref_counted_memory.h" #include "base/values.h"
diff --git a/chrome/browser/ui/webui/profile_helper.cc b/chrome/browser/ui/webui/profile_helper.cc index c0d7e248..c032e627 100644 --- a/chrome/browser/ui/webui/profile_helper.cc +++ b/chrome/browser/ui/webui/profile_helper.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/delete_profile_helper.h"
diff --git a/chrome/browser/ui/webui/profile_helper_browsertest.cc b/chrome/browser/ui/webui/profile_helper_browsertest.cc index 8fa08d86..6cc2369 100644 --- a/chrome/browser/ui/webui/profile_helper_browsertest.cc +++ b/chrome/browser/ui/webui/profile_helper_browsertest.cc
@@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/bind.h" #include "base/containers/contains.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/test/scoped_feature_list.h"
diff --git a/chrome/browser/ui/webui/profile_info_watcher.cc b/chrome/browser/ui/webui/profile_info_watcher.cc index 1df4859..83de27b 100644 --- a/chrome/browser/ui/webui/profile_info_watcher.cc +++ b/chrome/browser/ui/webui/profile_info_watcher.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ui/webui/profile_info_watcher.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h"
diff --git a/chrome/browser/ui/webui/profile_info_watcher.h b/chrome/browser/ui/webui/profile_info_watcher.h index 73b8501..d259640 100644 --- a/chrome/browser/ui/webui/profile_info_watcher.h +++ b/chrome/browser/ui/webui/profile_info_watcher.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/profiles/profile_attributes_storage.h" #include "components/prefs/pref_member.h"
diff --git a/chrome/browser/ui/webui/profile_internals/profile_internals_handler.cc b/chrome/browser/ui/webui/profile_internals/profile_internals_handler.cc index 8fcdced..1a8de3b6 100644 --- a/chrome/browser/ui/webui/profile_internals/profile_internals_handler.cc +++ b/chrome/browser/ui/webui/profile_internals/profile_internals_handler.cc
@@ -4,9 +4,9 @@ #include "chrome/browser/ui/webui/profile_internals/profile_internals_handler.h" -#include "base/bind.h" #include "base/containers/flat_set.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/json/values_util.h" #include "base/values.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/ui/webui/realbox/realbox_handler.cc b/chrome/browser/ui/webui/realbox/realbox_handler.cc index 44317d1..3530491 100644 --- a/chrome/browser/ui/webui/realbox/realbox_handler.cc +++ b/chrome/browser/ui/webui/realbox/realbox_handler.cc
@@ -6,8 +6,8 @@ #include "base/base64.h" #include "base/base64url.h" -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "base/metrics/user_metrics.h" #include "base/metrics/user_metrics_action.h"
diff --git a/chrome/browser/ui/webui/reset_password/reset_password_ui.cc b/chrome/browser/ui/webui/reset_password/reset_password_ui.cc index c9caf25..f8ed114 100644 --- a/chrome/browser/ui/webui/reset_password/reset_password_ui.cc +++ b/chrome/browser/ui/webui/reset_password/reset_password_ui.cc
@@ -8,7 +8,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/metrics/histogram_macros.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/webui/sandbox/sandbox_handler.cc b/chrome/browser/ui/webui/sandbox/sandbox_handler.cc index 3a455ba..b981afa 100644 --- a/chrome/browser/ui/webui/sandbox/sandbox_handler.cc +++ b/chrome/browser/ui/webui/sandbox/sandbox_handler.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/numerics/safe_conversions.h" #include "base/values.h" #include "content/public/browser/browser_child_process_host_iterator.h"
diff --git a/chrome/browser/ui/webui/segmentation_internals/segmentation_internals_page_handler_impl.cc b/chrome/browser/ui/webui/segmentation_internals/segmentation_internals_page_handler_impl.cc index 81a552c..45eb817 100644 --- a/chrome/browser/ui/webui/segmentation_internals/segmentation_internals_page_handler_impl.cc +++ b/chrome/browser/ui/webui/segmentation_internals/segmentation_internals_page_handler_impl.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/webui/segmentation_internals/segmentation_internals_page_handler_impl.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/segmentation_platform/segmentation_platform_service_factory.h" #include "components/optimization_guide/core/model_util.h"
diff --git a/chrome/browser/ui/webui/settings/about_handler.cc b/chrome/browser/ui/webui/settings/about_handler.cc index 5c259bb..8966b11 100644 --- a/chrome/browser/ui/webui/settings/about_handler.cc +++ b/chrome/browser/ui/webui/settings/about_handler.cc
@@ -9,11 +9,11 @@ #include <limits> #include <string> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/metrics/user_metrics.h" #include "base/metrics/user_metrics_action.h"
diff --git a/chrome/browser/ui/webui/settings/accessibility_main_handler.cc b/chrome/browser/ui/webui/settings/accessibility_main_handler.cc index 4365f28..816c10bb 100644 --- a/chrome/browser/ui/webui/settings/accessibility_main_handler.cc +++ b/chrome/browser/ui/webui/settings/accessibility_main_handler.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/values.h" #include "build/chromeos_buildflags.h" #include "chrome/browser/accessibility/accessibility_state_utils.h"
diff --git a/chrome/browser/ui/webui/settings/appearance_handler.cc b/chrome/browser/ui/webui/settings/appearance_handler.cc index af28e8d..75860108 100644 --- a/chrome/browser/ui/webui/settings/appearance_handler.cc +++ b/chrome/browser/ui/webui/settings/appearance_handler.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ui/webui/settings/appearance_handler.h" -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/values.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/ui/webui/settings/ash/about_section.cc b/chrome/browser/ui/webui/settings/ash/about_section.cc index eb0d146..2b3ee54 100644 --- a/chrome/browser/ui/webui/settings/ash/about_section.cc +++ b/chrome/browser/ui/webui/settings/ash/about_section.cc
@@ -5,9 +5,9 @@ #include "chrome/browser/ui/webui/settings/ash/about_section.h" #include "ash/constants/ash_features.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/feature_list.h" +#include "base/functional/callback_helpers.h" #include "base/i18n/message_formatter.h" #include "base/no_destructor.h" #include "base/strings/string_split.h"
diff --git a/chrome/browser/ui/webui/settings/ash/accessibility_handler.cc b/chrome/browser/ui/webui/settings/ash/accessibility_handler.cc index c6ca4b9..475481f 100644 --- a/chrome/browser/ui/webui/settings/ash/accessibility_handler.cc +++ b/chrome/browser/ui/webui/settings/ash/accessibility_handler.cc
@@ -7,9 +7,9 @@ #include <set> #include "ash/constants/ash_pref_names.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/flat_map.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/histogram_functions.h" #include "chrome/browser/ash/accessibility/accessibility_manager.h" #include "chrome/browser/ash/accessibility/dictation.h"
diff --git a/chrome/browser/ui/webui/settings/ash/account_manager_ui_handler.cc b/chrome/browser/ui/webui/settings/ash/account_manager_ui_handler.cc index fab39be..a6b99fb 100644 --- a/chrome/browser/ui/webui/settings/ash/account_manager_ui_handler.cc +++ b/chrome/browser/ui/webui/settings/ash/account_manager_ui_handler.cc
@@ -9,8 +9,8 @@ #include "ash/constants/notifier_catalogs.h" #include "ash/public/cpp/system/toast_data.h" #include "ash/public/cpp/system/toast_manager.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h"
diff --git a/chrome/browser/ui/webui/settings/ash/android_apps_handler.cc b/chrome/browser/ui/webui/settings/ash/android_apps_handler.cc index 70add35..4cc43c53 100644 --- a/chrome/browser/ui/webui/settings/ash/android_apps_handler.cc +++ b/chrome/browser/ui/webui/settings/ash/android_apps_handler.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/webui/settings/ash/android_apps_handler.h" -#include "base/bind.h" +#include "base/functional/bind.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/launch_utils.h"
diff --git a/chrome/browser/ui/webui/settings/ash/bluetooth_handler.cc b/chrome/browser/ui/webui/settings/ash/bluetooth_handler.cc index 1b42a1a96d..f054e346 100644 --- a/chrome/browser/ui/webui/settings/ash/bluetooth_handler.cc +++ b/chrome/browser/ui/webui/settings/ash/bluetooth_handler.cc
@@ -5,7 +5,7 @@ #include "chrome/browser/ui/webui/settings/ash/bluetooth_handler.h" #include "ash/public/cpp/hats_bluetooth_revamp_trigger.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/values.h" #include "chrome/browser/ash/quick_pair/fast_pair_support_utils.h" #include "chromeos/ash/components/network/network_event_log.h"
diff --git a/chrome/browser/ui/webui/settings/ash/bluetooth_section.cc b/chrome/browser/ui/webui/settings/ash/bluetooth_section.cc index c430c950..927d728 100644 --- a/chrome/browser/ui/webui/settings/ash/bluetooth_section.cc +++ b/chrome/browser/ui/webui/settings/ash/bluetooth_section.cc
@@ -6,7 +6,7 @@ #include "ash/constants/ash_features.h" #include "ash/constants/ash_pref_names.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "base/no_destructor.h" #include "chrome/browser/ui/webui/ash/bluetooth_shared_load_time_data_provider.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 87970fc..3f49260 100644 --- a/chrome/browser/ui/webui/settings/ash/calculator/size_calculator.cc +++ b/chrome/browser/ui/webui/settings/ash/calculator/size_calculator.cc
@@ -9,8 +9,8 @@ #include "ash/components/arc/session/arc_bridge_service.h" #include "ash/components/arc/session/arc_service_manager.h" #include "ash/components/arc/storage_manager/arc_storage_manager.h" -#include "base/callback_helpers.h" #include "base/containers/contains.h" +#include "base/functional/callback_helpers.h" #include "base/memory/scoped_refptr.h" #include "base/system/sys_info.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/ui/webui/settings/ash/crostini_handler.cc b/chrome/browser/ui/webui/settings/ash/crostini_handler.cc index d0a18cd..d54c29a 100644 --- a/chrome/browser/ui/webui/settings/ash/crostini_handler.cc +++ b/chrome/browser/ui/webui/settings/ash/crostini_handler.cc
@@ -7,8 +7,8 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/histogram_functions.h" #include "chrome/browser/ash/crostini/crostini_disk.h" #include "chrome/browser/ash/crostini/crostini_features.h"
diff --git a/chrome/browser/ui/webui/settings/ash/cups_printers_handler.cc b/chrome/browser/ui/webui/settings/ash/cups_printers_handler.cc index 58c7cdd..137ae64c 100644 --- a/chrome/browser/ui/webui/settings/ash/cups_printers_handler.cc +++ b/chrome/browser/ui/webui/settings/ash/cups_printers_handler.cc
@@ -7,11 +7,11 @@ #include <set> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/flat_map.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/json/json_string_value_serializer.h" #include "base/logging.h" #include "base/memory/ptr_util.h"
diff --git a/chrome/browser/ui/webui/settings/ash/cups_printers_handler_unittest.cc b/chrome/browser/ui/webui/settings/ash/cups_printers_handler_unittest.cc index efe4db9..2c33af3 100644 --- a/chrome/browser/ui/webui/settings/ash/cups_printers_handler_unittest.cc +++ b/chrome/browser/ui/webui/settings/ash/cups_printers_handler_unittest.cc
@@ -6,9 +6,9 @@ #include <memory> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/json/json_string_value_serializer.h" #include "base/test/values_test_util.h" #include "base/values.h"
diff --git a/chrome/browser/ui/webui/settings/ash/date_time_handler.cc b/chrome/browser/ui/webui/settings/ash/date_time_handler.cc index 0bd46a91..412eaf6 100644 --- a/chrome/browser/ui/webui/settings/ash/date_time_handler.cc +++ b/chrome/browser/ui/webui/settings/ash/date_time_handler.cc
@@ -6,9 +6,9 @@ #include "ash/public/cpp/child_accounts/parent_access_controller.h" #include "ash/public/cpp/login_screen.h" -#include "base/bind.h" #include "base/check_op.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/time/time.h" #include "base/values.h" #include "chrome/browser/ash/child_accounts/parent_access_code/parent_access_service.h"
diff --git a/chrome/browser/ui/webui/settings/ash/device_display_handler.cc b/chrome/browser/ui/webui/settings/ash/device_display_handler.cc index 0210b3d..7e0e0e4 100644 --- a/chrome/browser/ui/webui/settings/ash/device_display_handler.cc +++ b/chrome/browser/ui/webui/settings/ash/device_display_handler.cc
@@ -5,7 +5,7 @@ #include "chrome/browser/ui/webui/settings/ash/device_display_handler.h" #include "ash/public/ash_interfaces.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/string_number_conversions.h" #include "base/values.h" #include "content/public/browser/web_ui.h"
diff --git a/chrome/browser/ui/webui/settings/ash/device_keyboard_handler.cc b/chrome/browser/ui/webui/settings/ash/device_keyboard_handler.cc index 03b91b1d..c123f9a 100644 --- a/chrome/browser/ui/webui/settings/ash/device_keyboard_handler.cc +++ b/chrome/browser/ui/webui/settings/ash/device_keyboard_handler.cc
@@ -7,8 +7,8 @@ #include "ash/constants/ash_switches.h" #include "ash/public/cpp/keyboard_shortcut_viewer.h" #include "ash/public/cpp/tablet_mode.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/values.h" #include "content/public/browser/web_ui.h" #include "ui/chromeos/events/event_rewriter_chromeos.h"
diff --git a/chrome/browser/ui/webui/settings/ash/device_pointer_handler.cc b/chrome/browser/ui/webui/settings/ash/device_pointer_handler.cc index 71b7cbd..ef82715 100644 --- a/chrome/browser/ui/webui/settings/ash/device_pointer_handler.cc +++ b/chrome/browser/ui/webui/settings/ash/device_pointer_handler.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/webui/settings/ash/device_pointer_handler.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/values.h" #include "content/public/browser/web_ui.h"
diff --git a/chrome/browser/ui/webui/settings/ash/device_power_handler.cc b/chrome/browser/ui/webui/settings/ash/device_power_handler.cc index 0e7c59d..7762497 100644 --- a/chrome/browser/ui/webui/settings/ash/device_power_handler.cc +++ b/chrome/browser/ui/webui/settings/ash/device_power_handler.cc
@@ -9,8 +9,8 @@ #include "ash/constants/ash_pref_names.h" #include "ash/public/cpp/power_utils.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" #include "base/time/time.h"
diff --git a/chrome/browser/ui/webui/settings/ash/device_stylus_handler.cc b/chrome/browser/ui/webui/settings/ash/device_stylus_handler.cc index 4bea7117..7a76d7481 100644 --- a/chrome/browser/ui/webui/settings/ash/device_stylus_handler.cc +++ b/chrome/browser/ui/webui/settings/ash/device_stylus_handler.cc
@@ -10,7 +10,7 @@ #include <vector> #include "ash/public/cpp/stylus_utils.h" -#include "base/bind.h" +#include "base/functional/bind.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_list/arc/arc_app_utils.h"
diff --git a/chrome/browser/ui/webui/settings/ash/fast_pair_saved_devices_handler.cc b/chrome/browser/ui/webui/settings/ash/fast_pair_saved_devices_handler.cc index e87630a..a6b7d4fe 100644 --- a/chrome/browser/ui/webui/settings/ash/fast_pair_saved_devices_handler.cc +++ b/chrome/browser/ui/webui/settings/ash/fast_pair_saved_devices_handler.cc
@@ -9,9 +9,9 @@ #include "ash/quick_pair/repository/fast_pair/fast_pair_image_decoder_impl.h" #include "ash/quick_pair/repository/fast_pair_repository.h" #include "base/base64.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/strings/string_number_conversions.h" #include "base/values.h" #include "ui/base/webui/web_ui_util.h"
diff --git a/chrome/browser/ui/webui/settings/ash/fast_pair_saved_devices_handler_unittest.cc b/chrome/browser/ui/webui/settings/ash/fast_pair_saved_devices_handler_unittest.cc index 6f5297e..3b54ce2 100644 --- a/chrome/browser/ui/webui/settings/ash/fast_pair_saved_devices_handler_unittest.cc +++ b/chrome/browser/ui/webui/settings/ash/fast_pair_saved_devices_handler_unittest.cc
@@ -12,7 +12,7 @@ #include "ash/quick_pair/repository/fast_pair/mock_fast_pair_image_decoder.h" #include "ash/quick_pair/repository/fast_pair_repository.h" #include "base/base64.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/memory/weak_ptr.h" #include "base/run_loop.h" #include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/ui/webui/settings/ash/files_section.cc b/chrome/browser/ui/webui/settings/ash/files_section.cc index bda19d8..5347f93 100644 --- a/chrome/browser/ui/webui/settings/ash/files_section.cc +++ b/chrome/browser/ui/webui/settings/ash/files_section.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/webui/settings/ash/files_section.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/no_destructor.h" #include "chrome/browser/ash/profiles/profile_helper.h" #include "chrome/browser/ui/webui/ash/smb_shares/smb_handler.h"
diff --git a/chrome/browser/ui/webui/settings/ash/fingerprint_handler.cc b/chrome/browser/ui/webui/settings/ash/fingerprint_handler.cc index 5dd80a0d..9c0c1b9 100644 --- a/chrome/browser/ui/webui/settings/ash/fingerprint_handler.cc +++ b/chrome/browser/ui/webui/settings/ash/fingerprint_handler.cc
@@ -8,8 +8,8 @@ #include <memory> #include "ash/constants/ash_pref_names.h" -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h"
diff --git a/chrome/browser/ui/webui/settings/ash/google_assistant_handler.cc b/chrome/browser/ui/webui/settings/ash/google_assistant_handler.cc index 2d47694..bec999d 100644 --- a/chrome/browser/ui/webui/settings/ash/google_assistant_handler.cc +++ b/chrome/browser/ui/webui/settings/ash/google_assistant_handler.cc
@@ -10,8 +10,8 @@ #include "ash/components/arc/session/arc_service_manager.h" #include "ash/public/cpp/assistant/assistant_setup.h" #include "ash/public/cpp/assistant/controller/assistant_controller.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/values.h" #include "chrome/browser/ui/webui/ash/assistant_optin/assistant_optin_ui.h" #include "chromeos/ash/components/audio/cras_audio_handler.h"
diff --git a/chrome/browser/ui/webui/settings/ash/guest_os_handler.cc b/chrome/browser/ui/webui/settings/ash/guest_os_handler.cc index 4fbb164..5ff0ccc1 100644 --- a/chrome/browser/ui/webui/settings/ash/guest_os_handler.cc +++ b/chrome/browser/ui/webui/settings/ash/guest_os_handler.cc
@@ -8,8 +8,8 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/strings/stringprintf.h" #include "chrome/browser/ash/file_manager/path_util.h" #include "chrome/browser/ash/guest_os/guest_os_share_path.h"
diff --git a/chrome/browser/ui/webui/settings/ash/internet_handler.cc b/chrome/browser/ui/webui/settings/ash/internet_handler.cc index 7d2b246..c5bce99 100644 --- a/chrome/browser/ui/webui/settings/ash/internet_handler.cc +++ b/chrome/browser/ui/webui/settings/ash/internet_handler.cc
@@ -11,7 +11,7 @@ #include "ash/components/arc/session/arc_bridge_service.h" #include "ash/components/arc/session/arc_service_manager.h" #include "ash/constants/ash_pref_names.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/values.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/ui/webui/settings/ash/internet_section.cc b/chrome/browser/ui/webui/settings/ash/internet_section.cc index 1934b00..ddc440f6 100644 --- a/chrome/browser/ui/webui/settings/ash/internet_section.cc +++ b/chrome/browser/ui/webui/settings/ash/internet_section.cc
@@ -9,8 +9,8 @@ #include "ash/public/cpp/network_config_service.h" #include "ash/webui/network_ui/network_health_resource_provider.h" #include "ash/webui/network_ui/traffic_counters_resource_provider.h" -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "base/no_destructor.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/ui/webui/settings/ash/kerberos_accounts_handler.cc b/chrome/browser/ui/webui/settings/ash/kerberos_accounts_handler.cc index 3af4350..0b234803 100644 --- a/chrome/browser/ui/webui/settings/ash/kerberos_accounts_handler.cc +++ b/chrome/browser/ui/webui/settings/ash/kerberos_accounts_handler.cc
@@ -7,7 +7,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/strings/string_util.h" #include "base/values.h"
diff --git a/chrome/browser/ui/webui/settings/ash/multidevice_handler.cc b/chrome/browser/ui/webui/settings/ash/multidevice_handler.cc index 8c15f431..ceb4310 100644 --- a/chrome/browser/ui/webui/settings/ash/multidevice_handler.cc +++ b/chrome/browser/ui/webui/settings/ash/multidevice_handler.cc
@@ -6,8 +6,8 @@ #include "ash/constants/ash_features.h" #include "ash/constants/ash_pref_names.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/metrics/histogram_functions.h" #include "base/values.h"
diff --git a/chrome/browser/ui/webui/settings/ash/parental_controls_handler.cc b/chrome/browser/ui/webui/settings/ash/parental_controls_handler.cc index 8094787..e752fb2 100644 --- a/chrome/browser/ui/webui/settings/ash/parental_controls_handler.cc +++ b/chrome/browser/ui/webui/settings/ash/parental_controls_handler.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ui/webui/settings/ash/parental_controls_handler.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/values.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/ui/webui/settings/ash/people_section.cc b/chrome/browser/ui/webui/settings/ash/people_section.cc index 8bda3cbb..1ef7926a 100644 --- a/chrome/browser/ui/webui/settings/ash/people_section.cc +++ b/chrome/browser/ui/webui/settings/ash/people_section.cc
@@ -6,8 +6,8 @@ #include "ash/constants/ash_features.h" #include "ash/constants/ash_pref_names.h" -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/i18n/number_formatting.h" #include "base/metrics/histogram_functions.h" #include "base/no_destructor.h"
diff --git a/chrome/browser/ui/webui/settings/ash/peripheral_data_access_handler.cc b/chrome/browser/ui/webui/settings/ash/peripheral_data_access_handler.cc index ac1b959..4debfde7 100644 --- a/chrome/browser/ui/webui/settings/ash/peripheral_data_access_handler.cc +++ b/chrome/browser/ui/webui/settings/ash/peripheral_data_access_handler.cc
@@ -8,10 +8,10 @@ #include <utility> #include "ash/constants/ash_pref_names.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "chrome/browser/ash/settings/cros_settings.h"
diff --git a/chrome/browser/ui/webui/settings/ash/personalization_hub_handler.cc b/chrome/browser/ui/webui/settings/ash/personalization_hub_handler.cc index 1a122565..b9763420 100644 --- a/chrome/browser/ui/webui/settings/ash/personalization_hub_handler.cc +++ b/chrome/browser/ui/webui/settings/ash/personalization_hub_handler.cc
@@ -6,7 +6,7 @@ #include "ash/constants/ash_features.h" #include "ash/constants/personalization_entry_point.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/web_applications/personalization_app/personalization_app_metrics.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/ash/system_web_apps/system_web_app_ui_utils.h"
diff --git a/chrome/browser/ui/webui/settings/ash/plugin_vm_handler.cc b/chrome/browser/ui/webui/settings/ash/plugin_vm_handler.cc index 0de9ec9..f1226b5 100644 --- a/chrome/browser/ui/webui/settings/ash/plugin_vm_handler.cc +++ b/chrome/browser/ui/webui/settings/ash/plugin_vm_handler.cc
@@ -8,8 +8,8 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "chrome/browser/ash/plugin_vm/plugin_vm_manager.h" #include "chrome/browser/ash/plugin_vm/plugin_vm_manager_factory.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ui/webui/settings/ash/privacy_hub_handler.cc b/chrome/browser/ui/webui/settings/ash/privacy_hub_handler.cc index b89d45fa..c67517d8 100644 --- a/chrome/browser/ui/webui/settings/ash/privacy_hub_handler.cc +++ b/chrome/browser/ui/webui/settings/ash/privacy_hub_handler.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/webui/settings/ash/privacy_hub_handler.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "chrome/browser/ash/privacy_hub/privacy_hub_util.h"
diff --git a/chrome/browser/ui/webui/settings/ash/quick_unlock_handler.cc b/chrome/browser/ui/webui/settings/ash/quick_unlock_handler.cc index 878b627f..8cc55b78 100644 --- a/chrome/browser/ui/webui/settings/ash/quick_unlock_handler.cc +++ b/chrome/browser/ui/webui/settings/ash/quick_unlock_handler.cc
@@ -5,7 +5,7 @@ #include "chrome/browser/ui/webui/settings/ash/quick_unlock_handler.h" #include "ash/constants/ash_pref_names.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/ash/login/quick_unlock/pin_backend.h" #include "chrome/browser/ash/login/quick_unlock/quick_unlock_utils.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ui/webui/settings/ash/select_to_speak_handler.cc b/chrome/browser/ui/webui/settings/ash/select_to_speak_handler.cc index fc046d1..f3eddb365 100644 --- a/chrome/browser/ui/webui/settings/ash/select_to_speak_handler.cc +++ b/chrome/browser/ui/webui/settings/ash/select_to_speak_handler.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/webui/settings/ash/select_to_speak_handler.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/json/json_reader.h" #include "base/values.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/ui/webui/settings/ash/settings_with_tts_preview_handler.cc b/chrome/browser/ui/webui/settings/ash/settings_with_tts_preview_handler.cc index 40a08e4..d970f1c 100644 --- a/chrome/browser/ui/webui/settings/ash/settings_with_tts_preview_handler.cc +++ b/chrome/browser/ui/webui/settings/ash/settings_with_tts_preview_handler.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/webui/settings/ash/settings_with_tts_preview_handler.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/json/json_reader.h" #include "base/values.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/ui/webui/settings/ash/switch_access_handler.cc b/chrome/browser/ui/webui/settings/ash/switch_access_handler.cc index a807258..55bc5f2 100644 --- a/chrome/browser/ui/webui/settings/ash/switch_access_handler.cc +++ b/chrome/browser/ui/webui/settings/ash/switch_access_handler.cc
@@ -9,7 +9,7 @@ #include "ash/constants/ash_constants.h" #include "ash/constants/ash_pref_names.h" #include "ash/public/cpp/accessibility_controller.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/no_destructor.h" #include "base/values.h" #include "chrome/grit/generated_resources.h"
diff --git a/chrome/browser/ui/webui/settings/ash/tts_handler.cc b/chrome/browser/ui/webui/settings/ash/tts_handler.cc index ded0a79..6792a60 100644 --- a/chrome/browser/ui/webui/settings/ash/tts_handler.cc +++ b/chrome/browser/ui/webui/settings/ash/tts_handler.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/webui/settings/ash/tts_handler.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/json/json_reader.h" #include "base/values.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/ui/webui/settings/browser_lifetime_handler.cc b/chrome/browser/ui/webui/settings/browser_lifetime_handler.cc index 640e7ec4..f630f06 100644 --- a/chrome/browser/ui/webui/settings/browser_lifetime_handler.cc +++ b/chrome/browser/ui/webui/settings/browser_lifetime_handler.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ui/webui/settings/browser_lifetime_handler.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h" #include "chrome/browser/lifetime/application_lifetime.h"
diff --git a/chrome/browser/ui/webui/settings/captions_handler.cc b/chrome/browser/ui/webui/settings/captions_handler.cc index 818ba2d..67fe981e 100644 --- a/chrome/browser/ui/webui/settings/captions_handler.cc +++ b/chrome/browser/ui/webui/settings/captions_handler.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/webui/settings/captions_handler.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/values.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/ui/webui/settings/chrome_cleanup_handler_win.cc b/chrome/browser/ui/webui/settings/chrome_cleanup_handler_win.cc index 7d84658..e0daa4e 100644 --- a/chrome/browser/ui/webui/settings/chrome_cleanup_handler_win.cc +++ b/chrome/browser/ui/webui/settings/chrome_cleanup_handler_win.cc
@@ -9,9 +9,9 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/command_line.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "base/metrics/user_metrics.h" #include "base/metrics/user_metrics_action.h"
diff --git a/chrome/browser/ui/webui/settings/custom_home_pages_table_model.cc b/chrome/browser/ui/webui/settings/custom_home_pages_table_model.cc index bf3cffd6..6c3e46f 100644 --- a/chrome/browser/ui/webui/settings/custom_home_pages_table_model.cc +++ b/chrome/browser/ui/webui/settings/custom_home_pages_table_model.cc
@@ -6,8 +6,8 @@ #include <stddef.h> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/i18n/rtl.h" #include "base/ranges/algorithm.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/webui/settings/downloads_handler.cc b/chrome/browser/ui/webui/settings/downloads_handler.cc index 9cbc504a..437c8cd 100644 --- a/chrome/browser/ui/webui/settings/downloads_handler.cc +++ b/chrome/browser/ui/webui/settings/downloads_handler.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/webui/settings/downloads_handler.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/user_metrics.h" #include "base/values.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/ui/webui/settings/extension_control_handler.cc b/chrome/browser/ui/webui/settings/extension_control_handler.cc index ece7fac..984ed0d 100644 --- a/chrome/browser/ui/webui/settings/extension_control_handler.cc +++ b/chrome/browser/ui/webui/settings/extension_control_handler.cc
@@ -4,9 +4,9 @@ #include "chrome/browser/ui/webui/settings/extension_control_handler.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/profiles/profile.h" #include "content/public/browser/web_ui.h"
diff --git a/chrome/browser/ui/webui/settings/font_handler.cc b/chrome/browser/ui/webui/settings/font_handler.cc index 98e4d96..424647c 100644 --- a/chrome/browser/ui/webui/settings/font_handler.cc +++ b/chrome/browser/ui/webui/settings/font_handler.cc
@@ -9,8 +9,8 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/i18n/rtl.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h"
diff --git a/chrome/browser/ui/webui/settings/hats_handler.cc b/chrome/browser/ui/webui/settings/hats_handler.cc index bcb53b4a..139107e 100644 --- a/chrome/browser/ui/webui/settings/hats_handler.cc +++ b/chrome/browser/ui/webui/settings/hats_handler.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/webui/settings/hats_handler.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/threading/sequenced_task_runner_handle.h" #include "chrome/browser/privacy_sandbox/privacy_sandbox_settings_factory.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ui/webui/settings/import_data_handler.cc b/chrome/browser/ui/webui/settings/import_data_handler.cc index 30be39fc..0b2fb538 100644 --- a/chrome/browser/ui/webui/settings/import_data_handler.cc +++ b/chrome/browser/ui/webui/settings/import_data_handler.cc
@@ -9,8 +9,8 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/webui/settings/incompatible_applications_handler_win.cc b/chrome/browser/ui/webui/settings/incompatible_applications_handler_win.cc index d54ffeb..668bcc23 100644 --- a/chrome/browser/ui/webui/settings/incompatible_applications_handler_win.cc +++ b/chrome/browser/ui/webui/settings/incompatible_applications_handler_win.cc
@@ -8,8 +8,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "base/metrics/user_metrics.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/webui/settings/languages_handler.cc b/chrome/browser/ui/webui/settings/languages_handler.cc index 908b618..d2b1371 100644 --- a/chrome/browser/ui/webui/settings/languages_handler.cc +++ b/chrome/browser/ui/webui/settings/languages_handler.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/webui/settings/languages_handler.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/values.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/ui/webui/settings/metrics_reporting_handler.cc b/chrome/browser/ui/webui/settings/metrics_reporting_handler.cc index 9abc589..dceb42b 100644 --- a/chrome/browser/ui/webui/settings/metrics_reporting_handler.cc +++ b/chrome/browser/ui/webui/settings/metrics_reporting_handler.cc
@@ -9,8 +9,8 @@ #include "chrome/browser/ui/webui/settings/metrics_reporting_handler.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/values.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/metrics/chrome_metrics_service_accessor.h"
diff --git a/chrome/browser/ui/webui/settings/native_certificates_handler.cc b/chrome/browser/ui/webui/settings/native_certificates_handler.cc index 2b544df..2f337af 100644 --- a/chrome/browser/ui/webui/settings/native_certificates_handler.cc +++ b/chrome/browser/ui/webui/settings/native_certificates_handler.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ui/webui/settings/native_certificates_handler.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/user_metrics.h" #include "chrome/browser/ui/webui/settings/settings_utils.h" #include "content/public/browser/web_ui.h"
diff --git a/chrome/browser/ui/webui/settings/on_startup_handler.cc b/chrome/browser/ui/webui/settings/on_startup_handler.cc index 2ecb9243..9b1dfd01a 100644 --- a/chrome/browser/ui/webui/settings/on_startup_handler.cc +++ b/chrome/browser/ui/webui/settings/on_startup_handler.cc
@@ -6,9 +6,9 @@ #include <string> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check_op.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "chrome/browser/extensions/settings_api_helpers.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/webui/settings/settings_utils.h"
diff --git a/chrome/browser/ui/webui/settings/people_handler.cc b/chrome/browser/ui/webui/settings/people_handler.cc index ebb6576a..75d8652 100644 --- a/chrome/browser/ui/webui/settings/people_handler.cc +++ b/chrome/browser/ui/webui/settings/people_handler.cc
@@ -6,10 +6,10 @@ #include <string> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check_op.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/i18n/time_formatting.h" #include "base/json/json_reader.h" #include "base/metrics/user_metrics.h"
diff --git a/chrome/browser/ui/webui/settings/people_handler_unittest.cc b/chrome/browser/ui/webui/settings/people_handler_unittest.cc index ee500c1..ddede11 100644 --- a/chrome/browser/ui/webui/settings/people_handler_unittest.cc +++ b/chrome/browser/ui/webui/settings/people_handler_unittest.cc
@@ -8,9 +8,9 @@ #include <string> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/i18n/time_formatting.h" #include "base/json/json_writer.h" #include "base/memory/raw_ptr.h"
diff --git a/chrome/browser/ui/webui/settings/performance_handler.cc b/chrome/browser/ui/webui/settings/performance_handler.cc index 9e68f47c..3707ebe6 100644 --- a/chrome/browser/ui/webui/settings/performance_handler.cc +++ b/chrome/browser/ui/webui/settings/performance_handler.cc
@@ -3,8 +3,8 @@ // found in the LICENSE file. #include "chrome/browser/ui/webui/settings/performance_handler.h" -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/values.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h"
diff --git a/chrome/browser/ui/webui/settings/profile_info_handler.cc b/chrome/browser/ui/webui/settings/profile_info_handler.cc index c03ac9ca..765061d 100644 --- a/chrome/browser/ui/webui/settings/profile_info_handler.cc +++ b/chrome/browser/ui/webui/settings/profile_info_handler.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/webui/settings/profile_info_handler.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "build/chromeos_buildflags.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/ui/webui/settings/protocol_handlers_handler.cc b/chrome/browser/ui/webui/settings/protocol_handlers_handler.cc index 091c0f0..f39c04c 100644 --- a/chrome/browser/ui/webui/settings/protocol_handlers_handler.cc +++ b/chrome/browser/ui/webui/settings/protocol_handlers_handler.cc
@@ -8,9 +8,9 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/flat_set.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/custom_handlers/protocol_handler_registry_factory.h"
diff --git a/chrome/browser/ui/webui/settings/reset_settings_handler.cc b/chrome/browser/ui/webui/settings/reset_settings_handler.cc index 5e267c5..c8da5e9 100644 --- a/chrome/browser/ui/webui/settings/reset_settings_handler.cc +++ b/chrome/browser/ui/webui/settings/reset_settings_handler.cc
@@ -7,8 +7,8 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/histogram_macros.h" #include "base/metrics/user_metrics.h" #include "base/time/time.h"
diff --git a/chrome/browser/ui/webui/settings/safety_check_handler.cc b/chrome/browser/ui/webui/settings/safety_check_handler.cc index 6c35e29..3231767 100644 --- a/chrome/browser/ui/webui/settings/safety_check_handler.cc +++ b/chrome/browser/ui/webui/settings/safety_check_handler.cc
@@ -7,8 +7,8 @@ #include <memory> #include <string> -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/i18n/number_formatting.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/user_metrics.h"
diff --git a/chrome/browser/ui/webui/settings/safety_check_handler.h b/chrome/browser/ui/webui/settings/safety_check_handler.h index e2bfaa4d5..152906cf 100644 --- a/chrome/browser/ui/webui/settings/safety_check_handler.h +++ b/chrome/browser/ui/webui/settings/safety_check_handler.h
@@ -10,7 +10,7 @@ #include <memory> #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/scoped_observation.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 c97ade6..e92aec8 100644 --- a/chrome/browser/ui/webui/settings/safety_check_handler_unittest.cc +++ b/chrome/browser/ui/webui/settings/safety_check_handler_unittest.cc
@@ -7,8 +7,8 @@ #include <string> #include <unordered_map> -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/strings/strcat.h" #include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/ui/webui/settings/search_engines_handler.cc b/chrome/browser/ui/webui/settings/search_engines_handler.cc index 6e5b436..ad9fff2 100644 --- a/chrome/browser/ui/webui/settings/search_engines_handler.cc +++ b/chrome/browser/ui/webui/settings/search_engines_handler.cc
@@ -8,7 +8,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/field_trial.h" #include "base/metrics/user_metrics.h" #include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.cc b/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.cc index 87b7ccc..8c6a821 100644 --- a/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.cc +++ b/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.cc
@@ -8,8 +8,8 @@ #include <vector> -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h" #include "base/ranges/algorithm.h"
diff --git a/chrome/browser/ui/webui/settings/settings_default_browser_handler.cc b/chrome/browser/ui/webui/settings/settings_default_browser_handler.cc index 19d8eef4..0ffd7e0 100644 --- a/chrome/browser/ui/webui/settings/settings_default_browser_handler.cc +++ b/chrome/browser/ui/webui/settings/settings_default_browser_handler.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/webui/settings/settings_default_browser_handler.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "base/metrics/user_metrics.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/ui/webui/settings/settings_manage_profile_handler.cc b/chrome/browser/ui/webui/settings/settings_manage_profile_handler.cc index d901f8e..6340c1e4f 100644 --- a/chrome/browser/ui/webui/settings/settings_manage_profile_handler.cc +++ b/chrome/browser/ui/webui/settings/settings_manage_profile_handler.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/webui/settings/settings_media_devices_selection_handler.cc b/chrome/browser/ui/webui/settings/settings_media_devices_selection_handler.cc index 9d73fff..e57305f213 100644 --- a/chrome/browser/ui/webui/settings/settings_media_devices_selection_handler.cc +++ b/chrome/browser/ui/webui/settings/settings_media_devices_selection_handler.cc
@@ -9,7 +9,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/pref_names.h" #include "components/prefs/pref_service.h"
diff --git a/chrome/browser/ui/webui/settings/settings_secure_dns_handler.cc b/chrome/browser/ui/webui/settings/settings_secure_dns_handler.cc index 846f9af..537e7ee 100644 --- a/chrome/browser/ui/webui/settings/settings_secure_dns_handler.cc +++ b/chrome/browser/ui/webui/settings/settings_secure_dns_handler.cc
@@ -7,8 +7,8 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/rand_util.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/net/secure_dns_config.h"
diff --git a/chrome/browser/ui/webui/settings/settings_secure_dns_handler.h b/chrome/browser/ui/webui/settings/settings_secure_dns_handler.h index 78cbeb36..3b50fbd 100644 --- a/chrome/browser/ui/webui/settings/settings_secure_dns_handler.h +++ b/chrome/browser/ui/webui/settings/settings_secure_dns_handler.h
@@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/values.h" #include "chrome/browser/net/dns_probe_runner.h" #include "chrome/browser/ui/webui/settings/settings_page_ui_handler.h"
diff --git a/chrome/browser/ui/webui/settings/settings_security_key_handler.cc b/chrome/browser/ui/webui/settings/settings_security_key_handler.cc index d51208f..6e3d1c0 100644 --- a/chrome/browser/ui/webui/settings/settings_security_key_handler.cc +++ b/chrome/browser/ui/webui/settings/settings_security_key_handler.cc
@@ -9,9 +9,9 @@ #include <vector> #include "base/base64.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/metrics/histogram_functions.h" #include "base/ranges/algorithm.h" #include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/ui/webui/settings/settings_startup_pages_handler.cc b/chrome/browser/ui/webui/settings/settings_startup_pages_handler.cc index 71e430b..4a49f27 100644 --- a/chrome/browser/ui/webui/settings/settings_startup_pages_handler.cc +++ b/chrome/browser/ui/webui/settings/settings_startup_pages_handler.cc
@@ -9,7 +9,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/prefs/session_startup_pref.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/webui/settings/settings_utils.h"
diff --git a/chrome/browser/ui/webui/settings/settings_utils_linux.cc b/chrome/browser/ui/webui/settings/settings_utils_linux.cc index 9c037f2..f15366e0 100644 --- a/chrome/browser/ui/webui/settings/settings_utils_linux.cc +++ b/chrome/browser/ui/webui/settings/settings_utils_linux.cc
@@ -6,10 +6,10 @@ #include <stddef.h> -#include "base/bind.h" #include "base/containers/span.h" #include "base/environment.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/memory/weak_ptr.h" #include "base/nix/xdg_util.h" #include "base/process/launch.h"
diff --git a/chrome/browser/ui/webui/settings/settings_utils_win.cc b/chrome/browser/ui/webui/settings/settings_utils_win.cc index cffb38893..c39f0509 100644 --- a/chrome/browser/ui/webui/settings/settings_utils_win.cc +++ b/chrome/browser/ui/webui/settings/settings_utils_win.cc
@@ -7,8 +7,8 @@ #include <windows.h> #include <shellapi.h> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/path_service.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/ui/webui/settings/site_settings_handler.cc b/chrome/browser/ui/webui/settings/site_settings_handler.cc index a0c7e41..93113d4 100644 --- a/chrome/browser/ui/webui/settings/site_settings_handler.cc +++ b/chrome/browser/ui/webui/settings/site_settings_handler.cc
@@ -9,11 +9,11 @@ #include <vector> #include "base/barrier_closure.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/contains.h" #include "base/containers/flat_set.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/i18n/message_formatter.h" #include "base/i18n/number_formatting.h" #include "base/json/values_util.h"
diff --git a/chrome/browser/ui/webui/settings/site_settings_handler_unittest.cc b/chrome/browser/ui/webui/settings/site_settings_handler_unittest.cc index edb638d3..e5ceb41 100644 --- a/chrome/browser/ui/webui/settings/site_settings_handler_unittest.cc +++ b/chrome/browser/ui/webui/settings/site_settings_handler_unittest.cc
@@ -10,9 +10,9 @@ #include <vector> #include "base/barrier_closure.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/callback_helpers.h" #include "base/json/json_reader.h" #include "base/json/values_util.h" #include "base/logging.h"
diff --git a/chrome/browser/ui/webui/settings/site_settings_helper_unittest.cc b/chrome/browser/ui/webui/settings/site_settings_helper_unittest.cc index 8f07984b..1df9024 100644 --- a/chrome/browser/ui/webui/settings/site_settings_helper_unittest.cc +++ b/chrome/browser/ui/webui/settings/site_settings_helper_unittest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/webui/settings/site_settings_helper.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/guid.h" #include "base/json/json_reader.h" #include "base/strings/string_piece.h"
diff --git a/chrome/browser/ui/webui/settings/system_handler.cc b/chrome/browser/ui/webui/settings/system_handler.cc index a5ca5961..912aa12 100644 --- a/chrome/browser/ui/webui/settings/system_handler.cc +++ b/chrome/browser/ui/webui/settings/system_handler.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ui/webui/settings/system_handler.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/user_metrics.h" #include "base/metrics/user_metrics_action.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/ui/webui/signin/ash/inline_login_dialog.cc b/chrome/browser/ui/webui/signin/ash/inline_login_dialog.cc index d563a3c..f1908b4 100644 --- a/chrome/browser/ui/webui/signin/ash/inline_login_dialog.cc +++ b/chrome/browser/ui/webui/signin/ash/inline_login_dialog.cc
@@ -8,8 +8,8 @@ #include <string> #include "ash/public/cpp/window_backdrop.h" -#include "base/callback_helpers.h" #include "base/check_op.h" +#include "base/functional/callback_helpers.h" #include "base/json/json_writer.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/supervised_user/supervised_user_service.h"
diff --git a/chrome/browser/ui/webui/signin/ash/inline_login_dialog.h b/chrome/browser/ui/webui/signin/ash/inline_login_dialog.h index 3de9833..aeefa35 100644 --- a/chrome/browser/ui/webui/signin/ash/inline_login_dialog.h +++ b/chrome/browser/ui/webui/signin/ash/inline_login_dialog.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/gtest_prod_util.h" #include "base/observer_list.h" #include "chrome/browser/ui/webui/ash/system_web_dialog_delegate.h"
diff --git a/chrome/browser/ui/webui/signin/ash/inline_login_dialog_onboarding.h b/chrome/browser/ui/webui/signin/ash/inline_login_dialog_onboarding.h index cd30d8b4..c2994bef 100644 --- a/chrome/browser/ui/webui/signin/ash/inline_login_dialog_onboarding.h +++ b/chrome/browser/ui/webui/signin/ash/inline_login_dialog_onboarding.h
@@ -7,7 +7,7 @@ #include "chrome/browser/ui/webui/signin/ash/inline_login_dialog.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "ui/base/ui_base_types.h" #include "ui/gfx/geometry/size.h" #include "ui/gfx/native_widget_types.h"
diff --git a/chrome/browser/ui/webui/signin/ash/inline_login_handler_impl.cc b/chrome/browser/ui/webui/signin/ash/inline_login_handler_impl.cc index 70bf98c..84255a0 100644 --- a/chrome/browser/ui/webui/signin/ash/inline_login_handler_impl.cc +++ b/chrome/browser/ui/webui/signin/ash/inline_login_handler_impl.cc
@@ -9,7 +9,7 @@ #include "ash/constants/ash_pref_names.h" #include "base/base64.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/values.h" #include "chrome/browser/ash/account_manager/account_apps_availability.h"
diff --git a/chrome/browser/ui/webui/signin/ash/inline_login_handler_impl_browsertest.cc b/chrome/browser/ui/webui/signin/ash/inline_login_handler_impl_browsertest.cc index 09b18b7..a4d9890 100644 --- a/chrome/browser/ui/webui/signin/ash/inline_login_handler_impl_browsertest.cc +++ b/chrome/browser/ui/webui/signin/ash/inline_login_handler_impl_browsertest.cc
@@ -5,7 +5,7 @@ #include "chrome/browser/ui/webui/signin/ash/inline_login_handler_impl.h" #include "ash/constants/ash_features.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/scoped_observation.h" #include "base/test/bind.h"
diff --git a/chrome/browser/ui/webui/signin/ash/user_cloud_signin_restriction_policy_fetcher_unittest.cc b/chrome/browser/ui/webui/signin/ash/user_cloud_signin_restriction_policy_fetcher_unittest.cc index c416f412..02bea40a 100644 --- a/chrome/browser/ui/webui/signin/ash/user_cloud_signin_restriction_policy_fetcher_unittest.cc +++ b/chrome/browser/ui/webui/signin/ash/user_cloud_signin_restriction_policy_fetcher_unittest.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/json/json_string_value_serializer.h" #include "base/test/bind.h" #include "base/test/task_environment.h"
diff --git a/chrome/browser/ui/webui/signin/dice_web_signin_intercept_handler.cc b/chrome/browser/ui/webui/signin/dice_web_signin_intercept_handler.cc index 0d87209f..df30d39 100644 --- a/chrome/browser/ui/webui/signin/dice_web_signin_intercept_handler.cc +++ b/chrome/browser/ui/webui/signin/dice_web_signin_intercept_handler.cc
@@ -6,8 +6,8 @@ #include <string> -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/metrics/field_trial_params.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/ui/webui/signin/dice_web_signin_intercept_handler.h b/chrome/browser/ui/webui/signin/dice_web_signin_intercept_handler.h index b73a388..ed0cb83 100644 --- a/chrome/browser/ui/webui/signin/dice_web_signin_intercept_handler.h +++ b/chrome/browser/ui/webui/signin/dice_web_signin_intercept_handler.h
@@ -9,7 +9,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/scoped_observation.h" #include "base/values.h" #include "chrome/browser/signin/dice_web_signin_interceptor.h"
diff --git a/chrome/browser/ui/webui/signin/dice_web_signin_intercept_handler_unittest.cc b/chrome/browser/ui/webui/signin/dice_web_signin_intercept_handler_unittest.cc index c268c16c..c2cf70c 100644 --- a/chrome/browser/ui/webui/signin/dice_web_signin_intercept_handler_unittest.cc +++ b/chrome/browser/ui/webui/signin/dice_web_signin_intercept_handler_unittest.cc
@@ -4,10 +4,10 @@ #include "chrome/browser/ui/webui/signin/dice_web_signin_intercept_handler.h" -#include "base/bind.h" -#include "base/callback_forward.h" -#include "base/callback_helpers.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback_forward.h" +#include "base/functional/callback_helpers.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/browser_features.h"
diff --git a/chrome/browser/ui/webui/signin/dice_web_signin_intercept_ui.h b/chrome/browser/ui/webui/signin/dice_web_signin_intercept_ui.h index 1efd6e7..ca47377c 100644 --- a/chrome/browser/ui/webui/signin/dice_web_signin_intercept_ui.h +++ b/chrome/browser/ui/webui/signin/dice_web_signin_intercept_ui.h
@@ -7,7 +7,7 @@ #include "content/public/browser/web_ui_controller.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/signin/dice_web_signin_interceptor.h" namespace content {
diff --git a/chrome/browser/ui/webui/signin/enterprise_profile_welcome_handler.cc b/chrome/browser/ui/webui/signin/enterprise_profile_welcome_handler.cc index 76159bd8..215633d 100644 --- a/chrome/browser/ui/webui/signin/enterprise_profile_welcome_handler.cc +++ b/chrome/browser/ui/webui/signin/enterprise_profile_welcome_handler.cc
@@ -7,8 +7,8 @@ #include <string> #include <vector> -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "base/strings/utf_string_conversions.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/ui/webui/signin/enterprise_profile_welcome_handler.h b/chrome/browser/ui/webui/signin/enterprise_profile_welcome_handler.h index b0d60fe..af4b86c 100644 --- a/chrome/browser/ui/webui/signin/enterprise_profile_welcome_handler.h +++ b/chrome/browser/ui/webui/signin/enterprise_profile_welcome_handler.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/scoped_observation.h" #include "base/values.h"
diff --git a/chrome/browser/ui/webui/signin/enterprise_profile_welcome_ui.cc b/chrome/browser/ui/webui/signin/enterprise_profile_welcome_ui.cc index d90a7c35..55db225f 100644 --- a/chrome/browser/ui/webui/signin/enterprise_profile_welcome_ui.cc +++ b/chrome/browser/ui/webui/signin/enterprise_profile_welcome_ui.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/values.h" #include "build/build_config.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ui/webui/signin/enterprise_profile_welcome_ui.h b/chrome/browser/ui/webui/signin/enterprise_profile_welcome_ui.h index abc141e..dd789aec 100644 --- a/chrome/browser/ui/webui/signin/enterprise_profile_welcome_ui.h +++ b/chrome/browser/ui/webui/signin/enterprise_profile_welcome_ui.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_SIGNIN_ENTERPRISE_PROFILE_WELCOME_UI_H_ #define CHROME_BROWSER_UI_WEBUI_SIGNIN_ENTERPRISE_PROFILE_WELCOME_UI_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "build/chromeos_buildflags.h" #include "chrome/browser/ui/webui/signin/signin_utils.h"
diff --git a/chrome/browser/ui/webui/signin/inline_login_handler.cc b/chrome/browser/ui/webui/signin/inline_login_handler.cc index 34c7b72c..5824d59e 100644 --- a/chrome/browser/ui/webui/signin/inline_login_handler.cc +++ b/chrome/browser/ui/webui/signin/inline_login_handler.cc
@@ -9,7 +9,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/user_metrics.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc b/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc index 9e88d31..d552001 100644 --- a/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc +++ b/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc
@@ -10,9 +10,9 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/metrics/histogram_macros.h" #include "base/metrics/user_metrics.h"
diff --git a/chrome/browser/ui/webui/signin/inline_login_ui.cc b/chrome/browser/ui/webui/signin/inline_login_ui.cc index 909ad712..ea4501f 100644 --- a/chrome/browser/ui/webui/signin/inline_login_ui.cc +++ b/chrome/browser/ui/webui/signin/inline_login_ui.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "build/branding_buildflags.h" #include "build/build_config.h"
diff --git a/chrome/browser/ui/webui/signin/login_ui_test_utils.cc b/chrome/browser/ui/webui/signin/login_ui_test_utils.cc index f0450ef..14fad3e9 100644 --- a/chrome/browser/ui/webui/signin/login_ui_test_utils.cc +++ b/chrome/browser/ui/webui/signin/login_ui_test_utils.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/webui/signin/login_ui_test_utils.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/notreached.h" #include "base/run_loop.h" #include "base/scoped_observation.h"
diff --git a/chrome/browser/ui/webui/signin/profile_customization_handler.cc b/chrome/browser/ui/webui/signin/profile_customization_handler.cc index d6fb2608..ee58210a 100644 --- a/chrome/browser/ui/webui/signin/profile_customization_handler.cc +++ b/chrome/browser/ui/webui/signin/profile_customization_handler.cc
@@ -7,9 +7,9 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/ui/webui/signin/profile_customization_handler.h b/chrome/browser/ui/webui/signin/profile_customization_handler.h index cfbd4eb..7d1581f 100644 --- a/chrome/browser/ui/webui/signin/profile_customization_handler.h +++ b/chrome/browser/ui/webui/signin/profile_customization_handler.h
@@ -7,8 +7,8 @@ #include "content/public/browser/web_ui_message_handler.h" -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/scoped_observation.h" #include "chrome/browser/profiles/profile_attributes_storage.h"
diff --git a/chrome/browser/ui/webui/signin/profile_customization_ui.cc b/chrome/browser/ui/webui/signin/profile_customization_ui.cc index 7b42cd3..19d1446 100644 --- a/chrome/browser/ui/webui/signin/profile_customization_ui.cc +++ b/chrome/browser/ui/webui/signin/profile_customization_ui.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ui/webui/signin/profile_customization_ui.h" -#include "base/callback_helpers.h" #include "base/feature_list.h" +#include "base/functional/callback_helpers.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ui/webui/signin/profile_customization_ui.h b/chrome/browser/ui/webui/signin/profile_customization_ui.h index ed9bfbda..0b7ce1d 100644 --- a/chrome/browser/ui/webui/signin/profile_customization_ui.h +++ b/chrome/browser/ui/webui/signin/profile_customization_ui.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_SIGNIN_PROFILE_CUSTOMIZATION_UI_H_ #define CHROME_BROWSER_UI_WEBUI_SIGNIN_PROFILE_CUSTOMIZATION_UI_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/ui/webui/signin/profile_customization_handler.h" #include "mojo/public/cpp/bindings/pending_receiver.h" #include "mojo/public/cpp/bindings/pending_remote.h"
diff --git a/chrome/browser/ui/webui/signin/profile_picker_handler.cc b/chrome/browser/ui/webui/signin/profile_picker_handler.cc index 74390e8..57c7c2c 100644 --- a/chrome/browser/ui/webui/signin/profile_picker_handler.cc +++ b/chrome/browser/ui/webui/signin/profile_picker_handler.cc
@@ -4,11 +4,11 @@ #include "chrome/browser/ui/webui/signin/profile_picker_handler.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check.h" #include "base/containers/cxx20_erase.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/json/values_util.h" #include "base/metrics/histogram_functions.h" #include "base/notreached.h"
diff --git a/chrome/browser/ui/webui/signin/profile_picker_lacros_sign_in_provider.h b/chrome/browser/ui/webui/signin/profile_picker_lacros_sign_in_provider.h index e6863a1e..1ed6f46 100644 --- a/chrome/browser/ui/webui/signin/profile_picker_lacros_sign_in_provider.h +++ b/chrome/browser/ui/webui/signin/profile_picker_lacros_sign_in_provider.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_SIGNIN_PROFILE_PICKER_LACROS_SIGN_IN_PROVIDER_H_ #define CHROME_BROWSER_UI_WEBUI_SIGNIN_PROFILE_PICKER_LACROS_SIGN_IN_PROVIDER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/lacros/account_manager/account_profile_mapper.h"
diff --git a/chrome/browser/ui/webui/signin/signin_email_confirmation_dialog.h b/chrome/browser/ui/webui/signin/signin_email_confirmation_dialog.h index 45720b1..d1b9916 100644 --- a/chrome/browser/ui/webui/signin/signin_email_confirmation_dialog.h +++ b/chrome/browser/ui/webui/signin/signin_email_confirmation_dialog.h
@@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/ui/signin_view_controller_delegate.h" #include "chrome/browser/ui/webui/constrained_web_dialog_ui.h"
diff --git a/chrome/browser/ui/webui/signin/signin_error_handler.cc b/chrome/browser/ui/webui/signin/signin_error_handler.cc index 0356a43..bc17d1c 100644 --- a/chrome/browser/ui/webui/signin/signin_error_handler.cc +++ b/chrome/browser/ui/webui/signin/signin_error_handler.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/webui/signin/signin_error_handler.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/profiles/profile_window.h" #include "chrome/browser/signin/signin_ui_util.h"
diff --git a/chrome/browser/ui/webui/signin/signin_reauth_handler.cc b/chrome/browser/ui/webui/signin/signin_reauth_handler.cc index 07cacf2..243721a3 100644 --- a/chrome/browser/ui/webui/signin/signin_reauth_handler.cc +++ b/chrome/browser/ui/webui/signin/signin_reauth_handler.cc
@@ -6,7 +6,7 @@ #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "chrome/browser/ui/signin_reauth_view_controller.h" #include "components/sync/protocol/user_consent_types.pb.h"
diff --git a/chrome/browser/ui/webui/signin/signin_utils.h b/chrome/browser/ui/webui/signin/signin_utils.h index bb347e8..64e4f89 100644 --- a/chrome/browser/ui/webui/signin/signin_utils.h +++ b/chrome/browser/ui/webui/signin/signin_utils.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/values.h" class Browser;
diff --git a/chrome/browser/ui/webui/signin/sync_confirmation_handler.cc b/chrome/browser/ui/webui/signin/sync_confirmation_handler.cc index a32007b..0274b1a 100644 --- a/chrome/browser/ui/webui/signin/sync_confirmation_handler.cc +++ b/chrome/browser/ui/webui/signin/sync_confirmation_handler.cc
@@ -6,7 +6,7 @@ #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "base/metrics/user_metrics.h" #include "base/threading/thread_task_runner_handle.h"
diff --git a/chrome/browser/ui/webui/signin/sync_confirmation_handler_unittest.cc b/chrome/browser/ui/webui/signin/sync_confirmation_handler_unittest.cc index 6b75664..9001d00 100644 --- a/chrome/browser/ui/webui/signin/sync_confirmation_handler_unittest.cc +++ b/chrome/browser/ui/webui/signin/sync_confirmation_handler_unittest.cc
@@ -8,8 +8,8 @@ #include <unordered_map> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/scoped_observation.h" #include "base/test/metrics/histogram_tester.h"
diff --git a/chrome/browser/ui/webui/signin/turn_sync_on_helper.cc b/chrome/browser/ui/webui/signin/turn_sync_on_helper.cc index 0e7110a..8e1226e 100644 --- a/chrome/browser/ui/webui/signin/turn_sync_on_helper.cc +++ b/chrome/browser/ui/webui/signin/turn_sync_on_helper.cc
@@ -6,11 +6,11 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/check.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/logging.h" #include "base/memory/raw_ptr.h"
diff --git a/chrome/browser/ui/webui/signin/turn_sync_on_helper_browsertest.cc b/chrome/browser/ui/webui/signin/turn_sync_on_helper_browsertest.cc index f8342e1..8954a6e 100644 --- a/chrome/browser/ui/webui/signin/turn_sync_on_helper_browsertest.cc +++ b/chrome/browser/ui/webui/signin/turn_sync_on_helper_browsertest.cc
@@ -5,7 +5,7 @@ #include <memory> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/ptr_util.h" #include "base/memory/weak_ptr.h" #include "base/run_loop.h"
diff --git a/chrome/browser/ui/webui/signin/turn_sync_on_helper_delegate_impl.cc b/chrome/browser/ui/webui/signin/turn_sync_on_helper_delegate_impl.cc index 3417532..74c5bac 100644 --- a/chrome/browser/ui/webui/signin/turn_sync_on_helper_delegate_impl.cc +++ b/chrome/browser/ui/webui/signin/turn_sync_on_helper_delegate_impl.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ui/webui/signin/turn_sync_on_helper_delegate_impl.h" -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/metrics/user_metrics.h" #include "base/metrics/user_metrics_action.h" #include "base/notreached.h"
diff --git a/chrome/browser/ui/webui/signin/turn_sync_on_helper_delegate_impl.h b/chrome/browser/ui/webui/signin/turn_sync_on_helper_delegate_impl.h index 69ba863e..4922e1bd5 100644 --- a/chrome/browser/ui/webui/signin/turn_sync_on_helper_delegate_impl.h +++ b/chrome/browser/ui/webui/signin/turn_sync_on_helper_delegate_impl.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_SIGNIN_TURN_SYNC_ON_HELPER_DELEGATE_IMPL_H_ #define CHROME_BROWSER_UI_WEBUI_SIGNIN_TURN_SYNC_ON_HELPER_DELEGATE_IMPL_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/scoped_observation.h" #include "chrome/browser/ui/browser_list_observer.h"
diff --git a/chrome/browser/ui/webui/signin/turn_sync_on_helper_policy_fetch_tracker.h b/chrome/browser/ui/webui/signin/turn_sync_on_helper_policy_fetch_tracker.h index 909e465..be34d89 100644 --- a/chrome/browser/ui/webui/signin/turn_sync_on_helper_policy_fetch_tracker.h +++ b/chrome/browser/ui/webui/signin/turn_sync_on_helper_policy_fetch_tracker.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_SIGNIN_TURN_SYNC_ON_HELPER_POLICY_FETCH_TRACKER_H_ #define CHROME_BROWSER_UI_WEBUI_SIGNIN_TURN_SYNC_ON_HELPER_POLICY_FETCH_TRACKER_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "chrome/browser/ui/webui/signin/turn_sync_on_helper.h" #include "components/signin/public/identity_manager/account_info.h"
diff --git a/chrome/browser/ui/webui/signin/turn_sync_on_helper_unittest.cc b/chrome/browser/ui/webui/signin/turn_sync_on_helper_unittest.cc index ae6002d9..fb8fdfb 100644 --- a/chrome/browser/ui/webui/signin/turn_sync_on_helper_unittest.cc +++ b/chrome/browser/ui/webui/signin/turn_sync_on_helper_unittest.cc
@@ -7,13 +7,13 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/containers/flat_set.h" #include "base/feature_list.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h"
diff --git a/chrome/browser/ui/webui/support_tool/support_tool_ui.cc b/chrome/browser/ui/webui/support_tool/support_tool_ui.cc index 0e3b869..da9138a 100644 --- a/chrome/browser/ui/webui/support_tool/support_tool_ui.cc +++ b/chrome/browser/ui/webui/support_tool/support_tool_ui.cc
@@ -8,9 +8,9 @@ #include <string> #include <vector> -#include "base/bind.h" #include "base/check.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/memory/scoped_refptr.h" #include "base/ranges/algorithm.h" #include "base/time/time.h"
diff --git a/chrome/browser/ui/webui/sync_file_system_internals/dump_database_handler.cc b/chrome/browser/ui/webui/sync_file_system_internals/dump_database_handler.cc index ee9cc2e..bc588ffa 100644 --- a/chrome/browser/ui/webui/sync_file_system_internals/dump_database_handler.cc +++ b/chrome/browser/ui/webui/sync_file_system_internals/dump_database_handler.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/webui/sync_file_system_internals/dump_database_handler.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sync_file_system/sync_file_system_service.h" #include "chrome/browser/sync_file_system/sync_file_system_service_factory.h"
diff --git a/chrome/browser/ui/webui/sync_file_system_internals/extension_statuses_handler.cc b/chrome/browser/ui/webui/sync_file_system_internals/extension_statuses_handler.cc index 98d1c44..dafc776 100644 --- a/chrome/browser/ui/webui/sync_file_system_internals/extension_statuses_handler.cc +++ b/chrome/browser/ui/webui/sync_file_system_internals/extension_statuses_handler.cc
@@ -8,8 +8,8 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/weak_ptr.h" #include "base/values.h" #include "chrome/browser/extensions/extension_service.h"
diff --git a/chrome/browser/ui/webui/sync_file_system_internals/file_metadata_handler.cc b/chrome/browser/ui/webui/sync_file_system_internals/file_metadata_handler.cc index 4c606f68..b97d2df 100644 --- a/chrome/browser/ui/webui/sync_file_system_internals/file_metadata_handler.cc +++ b/chrome/browser/ui/webui/sync_file_system_internals/file_metadata_handler.cc
@@ -6,8 +6,8 @@ #include <map> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/values.h" #include "chrome/browser/apps/platform_apps/api/sync_file_system/sync_file_system_api_helpers.h"
diff --git a/chrome/browser/ui/webui/sync_file_system_internals/sync_file_system_internals_handler.cc b/chrome/browser/ui/webui/sync_file_system_internals/sync_file_system_internals_handler.cc index fe31510..af4eae10 100644 --- a/chrome/browser/ui/webui/sync_file_system_internals/sync_file_system_internals_handler.cc +++ b/chrome/browser/ui/webui/sync_file_system_internals/sync_file_system_internals_handler.cc
@@ -10,8 +10,8 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/values.h" #include "chrome/browser/apps/platform_apps/api/sync_file_system/sync_file_system_api_helpers.h" #include "chrome/browser/drive/drive_notification_manager_factory.h"
diff --git a/chrome/browser/ui/webui/sync_internals/sync_internals_message_handler.cc b/chrome/browser/ui/webui/sync_internals/sync_internals_message_handler.cc index 5833224..47ad941 100644 --- a/chrome/browser/ui/webui/sync_internals/sync_internals_message_handler.cc +++ b/chrome/browser/ui/webui/sync_internals/sync_internals_message_handler.cc
@@ -7,8 +7,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/strings/string_number_conversions.h" #include "base/values.h"
diff --git a/chrome/browser/ui/webui/sync_internals/sync_internals_message_handler_unittest.cc b/chrome/browser/ui/webui/sync_internals/sync_internals_message_handler_unittest.cc index 9dc0b2a1..14ed3549 100644 --- a/chrome/browser/ui/webui/sync_internals/sync_internals_message_handler_unittest.cc +++ b/chrome/browser/ui/webui/sync_internals/sync_internals_message_handler_unittest.cc
@@ -8,8 +8,8 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/sync/sync_service_factory.h" #include "chrome/browser/sync/user_event_service_factory.h"
diff --git a/chrome/browser/ui/webui/system_info_ui.cc b/chrome/browser/ui/webui/system_info_ui.cc index 8bdf8fa..09421df 100644 --- a/chrome/browser/ui/webui/system_info_ui.cc +++ b/chrome/browser/ui/webui/system_info_ui.cc
@@ -7,8 +7,8 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ref_counted_memory.h" #include "base/memory/weak_ptr.h" #include "base/strings/escape.h"
diff --git a/chrome/browser/ui/webui/tab_strip/tab_strip_ui_embedder.h b/chrome/browser/ui/webui/tab_strip/tab_strip_ui_embedder.h index 012fc7c..4f6aa47 100644 --- a/chrome/browser/ui/webui/tab_strip/tab_strip_ui_embedder.h +++ b/chrome/browser/ui/webui/tab_strip/tab_strip_ui_embedder.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_TAB_STRIP_TAB_STRIP_UI_EMBEDDER_H_ #define CHROME_BROWSER_UI_WEBUI_TAB_STRIP_TAB_STRIP_UI_EMBEDDER_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "chrome/browser/ui/webui/tab_strip/tab_strip_ui_layout.h" #include "components/tab_groups/tab_group_id.h" #include "ui/base/accelerators/accelerator.h"
diff --git a/chrome/browser/ui/webui/tab_strip/thumbnail_tracker_unittest.cc b/chrome/browser/ui/webui/tab_strip/thumbnail_tracker_unittest.cc index fd9ef93..0a853644 100644 --- a/chrome/browser/ui/webui/tab_strip/thumbnail_tracker_unittest.cc +++ b/chrome/browser/ui/webui/tab_strip/thumbnail_tracker_unittest.cc
@@ -8,7 +8,7 @@ #include <memory> #include <utility> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/run_loop.h" #include "base/test/mock_callback.h" #include "chrome/browser/extensions/extension_tab_util.h"
diff --git a/chrome/browser/ui/webui/test_files_request_filter.cc b/chrome/browser/ui/webui/test_files_request_filter.cc index bf39e55..5d94301 100644 --- a/chrome/browser/ui/webui/test_files_request_filter.cc +++ b/chrome/browser/ui/webui/test_files_request_filter.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ui/webui/test_files_request_filter.h" -#include "base/bind.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted_memory.h" #include "base/path_service.h" #include "base/strings/string_split.h"
diff --git a/chrome/browser/ui/webui/theme_handler.cc b/chrome/browser/ui/webui/theme_handler.cc index d648288..ed2addf 100644 --- a/chrome/browser/ui/webui/theme_handler.cc +++ b/chrome/browser/ui/webui/theme_handler.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/values.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/themes/theme_service.h"
diff --git a/chrome/browser/ui/webui/theme_source.cc b/chrome/browser/ui/webui/theme_source.cc index 9fc5aec..fc639173 100644 --- a/chrome/browser/ui/webui/theme_source.cc +++ b/chrome/browser/ui/webui/theme_source.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/webui/theme_source.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted_memory.h" #include "base/ranges/algorithm.h" #include "base/strings/strcat.h"
diff --git a/chrome/browser/ui/webui/theme_source_unittest.cc b/chrome/browser/ui/webui/theme_source_unittest.cc index c6f59c2..00a4bc21 100644 --- a/chrome/browser/ui/webui/theme_source_unittest.cc +++ b/chrome/browser/ui/webui/theme_source_unittest.cc
@@ -4,7 +4,7 @@ #include <stddef.h> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted_memory.h" #include "base/run_loop.h" #include "base/strings/strcat.h"
diff --git a/chrome/browser/ui/webui/translate_internals/chrome_translate_internals_handler.cc b/chrome/browser/ui/webui/translate_internals/chrome_translate_internals_handler.cc index e05f81f..003b7045a 100644 --- a/chrome/browser/ui/webui/translate_internals/chrome_translate_internals_handler.cc +++ b/chrome/browser/ui/webui/translate_internals/chrome_translate_internals_handler.cc
@@ -8,8 +8,8 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/values.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ui/webui/usb_internals/usb_internals_ui.cc b/chrome/browser/ui/webui/usb_internals/usb_internals_ui.cc index ea70c10c..bea2ed10 100644 --- a/chrome/browser/ui/webui/usb_internals/usb_internals_ui.cc +++ b/chrome/browser/ui/webui/usb_internals/usb_internals_ui.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/webui/usb_internals/usb_internals_ui.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/webui/usb_internals/usb_internals_page_handler.h" #include "chrome/browser/ui/webui/webui_util.h"
diff --git a/chrome/browser/ui/webui/user_actions/user_actions_ui_handler.cc b/chrome/browser/ui/webui/user_actions/user_actions_ui_handler.cc index 93300f0..1c3a3be1 100644 --- a/chrome/browser/ui/webui/user_actions/user_actions_ui_handler.cc +++ b/chrome/browser/ui/webui/user_actions/user_actions_ui_handler.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/webui/user_actions/user_actions_ui_handler.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/user_metrics.h" #include "base/time/time.h" #include "base/values.h"
diff --git a/chrome/browser/ui/webui/version/version_handler.cc b/chrome/browser/ui/webui/version/version_handler.cc index 91bab6eb..5554115 100644 --- a/chrome/browser/ui/webui/version/version_handler.cc +++ b/chrome/browser/ui/webui/version/version_handler.cc
@@ -8,9 +8,9 @@ #include <string> -#include "base/bind.h" #include "base/command_line.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/metrics/field_trial.h" #include "base/task/thread_pool.h" #include "base/threading/scoped_blocking_call.h"
diff --git a/chrome/browser/ui/webui/version/version_handler_chromeos.cc b/chrome/browser/ui/webui/version/version_handler_chromeos.cc index 77d07561..a6420d89 100644 --- a/chrome/browser/ui/webui/version/version_handler_chromeos.cc +++ b/chrome/browser/ui/webui/version/version_handler_chromeos.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/webui/version/version_handler_chromeos.h" -#include "base/bind.h" +#include "base/functional/bind.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 e72a26b..0326848 100644 --- a/chrome/browser/ui/webui/version/version_handler_win.cc +++ b/chrome/browser/ui/webui/version/version_handler_win.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/webui/version/version_handler_win.h" -#include "base/bind.h" +#include "base/functional/bind.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/webui/web_ui_test_handler.cc b/chrome/browser/ui/webui/web_ui_test_handler.cc index c2110ae0..305a610a 100644 --- a/chrome/browser/ui/webui/web_ui_test_handler.cc +++ b/chrome/browser/ui/webui/web_ui_test_handler.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/ui/webui/web_ui_test_handler.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h"
diff --git a/chrome/browser/ui/webui/webapks/webapks_handler.cc b/chrome/browser/ui/webui/webapks/webapks_handler.cc index bd681d2..b7ef4d4 100644 --- a/chrome/browser/ui/webui/webapks/webapks_handler.cc +++ b/chrome/browser/ui/webui/webapks/webapks_handler.cc
@@ -6,7 +6,7 @@ #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/values.h" #include "chrome/browser/android/shortcut_helper.h" #include "content/public/browser/web_ui.h"
diff --git a/chrome/browser/ui/webui/webui_webview_browsertest.cc b/chrome/browser/ui/webui/webui_webview_browsertest.cc index 2adeb90..3ea4554 100644 --- a/chrome/browser/ui/webui/webui_webview_browsertest.cc +++ b/chrome/browser/ui/webui/webui_webview_browsertest.cc
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/path_service.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h"
diff --git a/chrome/browser/ui/webui/welcome/bookmark_handler.cc b/chrome/browser/ui/webui/welcome/bookmark_handler.cc index 2d2142a..2a0b8af 100644 --- a/chrome/browser/ui/webui/welcome/bookmark_handler.cc +++ b/chrome/browser/ui/webui/welcome/bookmark_handler.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/webui/welcome/bookmark_handler.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/grit/browser_resources.h" #include "components/bookmarks/common/bookmark_pref_names.h" #include "components/prefs/pref_service.h"
diff --git a/chrome/browser/ui/webui/welcome/google_apps_handler.cc b/chrome/browser/ui/webui/welcome/google_apps_handler.cc index c2aa3c2..a1815b8 100644 --- a/chrome/browser/ui/webui/welcome/google_apps_handler.cc +++ b/chrome/browser/ui/webui/welcome/google_apps_handler.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/webui/welcome/google_apps_handler.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/field_trial_params.h" #include "base/metrics/histogram_macros.h" #include "build/branding_buildflags.h"
diff --git a/chrome/browser/ui/webui/welcome/ntp_background_fetcher.h b/chrome/browser/ui/webui/welcome/ntp_background_fetcher.h index 610375e2a..6ced80e 100644 --- a/chrome/browser/ui/webui/welcome/ntp_background_fetcher.h +++ b/chrome/browser/ui/webui/welcome/ntp_background_fetcher.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "content/public/browser/web_ui_data_source.h" namespace network {
diff --git a/chrome/browser/ui/webui/welcome/ntp_background_handler.cc b/chrome/browser/ui/webui/welcome/ntp_background_handler.cc index a687d5d..3b818b9 100644 --- a/chrome/browser/ui/webui/welcome/ntp_background_handler.cc +++ b/chrome/browser/ui/webui/welcome/ntp_background_handler.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ui/webui/welcome/welcome_handler.cc b/chrome/browser/ui/webui/welcome/welcome_handler.cc index ed35a1f..2be44af 100644 --- a/chrome/browser/ui/webui/welcome/welcome_handler.cc +++ b/chrome/browser/ui/webui/welcome/welcome_handler.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/webui/welcome/welcome_handler.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "base/metrics/user_metrics.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ui/webui/welcome/welcome_ui.cc b/chrome/browser/ui/webui/welcome/welcome_ui.cc index d185b27..127ebef 100644 --- a/chrome/browser/ui/webui/welcome/welcome_ui.cc +++ b/chrome/browser/ui/webui/welcome/welcome_ui.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/webui/welcome/welcome_ui.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/values.h"
diff --git a/chrome/browser/ui/webui/whats_new/whats_new_handler.cc b/chrome/browser/ui/webui/whats_new/whats_new_handler.cc index a30c219..8a534d0 100644 --- a/chrome/browser/ui/webui/whats_new/whats_new_handler.cc +++ b/chrome/browser/ui/webui/whats_new/whats_new_handler.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/webui/whats_new/whats_new_handler.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "base/values.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/ui/webui/whats_new/whats_new_util.cc b/chrome/browser/ui/webui/whats_new/whats_new_util.cc index 71ffcc9f..5fd003f 100644 --- a/chrome/browser/ui/webui/whats_new/whats_new_util.cc +++ b/chrome/browser/ui/webui/whats_new/whats_new_util.cc
@@ -3,11 +3,11 @@ // found in the LICENSE file. #include "chrome/browser/ui/webui/whats_new/whats_new_util.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/check.h" #include "base/command_line.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h"
diff --git a/chrome/browser/ui/webui/whats_new/whats_new_util.h b/chrome/browser/ui/webui/whats_new/whats_new_util.h index dbcdd2e..0ea228b 100644 --- a/chrome/browser/ui/webui/whats_new/whats_new_util.h +++ b/chrome/browser/ui/webui/whats_new/whats_new_util.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UI_WEBUI_WHATS_NEW_WHATS_NEW_UTIL_H_ #define CHROME_BROWSER_UI_WEBUI_WHATS_NEW_WHATS_NEW_UTIL_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "url/gurl.h" class Browser;
diff --git a/chrome/browser/ui/window_name_prompt/window_name_prompt.cc b/chrome/browser/ui/window_name_prompt/window_name_prompt.cc index 6c3b19f..16982659 100644 --- a/chrome/browser/ui/window_name_prompt/window_name_prompt.cc +++ b/chrome/browser/ui/window_name_prompt/window_name_prompt.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 "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/user_metrics.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/browser.h"
diff --git a/chrome/browser/ui/zoom/chrome_zoom_level_otr_delegate.cc b/chrome/browser/ui/zoom/chrome_zoom_level_otr_delegate.cc index 06fd4155..a0f5114 100644 --- a/chrome/browser/ui/zoom/chrome_zoom_level_otr_delegate.cc +++ b/chrome/browser/ui/zoom/chrome_zoom_level_otr_delegate.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/ui/zoom/chrome_zoom_level_otr_delegate.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "components/zoom/zoom_event_manager.h" ChromeZoomLevelOTRDelegate::ChromeZoomLevelOTRDelegate(
diff --git a/chrome/browser/ui/zoom/chrome_zoom_level_prefs.cc b/chrome/browser/ui/zoom/chrome_zoom_level_prefs.cc index 22c2e1e..31c4836d 100644 --- a/chrome/browser/ui/zoom/chrome_zoom_level_prefs.cc +++ b/chrome/browser/ui/zoom/chrome_zoom_level_prefs.cc
@@ -8,8 +8,8 @@ #include <memory> -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/strings/string_number_conversions.h" #include "base/time/time.h" #include "base/values.h"
diff --git a/chrome/browser/ui/zoom/chrome_zoom_level_prefs.h b/chrome/browser/ui/zoom/chrome_zoom_level_prefs.h index 7bda7f8f..ff1b247 100644 --- a/chrome/browser/ui/zoom/chrome_zoom_level_prefs.h +++ b/chrome/browser/ui/zoom/chrome_zoom_level_prefs.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_UI_ZOOM_CHROME_ZOOM_LEVEL_PREFS_H_ #define CHROME_BROWSER_UI_ZOOM_CHROME_ZOOM_LEVEL_PREFS_H_ -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/values.h"
diff --git a/chrome/browser/ukm_worker_browsertest.cc b/chrome/browser/ukm_worker_browsertest.cc index dd058e7..cfe2fbc0 100644 --- a/chrome/browser/ukm_worker_browsertest.cc +++ b/chrome/browser/ukm_worker_browsertest.cc
@@ -4,7 +4,7 @@ #include <algorithm> -#include "base/bind.h" +#include "base/functional/bind.h" #include "build/build_config.h" #include "chrome/browser/ui/browser.h" #include "chrome/common/privacy_budget/scoped_privacy_budget_config.h"
diff --git a/chrome/browser/unexpire_flags.h b/chrome/browser/unexpire_flags.h index 7a2d9f6..4d7207d8 100644 --- a/chrome/browser/unexpire_flags.h +++ b/chrome/browser/unexpire_flags.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_UNEXPIRE_FLAGS_H_ #define CHROME_BROWSER_UNEXPIRE_FLAGS_H_ -#include "base/callback.h" #include "base/feature_list.h" +#include "base/functional/callback.h" namespace flags_ui { class FlagsStorage;
diff --git a/chrome/browser/unload_browsertest.cc b/chrome/browser/unload_browsertest.cc index be6363e..6dc1000 100644 --- a/chrome/browser/unload_browsertest.cc +++ b/chrome/browser/unload_browsertest.cc
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h"
diff --git a/chrome/browser/updater/browser_updater_client.cc b/chrome/browser/updater/browser_updater_client.cc index fa606af..453d027 100644 --- a/chrome/browser/updater/browser_updater_client.cc +++ b/chrome/browser/updater/browser_updater_client.cc
@@ -8,8 +8,8 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/strings/utf_string_conversions.h" #include "base/task/bind_post_task.h"
diff --git a/chrome/browser/updater/browser_updater_client.h b/chrome/browser/updater/browser_updater_client.h index 2428ad4..6f8626f 100644 --- a/chrome/browser/updater/browser_updater_client.h +++ b/chrome/browser/updater/browser_updater_client.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_refptr.h" #include "base/sequence_checker.h"
diff --git a/chrome/browser/updater/browser_updater_client_util.h b/chrome/browser/updater/browser_updater_client_util.h index b6f7bca..e5d7b64 100644 --- a/chrome/browser/updater/browser_updater_client_util.h +++ b/chrome/browser/updater/browser_updater_client_util.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "chrome/updater/updater_scope.h" extern const char kUpdaterName[];
diff --git a/chrome/browser/updater/browser_updater_client_util_mac.mm b/chrome/browser/updater/browser_updater_client_util_mac.mm index e255359..fb7c4aa 100644 --- a/chrome/browser/updater/browser_updater_client_util_mac.mm +++ b/chrome/browser/updater/browser_updater_client_util_mac.mm
@@ -12,12 +12,12 @@ #include <sys/stat.h> #include <unistd.h> -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" #include "base/files/file_enumerator.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/mac/authorization_util.h" #include "base/mac/bundle_locations.h"
diff --git a/chrome/browser/updater/browser_updater_client_util_no_updater.cc b/chrome/browser/updater/browser_updater_client_util_no_updater.cc index 3bd4444f..182cb4d0 100644 --- a/chrome/browser/updater/browser_updater_client_util_no_updater.cc +++ b/chrome/browser/updater/browser_updater_client_util_no_updater.cc
@@ -6,7 +6,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/updater/updater_scope.h" std::string CurrentlyInstalledVersion() {
diff --git a/chrome/browser/updater/browser_updater_helper_client_mac.h b/chrome/browser/updater/browser_updater_helper_client_mac.h index 00f2548b..a4f6bf1 100644 --- a/chrome/browser/updater/browser_updater_helper_client_mac.h +++ b/chrome/browser/updater/browser_updater_helper_client_mac.h
@@ -7,7 +7,7 @@ #import <Foundation/Foundation.h> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/mac/scoped_nsobject.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_refptr.h"
diff --git a/chrome/browser/updater/browser_updater_helper_client_mac.mm b/chrome/browser/updater/browser_updater_helper_client_mac.mm index a675402..9ff8abd 100644 --- a/chrome/browser/updater/browser_updater_helper_client_mac.mm +++ b/chrome/browser/updater/browser_updater_helper_client_mac.mm
@@ -6,8 +6,8 @@ #import <Foundation/Foundation.h> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/mac/bundle_locations.h" #include "base/mac/foundation_util.h"
diff --git a/chrome/browser/updater/scheduler.cc b/chrome/browser/updater/scheduler.cc index de08c97..854a507 100644 --- a/chrome/browser/updater/scheduler.cc +++ b/chrome/browser/updater/scheduler.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/updater/scheduler.h" -#include "base/bind.h" +#include "base/functional/bind.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/updater/scheduler.h b/chrome/browser/updater/scheduler.h index 1eb4f74..c3a73e5 100644 --- a/chrome/browser/updater/scheduler.h +++ b/chrome/browser/updater/scheduler.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UPDATER_SCHEDULER_H_ #define CHROME_BROWSER_UPDATER_SCHEDULER_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" namespace updater {
diff --git a/chrome/browser/updater/scheduler_mac.cc b/chrome/browser/updater/scheduler_mac.cc index 1774b29f7..3fcba7b 100644 --- a/chrome/browser/updater/scheduler_mac.cc +++ b/chrome/browser/updater/scheduler_mac.cc
@@ -6,10 +6,10 @@ #include <string> -#include "base/callback.h" #include "base/feature_list.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/callback.h" #include "base/process/launch.h" #include "base/process/process.h" #include "base/task/sequenced_task_runner.h"
diff --git a/chrome/browser/updater/scheduler_mac_noimpl.cc b/chrome/browser/updater/scheduler_mac_noimpl.cc index 60d7488..a7b370f 100644 --- a/chrome/browser/updater/scheduler_mac_noimpl.cc +++ b/chrome/browser/updater/scheduler_mac_noimpl.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/updater/scheduler.h" -#include "base/callback.h" +#include "base/functional/callback.h" namespace updater {
diff --git a/chrome/browser/updates/announcement_notification/announcement_notification_handler.h b/chrome/browser/updates/announcement_notification/announcement_notification_handler.h index 3f5ba51..7273ffc2 100644 --- a/chrome/browser/updates/announcement_notification/announcement_notification_handler.h +++ b/chrome/browser/updates/announcement_notification/announcement_notification_handler.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UPDATES_ANNOUNCEMENT_NOTIFICATION_ANNOUNCEMENT_NOTIFICATION_HANDLER_H_ #define CHROME_BROWSER_UPDATES_ANNOUNCEMENT_NOTIFICATION_ANNOUNCEMENT_NOTIFICATION_HANDLER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/notifications/notification_handler.h" // nogncheck #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/chrome/browser/updates/announcement_notification/announcement_notification_service.cc b/chrome/browser/updates/announcement_notification/announcement_notification_service.cc index c7345791..04355154 100644 --- a/chrome/browser/updates/announcement_notification/announcement_notification_service.cc +++ b/chrome/browser/updates/announcement_notification/announcement_notification_service.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/updates/announcement_notification/announcement_notification_service.h" -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/metrics/field_trial_params.h"
diff --git a/chrome/browser/upgrade_detector/directory_monitor.cc b/chrome/browser/upgrade_detector/directory_monitor.cc index 71e25c1..251b452 100644 --- a/chrome/browser/upgrade_detector/directory_monitor.cc +++ b/chrome/browser/upgrade_detector/directory_monitor.cc
@@ -8,10 +8,10 @@ #include <utility> #include "base/base_paths.h" -#include "base/bind.h" #include "base/check.h" #include "base/files/file_path.h" #include "base/files/file_path_watcher.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/scoped_refptr.h" #include "base/path_service.h"
diff --git a/chrome/browser/upgrade_detector/get_installed_version.h b/chrome/browser/upgrade_detector/get_installed_version.h index c0936f32..57f2d7a0 100644 --- a/chrome/browser/upgrade_detector/get_installed_version.h +++ b/chrome/browser/upgrade_detector/get_installed_version.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UPGRADE_DETECTOR_GET_INSTALLED_VERSION_H_ #define CHROME_BROWSER_UPGRADE_DETECTOR_GET_INSTALLED_VERSION_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/version.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/chrome/browser/upgrade_detector/get_installed_version_fuchsia.cc b/chrome/browser/upgrade_detector/get_installed_version_fuchsia.cc index 619e463..7a9c764e 100644 --- a/chrome/browser/upgrade_detector/get_installed_version_fuchsia.cc +++ b/chrome/browser/upgrade_detector/get_installed_version_fuchsia.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/notreached.h" #include "components/version_info/version_info.h"
diff --git a/chrome/browser/upgrade_detector/get_installed_version_lacros.cc b/chrome/browser/upgrade_detector/get_installed_version_lacros.cc index 557eb2b0..82ae415 100644 --- a/chrome/browser/upgrade_detector/get_installed_version_lacros.cc +++ b/chrome/browser/upgrade_detector/get_installed_version_lacros.cc
@@ -7,9 +7,9 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/version.h" #include "chromeos/crosapi/mojom/browser_version.mojom.h"
diff --git a/chrome/browser/upgrade_detector/get_installed_version_linux.cc b/chrome/browser/upgrade_detector/get_installed_version_linux.cc index f711f9ee..90216e4 100644 --- a/chrome/browser/upgrade_detector/get_installed_version_linux.cc +++ b/chrome/browser/upgrade_detector/get_installed_version_linux.cc
@@ -7,9 +7,9 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/logging.h" #include "base/process/launch.h"
diff --git a/chrome/browser/upgrade_detector/get_installed_version_mac.mm b/chrome/browser/upgrade_detector/get_installed_version_mac.mm index d35f476..3b97fdd 100644 --- a/chrome/browser/upgrade_detector/get_installed_version_mac.mm +++ b/chrome/browser/upgrade_detector/get_installed_version_mac.mm
@@ -6,8 +6,8 @@ #include <utility> -#include "base/callback.h" #include "base/feature_list.h" +#include "base/functional/callback.h" #include "base/strings/utf_string_conversions.h" #include "base/version.h" #include "chrome/browser/mac/keystone_glue.h"
diff --git a/chrome/browser/upgrade_detector/get_installed_version_win.cc b/chrome/browser/upgrade_detector/get_installed_version_win.cc index 0e60859..73c041e 100644 --- a/chrome/browser/upgrade_detector/get_installed_version_win.cc +++ b/chrome/browser/upgrade_detector/get_installed_version_win.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/upgrade_detector/installed_version_monitor.h b/chrome/browser/upgrade_detector/installed_version_monitor.h index f219431a..9e805f4 100644 --- a/chrome/browser/upgrade_detector/installed_version_monitor.h +++ b/chrome/browser/upgrade_detector/installed_version_monitor.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" // An abstract base for an object that monitors the browser's installation for // updates.
diff --git a/chrome/browser/upgrade_detector/installed_version_monitor_fuchsia.cc b/chrome/browser/upgrade_detector/installed_version_monitor_fuchsia.cc index 657e3a6..68feca0 100644 --- a/chrome/browser/upgrade_detector/installed_version_monitor_fuchsia.cc +++ b/chrome/browser/upgrade_detector/installed_version_monitor_fuchsia.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/upgrade_detector/installed_version_monitor.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/notreached.h" namespace {
diff --git a/chrome/browser/upgrade_detector/installed_version_monitor_lacros.h b/chrome/browser/upgrade_detector/installed_version_monitor_lacros.h index 8af79ab..3d9e6668 100644 --- a/chrome/browser/upgrade_detector/installed_version_monitor_lacros.h +++ b/chrome/browser/upgrade_detector/installed_version_monitor_lacros.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UPGRADE_DETECTOR_INSTALLED_VERSION_MONITOR_LACROS_H_ #define CHROME_BROWSER_UPGRADE_DETECTOR_INSTALLED_VERSION_MONITOR_LACROS_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/upgrade_detector/installed_version_monitor.h" #include "chromeos/crosapi/mojom/browser_version.mojom.h"
diff --git a/chrome/browser/upgrade_detector/installed_version_poller.cc b/chrome/browser/upgrade_detector/installed_version_poller.cc index b04416b..6df52c0e 100644 --- a/chrome/browser/upgrade_detector/installed_version_poller.cc +++ b/chrome/browser/upgrade_detector/installed_version_poller.cc
@@ -9,8 +9,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/upgrade_detector/installed_version_poller.h b/chrome/browser/upgrade_detector/installed_version_poller.h index 837de2b0..a0bb8bc 100644 --- a/chrome/browser/upgrade_detector/installed_version_poller.h +++ b/chrome/browser/upgrade_detector/installed_version_poller.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h"
diff --git a/chrome/browser/upgrade_detector/installed_version_updater_chromeos.cc b/chrome/browser/upgrade_detector/installed_version_updater_chromeos.cc index 68ed989..2b9da9f 100644 --- a/chrome/browser/upgrade_detector/installed_version_updater_chromeos.cc +++ b/chrome/browser/upgrade_detector/installed_version_updater_chromeos.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/upgrade_detector/installed_version_updater_chromeos.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/metrics/histogram_functions.h" #include "chrome/browser/upgrade_detector/build_state.h"
diff --git a/chrome/browser/upgrade_detector/registry_monitor.cc b/chrome/browser/upgrade_detector/registry_monitor.cc index 96b2a20..dd01149 100644 --- a/chrome/browser/upgrade_detector/registry_monitor.cc +++ b/chrome/browser/upgrade_detector/registry_monitor.cc
@@ -7,8 +7,8 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/task/sequenced_task_runner.h" #include "base/win/registry.h"
diff --git a/chrome/browser/upgrade_detector/registry_monitor.h b/chrome/browser/upgrade_detector/registry_monitor.h index 3a81bbb..3892b3a 100644 --- a/chrome/browser/upgrade_detector/registry_monitor.h +++ b/chrome/browser/upgrade_detector/registry_monitor.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_UPGRADE_DETECTOR_REGISTRY_MONITOR_H_ #define CHROME_BROWSER_UPGRADE_DETECTOR_REGISTRY_MONITOR_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/win/registry.h" #include "chrome/browser/upgrade_detector/installed_version_monitor.h"
diff --git a/chrome/browser/upgrade_detector/upgrade_detector.cc b/chrome/browser/upgrade_detector/upgrade_detector.cc index 8b477e0..f33c74a8 100644 --- a/chrome/browser/upgrade_detector/upgrade_detector.cc +++ b/chrome/browser/upgrade_detector/upgrade_detector.cc
@@ -7,9 +7,9 @@ #include <algorithm> #include <vector> -#include "base/bind.h" #include "base/check.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h"
diff --git a/chrome/browser/upgrade_detector/upgrade_detector_impl.cc b/chrome/browser/upgrade_detector/upgrade_detector_impl.cc index facef73..1055fffb 100644 --- a/chrome/browser/upgrade_detector/upgrade_detector_impl.cc +++ b/chrome/browser/upgrade_detector/upgrade_detector_impl.cc
@@ -8,11 +8,11 @@ #include <string> -#include "base/bind.h" #include "base/build_time.h" #include "base/check_op.h" #include "base/command_line.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/no_destructor.h" #include "base/notreached.h" #include "base/ranges/algorithm.h"
diff --git a/chrome/browser/usb/android/web_usb_chooser_android.cc b/chrome/browser/usb/android/web_usb_chooser_android.cc index c05941d..6467caa1 100644 --- a/chrome/browser/usb/android/web_usb_chooser_android.cc +++ b/chrome/browser/usb/android/web_usb_chooser_android.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/ui/android/device_dialog/usb_chooser_dialog_android.h" #include "chrome/browser/usb/usb_chooser_controller.h"
diff --git a/chrome/browser/usb/chrome_usb_browsertest.cc b/chrome/browser/usb/chrome_usb_browsertest.cc index 663265a..6774690e 100644 --- a/chrome/browser/usb/chrome_usb_browsertest.cc +++ b/chrome/browser/usb/chrome_usb_browsertest.cc
@@ -6,7 +6,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted.h" #include "base/strings/stringprintf.h" #include "base/test/metrics/histogram_tester.h"
diff --git a/chrome/browser/usb/usb_chooser_context.cc b/chrome/browser/usb/usb_chooser_context.cc index 5dd84bb..adafbe1 100644 --- a/chrome/browser/usb/usb_chooser_context.cc +++ b/chrome/browser/usb/usb_chooser_context.cc
@@ -8,8 +8,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/observer_list.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h"
diff --git a/chrome/browser/usb/usb_chooser_context_unittest.cc b/chrome/browser/usb/usb_chooser_context_unittest.cc index ff4ddd64..668f327 100644 --- a/chrome/browser/usb/usb_chooser_context_unittest.cc +++ b/chrome/browser/usb/usb_chooser_context_unittest.cc
@@ -4,8 +4,8 @@ #include <vector> -#include "base/callback_helpers.h" #include "base/containers/flat_map.h" +#include "base/functional/callback_helpers.h" #include "base/json/json_reader.h" #include "base/no_destructor.h" #include "base/run_loop.h"
diff --git a/chrome/browser/usb/usb_chooser_controller.cc b/chrome/browser/usb/usb_chooser_controller.cc index 0345e30c..0b1666b 100644 --- a/chrome/browser/usb/usb_chooser_controller.cc +++ b/chrome/browser/usb/usb_chooser_controller.cc
@@ -7,7 +7,7 @@ #include <stddef.h> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h"
diff --git a/chrome/browser/usb/usb_policy_allowed_devices.cc b/chrome/browser/usb/usb_policy_allowed_devices.cc index e018091..2cfdae9 100644 --- a/chrome/browser/usb/usb_policy_allowed_devices.cc +++ b/chrome/browser/usb/usb_policy_allowed_devices.cc
@@ -7,7 +7,7 @@ #include <string> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/string_split.h" #include "base/values.h" #include "components/content_settings/core/common/pref_names.h"
diff --git a/chrome/browser/usb/web_usb_chooser_desktop.h b/chrome/browser/usb/web_usb_chooser_desktop.h index 2921cbd..53a97c4 100644 --- a/chrome/browser/usb/web_usb_chooser_desktop.h +++ b/chrome/browser/usb/web_usb_chooser_desktop.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "chrome/browser/usb/web_usb_chooser.h" // Implementation of WebUsbChooser for desktop browsers that uses a bubble to
diff --git a/chrome/browser/usb/web_usb_detector.cc b/chrome/browser/usb/web_usb_detector.cc index a162a1f..c563d1f 100644 --- a/chrome/browser/usb/web_usb_detector.cc +++ b/chrome/browser/usb/web_usb_detector.cc
@@ -7,8 +7,8 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h"
diff --git a/chrome/browser/user_agent/user_agent_browsertest.cc b/chrome/browser/user_agent/user_agent_browsertest.cc index b58b6b2..82019ae 100644 --- a/chrome/browser/user_agent/user_agent_browsertest.cc +++ b/chrome/browser/user_agent/user_agent_browsertest.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 "base/bind.h" +#include "base/functional/bind.h" #include "base/test/scoped_feature_list.h" #include "build/build_config.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/video_tutorials/internal/android/video_tutorial_service_bridge.cc b/chrome/browser/video_tutorials/internal/android/video_tutorial_service_bridge.cc index 9fae6018..7d3301f1 100644 --- a/chrome/browser/video_tutorials/internal/android/video_tutorial_service_bridge.cc +++ b/chrome/browser/video_tutorials/internal/android/video_tutorial_service_bridge.cc
@@ -10,7 +10,7 @@ #include "base/android/callback_android.h" #include "base/android/jni_array.h" #include "base/android/jni_string.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/video_tutorials/internal/android/tutorial_conversion_bridge.h" #include "chrome/browser/video_tutorials/internal/jni_headers/VideoTutorialServiceBridge_jni.h" #include "chrome/browser/video_tutorials/tutorial.h"
diff --git a/chrome/browser/video_tutorials/internal/store.h b/chrome/browser/video_tutorials/internal/store.h index 5207d483..d318cb1 100644 --- a/chrome/browser/video_tutorials/internal/store.h +++ b/chrome/browser/video_tutorials/internal/store.h
@@ -10,7 +10,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" namespace video_tutorials {
diff --git a/chrome/browser/video_tutorials/internal/tutorial_fetcher.h b/chrome/browser/video_tutorials/internal/tutorial_fetcher.h index 7004007..295e6f7 100644 --- a/chrome/browser/video_tutorials/internal/tutorial_fetcher.h +++ b/chrome/browser/video_tutorials/internal/tutorial_fetcher.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "url/gurl.h" namespace network {
diff --git a/chrome/browser/video_tutorials/internal/tutorial_manager.h b/chrome/browser/video_tutorials/internal/tutorial_manager.h index ea85c17..4828f9a9 100644 --- a/chrome/browser/video_tutorials/internal/tutorial_manager.h +++ b/chrome/browser/video_tutorials/internal/tutorial_manager.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_VIDEO_TUTORIALS_INTERNAL_TUTORIAL_MANAGER_H_ #define CHROME_BROWSER_VIDEO_TUTORIALS_INTERNAL_TUTORIAL_MANAGER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/video_tutorials/internal/tutorial_group.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/chrome/browser/video_tutorials/internal/tutorial_manager_impl.cc b/chrome/browser/video_tutorials/internal/tutorial_manager_impl.cc index d55fedc8d..ee0e04f7 100644 --- a/chrome/browser/video_tutorials/internal/tutorial_manager_impl.cc +++ b/chrome/browser/video_tutorials/internal/tutorial_manager_impl.cc
@@ -7,7 +7,7 @@ #include <string> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/threading/thread_task_runner_handle.h" #include "components/prefs/pref_service.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/chrome/browser/video_tutorials/internal/tutorial_manager_impl_unittest.cc b/chrome/browser/video_tutorials/internal/tutorial_manager_impl_unittest.cc index e538cbc..4803193 100644 --- a/chrome/browser/video_tutorials/internal/tutorial_manager_impl_unittest.cc +++ b/chrome/browser/video_tutorials/internal/tutorial_manager_impl_unittest.cc
@@ -7,7 +7,7 @@ #include <map> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/test/task_environment.h"
diff --git a/chrome/browser/video_tutorials/internal/tutorial_service_impl.cc b/chrome/browser/video_tutorials/internal/tutorial_service_impl.cc index e9ebc18..ddc3f02 100644 --- a/chrome/browser/video_tutorials/internal/tutorial_service_impl.cc +++ b/chrome/browser/video_tutorials/internal/tutorial_service_impl.cc
@@ -6,9 +6,9 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/strings/string_util.h" #include "base/task/single_thread_task_runner.h" #include "chrome/browser/video_tutorials/internal/config.h"
diff --git a/chrome/browser/video_tutorials/internal/tutorial_store.cc b/chrome/browser/video_tutorials/internal/tutorial_store.cc index f2ea2426..01643e4 100644 --- a/chrome/browser/video_tutorials/internal/tutorial_store.cc +++ b/chrome/browser/video_tutorials/internal/tutorial_store.cc
@@ -8,7 +8,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "components/leveldb_proto/public/proto_database.h" namespace video_tutorials {
diff --git a/chrome/browser/video_tutorials/internal/tutorial_store.h b/chrome/browser/video_tutorials/internal/tutorial_store.h index 9dceea3..48cad13a 100644 --- a/chrome/browser/video_tutorials/internal/tutorial_store.h +++ b/chrome/browser/video_tutorials/internal/tutorial_store.h
@@ -8,7 +8,7 @@ #include <memory> #include <utility> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/video_tutorials/internal/proto_conversions.h" #include "chrome/browser/video_tutorials/internal/store.h"
diff --git a/chrome/browser/video_tutorials/video_tutorial_service.h b/chrome/browser/video_tutorials/video_tutorial_service.h index c7c3b89..bd2510a1 100644 --- a/chrome/browser/video_tutorials/video_tutorial_service.h +++ b/chrome/browser/video_tutorials/video_tutorial_service.h
@@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/supports_user_data.h" #include "chrome/browser/video_tutorials/tutorial.h" #include "components/keyed_service/core/keyed_service.h"
diff --git a/chrome/browser/visibility_timer_tab_helper.cc b/chrome/browser/visibility_timer_tab_helper.cc index a325721d..8d8d41ff 100644 --- a/chrome/browser/visibility_timer_tab_helper.cc +++ b/chrome/browser/visibility_timer_tab_helper.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/time/time.h" #include "base/timer/timer.h"
diff --git a/chrome/browser/visibility_timer_tab_helper.h b/chrome/browser/visibility_timer_tab_helper.h index cad4017..23702d1 100644 --- a/chrome/browser/visibility_timer_tab_helper.h +++ b/chrome/browser/visibility_timer_tab_helper.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_VISIBILITY_TIMER_TAB_HELPER_H_ #define CHROME_BROWSER_VISIBILITY_TIMER_TAB_HELPER_H_ -#include "base/callback_forward.h" #include "base/containers/circular_deque.h" +#include "base/functional/callback_forward.h" #include "base/timer/timer.h" #include "content/public/browser/web_contents_observer.h" #include "content/public/browser/web_contents_user_data.h"
diff --git a/chrome/browser/vr/assets_loader.cc b/chrome/browser/vr/assets_loader.cc index d465813..19719505 100644 --- a/chrome/browser/vr/assets_loader.cc +++ b/chrome/browser/vr/assets_loader.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/vr/assets_loader.h" -#include "base/bind.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/memory/singleton.h" #include "base/task/single_thread_task_runner.h" #include "base/task/task_traits.h"
diff --git a/chrome/browser/vr/assets_loader.h b/chrome/browser/vr/assets_loader.h index 73389195..88085a3 100644 --- a/chrome/browser/vr/assets_loader.h +++ b/chrome/browser/vr/assets_loader.h
@@ -8,8 +8,8 @@ #include <stdint.h> #include <memory> -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/values.h" #include "base/version.h"
diff --git a/chrome/browser/vr/base_graphics_delegate.cc b/chrome/browser/vr/base_graphics_delegate.cc index 1a04028c..8ec589f 100644 --- a/chrome/browser/vr/base_graphics_delegate.cc +++ b/chrome/browser/vr/base_graphics_delegate.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/trace_event/trace_event.h" #include "ui/gl/gl_context.h"
diff --git a/chrome/browser/vr/base_scheduler_delegate.cc b/chrome/browser/vr/base_scheduler_delegate.cc index 65d79339..9805748 100644 --- a/chrome/browser/vr/base_scheduler_delegate.cc +++ b/chrome/browser/vr/base_scheduler_delegate.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/vr/base_scheduler_delegate.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/single_thread_task_runner.h" #include "base/trace_event/trace_event.h" #include "chrome/browser/vr/scheduler_ui_interface.h"
diff --git a/chrome/browser/vr/browser_renderer.cc b/chrome/browser/vr/browser_renderer.cc index 9aa0027..c3d77e6 100644 --- a/chrome/browser/vr/browser_renderer.cc +++ b/chrome/browser/vr/browser_renderer.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/time/time.h" #include "base/trace_event/common/trace_event_common.h" #include "base/trace_event/trace_event.h"
diff --git a/chrome/browser/vr/content_input_delegate.h b/chrome/browser/vr/content_input_delegate.h index db9b966..96440e8 100644 --- a/chrome/browser/vr/content_input_delegate.h +++ b/chrome/browser/vr/content_input_delegate.h
@@ -8,8 +8,8 @@ #include <memory> #include <queue> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "chrome/browser/vr/macros.h" #include "chrome/browser/vr/model/text_input_info.h" #include "chrome/browser/vr/platform_ui_input_delegate.h"
diff --git a/chrome/browser/vr/databinding/binding.h b/chrome/browser/vr/databinding/binding.h index d14fbd2..d80ff8f9 100644 --- a/chrome/browser/vr/databinding/binding.h +++ b/chrome/browser/vr/databinding/binding.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_VR_DATABINDING_BINDING_H_ #define CHROME_BROWSER_VR_DATABINDING_BINDING_H_ -#include "base/bind.h" +#include "base/functional/bind.h" #include <memory>
diff --git a/chrome/browser/vr/databinding/binding_unittest.cc b/chrome/browser/vr/databinding/binding_unittest.cc index 04c9be4..b50264b 100644 --- a/chrome/browser/vr/databinding/binding_unittest.cc +++ b/chrome/browser/vr/databinding/binding_unittest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/vr/databinding/binding.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "testing/gtest/include/gtest/gtest.h" namespace vr {
diff --git a/chrome/browser/vr/databinding/vector_binding.h b/chrome/browser/vr/databinding/vector_binding.h index a80b85b..1a22c07 100644 --- a/chrome/browser/vr/databinding/vector_binding.h +++ b/chrome/browser/vr/databinding/vector_binding.h
@@ -9,7 +9,7 @@ #include <sstream> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/vr/databinding/binding_base.h" #include "chrome/browser/vr/databinding/vector_element_binding.h"
diff --git a/chrome/browser/vr/databinding/vector_binding_unittest.cc b/chrome/browser/vr/databinding/vector_binding_unittest.cc index d0b79a1..7d1b979 100644 --- a/chrome/browser/vr/databinding/vector_binding_unittest.cc +++ b/chrome/browser/vr/databinding/vector_binding_unittest.cc
@@ -4,9 +4,9 @@ #include "chrome/browser/vr/databinding/vector_binding.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/containers/cxx20_erase.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "chrome/browser/vr/databinding/binding.h" #include "chrome/browser/vr/databinding/vector_element_binding.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/vr/databinding/vector_element_binding.h b/chrome/browser/vr/databinding/vector_element_binding.h index 04d2e57..d30ebab 100644 --- a/chrome/browser/vr/databinding/vector_element_binding.h +++ b/chrome/browser/vr/databinding/vector_element_binding.h
@@ -8,7 +8,7 @@ #include <sstream> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/vr/databinding/binding_base.h"
diff --git a/chrome/browser/vr/elements/button.cc b/chrome/browser/vr/elements/button.cc index 4348219..1fb364e 100644 --- a/chrome/browser/vr/elements/button.cc +++ b/chrome/browser/vr/elements/button.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/vr/elements/button.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/vr/elements/invisible_hit_target.h" #include "chrome/browser/vr/elements/rect.h" #include "chrome/browser/vr/elements/ui_element.h"
diff --git a/chrome/browser/vr/elements/button.h b/chrome/browser/vr/elements/button.h index 51e9e5c..fd8ef8b 100644 --- a/chrome/browser/vr/elements/button.h +++ b/chrome/browser/vr/elements/button.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_VR_ELEMENTS_BUTTON_H_ #define CHROME_BROWSER_VR_ELEMENTS_BUTTON_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/vr/elements/draw_phase.h" #include "chrome/browser/vr/elements/ui_element.h"
diff --git a/chrome/browser/vr/elements/content_element_unittest.cc b/chrome/browser/vr/elements/content_element_unittest.cc index c319747..01b490e 100644 --- a/chrome/browser/vr/elements/content_element_unittest.cc +++ b/chrome/browser/vr/elements/content_element_unittest.cc
@@ -6,7 +6,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h"
diff --git a/chrome/browser/vr/elements/disc_button.h b/chrome/browser/vr/elements/disc_button.h index 7883436c..0d4ca00 100644 --- a/chrome/browser/vr/elements/disc_button.h +++ b/chrome/browser/vr/elements/disc_button.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_VR_ELEMENTS_DISC_BUTTON_H_ #define CHROME_BROWSER_VR_ELEMENTS_DISC_BUTTON_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/vr/elements/vector_icon_button.h" #include "chrome/browser/vr/vr_ui_export.h" #include "ui/gfx/vector_icon_types.h"
diff --git a/chrome/browser/vr/elements/omnibox_text_field.h b/chrome/browser/vr/elements/omnibox_text_field.h index e946b0a..567c4693 100644 --- a/chrome/browser/vr/elements/omnibox_text_field.h +++ b/chrome/browser/vr/elements/omnibox_text_field.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_VR_ELEMENTS_OMNIBOX_TEXT_FIELD_H_ #define CHROME_BROWSER_VR_ELEMENTS_OMNIBOX_TEXT_FIELD_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "chrome/browser/vr/elements/text_input.h" #include "chrome/browser/vr/model/omnibox_suggestions.h" #include "chrome/browser/vr/model/text_input_info.h"
diff --git a/chrome/browser/vr/elements/omnibox_text_field_unittest.cc b/chrome/browser/vr/elements/omnibox_text_field_unittest.cc index a3b27ede..07d6d72 100644 --- a/chrome/browser/vr/elements/omnibox_text_field_unittest.cc +++ b/chrome/browser/vr/elements/omnibox_text_field_unittest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/vr/elements/omnibox_text_field.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/vr/model/model.h"
diff --git a/chrome/browser/vr/elements/text_button.cc b/chrome/browser/vr/elements/text_button.cc index 6f8519df..6ff22ab 100644 --- a/chrome/browser/vr/elements/text_button.cc +++ b/chrome/browser/vr/elements/text_button.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/vr/elements/text_button.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "chrome/browser/vr/elements/rect.h" namespace vr {
diff --git a/chrome/browser/vr/elements/text_input.h b/chrome/browser/vr/elements/text_input.h index 772ee569..39225f5 100644 --- a/chrome/browser/vr/elements/text_input.h +++ b/chrome/browser/vr/elements/text_input.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_VR_ELEMENTS_TEXT_INPUT_H_ #define CHROME_BROWSER_VR_ELEMENTS_TEXT_INPUT_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/time/time.h" #include "chrome/browser/vr/elements/ui_element.h"
diff --git a/chrome/browser/vr/elements/text_input_unittest.cc b/chrome/browser/vr/elements/text_input_unittest.cc index 70fc344..8894085 100644 --- a/chrome/browser/vr/elements/text_input_unittest.cc +++ b/chrome/browser/vr/elements/text_input_unittest.cc
@@ -7,7 +7,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h" #include "chrome/browser/vr/databinding/binding.h"
diff --git a/chrome/browser/vr/elements/transient_element.cc b/chrome/browser/vr/elements/transient_element.cc index d6e11ce..f98576b 100644 --- a/chrome/browser/vr/elements/transient_element.cc +++ b/chrome/browser/vr/elements/transient_element.cc
@@ -3,7 +3,7 @@ // found in the LICENSE file. #include "chrome/browser/vr/elements/transient_element.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" namespace vr {
diff --git a/chrome/browser/vr/elements/transient_element.h b/chrome/browser/vr/elements/transient_element.h index 2d36e4a..6664575 100644 --- a/chrome/browser/vr/elements/transient_element.h +++ b/chrome/browser/vr/elements/transient_element.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_VR_ELEMENTS_TRANSIENT_ELEMENT_H_ #define CHROME_BROWSER_VR_ELEMENTS_TRANSIENT_ELEMENT_H_ -#include "base/callback.h" +#include "base/functional/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/transient_element_unittest.cc b/chrome/browser/vr/elements/transient_element_unittest.cc index ce1eeb9..ef7f9f1 100644 --- a/chrome/browser/vr/elements/transient_element_unittest.cc +++ b/chrome/browser/vr/elements/transient_element_unittest.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/vr/test/animation_utils.h" #include "chrome/browser/vr/test/constants.h" #include "chrome/browser/vr/ui_scene.h"
diff --git a/chrome/browser/vr/elements/ui_element.h b/chrome/browser/vr/elements/ui_element.h index 454f3cee..c2b535e 100644 --- a/chrome/browser/vr/elements/ui_element.h +++ b/chrome/browser/vr/elements/ui_element.h
@@ -10,7 +10,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/vr/audio_delegate.h" #include "chrome/browser/vr/databinding/binding_base.h"
diff --git a/chrome/browser/vr/elements/ui_element_unittest.cc b/chrome/browser/vr/elements/ui_element_unittest.cc index 613d8cd..c3dd557a 100644 --- a/chrome/browser/vr/elements/ui_element_unittest.cc +++ b/chrome/browser/vr/elements/ui_element_unittest.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "cc/animation/keyframe_model.h" #include "chrome/browser/vr/databinding/binding.h" #include "chrome/browser/vr/test/animation_utils.h"
diff --git a/chrome/browser/vr/elements/url_text.cc b/chrome/browser/vr/elements/url_text.cc index 25fcbb9..7b38b54 100644 --- a/chrome/browser/vr/elements/url_text.cc +++ b/chrome/browser/vr/elements/url_text.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/vr/elements/url_text.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "cc/paint/skia_paint_canvas.h" #include "chrome/browser/vr/elements/omnibox_formatting.h" #include "third_party/skia/include/effects/SkGradientShader.h"
diff --git a/chrome/browser/vr/elements/url_text.h b/chrome/browser/vr/elements/url_text.h index 6c9188b..a4d0d3da7 100644 --- a/chrome/browser/vr/elements/url_text.h +++ b/chrome/browser/vr/elements/url_text.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_VR_ELEMENTS_URL_TEXT_H_ #define CHROME_BROWSER_VR_ELEMENTS_URL_TEXT_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/vr/elements/omnibox_formatting.h" #include "chrome/browser/vr/elements/text.h" #include "chrome/browser/vr/ui_unsupported_mode.h"
diff --git a/chrome/browser/vr/elements/vector_icon_button.h b/chrome/browser/vr/elements/vector_icon_button.h index 52ee0fc0..255f3308 100644 --- a/chrome/browser/vr/elements/vector_icon_button.h +++ b/chrome/browser/vr/elements/vector_icon_button.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_VR_ELEMENTS_VECTOR_ICON_BUTTON_H_ #define CHROME_BROWSER_VR_ELEMENTS_VECTOR_ICON_BUTTON_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/vr/elements/button.h" #include "chrome/browser/vr/vr_ui_export.h"
diff --git a/chrome/browser/vr/graphics_delegate.h b/chrome/browser/vr/graphics_delegate.h index b0528c9..eed527e 100644 --- a/chrome/browser/vr/graphics_delegate.h +++ b/chrome/browser/vr/graphics_delegate.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/scoped_refptr.h" #include "chrome/browser/vr/fov_rectangle.h" #include "chrome/browser/vr/frame_type.h"
diff --git a/chrome/browser/vr/platform_input_handler.h b/chrome/browser/vr/platform_input_handler.h index 26490b0..4fc570c0 100644 --- a/chrome/browser/vr/platform_input_handler.h +++ b/chrome/browser/vr/platform_input_handler.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_VR_PLATFORM_INPUT_HANDLER_H_ #define CHROME_BROWSER_VR_PLATFORM_INPUT_HANDLER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/vr/text_edit_action.h" namespace vr {
diff --git a/chrome/browser/vr/platform_ui_input_delegate.cc b/chrome/browser/vr/platform_ui_input_delegate.cc index c8451b6..b9a6c0d 100644 --- a/chrome/browser/vr/platform_ui_input_delegate.cc +++ b/chrome/browser/vr/platform_ui_input_delegate.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/vr/platform_ui_input_delegate.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/time/time.h" #include "chrome/browser/vr/platform_input_handler.h"
diff --git a/chrome/browser/vr/platform_ui_input_delegate.h b/chrome/browser/vr/platform_ui_input_delegate.h index e38add7..1112ba6 100644 --- a/chrome/browser/vr/platform_ui_input_delegate.h +++ b/chrome/browser/vr/platform_ui_input_delegate.h
@@ -8,8 +8,8 @@ #include <memory> #include <queue> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/vr/input_event.h" #include "chrome/browser/vr/macros.h"
diff --git a/chrome/browser/vr/scheduler_delegate.h b/chrome/browser/vr/scheduler_delegate.h index ba6f9096..8bab1fd 100644 --- a/chrome/browser/vr/scheduler_delegate.h +++ b/chrome/browser/vr/scheduler_delegate.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_VR_SCHEDULER_DELEGATE_H_ #define CHROME_BROWSER_VR_SCHEDULER_DELEGATE_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/vr/frame_type.h" #include "chrome/browser/vr/vr_export.h" #include "device/vr/public/mojom/isolated_xr_service.mojom.h"
diff --git a/chrome/browser/vr/sequence.h b/chrome/browser/vr/sequence.h index f07328b..69a3c0e 100644 --- a/chrome/browser/vr/sequence.h +++ b/chrome/browser/vr/sequence.h
@@ -7,8 +7,8 @@ #include <list> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/time/time.h" namespace vr {
diff --git a/chrome/browser/vr/speech_recognizer.cc b/chrome/browser/vr/speech_recognizer.cc index e20b330..8f59ab1e 100644 --- a/chrome/browser/vr/speech_recognizer.cc +++ b/chrome/browser/vr/speech_recognizer.cc
@@ -7,7 +7,7 @@ #include <memory> #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/vr/browser_ui_interface.h" #include "chrome/grit/generated_resources.h" #include "content/public/browser/browser_task_traits.h"
diff --git a/chrome/browser/vr/speech_recognizer_unittest.cc b/chrome/browser/vr/speech_recognizer_unittest.cc index 4876c0f2..24a11c7a 100644 --- a/chrome/browser/vr/speech_recognizer_unittest.cc +++ b/chrome/browser/vr/speech_recognizer_unittest.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/vr/speech_recognizer.h" -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted.h" #include "base/notreached.h" #include "base/run_loop.h"
diff --git a/chrome/browser/vr/test/browser_test_browser_renderer_browser_interface.cc b/chrome/browser/vr/test/browser_test_browser_renderer_browser_interface.cc index 1d124e52..69653bb 100644 --- a/chrome/browser/vr/test/browser_test_browser_renderer_browser_interface.cc +++ b/chrome/browser/vr/test/browser_test_browser_renderer_browser_interface.cc
@@ -3,7 +3,7 @@ // found in the LICENSE file. #include "chrome/browser/vr/test/browser_test_browser_renderer_browser_interface.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/vr/browser_renderer.h" #include "chrome/browser/vr/test/ui_utils.h"
diff --git a/chrome/browser/vr/test/run_all_perftests.cc b/chrome/browser/vr/test/run_all_perftests.cc index c340ba9..833fdc1 100644 --- a/chrome/browser/vr/test/run_all_perftests.cc +++ b/chrome/browser/vr/test/run_all_perftests.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 "base/bind.h" +#include "base/functional/bind.h" #include "base/test/launcher/unit_test_launcher.h" #include "chrome/browser/vr/test/vr_gl_test_suite.h" #include "ui/gl/gl_display.h"
diff --git a/chrome/browser/vr/test/run_all_pixeltests.cc b/chrome/browser/vr/test/run_all_pixeltests.cc index 4c95933..2c9c90a 100644 --- a/chrome/browser/vr/test/run_all_pixeltests.cc +++ b/chrome/browser/vr/test/run_all_pixeltests.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 "base/bind.h" +#include "base/functional/bind.h" #include "base/test/launcher/unit_test_launcher.h" #include "chrome/browser/vr/test/vr_gl_test_suite.h" #include "ui/gl/gl_display.h"
diff --git a/chrome/browser/vr/test/run_all_unittests.cc b/chrome/browser/vr/test/run_all_unittests.cc index 6c76e64..7b642d6 100644 --- a/chrome/browser/vr/test/run_all_unittests.cc +++ b/chrome/browser/vr/test/run_all_unittests.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 "base/bind.h" +#include "base/functional/bind.h" #include "base/test/launcher/unit_test_launcher.h" #include "chrome/browser/vr/test/vr_test_suite.h"
diff --git a/chrome/browser/vr/test/ui_utils.cc b/chrome/browser/vr/test/ui_utils.cc index 2bdaba9..15025b2 100644 --- a/chrome/browser/vr/test/ui_utils.cc +++ b/chrome/browser/vr/test/ui_utils.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 "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/threading/platform_thread.h" #include "build/build_config.h"
diff --git a/chrome/browser/vr/test/ui_utils.h b/chrome/browser/vr/test/ui_utils.h index a83bb2f..4f3e7bd 100644 --- a/chrome/browser/vr/test/ui_utils.h +++ b/chrome/browser/vr/test/ui_utils.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_VR_TEST_UI_UTILS_H_ #define CHROME_BROWSER_VR_TEST_UI_UTILS_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/run_loop.h" #include "base/threading/thread.h" #include "chrome/browser/vr/ui_test_input.h"
diff --git a/chrome/browser/vr/test/xr_browser_test.cc b/chrome/browser/vr/test/xr_browser_test.cc index deeb2b5..8b8ed5b 100644 --- a/chrome/browser/vr/test/xr_browser_test.cc +++ b/chrome/browser/vr/test/xr_browser_test.cc
@@ -5,13 +5,13 @@ #include <cstring> #include "base/base_paths.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" #include "base/debug/debugger.h" #include "base/environment.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/path_service.h" #include "base/strings/string_split.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/vr/test/xr_browser_test.h b/chrome/browser/vr/test/xr_browser_test.h index ef1cfbb1..6c10e9a 100644 --- a/chrome/browser/vr/test/xr_browser_test.h +++ b/chrome/browser/vr/test/xr_browser_test.h
@@ -7,8 +7,8 @@ #include <unordered_set> -#include "base/callback.h" #include "base/environment.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/test/scoped_feature_list.h"
diff --git a/chrome/browser/vr/text_input_delegate.h b/chrome/browser/vr/text_input_delegate.h index bc615e1..be0e0b1b 100644 --- a/chrome/browser/vr/text_input_delegate.h +++ b/chrome/browser/vr/text_input_delegate.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_VR_TEXT_INPUT_DELEGATE_H_ #define CHROME_BROWSER_VR_TEXT_INPUT_DELEGATE_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/vr/vr_base_export.h" namespace vr {
diff --git a/chrome/browser/vr/ui.cc b/chrome/browser/vr/ui.cc index 61e9af5..cb3bf78 100644 --- a/chrome/browser/vr/ui.cc +++ b/chrome/browser/vr/ui.cc
@@ -11,8 +11,8 @@ #include "chrome/browser/vr/ui.h" -#include "base/bind.h" #include "base/cxx17_backports.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/numerics/math_constants.h" #include "base/task/single_thread_task_runner.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 14af65c..8a0b829 100644 --- a/chrome/browser/vr/ui_host/vr_ui_host_impl.h +++ b/chrome/browser/vr/ui_host/vr_ui_host_impl.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_VR_UI_HOST_VR_UI_HOST_IMPL_H_ #define CHROME_BROWSER_VR_UI_HOST_VR_UI_HOST_IMPL_H_ -#include "base/callback.h" #include "base/cancelable_callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/vr/ui_scene.cc b/chrome/browser/vr/ui_scene.cc index 46e08c59..60b0d18 100644 --- a/chrome/browser/vr/ui_scene.cc +++ b/chrome/browser/vr/ui_scene.cc
@@ -7,8 +7,8 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/containers/adapters.h" +#include "base/functional/bind.h" #include "base/time/time.h" #include "base/trace_event/trace_event.h" #include "base/values.h"
diff --git a/chrome/browser/vr/ui_scene_creator.cc b/chrome/browser/vr/ui_scene_creator.cc index 10888c0..6297ec5 100644 --- a/chrome/browser/vr/ui_scene_creator.cc +++ b/chrome/browser/vr/ui_scene_creator.cc
@@ -10,9 +10,9 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/i18n/case_conversion.h" #include "base/logging.h" #include "base/numerics/math_constants.h"
diff --git a/chrome/browser/vr/vr_web_contents_observer.h b/chrome/browser/vr/vr_web_contents_observer.h index 905a84b..6a72090 100644 --- a/chrome/browser/vr/vr_web_contents_observer.h +++ b/chrome/browser/vr/vr_web_contents_observer.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_VR_VR_WEB_CONTENTS_OBSERVER_H_ #define CHROME_BROWSER_VR_VR_WEB_CONTENTS_OBSERVER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/vr/vr_export.h" #include "content/public/browser/web_contents_observer.h"
diff --git a/chrome/browser/vr/webxr_vr_indicators_browser_test.cc b/chrome/browser/vr/webxr_vr_indicators_browser_test.cc index a9fa6dc..235f0d59 100644 --- a/chrome/browser/vr/webxr_vr_indicators_browser_test.cc +++ b/chrome/browser/vr/webxr_vr_indicators_browser_test.cc
@@ -5,7 +5,7 @@ #include <algorithm> #include <vector> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/vr/test/multi_class_browser_test.h"
diff --git a/chrome/browser/vr/webxr_vr_isolated_device_service_test.cc b/chrome/browser/vr/webxr_vr_isolated_device_service_test.cc index 8bfd52d..61273025 100644 --- a/chrome/browser/vr/webxr_vr_isolated_device_service_test.cc +++ b/chrome/browser/vr/webxr_vr_isolated_device_service_test.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 "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/test/bind.h" #include "build/build_config.h" #include "chrome/browser/vr/test/mock_xr_device_hook_base.h"
diff --git a/chrome/browser/vr/webxr_vr_permission_request_browser_test.cc b/chrome/browser/vr/webxr_vr_permission_request_browser_test.cc index c4a1a7e..53fe32e4 100644 --- a/chrome/browser/vr/webxr_vr_permission_request_browser_test.cc +++ b/chrome/browser/vr/webxr_vr_permission_request_browser_test.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 "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "chrome/browser/vr/test/multi_class_browser_test.h" #include "chrome/browser/vr/test/ui_utils.h"
diff --git a/chrome/browser/vr/win/graphics_delegate_win.h b/chrome/browser/vr/win/graphics_delegate_win.h index 4c598a6..533ba77 100644 --- a/chrome/browser/vr/win/graphics_delegate_win.h +++ b/chrome/browser/vr/win/graphics_delegate_win.h
@@ -6,7 +6,7 @@ #define CHROME_BROWSER_VR_WIN_GRAPHICS_DELEGATE_WIN_H_ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "chrome/browser/vr/graphics_delegate.h"
diff --git a/chrome/browser/vr/win/vr_browser_renderer_thread_win.cc b/chrome/browser/vr/win/vr_browser_renderer_thread_win.cc index 93eef12..66384856 100644 --- a/chrome/browser/vr/win/vr_browser_renderer_thread_win.cc +++ b/chrome/browser/vr/win/vr_browser_renderer_thread_win.cc
@@ -6,7 +6,7 @@ #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/vr/audio_delegate.h" #include "chrome/browser/vr/browser_renderer.h" #include "chrome/browser/vr/content_input_delegate.h"
diff --git a/chrome/browser/web_applications/app_service/lacros_web_apps_controller.cc b/chrome/browser/web_applications/app_service/lacros_web_apps_controller.cc index 1c1fc25f..b981384 100644 --- a/chrome/browser/web_applications/app_service/lacros_web_apps_controller.cc +++ b/chrome/browser/web_applications/app_service/lacros_web_apps_controller.cc
@@ -7,9 +7,9 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_forward.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback_forward.h" #include "base/one_shot_event.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/apps/app_service/app_icon/app_icon_factory.h"
diff --git a/chrome/browser/web_applications/app_service/lacros_web_apps_controller_browsertest.cc b/chrome/browser/web_applications/app_service/lacros_web_apps_controller_browsertest.cc index 4905fb19..89f4c84 100644 --- a/chrome/browser/web_applications/app_service/lacros_web_apps_controller_browsertest.cc +++ b/chrome/browser/web_applications/app_service/lacros_web_apps_controller_browsertest.cc
@@ -8,9 +8,9 @@ #include <memory> #include <vector> -#include "base/callback_helpers.h" #include "base/files/file_util.h" #include "base/files/scoped_file.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/notreached.h" #include "base/ranges/algorithm.h"
diff --git a/chrome/browser/web_applications/app_service/lacros_web_apps_controller_lacros_browsertest.cc b/chrome/browser/web_applications/app_service/lacros_web_apps_controller_lacros_browsertest.cc index 54e489c1..d4b4010 100644 --- a/chrome/browser/web_applications/app_service/lacros_web_apps_controller_lacros_browsertest.cc +++ b/chrome/browser/web_applications/app_service/lacros_web_apps_controller_lacros_browsertest.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 "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/test/bind.h" #include "chrome/browser/lacros/browser_test_util.h"
diff --git a/chrome/browser/web_applications/app_service/web_apps.cc b/chrome/browser/web_applications/app_service/web_apps.cc index 909b137..9c6be09c 100644 --- a/chrome/browser/web_applications/app_service/web_apps.cc +++ b/chrome/browser/web_applications/app_service/web_apps.cc
@@ -20,7 +20,7 @@ #if BUILDFLAG(IS_CHROMEOS_ASH) #include "ash/public/cpp/app_menu_constants.h" #include "ash/webui/projector_app/public/cpp/projector_app_constants.h" // nogncheck -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/apps/app_service/menu_item_constants.h" #include "chrome/browser/apps/app_service/menu_util.h"
diff --git a/chrome/browser/web_applications/chrome_pwa_launcher/launcher_update.cc b/chrome/browser/web_applications/chrome_pwa_launcher/launcher_update.cc index b6e4def1..1a2a6bd6 100644 --- a/chrome/browser/web_applications/chrome_pwa_launcher/launcher_update.cc +++ b/chrome/browser/web_applications/chrome_pwa_launcher/launcher_update.cc
@@ -4,12 +4,12 @@ #include "chrome/browser/web_applications/chrome_pwa_launcher/launcher_update.h" -#include "base/bind.h" #include "base/check.h" #include "base/files/file_enumerator.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "chrome/browser/web_applications/chrome_pwa_launcher/chrome_pwa_launcher_util.h" #include "chrome/installer/util/callback_work_item.h" #include "chrome/installer/util/delete_tree_work_item.h"
diff --git a/chrome/browser/web_applications/commands/callback_command.h b/chrome/browser/web_applications/commands/callback_command.h index c0fca3a..fdcf8481 100644 --- a/chrome/browser/web_applications/commands/callback_command.h +++ b/chrome/browser/web_applications/commands/callback_command.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/values.h" #include "chrome/browser/web_applications/commands/web_app_command.h"
diff --git a/chrome/browser/web_applications/commands/externally_managed_install_command.cc b/chrome/browser/web_applications/commands/externally_managed_install_command.cc index 28337736..2a4d5584 100644 --- a/chrome/browser/web_applications/commands/externally_managed_install_command.cc +++ b/chrome/browser/web_applications/commands/externally_managed_install_command.cc
@@ -7,8 +7,8 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/strings/string_util.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/web_applications/commands/web_app_command.h"
diff --git a/chrome/browser/web_applications/commands/externally_managed_install_command_browsertest.cc b/chrome/browser/web_applications/commands/externally_managed_install_command_browsertest.cc index 718810ce..96d3f671 100644 --- a/chrome/browser/web_applications/commands/externally_managed_install_command_browsertest.cc +++ b/chrome/browser/web_applications/commands/externally_managed_install_command_browsertest.cc
@@ -5,8 +5,8 @@ #include <map> #include <utility> -#include "base/callback.h" #include "base/containers/flat_set.h" +#include "base/functional/callback.h" #include "base/test/test_future.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h"
diff --git a/chrome/browser/web_applications/commands/fetch_installability_for_chrome_management.cc b/chrome/browser/web_applications/commands/fetch_installability_for_chrome_management.cc index bcfdaccb..c0acf262 100644 --- a/chrome/browser/web_applications/commands/fetch_installability_for_chrome_management.cc +++ b/chrome/browser/web_applications/commands/fetch_installability_for_chrome_management.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/values.h" #include "chrome/browser/web_applications/commands/web_app_command.h" #include "chrome/browser/web_applications/locks/app_lock.h"
diff --git a/chrome/browser/web_applications/commands/fetch_manifest_and_install_command.cc b/chrome/browser/web_applications/commands/fetch_manifest_and_install_command.cc index 68ebb2a..cf89b0022 100644 --- a/chrome/browser/web_applications/commands/fetch_manifest_and_install_command.cc +++ b/chrome/browser/web_applications/commands/fetch_manifest_and_install_command.cc
@@ -7,8 +7,8 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/web_applications/commands/install_from_info_command.cc b/chrome/browser/web_applications/commands/install_from_info_command.cc index 3bd16c0..0dae179e 100644 --- a/chrome/browser/web_applications/commands/install_from_info_command.cc +++ b/chrome/browser/web_applications/commands/install_from_info_command.cc
@@ -7,8 +7,8 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/containers/flat_set.h" +#include "base/functional/bind.h" #include "base/memory/weak_ptr.h" #include "base/strings/stringprintf.h" #include "chrome/browser/web_applications/locks/app_lock.h"
diff --git a/chrome/browser/web_applications/commands/sub_app_install_command.cc b/chrome/browser/web_applications/commands/sub_app_install_command.cc index 291c5a0..626bbd3 100644 --- a/chrome/browser/web_applications/commands/sub_app_install_command.cc +++ b/chrome/browser/web_applications/commands/sub_app_install_command.cc
@@ -8,9 +8,9 @@ #include <sstream> #include <utility> -#include "base/callback.h" #include "base/containers/contains.h" #include "base/containers/flat_map.h" +#include "base/functional/callback.h" #include "base/ranges/algorithm.h" #include "base/values.h" #include "chrome/browser/web_applications/commands/web_app_command.h"
diff --git a/chrome/browser/web_applications/commands/sub_app_install_command.h b/chrome/browser/web_applications/commands/sub_app_install_command.h index f6d60cea..84459cb5 100644 --- a/chrome/browser/web_applications/commands/sub_app_install_command.h +++ b/chrome/browser/web_applications/commands/sub_app_install_command.h
@@ -9,8 +9,8 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/containers/flat_map.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/values.h"
diff --git a/chrome/browser/web_applications/commands/web_app_uninstall_command.cc b/chrome/browser/web_applications/commands/web_app_uninstall_command.cc index 79d86fad..e6e2b3e 100644 --- a/chrome/browser/web_applications/commands/web_app_uninstall_command.cc +++ b/chrome/browser/web_applications/commands/web_app_uninstall_command.cc
@@ -8,8 +8,8 @@ #include <sstream> #include <utility> -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/web_applications/isolation_prefs_utils.h"
diff --git a/chrome/browser/web_applications/commands/web_app_uninstall_command.h b/chrome/browser/web_applications/commands/web_app_uninstall_command.h index af7fae9..d3cf6b17 100644 --- a/chrome/browser/web_applications/commands/web_app_uninstall_command.h +++ b/chrome/browser/web_applications/commands/web_app_uninstall_command.h
@@ -7,9 +7,9 @@ #include <memory> -#include "base/callback_forward.h" #include "base/containers/circular_deque.h" #include "base/containers/flat_map.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/values.h"
diff --git a/chrome/browser/web_applications/extension_status_utils.h b/chrome/browser/web_applications/extension_status_utils.h index 042c634f..9264648 100644 --- a/chrome/browser/web_applications/extension_status_utils.h +++ b/chrome/browser/web_applications/extension_status_utils.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "build/build_config.h" class Profile;
diff --git a/chrome/browser/web_applications/extensions/externally_managed_app_install_task_unittest.cc b/chrome/browser/web_applications/extensions/externally_managed_app_install_task_unittest.cc index b971aa7..96fa5e8b 100644 --- a/chrome/browser/web_applications/extensions/externally_managed_app_install_task_unittest.cc +++ b/chrome/browser/web_applications/extensions/externally_managed_app_install_task_unittest.cc
@@ -10,12 +10,12 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/check_op.h" #include "base/containers/contains.h" #include "base/containers/flat_set.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/notreached.h" #include "base/run_loop.h"
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 3dea4ac..776dc9a 100644 --- a/chrome/browser/web_applications/extensions/web_app_extension_shortcut.cc +++ b/chrome/browser/web_applications/extensions/web_app_extension_shortcut.cc
@@ -7,11 +7,11 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/functional/callback_forward.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/histogram_functions.h" #include "base/no_destructor.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/web_applications/extensions/web_app_extension_shortcut.h b/chrome/browser/web_applications/extensions/web_app_extension_shortcut.h index b5085a48..b68cd275 100644 --- a/chrome/browser/web_applications/extensions/web_app_extension_shortcut.h +++ b/chrome/browser/web_applications/extensions/web_app_extension_shortcut.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "build/build_config.h" #include "chrome/browser/web_applications/os_integration/web_app_shortcut.h" #include "chrome/browser/web_applications/web_app_id.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 594a91f..4bc97ee 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
@@ -6,10 +6,10 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/one_shot_event.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/web_applications/externally_managed_app_install_task.cc b/chrome/browser/web_applications/externally_managed_app_install_task.cc index f0e7186..5d42def 100644 --- a/chrome/browser/web_applications/externally_managed_app_install_task.cc +++ b/chrome/browser/web_applications/externally_managed_app_install_task.cc
@@ -7,9 +7,9 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/strings/utf_string_conversions.h" #include "base/task/single_thread_task_runner.h" #include "base/time/time.h"
diff --git a/chrome/browser/web_applications/externally_managed_app_install_task.h b/chrome/browser/web_applications/externally_managed_app_install_task.h index 223a7144..35100a4 100644 --- a/chrome/browser/web_applications/externally_managed_app_install_task.h +++ b/chrome/browser/web_applications/externally_managed_app_install_task.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_WEB_APPLICATIONS_EXTERNALLY_MANAGED_APP_INSTALL_TASK_H_ #define CHROME_BROWSER_WEB_APPLICATIONS_EXTERNALLY_MANAGED_APP_INSTALL_TASK_H_ -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/web_applications/external_install_options.h"
diff --git a/chrome/browser/web_applications/externally_managed_app_manager.cc b/chrome/browser/web_applications/externally_managed_app_manager.cc index 2dc5ecf5..858751f1 100644 --- a/chrome/browser/web_applications/externally_managed_app_manager.cc +++ b/chrome/browser/web_applications/externally_managed_app_manager.cc
@@ -9,8 +9,8 @@ #include <utility> #include <vector> -#include "base/callback_helpers.h" #include "base/containers/contains.h" +#include "base/functional/callback_helpers.h" #include "base/ranges/algorithm.h" #include "base/stl_util.h" #include "base/task/single_thread_task_runner.h"
diff --git a/chrome/browser/web_applications/externally_managed_app_manager.h b/chrome/browser/web_applications/externally_managed_app_manager.h index bd8807a..e3d226e 100644 --- a/chrome/browser/web_applications/externally_managed_app_manager.h +++ b/chrome/browser/web_applications/externally_managed_app_manager.h
@@ -10,8 +10,8 @@ #include <ostream> #include <vector> -#include "base/callback.h" #include "base/containers/flat_map.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/web_applications/external_install_options.h"
diff --git a/chrome/browser/web_applications/externally_managed_app_manager_impl.cc b/chrome/browser/web_applications/externally_managed_app_manager_impl.cc index 6a5c5d3..e9ebad3 100644 --- a/chrome/browser/web_applications/externally_managed_app_manager_impl.cc +++ b/chrome/browser/web_applications/externally_managed_app_manager_impl.cc
@@ -9,10 +9,9 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/feature_list.h" #include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/task/single_thread_task_runner.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/web_applications/externally_managed_app_manager.h"
diff --git a/chrome/browser/web_applications/externally_managed_app_manager_impl.h b/chrome/browser/web_applications/externally_managed_app_manager_impl.h index 794125722..e116e77 100644 --- a/chrome/browser/web_applications/externally_managed_app_manager_impl.h +++ b/chrome/browser/web_applications/externally_managed_app_manager_impl.h
@@ -8,8 +8,8 @@ #include <memory> #include <vector> -#include "base/callback.h" #include "base/containers/circular_deque.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/web_applications/external_install_options.h"
diff --git a/chrome/browser/web_applications/externally_managed_app_manager_impl_browsertest.cc b/chrome/browser/web_applications/externally_managed_app_manager_impl_browsertest.cc index b4eb60f9..448f9f09 100644 --- a/chrome/browser/web_applications/externally_managed_app_manager_impl_browsertest.cc +++ b/chrome/browser/web_applications/externally_managed_app_manager_impl_browsertest.cc
@@ -4,9 +4,9 @@ #include "chrome/browser/web_applications/externally_managed_app_manager_impl.h" -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/test/bind.h" #include "build/build_config.h"
diff --git a/chrome/browser/web_applications/externally_managed_app_manager_impl_unittest.cc b/chrome/browser/web_applications/externally_managed_app_manager_impl_unittest.cc index 36c3b34..f09ee357 100644 --- a/chrome/browser/web_applications/externally_managed_app_manager_impl_unittest.cc +++ b/chrome/browser/web_applications/externally_managed_app_manager_impl_unittest.cc
@@ -10,9 +10,9 @@ #include <utility> #include "base/barrier_closure.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/raw_ref.h" #include "base/one_shot_event.h"
diff --git a/chrome/browser/web_applications/externally_managed_app_manager_unittest.cc b/chrome/browser/web_applications/externally_managed_app_manager_unittest.cc index 4afb9a1..60e52810 100644 --- a/chrome/browser/web_applications/externally_managed_app_manager_unittest.cc +++ b/chrome/browser/web_applications/externally_managed_app_manager_unittest.cc
@@ -7,9 +7,9 @@ #include <sstream> #include <vector> -#include "base/callback_helpers.h" #include "base/containers/flat_map.h" #include "base/containers/flat_set.h" +#include "base/functional/callback_helpers.h" #include "base/ranges/algorithm.h" #include "base/run_loop.h" #include "base/test/bind.h"
diff --git a/chrome/browser/web_applications/externally_managed_app_registration_task.cc b/chrome/browser/web_applications/externally_managed_app_registration_task.cc index 110c09b..51c0557 100644 --- a/chrome/browser/web_applications/externally_managed_app_registration_task.cc +++ b/chrome/browser/web_applications/externally_managed_app_registration_task.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/web_applications/externally_managed_app_registration_task.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/web_applications/externally_managed_app_manager.h" #include "chrome/browser/web_applications/web_app_url_loader.h"
diff --git a/chrome/browser/web_applications/externally_managed_app_registration_task.h b/chrome/browser/web_applications/externally_managed_app_registration_task.h index 432fa97b2..61c8c07b 100644 --- a/chrome/browser/web_applications/externally_managed_app_registration_task.h +++ b/chrome/browser/web_applications/externally_managed_app_registration_task.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_WEB_APPLICATIONS_EXTERNALLY_MANAGED_APP_REGISTRATION_TASK_H_ #define CHROME_BROWSER_WEB_APPLICATIONS_EXTERNALLY_MANAGED_APP_REGISTRATION_TASK_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/observer_list_types.h"
diff --git a/chrome/browser/web_applications/isolated_web_apps/install_isolated_web_app_command.cc b/chrome/browser/web_applications/isolated_web_apps/install_isolated_web_app_command.cc index 2f332455..18537633 100644 --- a/chrome/browser/web_applications/isolated_web_apps/install_isolated_web_app_command.cc +++ b/chrome/browser/web_applications/isolated_web_apps/install_isolated_web_app_command.cc
@@ -9,11 +9,11 @@ #include <string> #include <utility> -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/check.h" #include "base/containers/flat_set.h" #include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/sequence_checker.h" #include "base/strings/strcat.h"
diff --git a/chrome/browser/web_applications/isolated_web_apps/install_isolated_web_app_command.h b/chrome/browser/web_applications/isolated_web_apps/install_isolated_web_app_command.h index b762fff..d631597 100644 --- a/chrome/browser/web_applications/isolated_web_apps/install_isolated_web_app_command.h +++ b/chrome/browser/web_applications/isolated_web_apps/install_isolated_web_app_command.h
@@ -9,7 +9,7 @@ #include <ostream> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ref.h" #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h"
diff --git a/chrome/browser/web_applications/isolated_web_apps/install_isolated_web_app_command_unittest.cc b/chrome/browser/web_applications/isolated_web_apps/install_isolated_web_app_command_unittest.cc index 568b9ae..9d09787 100644 --- a/chrome/browser/web_applications/isolated_web_apps/install_isolated_web_app_command_unittest.cc +++ b/chrome/browser/web_applications/isolated_web_apps/install_isolated_web_app_command_unittest.cc
@@ -12,10 +12,9 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check_op.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/functional/callback_forward.h" #include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h"
diff --git a/chrome/browser/web_applications/isolated_web_apps/install_isolated_web_app_from_command_line.cc b/chrome/browser/web_applications/isolated_web_apps/install_isolated_web_app_from_command_line.cc index 22c8401..a664e7d 100644 --- a/chrome/browser/web_applications/isolated_web_apps/install_isolated_web_app_from_command_line.cc +++ b/chrome/browser/web_applications/isolated_web_apps/install_isolated_web_app_from_command_line.cc
@@ -8,10 +8,10 @@ #include <string> #include <vector> -#include "base/bind.h" #include "base/command_line.h" #include "base/feature_list.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/no_destructor.h" #include "base/strings/strcat.h" #include "base/strings/string_piece.h"
diff --git a/chrome/browser/web_applications/isolated_web_apps/install_isolated_web_app_from_command_line.h b/chrome/browser/web_applications/isolated_web_apps/install_isolated_web_app_from_command_line.h index a0ef58d..671b808e 100644 --- a/chrome/browser/web_applications/isolated_web_apps/install_isolated_web_app_from_command_line.h +++ b/chrome/browser/web_applications/isolated_web_apps/install_isolated_web_app_from_command_line.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_WEB_APPLICATIONS_ISOLATED_WEB_APPS_INSTALL_ISOLATED_WEB_APP_FROM_COMMAND_LINE_H_ #define CHROME_BROWSER_WEB_APPLICATIONS_ISOLATED_WEB_APPS_INSTALL_ISOLATED_WEB_APP_FROM_COMMAND_LINE_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/types/expected.h" #include "chrome/browser/web_applications/isolated_web_apps/isolated_web_app_url_info.h" #include "chrome/browser/web_applications/isolation_data.h"
diff --git a/chrome/browser/web_applications/isolated_web_apps/install_isolated_web_app_from_command_line_unittest.cc b/chrome/browser/web_applications/isolated_web_apps/install_isolated_web_app_from_command_line_unittest.cc index 3f48fbb..ac7dfbc4 100644 --- a/chrome/browser/web_applications/isolated_web_apps/install_isolated_web_app_from_command_line_unittest.cc +++ b/chrome/browser/web_applications/isolated_web_apps/install_isolated_web_app_from_command_line_unittest.cc
@@ -6,11 +6,11 @@ #include <memory> -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/path_service.h" #include "base/strings/string_piece.h" #include "base/strings/string_piece_forward.h"
diff --git a/chrome/browser/web_applications/isolated_web_apps/isolated_web_app_reader_registry.cc b/chrome/browser/web_applications/isolated_web_apps/isolated_web_app_reader_registry.cc index 6fcee02a..9891bfc 100644 --- a/chrome/browser/web_applications/isolated_web_apps/isolated_web_app_reader_registry.cc +++ b/chrome/browser/web_applications/isolated_web_apps/isolated_web_app_reader_registry.cc
@@ -7,8 +7,8 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/functional/overloaded.h" #include "base/memory/weak_ptr.h" #include "base/metrics/histogram_functions.h"
diff --git a/chrome/browser/web_applications/isolated_web_apps/isolated_web_app_reader_registry.h b/chrome/browser/web_applications/isolated_web_apps/isolated_web_app_reader_registry.h index 64e01ba..350324b 100644 --- a/chrome/browser/web_applications/isolated_web_apps/isolated_web_app_reader_registry.h +++ b/chrome/browser/web_applications/isolated_web_apps/isolated_web_app_reader_registry.h
@@ -7,9 +7,9 @@ #include <memory> -#include "base/callback_forward.h" #include "base/containers/flat_map.h" #include "base/files/file_path.h" +#include "base/functional/callback_forward.h" #include "base/gtest_prod_util.h" #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h"
diff --git a/chrome/browser/web_applications/isolated_web_apps/isolated_web_app_reader_registry_factory.cc b/chrome/browser/web_applications/isolated_web_apps/isolated_web_app_reader_registry_factory.cc index acf0493..d143685fc 100644 --- a/chrome/browser/web_applications/isolated_web_apps/isolated_web_app_reader_registry_factory.cc +++ b/chrome/browser/web_applications/isolated_web_apps/isolated_web_app_reader_registry_factory.cc
@@ -6,9 +6,9 @@ #include <memory> -#include "base/bind.h" #include "base/check_deref.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/web_applications/isolated_web_apps/isolated_web_app_trust_checker.h" #include "chrome/browser/web_applications/isolated_web_apps/isolated_web_app_validator.h"
diff --git a/chrome/browser/web_applications/isolated_web_apps/isolated_web_app_url_loader_factory.cc b/chrome/browser/web_applications/isolated_web_apps/isolated_web_app_url_loader_factory.cc index a656d37..0ab99ac5 100644 --- a/chrome/browser/web_applications/isolated_web_apps/isolated_web_app_url_loader_factory.cc +++ b/chrome/browser/web_applications/isolated_web_apps/isolated_web_app_url_loader_factory.cc
@@ -7,8 +7,8 @@ #include <memory> #include <vector> -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/functional/overloaded.h" #include "base/memory/scoped_refptr.h" #include "base/strings/strcat.h"
diff --git a/chrome/browser/web_applications/isolated_web_apps/isolated_web_app_url_loader_factory_browsertest.cc b/chrome/browser/web_applications/isolated_web_apps/isolated_web_app_url_loader_factory_browsertest.cc index a6aae9b..2f8cd506 100644 --- a/chrome/browser/web_applications/isolated_web_apps/isolated_web_app_url_loader_factory_browsertest.cc +++ b/chrome/browser/web_applications/isolated_web_apps/isolated_web_app_url_loader_factory_browsertest.cc
@@ -4,10 +4,10 @@ #include <memory> -#include "base/callback.h" #include "base/containers/span.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/callback.h" #include "base/strings/strcat.h" #include "base/threading/thread_restrictions.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/web_applications/isolated_web_apps/isolated_web_app_url_loader_factory_unittest.cc b/chrome/browser/web_applications/isolated_web_apps/isolated_web_app_url_loader_factory_unittest.cc index c837f56b2..d91a9b3 100644 --- a/chrome/browser/web_applications/isolated_web_apps/isolated_web_app_url_loader_factory_unittest.cc +++ b/chrome/browser/web_applications/isolated_web_apps/isolated_web_app_url_loader_factory_unittest.cc
@@ -7,10 +7,10 @@ #include <memory> #include <string> -#include "base/bind.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/strings/strcat.h" #include "chrome/browser/ui/web_applications/test/isolated_web_app_test_utils.h"
diff --git a/chrome/browser/web_applications/isolated_web_apps/signed_web_bundle_reader.cc b/chrome/browser/web_applications/isolated_web_apps/signed_web_bundle_reader.cc index 4e5955c7..4b298b41 100644 --- a/chrome/browser/web_applications/isolated_web_apps/signed_web_bundle_reader.cc +++ b/chrome/browser/web_applications/isolated_web_apps/signed_web_bundle_reader.cc
@@ -8,9 +8,9 @@ #include <utility> #include <vector> -#include "base/callback.h" #include "base/check_is_test.h" #include "base/check_op.h" +#include "base/functional/callback.h" #include "base/memory/ptr_util.h" #include "base/metrics/histogram_functions.h" #include "base/notreached.h"
diff --git a/chrome/browser/web_applications/isolated_web_apps/signed_web_bundle_reader.h b/chrome/browser/web_applications/isolated_web_apps/signed_web_bundle_reader.h index dacd606..ca69592 100644 --- a/chrome/browser/web_applications/isolated_web_apps/signed_web_bundle_reader.h +++ b/chrome/browser/web_applications/isolated_web_apps/signed_web_bundle_reader.h
@@ -8,8 +8,8 @@ #include <memory> #include <vector> -#include "base/callback_forward.h" #include "base/files/file_path.h" +#include "base/functional/callback_forward.h" #include "base/sequence_checker.h" #include "base/types/expected.h" #include "components/web_package/mojom/web_bundle_parser.mojom-forward.h"
diff --git a/chrome/browser/web_applications/locks/web_app_lock_manager.cc b/chrome/browser/web_applications/locks/web_app_lock_manager.cc index 1be575c..7d18079 100644 --- a/chrome/browser/web_applications/locks/web_app_lock_manager.cc +++ b/chrome/browser/web_applications/locks/web_app_lock_manager.cc
@@ -5,7 +5,6 @@ #include "chrome/browser/web_applications/locks/web_app_lock_manager.h" #include <memory> -#include "base/bind.h" #include "base/functional/bind.h" #include "base/functional/callback_forward.h" #include "base/functional/callback_helpers.h"
diff --git a/chrome/browser/web_applications/locks/web_app_lock_manager.h b/chrome/browser/web_applications/locks/web_app_lock_manager.h index a664094..5ef9f0f 100644 --- a/chrome/browser/web_applications/locks/web_app_lock_manager.h +++ b/chrome/browser/web_applications/locks/web_app_lock_manager.h
@@ -7,8 +7,8 @@ #include <memory> -#include "base/callback_forward.h" #include "base/containers/flat_set.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ref.h" #include "base/types/pass_key.h" #include "chrome/browser/web_applications/web_app_id.h"
diff --git a/chrome/browser/web_applications/manifest_update_manager.h b/chrome/browser/web_applications/manifest_update_manager.h index 11108b2..9323479 100644 --- a/chrome/browser/web_applications/manifest_update_manager.h +++ b/chrome/browser/web_applications/manifest_update_manager.h
@@ -8,9 +8,9 @@ #include <map> #include <memory> -#include "base/callback.h" #include "base/containers/flat_map.h" #include "base/containers/flat_set.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/scoped_observation.h"
diff --git a/chrome/browser/web_applications/manifest_update_manager_browsertest.cc b/chrome/browser/web_applications/manifest_update_manager_browsertest.cc index bd7465cb..b9691af 100644 --- a/chrome/browser/web_applications/manifest_update_manager_browsertest.cc +++ b/chrome/browser/web_applications/manifest_update_manager_browsertest.cc
@@ -13,12 +13,12 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/check.h" #include "base/check_op.h" #include "base/containers/contains.h" #include "base/containers/flat_tree.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/memory/raw_ref.h" #include "base/notreached.h"
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 d28c916..9670641e 100644 --- a/chrome/browser/web_applications/os_integration/os_integration_manager.cc +++ b/chrome/browser/web_applications/os_integration/os_integration_manager.cc
@@ -10,11 +10,10 @@ #include "base/auto_reset.h" #include "base/barrier_callback.h" #include "base/barrier_closure.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/feature_list.h" #include "base/functional/bind.h" #include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/metrics/histogram_functions.h"
diff --git a/chrome/browser/web_applications/os_integration/os_integration_manager.h b/chrome/browser/web_applications/os_integration/os_integration_manager.h index 82b0fb9..010695b 100644 --- a/chrome/browser/web_applications/os_integration/os_integration_manager.h +++ b/chrome/browser/web_applications/os_integration/os_integration_manager.h
@@ -10,7 +10,7 @@ #include <vector> #include "base/auto_reset.h" -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/scoped_observation.h"
diff --git a/chrome/browser/web_applications/os_integration/os_integration_manager_unittest.cc b/chrome/browser/web_applications/os_integration/os_integration_manager_unittest.cc index d925d3b..d22ef2c 100644 --- a/chrome/browser/web_applications/os_integration/os_integration_manager_unittest.cc +++ b/chrome/browser/web_applications/os_integration/os_integration_manager_unittest.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/strings/string_piece_forward.h" #include "base/test/bind.h"
diff --git a/chrome/browser/web_applications/os_integration/url_handler_manager.h b/chrome/browser/web_applications/os_integration/url_handler_manager.h index fd2a991b..37f5159 100644 --- a/chrome/browser/web_applications/os_integration/url_handler_manager.h +++ b/chrome/browser/web_applications/os_integration/url_handler_manager.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/web_applications/web_app_constants.h" #include "chrome/browser/web_applications/web_app_id.h"
diff --git a/chrome/browser/web_applications/os_integration/url_handler_manager_impl.cc b/chrome/browser/web_applications/os_integration/url_handler_manager_impl.cc index a49e2dad..6a475a7b 100644 --- a/chrome/browser/web_applications/os_integration/url_handler_manager_impl.cc +++ b/chrome/browser/web_applications/os_integration/url_handler_manager_impl.cc
@@ -7,7 +7,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/web_applications/os_integration/url_handler_manager_impl.h b/chrome/browser/web_applications/os_integration/url_handler_manager_impl.h index 701c6442..cfde03b 100644 --- a/chrome/browser/web_applications/os_integration/url_handler_manager_impl.h +++ b/chrome/browser/web_applications/os_integration/url_handler_manager_impl.h
@@ -8,8 +8,8 @@ #include <memory> #include <vector> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/web_applications/os_integration/url_handler_manager.h" #include "chrome/browser/web_applications/url_handler_launch_params.h"
diff --git a/chrome/browser/web_applications/os_integration/web_app_file_handler_manager.cc b/chrome/browser/web_applications/os_integration/web_app_file_handler_manager.cc index 0b8bd3d..b3b557bc 100644 --- a/chrome/browser/web_applications/os_integration/web_app_file_handler_manager.cc +++ b/chrome/browser/web_applications/os_integration/web_app_file_handler_manager.cc
@@ -8,13 +8,13 @@ #include <tuple> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check.h" #include "base/compiler_specific.h" #include "base/containers/contains.h" #include "base/feature_list.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/no_destructor.h" #include "base/time/time.h" #include "build/build_config.h"
diff --git a/chrome/browser/web_applications/os_integration/web_app_file_handler_manager_unittest.cc b/chrome/browser/web_applications/os_integration/web_app_file_handler_manager_unittest.cc index 1a2d29b29..ded315d 100644 --- a/chrome/browser/web_applications/os_integration/web_app_file_handler_manager_unittest.cc +++ b/chrome/browser/web_applications/os_integration/web_app_file_handler_manager_unittest.cc
@@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/test/bind.h" #include "chrome/browser/web_applications/os_integration/web_app_file_handler_registration.h"
diff --git a/chrome/browser/web_applications/os_integration/web_app_file_handler_registration.h b/chrome/browser/web_applications/os_integration/web_app_file_handler_registration.h index c241534..4d7d749 100644 --- a/chrome/browser/web_applications/os_integration/web_app_file_handler_registration.h +++ b/chrome/browser/web_applications/os_integration/web_app_file_handler_registration.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "build/build_config.h" #include "chrome/browser/web_applications/web_app_constants.h" #include "chrome/browser/web_applications/web_app_id.h"
diff --git a/chrome/browser/web_applications/os_integration/web_app_file_handler_registration_linux.cc b/chrome/browser/web_applications/os_integration/web_app_file_handler_registration_linux.cc index 1a7b2861..255892ec8 100644 --- a/chrome/browser/web_applications/os_integration/web_app_file_handler_registration_linux.cc +++ b/chrome/browser/web_applications/os_integration/web_app_file_handler_registration_linux.cc
@@ -4,11 +4,11 @@ #include "chrome/browser/web_applications/os_integration/web_app_file_handler_registration.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h" #include "base/no_destructor.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 3174759..7fec17f 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
@@ -8,9 +8,9 @@ #include <set> #include <string> -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/files/file_util.h" +#include "base/functional/callback_helpers.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/web_applications/os_integration/web_app_file_handler_registration_win_unittest.cc b/chrome/browser/web_applications/os_integration/web_app_file_handler_registration_win_unittest.cc index 95327f0..514143c 100644 --- a/chrome/browser/web_applications/os_integration/web_app_file_handler_registration_win_unittest.cc +++ b/chrome/browser/web_applications/os_integration/web_app_file_handler_registration_win_unittest.cc
@@ -8,9 +8,9 @@ #include <string> #include <vector> -#include "base/callback_helpers.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/path_service.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/web_applications/os_integration/web_app_handler_registration_utils_win_unittest.cc b/chrome/browser/web_applications/os_integration/web_app_handler_registration_utils_win_unittest.cc index 83079c2d..7753383 100644 --- a/chrome/browser/web_applications/os_integration/web_app_handler_registration_utils_win_unittest.cc +++ b/chrome/browser/web_applications/os_integration/web_app_handler_registration_utils_win_unittest.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/callback_helpers.h" #include "base/files/file_util.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/task/thread_pool/thread_pool_instance.h" #include "base/test/bind.h"
diff --git a/chrome/browser/web_applications/os_integration/web_app_protocol_handler_manager.h b/chrome/browser/web_applications/os_integration/web_app_protocol_handler_manager.h index 610acb0..0399b8fe 100644 --- a/chrome/browser/web_applications/os_integration/web_app_protocol_handler_manager.h +++ b/chrome/browser/web_applications/os_integration/web_app_protocol_handler_manager.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_WEB_APPLICATIONS_OS_INTEGRATION_WEB_APP_PROTOCOL_HANDLER_MANAGER_H_ #define CHROME_BROWSER_WEB_APPLICATIONS_OS_INTEGRATION_WEB_APP_PROTOCOL_HANDLER_MANAGER_H_ -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/web_applications/web_app_constants.h" #include "chrome/browser/web_applications/web_app_id.h"
diff --git a/chrome/browser/web_applications/os_integration/web_app_protocol_handler_registration.h b/chrome/browser/web_applications/os_integration/web_app_protocol_handler_registration.h index ac82a75..6eac4f2 100644 --- a/chrome/browser/web_applications/os_integration/web_app_protocol_handler_registration.h +++ b/chrome/browser/web_applications/os_integration/web_app_protocol_handler_registration.h
@@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/web_applications/web_app_constants.h" #include "chrome/browser/web_applications/web_app_id.h" #include "components/services/app_service/public/cpp/protocol_handler_info.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 58db0ddf..64459ed 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
@@ -9,11 +9,11 @@ #include <shlobj.h> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/path_service.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/web_applications/os_integration/web_app_run_on_os_login.cc b/chrome/browser/web_applications/os_integration/web_app_run_on_os_login.cc index f80d0fe..55a3494 100644 --- a/chrome/browser/web_applications/os_integration/web_app_run_on_os_login.cc +++ b/chrome/browser/web_applications/os_integration/web_app_run_on_os_login.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "chrome/browser/web_applications/os_integration/web_app_shortcut.h" #include "chrome/browser/web_applications/web_app_constants.h" #include "chrome/browser/web_applications/web_app_registry_update.h"
diff --git a/chrome/browser/web_applications/os_integration/web_app_run_on_os_login.h b/chrome/browser/web_applications/os_integration/web_app_run_on_os_login.h index 952cc34..31bbf72 100644 --- a/chrome/browser/web_applications/os_integration/web_app_run_on_os_login.h +++ b/chrome/browser/web_applications/os_integration/web_app_run_on_os_login.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "chrome/browser/web_applications/os_integration/web_app_shortcut.h" #include "chrome/browser/web_applications/web_app_constants.h" #include "chrome/browser/web_applications/web_app_id.h"
diff --git a/chrome/browser/web_applications/os_integration/web_app_shortcut.cc b/chrome/browser/web_applications/os_integration/web_app_shortcut.cc index 1e1755f3..c96bb92 100644 --- a/chrome/browser/web_applications/os_integration/web_app_shortcut.cc +++ b/chrome/browser/web_applications/os_integration/web_app_shortcut.cc
@@ -9,12 +9,10 @@ #include <string> #include <vector> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/memory/raw_ptr.h"
diff --git a/chrome/browser/web_applications/os_integration/web_app_shortcut.h b/chrome/browser/web_applications/os_integration/web_app_shortcut.h index d5d32e4..5c6944f 100644 --- a/chrome/browser/web_applications/os_integration/web_app_shortcut.h +++ b/chrome/browser/web_applications/os_integration/web_app_shortcut.h
@@ -10,9 +10,9 @@ #include <string> #include <vector> -#include "base/callback_forward.h" -#include "base/callback_helpers.h" #include "base/files/file_path.h" +#include "base/functional/callback_forward.h" +#include "base/functional/callback_helpers.h" #include "base/sequence_checker.h" #include "build/build_config.h" #include "chrome/browser/web_applications/web_app_constants.h"
diff --git a/chrome/browser/web_applications/os_integration/web_app_shortcut_chromeos.cc b/chrome/browser/web_applications/os_integration/web_app_shortcut_chromeos.cc index 803cc49..78c51bf 100644 --- a/chrome/browser/web_applications/os_integration/web_app_shortcut_chromeos.cc +++ b/chrome/browser/web_applications/os_integration/web_app_shortcut_chromeos.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/task/task_runner.h" #include "chrome/browser/web_applications/web_app_constants.h"
diff --git a/chrome/browser/web_applications/os_integration/web_app_shortcut_linux.cc b/chrome/browser/web_applications/os_integration/web_app_shortcut_linux.cc index 77ef7342..2eaf2cb2 100644 --- a/chrome/browser/web_applications/os_integration/web_app_shortcut_linux.cc +++ b/chrome/browser/web_applications/os_integration/web_app_shortcut_linux.cc
@@ -10,12 +10,12 @@ #include <fcntl.h> #include "base/base_paths.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/environment.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/i18n/file_util_icu.h" #include "base/location.h" #include "base/logging.h"
diff --git a/chrome/browser/web_applications/os_integration/web_app_shortcut_linux.h b/chrome/browser/web_applications/os_integration/web_app_shortcut_linux.h index dd076bd..4924d3af 100644 --- a/chrome/browser/web_applications/os_integration/web_app_shortcut_linux.h +++ b/chrome/browser/web_applications/os_integration/web_app_shortcut_linux.h
@@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "url/gurl.h" namespace base {
diff --git a/chrome/browser/web_applications/os_integration/web_app_shortcut_mac.h b/chrome/browser/web_applications/os_integration/web_app_shortcut_mac.h index 3f11622..f26a5c76 100644 --- a/chrome/browser/web_applications/os_integration/web_app_shortcut_mac.h +++ b/chrome/browser/web_applications/os_integration/web_app_shortcut_mac.h
@@ -11,8 +11,8 @@ #include <string> #include <vector> -#include "base/callback_forward.h" #include "base/files/file_path.h" +#include "base/functional/callback_forward.h" #include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" #include "base/process/process.h"
diff --git a/chrome/browser/web_applications/os_integration/web_app_shortcut_mac.mm b/chrome/browser/web_applications/os_integration/web_app_shortcut_mac.mm index 92d2bac..dd6906e2 100644 --- a/chrome/browser/web_applications/os_integration/web_app_shortcut_mac.mm +++ b/chrome/browser/web_applications/os_integration/web_app_shortcut_mac.mm
@@ -14,14 +14,14 @@ #include <utility> #include "base/base_switches.h" -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/feature_list.h" #include "base/files/file_enumerator.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/mac/bundle_locations.h" #include "base/mac/foundation_util.h"
diff --git a/chrome/browser/web_applications/os_integration/web_app_shortcut_manager.cc b/chrome/browser/web_applications/os_integration/web_app_shortcut_manager.cc index 5286c987..b8e7c18 100644 --- a/chrome/browser/web_applications/os_integration/web_app_shortcut_manager.cc +++ b/chrome/browser/web_applications/os_integration/web_app_shortcut_manager.cc
@@ -9,11 +9,10 @@ #include <vector> #include "base/barrier_closure.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" #include "base/files/file_path.h" #include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/functional/callback_forward.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h"
diff --git a/chrome/browser/web_applications/os_integration/web_app_shortcut_win.cc b/chrome/browser/web_applications/os_integration/web_app_shortcut_win.cc index b355c8d..0917f23 100644 --- a/chrome/browser/web_applications/os_integration/web_app_shortcut_win.cc +++ b/chrome/browser/web_applications/os_integration/web_app_shortcut_win.cc
@@ -12,13 +12,13 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check_op.h" #include "base/command_line.h" #include "base/files/file_enumerator.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/hash/md5.h" #include "base/i18n/file_util_icu.h" #include "base/notreached.h"
diff --git a/chrome/browser/web_applications/os_integration/web_app_stubs.cc b/chrome/browser/web_applications/os_integration/web_app_stubs.cc index eb3e053..968f63e 100644 --- a/chrome/browser/web_applications/os_integration/web_app_stubs.cc +++ b/chrome/browser/web_applications/os_integration/web_app_stubs.cc
@@ -7,8 +7,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/task/task_runner.h" #include "chrome/browser/web_applications/os_integration/web_app_file_handler_registration.h"
diff --git a/chrome/browser/web_applications/os_integration/web_app_uninstallation_via_os_settings_registration.h b/chrome/browser/web_applications/os_integration/web_app_uninstallation_via_os_settings_registration.h index 79c14d1..8531b4cf 100644 --- a/chrome/browser/web_applications/os_integration/web_app_uninstallation_via_os_settings_registration.h +++ b/chrome/browser/web_applications/os_integration/web_app_uninstallation_via_os_settings_registration.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "build/build_config.h" #include "chrome/browser/web_applications/web_app_id.h" #include "components/services/app_service/public/cpp/file_handler.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 d0c2c83f..78cc325 100644 --- a/chrome/browser/web_applications/policy/web_app_policy_manager.cc +++ b/chrome/browser/web_applications/policy/web_app_policy_manager.cc
@@ -9,14 +9,13 @@ #include <vector> #include "base/barrier_callback.h" -#include "base/bind.h" -#include "base/callback_forward.h" -#include "base/callback_helpers.h" #include "base/containers/contains.h" #include "base/containers/flat_map.h" #include "base/containers/flat_set.h" #include "base/feature_list.h" #include "base/functional/bind.h" +#include "base/functional/callback_forward.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/histogram_functions.h" #include "base/ranges/algorithm.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/web_applications/preinstalled_web_app_manager.cc b/chrome/browser/web_applications/preinstalled_web_app_manager.cc index 56fc193..afa2cea4 100644 --- a/chrome/browser/web_applications/preinstalled_web_app_manager.cc +++ b/chrome/browser/web_applications/preinstalled_web_app_manager.cc
@@ -11,8 +11,6 @@ #include <utility> #include "base/barrier_closure.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/containers/contains.h" #include "base/containers/cxx20_erase.h" #include "base/feature_list.h" @@ -20,6 +18,7 @@ #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/json/json_file_value_serializer.h" #include "base/json/json_reader.h" #include "base/memory/scoped_refptr.h"
diff --git a/chrome/browser/web_applications/preinstalled_web_app_manager_unittest.cc b/chrome/browser/web_applications/preinstalled_web_app_manager_unittest.cc index 2cd953a..8fe9c9e 100644 --- a/chrome/browser/web_applications/preinstalled_web_app_manager_unittest.cc +++ b/chrome/browser/web_applications/preinstalled_web_app_manager_unittest.cc
@@ -9,10 +9,10 @@ #include <set> #include <vector> -#include "base/bind.h" #include "base/command_line.h" #include "base/containers/contains.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/path_service.h" #include "base/run_loop.h" #include "base/test/bind.h"
diff --git a/chrome/browser/web_applications/preinstalled_web_apps/calculator.cc b/chrome/browser/web_applications/preinstalled_web_apps/calculator.cc index 8c0a30f..e295ab3f 100644 --- a/chrome/browser/web_applications/preinstalled_web_apps/calculator.cc +++ b/chrome/browser/web_applications/preinstalled_web_apps/calculator.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/web_applications/preinstalled_web_apps/calculator.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/web_applications/mojom/user_display_mode.mojom.h" #include "chrome/browser/web_applications/preinstalled_app_install_features.h"
diff --git a/chrome/browser/web_applications/preinstalled_web_apps/gmail.cc b/chrome/browser/web_applications/preinstalled_web_apps/gmail.cc index d9ea8e2..c6deb0b 100644 --- a/chrome/browser/web_applications/preinstalled_web_apps/gmail.cc +++ b/chrome/browser/web_applications/preinstalled_web_apps/gmail.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/web_applications/preinstalled_web_apps/gmail.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h" #include "chrome/browser/web_applications/mojom/user_display_mode.mojom.h"
diff --git a/chrome/browser/web_applications/preinstalled_web_apps/google_calendar.cc b/chrome/browser/web_applications/preinstalled_web_apps/google_calendar.cc index fed06f1..0692238 100644 --- a/chrome/browser/web_applications/preinstalled_web_apps/google_calendar.cc +++ b/chrome/browser/web_applications/preinstalled_web_apps/google_calendar.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 "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h" #include "chrome/browser/web_applications/mojom/user_display_mode.mojom.h"
diff --git a/chrome/browser/web_applications/preinstalled_web_apps/google_docs.cc b/chrome/browser/web_applications/preinstalled_web_apps/google_docs.cc index e3f17a5..42dda56 100644 --- a/chrome/browser/web_applications/preinstalled_web_apps/google_docs.cc +++ b/chrome/browser/web_applications/preinstalled_web_apps/google_docs.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/web_applications/preinstalled_web_apps/google_docs.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/web_applications/mojom/user_display_mode.mojom.h" #include "chrome/browser/web_applications/preinstalled_app_install_features.h"
diff --git a/chrome/browser/web_applications/preinstalled_web_apps/google_drive.cc b/chrome/browser/web_applications/preinstalled_web_apps/google_drive.cc index 0c8a668..38e47b6 100644 --- a/chrome/browser/web_applications/preinstalled_web_apps/google_drive.cc +++ b/chrome/browser/web_applications/preinstalled_web_apps/google_drive.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/web_applications/preinstalled_web_apps/google_drive.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/web_applications/mojom/user_display_mode.mojom.h" #include "chrome/browser/web_applications/preinstalled_app_install_features.h"
diff --git a/chrome/browser/web_applications/preinstalled_web_apps/google_sheets.cc b/chrome/browser/web_applications/preinstalled_web_apps/google_sheets.cc index ea6811c..06a04be 100644 --- a/chrome/browser/web_applications/preinstalled_web_apps/google_sheets.cc +++ b/chrome/browser/web_applications/preinstalled_web_apps/google_sheets.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/web_applications/preinstalled_web_apps/google_sheets.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/web_applications/mojom/user_display_mode.mojom.h" #include "chrome/browser/web_applications/preinstalled_app_install_features.h"
diff --git a/chrome/browser/web_applications/preinstalled_web_apps/google_slides.cc b/chrome/browser/web_applications/preinstalled_web_apps/google_slides.cc index a8b54f1b..bca3c11 100644 --- a/chrome/browser/web_applications/preinstalled_web_apps/google_slides.cc +++ b/chrome/browser/web_applications/preinstalled_web_apps/google_slides.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/web_applications/preinstalled_web_apps/google_slides.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/web_applications/mojom/user_display_mode.mojom.h" #include "chrome/browser/web_applications/preinstalled_app_install_features.h"
diff --git a/chrome/browser/web_applications/preinstalled_web_apps/youtube.cc b/chrome/browser/web_applications/preinstalled_web_apps/youtube.cc index 3ead858..18c1f906 100644 --- a/chrome/browser/web_applications/preinstalled_web_apps/youtube.cc +++ b/chrome/browser/web_applications/preinstalled_web_apps/youtube.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/web_applications/preinstalled_web_apps/youtube.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h" #include "chrome/browser/web_applications/mojom/user_display_mode.mojom.h"
diff --git a/chrome/browser/web_applications/test/fake_data_retriever.cc b/chrome/browser/web_applications/test/fake_data_retriever.cc index 83ab95c..6243f96 100644 --- a/chrome/browser/web_applications/test/fake_data_retriever.cc +++ b/chrome/browser/web_applications/test/fake_data_retriever.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "components/webapps/browser/installable/installable_logging.h" #include "components/webapps/browser/installable/installable_params.h"
diff --git a/chrome/browser/web_applications/test/fake_data_retriever.h b/chrome/browser/web_applications/test/fake_data_retriever.h index c6d04e6..1cdfc5d 100644 --- a/chrome/browser/web_applications/test/fake_data_retriever.h +++ b/chrome/browser/web_applications/test/fake_data_retriever.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/web_applications/web_app_constants.h" #include "chrome/browser/web_applications/web_app_data_retriever.h"
diff --git a/chrome/browser/web_applications/test/fake_install_finalizer.cc b/chrome/browser/web_applications/test/fake_install_finalizer.cc index 1971f8a..e57c943 100644 --- a/chrome/browser/web_applications/test/fake_install_finalizer.cc +++ b/chrome/browser/web_applications/test/fake_install_finalizer.cc
@@ -7,9 +7,9 @@ #include "base/containers/flat_set.h" #include "chrome/browser/web_applications/test/fake_install_finalizer.h" -#include "base/callback.h" #include "base/check.h" #include "base/containers/contains.h" +#include "base/functional/callback.h" #include "base/notreached.h" #include "base/task/single_thread_task_runner.h" #include "base/test/bind.h"
diff --git a/chrome/browser/web_applications/test/fake_web_app_provider.cc b/chrome/browser/web_applications/test/fake_web_app_provider.cc index a3b74204..4cbeb7c0 100644 --- a/chrome/browser/web_applications/test/fake_web_app_provider.cc +++ b/chrome/browser/web_applications/test/fake_web_app_provider.cc
@@ -8,9 +8,9 @@ #include <ostream> #include <utility> -#include "base/bind.h" #include "base/check.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/memory/scoped_refptr.h" #include "base/one_shot_event.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/web_applications/test/fake_web_app_provider.h b/chrome/browser/web_applications/test/fake_web_app_provider.h index f9269c9..3260098 100644 --- a/chrome/browser/web_applications/test/fake_web_app_provider.h +++ b/chrome/browser/web_applications/test/fake_web_app_provider.h
@@ -7,8 +7,8 @@ #include <memory> -#include "base/callback.h" #include "base/callback_list.h" +#include "base/functional/callback.h" #include "chrome/browser/web_applications/web_app_provider.h" #include "components/sync/test/mock_model_type_change_processor.h" #include "testing/gmock/include/gmock/gmock.h"
diff --git a/chrome/browser/web_applications/test/fake_web_app_ui_manager.cc b/chrome/browser/web_applications/test/fake_web_app_ui_manager.cc index 82e7f47..53c935f 100644 --- a/chrome/browser/web_applications/test/fake_web_app_ui_manager.cc +++ b/chrome/browser/web_applications/test/fake_web_app_ui_manager.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/callback.h" #include "base/containers/contains.h" +#include "base/functional/callback.h" #include "base/task/single_thread_task_runner.h" #include "base/test/bind.h" #include "chrome/browser/web_applications/web_app_callback_app_identity.h"
diff --git a/chrome/browser/web_applications/test/signed_web_bundle_utils.cc b/chrome/browser/web_applications/test/signed_web_bundle_utils.cc index 33ce78a..6e43932 100644 --- a/chrome/browser/web_applications/test/signed_web_bundle_utils.cc +++ b/chrome/browser/web_applications/test/signed_web_bundle_utils.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/web_applications/test/signed_web_bundle_utils.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/test/test_future.h" #include "chrome/browser/web_applications/isolated_web_apps/signed_web_bundle_reader.h" #include "components/web_package/mojom/web_bundle_parser.mojom.h"
diff --git a/chrome/browser/web_applications/test/signed_web_bundle_utils.h b/chrome/browser/web_applications/test/signed_web_bundle_utils.h index 4d27ebd..3f0098ae8 100644 --- a/chrome/browser/web_applications/test/signed_web_bundle_utils.h +++ b/chrome/browser/web_applications/test/signed_web_bundle_utils.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "components/web_package/mojom/web_bundle_parser.mojom-forward.h" #include "mojo/public/cpp/system/data_pipe.h" #include "net/base/net_errors.h"
diff --git a/chrome/browser/web_applications/test/test_web_app_url_loader.cc b/chrome/browser/web_applications/test/test_web_app_url_loader.cc index 4b20800..7ba393a2 100644 --- a/chrome/browser/web_applications/test/test_web_app_url_loader.cc +++ b/chrome/browser/web_applications/test/test_web_app_url_loader.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/web_applications/test/test_web_app_url_loader.h" -#include "base/callback.h" #include "base/containers/contains.h" +#include "base/functional/callback.h" #include "base/task/single_thread_task_runner.h" namespace web_app {
diff --git a/chrome/browser/web_applications/test/test_web_app_url_loader.h b/chrome/browser/web_applications/test/test_web_app_url_loader.h index cde73ed..0b84e33 100644 --- a/chrome/browser/web_applications/test/test_web_app_url_loader.h +++ b/chrome/browser/web_applications/test/test_web_app_url_loader.h
@@ -9,8 +9,8 @@ #include <queue> #include <vector> -#include "base/callback.h" #include "base/containers/queue.h" +#include "base/functional/callback.h" #include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/web_applications/web_app_url_loader.h"
diff --git a/chrome/browser/web_applications/test/web_app_test_observers.h b/chrome/browser/web_applications/test/web_app_test_observers.h index 0f30c6d..a17d08f 100644 --- a/chrome/browser/web_applications/test/web_app_test_observers.h +++ b/chrome/browser/web_applications/test/web_app_test_observers.h
@@ -7,7 +7,7 @@ #include <set> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/run_loop.h" #include "base/scoped_observation.h" #include "chrome/browser/web_applications/app_registrar_observer.h"
diff --git a/chrome/browser/web_applications/test/web_app_test_utils.cc b/chrome/browser/web_applications/test/web_app_test_utils.cc index 452d3796..f3b88ed 100644 --- a/chrome/browser/web_applications/test/web_app_test_utils.cc +++ b/chrome/browser/web_applications/test/web_app_test_utils.cc
@@ -14,11 +14,11 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/check.h" #include "base/check_op.h" #include "base/containers/flat_map.h" #include "base/containers/flat_set.h" +#include "base/functional/bind.h" #include "base/json/json_reader.h" #include "base/location.h" #include "base/memory/scoped_refptr.h"
diff --git a/chrome/browser/web_applications/web_app_callback_app_identity.h b/chrome/browser/web_applications/web_app_callback_app_identity.h index c9cae00..eae1c51 100644 --- a/chrome/browser/web_applications/web_app_callback_app_identity.h +++ b/chrome/browser/web_applications/web_app_callback_app_identity.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_WEB_APPLICATIONS_WEB_APP_CALLBACK_APP_IDENTITY_H_ #define CHROME_BROWSER_WEB_APPLICATIONS_WEB_APP_CALLBACK_APP_IDENTITY_H_ -#include "base/callback.h" +#include "base/functional/callback.h" namespace web_app {
diff --git a/chrome/browser/web_applications/web_app_command_manager.cc b/chrome/browser/web_applications/web_app_command_manager.cc index e06dbe8..b6901e0 100644 --- a/chrome/browser/web_applications/web_app_command_manager.cc +++ b/chrome/browser/web_applications/web_app_command_manager.cc
@@ -8,9 +8,9 @@ #include <tuple> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "base/run_loop.h"
diff --git a/chrome/browser/web_applications/web_app_command_manager_unittest.cc b/chrome/browser/web_applications/web_app_command_manager_unittest.cc index 83583713..0877bd0 100644 --- a/chrome/browser/web_applications/web_app_command_manager_unittest.cc +++ b/chrome/browser/web_applications/web_app_command_manager_unittest.cc
@@ -9,9 +9,9 @@ #include "base/barrier_callback.h" #include "base/barrier_closure.h" -#include "base/callback_forward.h" -#include "base/callback_helpers.h" #include "base/containers/flat_set.h" +#include "base/functional/callback_forward.h" +#include "base/functional/callback_helpers.h" #include "base/memory/weak_ptr.h" #include "base/run_loop.h" #include "base/task/sequenced_task_runner.h"
diff --git a/chrome/browser/web_applications/web_app_data_retriever.cc b/chrome/browser/web_applications/web_app_data_retriever.cc index 77e1957..4d01c13 100644 --- a/chrome/browser/web_applications/web_app_data_retriever.cc +++ b/chrome/browser/web_applications/web_app_data_retriever.cc
@@ -10,8 +10,8 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/strings/utf_string_conversions.h" #include "base/task/single_thread_task_runner.h" #include "chrome/browser/web_applications/web_app_constants.h"
diff --git a/chrome/browser/web_applications/web_app_data_retriever.h b/chrome/browser/web_applications/web_app_data_retriever.h index b424f01..469ee0e8 100644 --- a/chrome/browser/web_applications/web_app_data_retriever.h +++ b/chrome/browser/web_applications/web_app_data_retriever.h
@@ -9,7 +9,7 @@ #include <memory> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/web_applications/web_app_icon_downloader.h" #include "chrome/browser/web_applications/web_app_install_utils.h"
diff --git a/chrome/browser/web_applications/web_app_data_retriever_unittest.cc b/chrome/browser/web_applications/web_app_data_retriever_unittest.cc index 4b95ffc5..672b6bf 100644 --- a/chrome/browser/web_applications/web_app_data_retriever_unittest.cc +++ b/chrome/browser/web_applications/web_app_data_retriever_unittest.cc
@@ -9,7 +9,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "base/test/bind.h" #include "chrome/browser/web_applications/web_app.h"
diff --git a/chrome/browser/web_applications/web_app_database.cc b/chrome/browser/web_applications/web_app_database.cc index 2bc69e8..9d816aa 100644 --- a/chrome/browser/web_applications/web_app_database.cc +++ b/chrome/browser/web_applications/web_app_database.cc
@@ -8,11 +8,11 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" #include "base/check.h" #include "base/containers/contains.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/functional/overloaded.h" #include "base/pickle.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/web_applications/web_app_database.h b/chrome/browser/web_applications/web_app_database.h index 7df21c46..aa9a343 100644 --- a/chrome/browser/web_applications/web_app_database.h +++ b/chrome/browser/web_applications/web_app_database.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h"
diff --git a/chrome/browser/web_applications/web_app_icon_downloader.cc b/chrome/browser/web_applications/web_app_icon_downloader.cc index 5f94117..4e11e302 100644 --- a/chrome/browser/web_applications/web_app_icon_downloader.cc +++ b/chrome/browser/web_applications/web_app_icon_downloader.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/web_applications/web_app_icon_downloader.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/single_thread_task_runner.h" #include "chrome/browser/web_applications/web_app_constants.h" #include "chrome/browser/web_applications/web_app_helpers.h"
diff --git a/chrome/browser/web_applications/web_app_icon_downloader.h b/chrome/browser/web_applications/web_app_icon_downloader.h index 723085f..3a15c9d 100644 --- a/chrome/browser/web_applications/web_app_icon_downloader.h +++ b/chrome/browser/web_applications/web_app_icon_downloader.h
@@ -9,7 +9,7 @@ #include <set> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/gtest_prod_util.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/web_applications/web_app_install_utils.h"
diff --git a/chrome/browser/web_applications/web_app_icon_downloader_unittest.cc b/chrome/browser/web_applications/web_app_icon_downloader_unittest.cc index 4cd9fea..703bc25 100644 --- a/chrome/browser/web_applications/web_app_icon_downloader_unittest.cc +++ b/chrome/browser/web_applications/web_app_icon_downloader_unittest.cc
@@ -6,8 +6,8 @@ #include <stddef.h> -#include "base/bind.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/test/scoped_feature_list.h" #include "base/test/test_future.h"
diff --git a/chrome/browser/web_applications/web_app_icon_manager_unittest.cc b/chrome/browser/web_applications/web_app_icon_manager_unittest.cc index 9e2ebd5e..d7807a71 100644 --- a/chrome/browser/web_applications/web_app_icon_manager_unittest.cc +++ b/chrome/browser/web_applications/web_app_icon_manager_unittest.cc
@@ -9,9 +9,9 @@ #include <string> #include <utility> -#include "base/callback_helpers.h" #include "base/containers/contains.h" #include "base/files/file_enumerator.h" +#include "base/functional/callback_helpers.h" #include "base/memory/scoped_refptr.h" #include "base/run_loop.h" #include "base/test/bind.h"
diff --git a/chrome/browser/web_applications/web_app_install_finalizer.cc b/chrome/browser/web_applications/web_app_install_finalizer.cc index 0b84bfd..588e025c 100644 --- a/chrome/browser/web_applications/web_app_install_finalizer.cc +++ b/chrome/browser/web_applications/web_app_install_finalizer.cc
@@ -8,9 +8,9 @@ #include <utility> #include "base/barrier_callback.h" -#include "base/bind.h" #include "base/containers/contains.h" #include "base/containers/flat_set.h" +#include "base/functional/bind.h" #include "base/functional/callback.h" #include "base/functional/callback_helpers.h" #include "base/logging.h"
diff --git a/chrome/browser/web_applications/web_app_install_finalizer.h b/chrome/browser/web_applications/web_app_install_finalizer.h index 2a4a5fb..187f527 100644 --- a/chrome/browser/web_applications/web_app_install_finalizer.h +++ b/chrome/browser/web_applications/web_app_install_finalizer.h
@@ -9,8 +9,8 @@ #include <memory> #include <vector> -#include "base/callback_forward.h" #include "base/containers/flat_set.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/ash/system_web_apps/types/system_web_app_data.h"
diff --git a/chrome/browser/web_applications/web_app_install_manager.cc b/chrome/browser/web_applications/web_app_install_manager.cc index 886c60d..4e8752b 100644 --- a/chrome/browser/web_applications/web_app_install_manager.cc +++ b/chrome/browser/web_applications/web_app_install_manager.cc
@@ -8,10 +8,10 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/histogram_macros.h" #include "base/observer_list.h" #include "base/ranges/algorithm.h"
diff --git a/chrome/browser/web_applications/web_app_install_manager.h b/chrome/browser/web_applications/web_app_install_manager.h index f3f0cc0..12701c1 100644 --- a/chrome/browser/web_applications/web_app_install_manager.h +++ b/chrome/browser/web_applications/web_app_install_manager.h
@@ -7,10 +7,10 @@ #include <memory> -#include "base/callback_forward.h" #include "base/containers/flat_set.h" #include "base/containers/queue.h" #include "base/containers/unique_ptr_adapters.h" +#include "base/functional/callback_forward.h" #include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/web_applications/web_app_install_params.h b/chrome/browser/web_applications/web_app_install_params.h index d774e24..67f3fa6 100644 --- a/chrome/browser/web_applications/web_app_install_params.h +++ b/chrome/browser/web_applications/web_app_install_params.h
@@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/ash/system_web_apps/types/system_web_app_type.h" #include "chrome/browser/web_applications/mojom/user_display_mode.mojom.h" #include "chrome/browser/web_applications/web_app_id.h"
diff --git a/chrome/browser/web_applications/web_app_install_task.cc b/chrome/browser/web_applications/web_app_install_task.cc index 65b29bf..478ed89b 100644 --- a/chrome/browser/web_applications/web_app_install_task.cc +++ b/chrome/browser/web_applications/web_app_install_task.cc
@@ -5,9 +5,9 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h"
diff --git a/chrome/browser/web_applications/web_app_install_task.h b/chrome/browser/web_applications/web_app_install_task.h index da520e1..36ee584e 100644 --- a/chrome/browser/web_applications/web_app_install_task.h +++ b/chrome/browser/web_applications/web_app_install_task.h
@@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/values.h"
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 41a9235c..bba295e3 100644 --- a/chrome/browser/web_applications/web_app_install_task_unittest.cc +++ b/chrome/browser/web_applications/web_app_install_task_unittest.cc
@@ -8,9 +8,9 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/run_loop.h"
diff --git a/chrome/browser/web_applications/web_app_internals_browsertest.cc b/chrome/browser/web_applications/web_app_internals_browsertest.cc index d49c5e7..1979946 100644 --- a/chrome/browser/web_applications/web_app_internals_browsertest.cc +++ b/chrome/browser/web_applications/web_app_internals_browsertest.cc
@@ -4,7 +4,7 @@ #include <string> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/strings/string_piece.h" #include "base/strings/string_util.h" #include "base/test/bind.h"
diff --git a/chrome/browser/web_applications/web_app_internals_utils.h b/chrome/browser/web_applications/web_app_internals_utils.h index b6e9fa91..4b1ffd3 100644 --- a/chrome/browser/web_applications/web_app_internals_utils.h +++ b/chrome/browser/web_applications/web_app_internals_utils.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_WEB_APPLICATIONS_WEB_APP_INTERNALS_UTILS_H_ #define CHROME_BROWSER_WEB_APPLICATIONS_WEB_APP_INTERNALS_UTILS_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/strings/string_piece_forward.h" #include "chrome/browser/web_applications/web_app_constants.h"
diff --git a/chrome/browser/web_applications/web_app_origin_association_manager.cc b/chrome/browser/web_applications/web_app_origin_association_manager.cc index 499ecab..3a72883e 100644 --- a/chrome/browser/web_applications/web_app_origin_association_manager.cc +++ b/chrome/browser/web_applications/web_app_origin_association_manager.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "chrome/browser/web_applications/web_app_origin_association_task.h" #include "components/webapps/services/web_app_origin_association/web_app_origin_association_fetcher.h" #include "components/webapps/services/web_app_origin_association/web_app_origin_association_parser_service.h"
diff --git a/chrome/browser/web_applications/web_app_origin_association_task.cc b/chrome/browser/web_applications/web_app_origin_association_task.cc index 738c540..7e208e8 100644 --- a/chrome/browser/web_applications/web_app_origin_association_task.cc +++ b/chrome/browser/web_applications/web_app_origin_association_task.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" #include "base/containers/flat_set.h" +#include "base/functional/bind.h" #include "base/task/single_thread_task_runner.h" #include "chrome/browser/browser_process.h" #include "components/webapps/services/web_app_origin_association/public/mojom/web_app_origin_association_parser.mojom.h"
diff --git a/chrome/browser/web_applications/web_app_provider.cc b/chrome/browser/web_applications/web_app_provider.cc index 314a13b..ae9aff1 100644 --- a/chrome/browser/web_applications/web_app_provider.cc +++ b/chrome/browser/web_applications/web_app_provider.cc
@@ -8,9 +8,9 @@ #include <utility> #include "base/barrier_closure.h" -#include "base/bind.h" #include "base/check_is_test.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/functional/callback_forward.h" #include "base/location.h" #include "base/memory/scoped_refptr.h"
diff --git a/chrome/browser/web_applications/web_app_registrar.cc b/chrome/browser/web_applications/web_app_registrar.cc index ca85f49..2ab7ca6e 100644 --- a/chrome/browser/web_applications/web_app_registrar.cc +++ b/chrome/browser/web_applications/web_app_registrar.cc
@@ -9,12 +9,12 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check_op.h" #include "base/containers/contains.h" #include "base/containers/cxx20_erase.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/observer_list.h" #include "base/strings/string_util.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/web_applications/web_app_registrar_unittest.cc b/chrome/browser/web_applications/web_app_registrar_unittest.cc index 13a32cf..13b94d72 100644 --- a/chrome/browser/web_applications/web_app_registrar_unittest.cc +++ b/chrome/browser/web_applications/web_app_registrar_unittest.cc
@@ -8,9 +8,9 @@ #include <string> #include <utility> -#include "base/callback_helpers.h" #include "base/containers/contains.h" #include "base/containers/flat_set.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/notreached.h" #include "base/run_loop.h"
diff --git a/chrome/browser/web_applications/web_app_registry_update.cc b/chrome/browser/web_applications/web_app_registry_update.cc index 29bb17d..b7be65c 100644 --- a/chrome/browser/web_applications/web_app_registry_update.cc +++ b/chrome/browser/web_applications/web_app_registry_update.cc
@@ -4,9 +4,9 @@ #include "chrome/browser/web_applications/web_app_registry_update.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/containers/contains.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "chrome/browser/web_applications/web_app_registrar.h" #include "chrome/browser/web_applications/web_app_sync_bridge.h"
diff --git a/chrome/browser/web_applications/web_app_sync_bridge.cc b/chrome/browser/web_applications/web_app_sync_bridge.cc index 637a00a..6d3ea5a2 100644 --- a/chrome/browser/web_applications/web_app_sync_bridge.cc +++ b/chrome/browser/web_applications/web_app_sync_bridge.cc
@@ -7,9 +7,9 @@ #include <memory> #include <vector> -#include "base/bind.h" #include "base/containers/contains.h" #include "base/containers/flat_set.h" +#include "base/functional/bind.h" #include "base/functional/callback.h" #include "base/functional/callback_helpers.h" #include "base/logging.h"
diff --git a/chrome/browser/web_applications/web_app_sync_bridge.h b/chrome/browser/web_applications/web_app_sync_bridge.h index 76d2c9d4..47d2d72 100644 --- a/chrome/browser/web_applications/web_app_sync_bridge.h +++ b/chrome/browser/web_applications/web_app_sync_bridge.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "build/build_config.h"
diff --git a/chrome/browser/web_applications/web_app_sync_bridge_unittest.cc b/chrome/browser/web_applications/web_app_sync_bridge_unittest.cc index 32d2f73e..0327eb6 100644 --- a/chrome/browser/web_applications/web_app_sync_bridge_unittest.cc +++ b/chrome/browser/web_applications/web_app_sync_bridge_unittest.cc
@@ -8,9 +8,9 @@ #include <vector> #include "base/barrier_closure.h" -#include "base/bind.h" #include "base/containers/contains.h" #include "base/containers/cxx20_erase.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/strings/string_number_conversions.h" #include "base/test/bind.h"
diff --git a/chrome/browser/web_applications/web_app_translation_manager.h b/chrome/browser/web_applications/web_app_translation_manager.h index d82168d..317be5f 100644 --- a/chrome/browser/web_applications/web_app_translation_manager.h +++ b/chrome/browser/web_applications/web_app_translation_manager.h
@@ -7,9 +7,9 @@ #include <map> -#include "base/callback.h" #include "base/containers/flat_map.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/scoped_observation.h" #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/web_applications/web_app_ui_manager.h b/chrome/browser/web_applications/web_app_ui_manager.h index 71375475..afa0b95 100644 --- a/chrome/browser/web_applications/web_app_ui_manager.h +++ b/chrome/browser/web_applications/web_app_ui_manager.h
@@ -9,7 +9,7 @@ #include <vector> #include "base/auto_reset.h" -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" #include "base/observer_list_types.h"
diff --git a/chrome/browser/web_applications/web_app_uninstall_job.cc b/chrome/browser/web_applications/web_app_uninstall_job.cc index f0b5a9cb..0aa2525d 100644 --- a/chrome/browser/web_applications/web_app_uninstall_job.cc +++ b/chrome/browser/web_applications/web_app_uninstall_job.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/metrics/histogram_functions.h" #include "chrome/browser/web_applications/isolation_prefs_utils.h"
diff --git a/chrome/browser/web_applications/web_app_uninstall_job.h b/chrome/browser/web_applications/web_app_uninstall_job.h index 9ccd4c7..9e761af 100644 --- a/chrome/browser/web_applications/web_app_uninstall_job.h +++ b/chrome/browser/web_applications/web_app_uninstall_job.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "chrome/browser/web_applications/os_integration/os_integration_manager.h"
diff --git a/chrome/browser/web_applications/web_app_url_loader.cc b/chrome/browser/web_applications/web_app_url_loader.cc index 340d437..dab8047 100644 --- a/chrome/browser/web_applications/web_app_url_loader.cc +++ b/chrome/browser/web_applications/web_app_url_loader.cc
@@ -7,9 +7,9 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/check.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/memory/weak_ptr.h" #include "base/metrics/histogram_functions.h"
diff --git a/chrome/browser/web_applications/web_app_url_loader.h b/chrome/browser/web_applications/web_app_url_loader.h index a153f86..90e8602 100644 --- a/chrome/browser/web_applications/web_app_url_loader.h +++ b/chrome/browser/web_applications/web_app_url_loader.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_WEB_APPLICATIONS_WEB_APP_URL_LOADER_H_ #define CHROME_BROWSER_WEB_APPLICATIONS_WEB_APP_URL_LOADER_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/time/time.h" class GURL;
diff --git a/chrome/browser/web_applications/web_app_url_loader_browsertest.cc b/chrome/browser/web_applications/web_app_url_loader_browsertest.cc index 5a3cca3..0c9ad89 100644 --- a/chrome/browser/web_applications/web_app_url_loader_browsertest.cc +++ b/chrome/browser/web_applications/web_app_url_loader_browsertest.cc
@@ -5,8 +5,8 @@ #include "chrome/browser/web_applications/web_app_url_loader.h" #include "base/barrier_closure.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/strings/escape.h" #include "base/strings/stringprintf.h" #include "base/test/bind.h"
diff --git a/chrome/browser/web_applications/web_app_utils.cc b/chrome/browser/web_applications/web_app_utils.cc index 95add8ad..2c1af3b 100644 --- a/chrome/browser/web_applications/web_app_utils.cc +++ b/chrome/browser/web_applications/web_app_utils.cc
@@ -12,13 +12,13 @@ #include <utility> #include "base/base64.h" -#include "base/bind.h" #include "base/check.h" #include "base/check_op.h" #include "base/containers/contains.h" #include "base/containers/flat_set.h" #include "base/containers/flat_tree.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/memory/weak_ptr.h" #include "base/strings/string_piece_forward.h" #include "base/strings/string_util.h"
diff --git a/chrome/browser/web_applications/web_app_utils.h b/chrome/browser/web_applications/web_app_utils.h index fdd2a838..a9371bd3 100644 --- a/chrome/browser/web_applications/web_app_utils.h +++ b/chrome/browser/web_applications/web_app_utils.h
@@ -12,7 +12,7 @@ #include <tuple> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "build/build_config.h" #include "build/buildflag.h" #include "build/chromeos_buildflags.h"
diff --git a/chrome/browser/web_data_service_factory.cc b/chrome/browser/web_data_service_factory.cc index 0d9326d3..f3843fc3 100644 --- a/chrome/browser/web_data_service_factory.cc +++ b/chrome/browser/web_data_service_factory.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/web_data_service_factory.h" -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/memory/singleton.h" #include "build/build_config.h" #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/webauth_interactive_uitest.cc b/chrome/browser/webauth_interactive_uitest.cc index 692f326..ca069f4c 100644 --- a/chrome/browser/webauth_interactive_uitest.cc +++ b/chrome/browser/webauth_interactive_uitest.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 "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/test/bind.h" #include "build/build_config.h"
diff --git a/chrome/browser/webauthn/android/cable_module_android.cc b/chrome/browser/webauthn/android/cable_module_android.cc index 537de7a..6a2ba85 100644 --- a/chrome/browser/webauthn/android/cable_module_android.cc +++ b/chrome/browser/webauthn/android/cable_module_android.cc
@@ -6,7 +6,7 @@ #include "base/android/jni_array.h" #include "base/base64.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/no_destructor.h" #include "base/task/task_traits.h"
diff --git a/chrome/browser/webauthn/android/chrome_webauthn_client_android.h b/chrome/browser/webauthn/android/chrome_webauthn_client_android.h index b98ef13..6249cbf 100644 --- a/chrome/browser/webauthn/android/chrome_webauthn_client_android.h +++ b/chrome/browser/webauthn/android/chrome_webauthn_client_android.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_WEBAUTHN_ANDROID_CHROME_WEBAUTHN_CLIENT_ANDROID_H_ #define CHROME_BROWSER_WEBAUTHN_ANDROID_CHROME_WEBAUTHN_CLIENT_ANDROID_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "components/webauthn/android/webauthn_client_android.h" // Chrome implementation of WebAuthnClientAndroid.
diff --git a/chrome/browser/webauthn/android/webauthn_request_delegate_android.cc b/chrome/browser/webauthn/android/webauthn_request_delegate_android.cc index 3bd03309..ea504073 100644 --- a/chrome/browser/webauthn/android/webauthn_request_delegate_android.cc +++ b/chrome/browser/webauthn/android/webauthn_request_delegate_android.cc
@@ -9,7 +9,7 @@ #include <vector> #include "base/base64.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/ranges/algorithm.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/password_manager/chrome_webauthn_credentials_delegate.h"
diff --git a/chrome/browser/webauthn/android/webauthn_request_delegate_android.h b/chrome/browser/webauthn/android/webauthn_request_delegate_android.h index 9171e41..3f45a5c0 100644 --- a/chrome/browser/webauthn/android/webauthn_request_delegate_android.h +++ b/chrome/browser/webauthn/android/webauthn_request_delegate_android.h
@@ -7,7 +7,7 @@ #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/supports_user_data.h"
diff --git a/chrome/browser/webauthn/authenticator_request_dialog_model.cc b/chrome/browser/webauthn/authenticator_request_dialog_model.cc index 9cfccebe..b47a45c4 100644 --- a/chrome/browser/webauthn/authenticator_request_dialog_model.cc +++ b/chrome/browser/webauthn/authenticator_request_dialog_model.cc
@@ -7,9 +7,9 @@ #include <iterator> #include <utility> -#include "base/bind.h" #include "base/containers/contains.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "base/observer_list.h" #include "base/ranges/algorithm.h"
diff --git a/chrome/browser/webauthn/authenticator_request_dialog_model.h b/chrome/browser/webauthn/authenticator_request_dialog_model.h index 3a5986da4..1f8ce24c 100644 --- a/chrome/browser/webauthn/authenticator_request_dialog_model.h +++ b/chrome/browser/webauthn/authenticator_request_dialog_model.h
@@ -9,8 +9,8 @@ #include <string> #include <vector> -#include "base/callback_forward.h" #include "base/containers/span.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/raw_ref.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/webauthn/authenticator_request_dialog_model_unittest.cc b/chrome/browser/webauthn/authenticator_request_dialog_model_unittest.cc index 625f092..835933f1 100644 --- a/chrome/browser/webauthn/authenticator_request_dialog_model_unittest.cc +++ b/chrome/browser/webauthn/authenticator_request_dialog_model_unittest.cc
@@ -7,9 +7,9 @@ #include <algorithm> #include <utility> -#include "base/bind.h" #include "base/containers/contains.h" #include "base/containers/flat_set.h" +#include "base/functional/bind.h" #include "base/strings/string_util.h" #include "base/test/bind.h" #include "base/test/scoped_feature_list.h"
diff --git a/chrome/browser/webauthn/chrome_authenticator_request_delegate.cc b/chrome/browser/webauthn/chrome_authenticator_request_delegate.cc index e25a198c..9f7e4a4b 100644 --- a/chrome/browser/webauthn/chrome_authenticator_request_delegate.cc +++ b/chrome/browser/webauthn/chrome_authenticator_request_delegate.cc
@@ -8,11 +8,11 @@ #include <utility> #include "base/base64.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" #include "base/containers/contains.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/strings/string_piece.h"
diff --git a/chrome/browser/webauthn/chrome_authenticator_request_delegate.h b/chrome/browser/webauthn/chrome_authenticator_request_delegate.h index 8f2149ea..64592d3 100644 --- a/chrome/browser/webauthn/chrome_authenticator_request_delegate.h +++ b/chrome/browser/webauthn/chrome_authenticator_request_delegate.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/webauthn/local_credential_management.h b/chrome/browser/webauthn/local_credential_management.h index 0318c90..26adb9a 100644 --- a/chrome/browser/webauthn/local_credential_management.h +++ b/chrome/browser/webauthn/local_credential_management.h
@@ -7,7 +7,7 @@ #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "chrome/browser/profiles/profile_observer.h" #include "device/fido/discoverable_credential_metadata.h" #include "third_party/icu/source/i18n/unicode/coll.h"
diff --git a/chrome/browser/webauthn/local_credential_management_mac.cc b/chrome/browser/webauthn/local_credential_management_mac.cc index 075faeb..b126ffa9 100644 --- a/chrome/browser/webauthn/local_credential_management_mac.cc +++ b/chrome/browser/webauthn/local_credential_management_mac.cc
@@ -5,7 +5,7 @@ #include "chrome/browser/webauthn/local_credential_management_mac.h" #include "chrome/browser/webauthn/local_credential_management.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "device/fido/mac/credential_store.h" LocalCredentialManagementMac::LocalCredentialManagementMac(
diff --git a/chrome/browser/webauthn/local_credential_management_win.cc b/chrome/browser/webauthn/local_credential_management_win.cc index 97e25d2..515ad13 100644 --- a/chrome/browser/webauthn/local_credential_management_win.cc +++ b/chrome/browser/webauthn/local_credential_management_win.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/webauthn/local_credential_management_win.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/notreached.h" #include "base/task/sequenced_task_runner.h" #include "build/build_config.h"
diff --git a/chrome/browser/webauthn/local_credential_management_win.h b/chrome/browser/webauthn/local_credential_management_win.h index 8a5a5e9..fb4a6a9 100644 --- a/chrome/browser/webauthn/local_credential_management_win.h +++ b/chrome/browser/webauthn/local_credential_management_win.h
@@ -7,8 +7,8 @@ #include <vector> -#include "base/callback_forward.h" #include "base/containers/span.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "chrome/browser/webauthn/local_credential_management.h" #include "device/fido/win/authenticator.h"
diff --git a/chrome/browser/webshare/chromeos/sharesheet_client.cc b/chrome/browser/webshare/chromeos/sharesheet_client.cc index 16b47c04..90764a81 100644 --- a/chrome/browser/webshare/chromeos/sharesheet_client.cc +++ b/chrome/browser/webshare/chromeos/sharesheet_client.cc
@@ -6,11 +6,11 @@ #include <memory> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/feature_list.h" #include "base/files/file_path.h" #include "base/files/safe_base_name.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/no_destructor.h" #include "base/rand_util.h" #include "base/strings/string_piece.h"
diff --git a/chrome/browser/webshare/chromeos/sharesheet_client_unittest.cc b/chrome/browser/webshare/chromeos/sharesheet_client_unittest.cc index fd41fe5..3d2c0803 100644 --- a/chrome/browser/webshare/chromeos/sharesheet_client_unittest.cc +++ b/chrome/browser/webshare/chromeos/sharesheet_client_unittest.cc
@@ -7,10 +7,10 @@ #include <string> #include <vector> -#include "base/bind.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/safe_base_name.h" +#include "base/functional/bind.h" #include "base/memory/scoped_refptr.h" #include "base/run_loop.h" #include "base/test/bind.h"
diff --git a/chrome/browser/webshare/mac/sharing_service_operation.mm b/chrome/browser/webshare/mac/sharing_service_operation.mm index 1c4e45e..eb41da3 100644 --- a/chrome/browser/webshare/mac/sharing_service_operation.mm +++ b/chrome/browser/webshare/mac/sharing_service_operation.mm
@@ -8,7 +8,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/guid.h" #include "base/i18n/file_util_icu.h" #include "base/mac/scoped_nsobject.h"
diff --git a/chrome/browser/webshare/safe_browsing_request.cc b/chrome/browser/webshare/safe_browsing_request.cc index 1db469ed..3585b81 100644 --- a/chrome/browser/webshare/safe_browsing_request.cc +++ b/chrome/browser/webshare/safe_browsing_request.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_runner.h"
diff --git a/chrome/browser/webshare/safe_browsing_request.h b/chrome/browser/webshare/safe_browsing_request.h index bc29750b6..0c62444e 100644 --- a/chrome/browser/webshare/safe_browsing_request.h +++ b/chrome/browser/webshare/safe_browsing_request.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h"
diff --git a/chrome/browser/webshare/store_files_task.cc b/chrome/browser/webshare/store_files_task.cc index d8cbbfa..f928b46 100644 --- a/chrome/browser/webshare/store_files_task.cc +++ b/chrome/browser/webshare/store_files_task.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/webshare/store_files_task.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/thread_pool.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/webshare/win/fake_data_transfer_manager.cc b/chrome/browser/webshare/win/fake_data_transfer_manager.cc index d905040..3965fd9 100644 --- a/chrome/browser/webshare/win/fake_data_transfer_manager.cc +++ b/chrome/browser/webshare/win/fake_data_transfer_manager.cc
@@ -6,8 +6,8 @@ #include <wrl/module.h> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ref.h" #include "base/win/core_winrt_util.h" #include "base/win/scoped_hstring.h"
diff --git a/chrome/browser/webshare/win/fake_data_transfer_manager.h b/chrome/browser/webshare/win/fake_data_transfer_manager.h index a2e7a4f4..eb79a55 100644 --- a/chrome/browser/webshare/win/fake_data_transfer_manager.h +++ b/chrome/browser/webshare/win/fake_data_transfer_manager.h
@@ -9,7 +9,7 @@ #include <wrl/implements.h> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" namespace webshare {
diff --git a/chrome/browser/webshare/win/fake_data_transfer_manager_interop.cc b/chrome/browser/webshare/win/fake_data_transfer_manager_interop.cc index 6ca4d453..b567168 100644 --- a/chrome/browser/webshare/win/fake_data_transfer_manager_interop.cc +++ b/chrome/browser/webshare/win/fake_data_transfer_manager_interop.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/webshare/win/fake_data_transfer_manager_interop.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "chrome/browser/webshare/win/fake_data_transfer_manager.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/webshare/win/fake_data_transfer_manager_interop.h b/chrome/browser/webshare/win/fake_data_transfer_manager_interop.h index 90bd0f9..ec01e65 100644 --- a/chrome/browser/webshare/win/fake_data_transfer_manager_interop.h +++ b/chrome/browser/webshare/win/fake_data_transfer_manager_interop.h
@@ -9,7 +9,7 @@ #include <wrl/implements.h> #include <map> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" namespace webshare {
diff --git a/chrome/browser/webshare/win/fake_data_transfer_manager_interop_unittest.cc b/chrome/browser/webshare/win/fake_data_transfer_manager_interop_unittest.cc index 11d80f6..6ee684f9 100644 --- a/chrome/browser/webshare/win/fake_data_transfer_manager_interop_unittest.cc +++ b/chrome/browser/webshare/win/fake_data_transfer_manager_interop_unittest.cc
@@ -8,8 +8,8 @@ #include <wrl/event.h> #include <wrl/implements.h> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/win/core_winrt_util.h" #include "content/public/test/browser_task_environment.h"
diff --git a/chrome/browser/webshare/win/fake_data_transfer_manager_unittest.cc b/chrome/browser/webshare/win/fake_data_transfer_manager_unittest.cc index e97fbef..219322a3 100644 --- a/chrome/browser/webshare/win/fake_data_transfer_manager_unittest.cc +++ b/chrome/browser/webshare/win/fake_data_transfer_manager_unittest.cc
@@ -7,8 +7,8 @@ #include <windows.storage.h> #include <wrl/event.h> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/run_loop.h" #include "base/test/bind.h"
diff --git a/chrome/browser/webshare/win/fake_random_access_stream.cc b/chrome/browser/webshare/win/fake_random_access_stream.cc index c147247..ef3ec18 100644 --- a/chrome/browser/webshare/win/fake_random_access_stream.cc +++ b/chrome/browser/webshare/win/fake_random_access_stream.cc
@@ -7,8 +7,8 @@ #include <robuffer.h> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/weak_ptr.h" #include "base/task/single_thread_task_runner.h" #include "base/test/bind.h"
diff --git a/chrome/browser/webshare/win/fake_random_access_stream.h b/chrome/browser/webshare/win/fake_random_access_stream.h index 64c9b03..84ce0a7 100644 --- a/chrome/browser/webshare/win/fake_random_access_stream.h +++ b/chrome/browser/webshare/win/fake_random_access_stream.h
@@ -9,7 +9,7 @@ #include <windows.storage.streams.h> #include <wrl/implements.h> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" namespace webshare {
diff --git a/chrome/browser/webshare/win/fake_random_access_stream_unittest.cc b/chrome/browser/webshare/win/fake_random_access_stream_unittest.cc index a31f1cab..733e36f4 100644 --- a/chrome/browser/webshare/win/fake_random_access_stream_unittest.cc +++ b/chrome/browser/webshare/win/fake_random_access_stream_unittest.cc
@@ -7,7 +7,7 @@ #include <wrl/event.h> #include <wrl/implements.h> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/test/task_environment.h" #include "chrome/browser/webshare/win/fake_buffer.h"
diff --git a/chrome/browser/webshare/win/fake_storage_file_statics.cc b/chrome/browser/webshare/win/fake_storage_file_statics.cc index 060fcca..516e84ab 100644 --- a/chrome/browser/webshare/win/fake_storage_file_statics.cc +++ b/chrome/browser/webshare/win/fake_storage_file_statics.cc
@@ -11,8 +11,8 @@ #include <memory> #include <tuple> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/task/single_thread_task_runner.h" #include "base/test/bind.h" #include "base/test/fake_iasync_operation_win.h"
diff --git a/chrome/browser/webshare/win/share_operation.cc b/chrome/browser/webshare/win/share_operation.cc index 8867367aa..1083e75 100644 --- a/chrome/browser/webshare/win/share_operation.cc +++ b/chrome/browser/webshare/win/share_operation.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/webshare/win/share_operation.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "base/win/core_winrt_util.h" #include "base/win/post_async_results.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 00864c3..e05b26b 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
@@ -9,7 +9,7 @@ #include <windows.applicationmodel.datatransfer.h> #include <wrl/event.h> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/task/single_thread_task_runner.h" #include "base/win/core_winrt_util.h" #include "base/win/windows_version.h"
diff --git a/chrome/browser/webshare/win/show_share_ui_for_window_operation.h b/chrome/browser/webshare/win/show_share_ui_for_window_operation.h index 6856426..5a40aaf 100644 --- a/chrome/browser/webshare/win/show_share_ui_for_window_operation.h +++ b/chrome/browser/webshare/win/show_share_ui_for_window_operation.h
@@ -7,7 +7,7 @@ #include <wrl/client.h> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h" #include "base/win/core_winrt_util.h"
diff --git a/chrome/browser/webshare/win/show_share_ui_for_window_operation_unittest.cc b/chrome/browser/webshare/win/show_share_ui_for_window_operation_unittest.cc index 54c21e3..a63c520c7 100644 --- a/chrome/browser/webshare/win/show_share_ui_for_window_operation_unittest.cc +++ b/chrome/browser/webshare/win/show_share_ui_for_window_operation_unittest.cc
@@ -9,9 +9,9 @@ #include <wrl/implements.h> #include <wrl/module.h> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/weak_ptr.h" #include "base/win/com_init_util.h" #include "base/win/core_winrt_util.h"
diff --git a/chrome/browser/win/automation_controller.cc b/chrome/browser/win/automation_controller.cc index 9adc953b..68b48c2 100644 --- a/chrome/browser/win/automation_controller.cc +++ b/chrome/browser/win/automation_controller.cc
@@ -10,7 +10,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/sequence_checker.h" #include "base/strings/string_number_conversions.h"
diff --git a/chrome/browser/win/chrome_elf_init.cc b/chrome/browser/win/chrome_elf_init.cc index 3462644..a090b79 100644 --- a/chrome/browser/win/chrome_elf_init.cc +++ b/chrome/browser/win/chrome_elf_init.cc
@@ -6,7 +6,7 @@ #include <stddef.h> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/field_trial.h" #include "base/metrics/histogram_functions.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/win/chrome_select_file_dialog_factory.cc b/chrome/browser/win/chrome_select_file_dialog_factory.cc index 82f1327..cda3c39 100644 --- a/chrome/browser/win/chrome_select_file_dialog_factory.cc +++ b/chrome/browser/win/chrome_select_file_dialog_factory.cc
@@ -7,8 +7,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "base/strings/utf_string_conversions.h" #include "base/win/win_util.h"
diff --git a/chrome/browser/win/conflicts/enumerate_input_method_editors.cc b/chrome/browser/win/conflicts/enumerate_input_method_editors.cc index 7f50123..fecf8d11 100644 --- a/chrome/browser/win/conflicts/enumerate_input_method_editors.cc +++ b/chrome/browser/win/conflicts/enumerate_input_method_editors.cc
@@ -9,9 +9,9 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/metrics/histogram_functions.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h"
diff --git a/chrome/browser/win/conflicts/enumerate_input_method_editors.h b/chrome/browser/win/conflicts/enumerate_input_method_editors.h index 9b9ccba..6b17c8d 100644 --- a/chrome/browser/win/conflicts/enumerate_input_method_editors.h +++ b/chrome/browser/win/conflicts/enumerate_input_method_editors.h
@@ -7,7 +7,7 @@ #include <stdint.h> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" namespace base { class FilePath;
diff --git a/chrome/browser/win/conflicts/enumerate_input_method_editors_unittest.cc b/chrome/browser/win/conflicts/enumerate_input_method_editors_unittest.cc index e0ab247..c4a9b19 100644 --- a/chrome/browser/win/conflicts/enumerate_input_method_editors_unittest.cc +++ b/chrome/browser/win/conflicts/enumerate_input_method_editors_unittest.cc
@@ -6,8 +6,8 @@ #include <vector> -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/path_service.h" #include "base/strings/stringprintf.h" #include "base/test/task_environment.h"
diff --git a/chrome/browser/win/conflicts/enumerate_shell_extensions.cc b/chrome/browser/win/conflicts/enumerate_shell_extensions.cc index f7cd13b..7dfca09 100644 --- a/chrome/browser/win/conflicts/enumerate_shell_extensions.cc +++ b/chrome/browser/win/conflicts/enumerate_shell_extensions.cc
@@ -7,8 +7,8 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted.h" #include "base/strings/stringprintf.h" #include "base/task/sequenced_task_runner.h"
diff --git a/chrome/browser/win/conflicts/enumerate_shell_extensions.h b/chrome/browser/win/conflicts/enumerate_shell_extensions.h index 90ac8bc5..dc69446 100644 --- a/chrome/browser/win/conflicts/enumerate_shell_extensions.h +++ b/chrome/browser/win/conflicts/enumerate_shell_extensions.h
@@ -7,7 +7,7 @@ #include <stdint.h> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" namespace base { class FilePath;
diff --git a/chrome/browser/win/conflicts/enumerate_shell_extensions_unittest.cc b/chrome/browser/win/conflicts/enumerate_shell_extensions_unittest.cc index d3a2282..09eda37 100644 --- a/chrome/browser/win/conflicts/enumerate_shell_extensions_unittest.cc +++ b/chrome/browser/win/conflicts/enumerate_shell_extensions_unittest.cc
@@ -6,9 +6,9 @@ #include <vector> -#include "base/bind.h" #include "base/containers/contains.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/path_service.h" #include "base/strings/stringprintf.h" #include "base/test/task_environment.h"
diff --git a/chrome/browser/win/conflicts/incompatible_applications_browsertest.cc b/chrome/browser/win/conflicts/incompatible_applications_browsertest.cc index fa58aca..38b8e78a 100644 --- a/chrome/browser/win/conflicts/incompatible_applications_browsertest.cc +++ b/chrome/browser/win/conflicts/incompatible_applications_browsertest.cc
@@ -3,10 +3,10 @@ // found in the LICENSE file. #include "base/base_paths.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/path_service.h" #include "base/run_loop.h" #include "base/scoped_native_library.h"
diff --git a/chrome/browser/win/conflicts/incompatible_applications_updater.cc b/chrome/browser/win/conflicts/incompatible_applications_updater.cc index ce5f2fe..873b80a9 100644 --- a/chrome/browser/win/conflicts/incompatible_applications_updater.cc +++ b/chrome/browser/win/conflicts/incompatible_applications_updater.cc
@@ -8,8 +8,8 @@ #include <utility> #include "base/base_paths.h" -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "base/path_service.h" #include "base/strings/utf_string_conversions.h"
diff --git a/chrome/browser/win/conflicts/module_blocklist_cache_updater.cc b/chrome/browser/win/conflicts/module_blocklist_cache_updater.cc index 835da54..ba0f887 100644 --- a/chrome/browser/win/conflicts/module_blocklist_cache_updater.cc +++ b/chrome/browser/win/conflicts/module_blocklist_cache_updater.cc
@@ -8,10 +8,10 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/feature_list.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/hash/sha1.h" #include "base/i18n/case_conversion.h" #include "base/metrics/histogram_macros.h"
diff --git a/chrome/browser/win/conflicts/module_blocklist_cache_updater.h b/chrome/browser/win/conflicts/module_blocklist_cache_updater.h index 3375ee2..fa320498 100644 --- a/chrome/browser/win/conflicts/module_blocklist_cache_updater.h +++ b/chrome/browser/win/conflicts/module_blocklist_cache_updater.h
@@ -7,9 +7,9 @@ #include <vector> -#include "base/callback.h" #include "base/containers/flat_map.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/hash/md5.h" #include "base/memory/raw_ptr.h" #include "base/memory/raw_ref.h"
diff --git a/chrome/browser/win/conflicts/module_blocklist_cache_updater_unittest.cc b/chrome/browser/win/conflicts/module_blocklist_cache_updater_unittest.cc index 7e2fedb..efdb7405 100644 --- a/chrome/browser/win/conflicts/module_blocklist_cache_updater_unittest.cc +++ b/chrome/browser/win/conflicts/module_blocklist_cache_updater_unittest.cc
@@ -12,9 +12,9 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/hash/sha1.h" #include "base/i18n/case_conversion.h" #include "base/path_service.h"
diff --git a/chrome/browser/win/conflicts/module_database.cc b/chrome/browser/win/conflicts/module_database.cc index de70e49..c2743da 100644 --- a/chrome/browser/win/conflicts/module_database.cc +++ b/chrome/browser/win/conflicts/module_database.cc
@@ -7,8 +7,8 @@ #include <tuple> #include <utility> -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/task/lazy_thread_pool_task_runner.h" #include "base/task/sequenced_task_runner.h"
diff --git a/chrome/browser/win/conflicts/module_database_unittest.cc b/chrome/browser/win/conflicts/module_database_unittest.cc index 95efcb7..b622de0 100644 --- a/chrome/browser/win/conflicts/module_database_unittest.cc +++ b/chrome/browser/win/conflicts/module_database_unittest.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.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 fa6ef6f..ef55693 100644 --- a/chrome/browser/win/conflicts/module_event_sink_impl.cc +++ b/chrome/browser/win/conflicts/module_event_sink_impl.cc
@@ -12,9 +12,9 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/strings/string_piece.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/win/conflicts/module_event_sink_impl.h b/chrome/browser/win/conflicts/module_event_sink_impl.h index ad77558..9dec5c8 100644 --- a/chrome/browser/win/conflicts/module_event_sink_impl.h +++ b/chrome/browser/win/conflicts/module_event_sink_impl.h
@@ -9,7 +9,7 @@ #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/process/process.h" #include "chrome/common/conflicts/module_event_sink_win.mojom.h" #include "content/public/common/process_type.h"
diff --git a/chrome/browser/win/conflicts/module_inspector.cc b/chrome/browser/win/conflicts/module_inspector.cc index 3ccd479..85679909 100644 --- a/chrome/browser/win/conflicts/module_inspector.cc +++ b/chrome/browser/win/conflicts/module_inspector.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/path_service.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h"
diff --git a/chrome/browser/win/conflicts/module_inspector.h b/chrome/browser/win/conflicts/module_inspector.h index 199831ff..6c8380fc 100644 --- a/chrome/browser/win/conflicts/module_inspector.h +++ b/chrome/browser/win/conflicts/module_inspector.h
@@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_WIN_CONFLICTS_MODULE_INSPECTOR_H_ #define CHROME_BROWSER_WIN_CONFLICTS_MODULE_INSPECTOR_H_ -#include "base/callback.h" #include "base/containers/queue.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h"
diff --git a/chrome/browser/win/conflicts/module_inspector_unittest.cc b/chrome/browser/win/conflicts/module_inspector_unittest.cc index 65761f2..4a30203 100644 --- a/chrome/browser/win/conflicts/module_inspector_unittest.cc +++ b/chrome/browser/win/conflicts/module_inspector_unittest.cc
@@ -9,10 +9,10 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/environment.h" #include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/test/scoped_feature_list.h" #include "base/test/scoped_path_override.h" #include "chrome/common/chrome_paths.h"
diff --git a/chrome/browser/win/conflicts/module_list_component_updater.cc b/chrome/browser/win/conflicts/module_list_component_updater.cc index ab7b6f4..2366738c 100644 --- a/chrome/browser/win/conflicts/module_list_component_updater.cc +++ b/chrome/browser/win/conflicts/module_list_component_updater.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/win/conflicts/module_database.h" #include "content/public/browser/browser_task_traits.h"
diff --git a/chrome/browser/win/conflicts/module_list_component_updater.h b/chrome/browser/win/conflicts/module_list_component_updater.h index 26c6e32..e20659b 100644 --- a/chrome/browser/win/conflicts/module_list_component_updater.h +++ b/chrome/browser/win/conflicts/module_list_component_updater.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/scoped_observation.h" #include "base/task/sequenced_task_runner.h" #include "components/component_updater/component_updater_service.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 f2d5a0c..4977d2c 100644 --- a/chrome/browser/win/conflicts/module_load_attempt_log_listener.cc +++ b/chrome/browser/win/conflicts/module_load_attempt_log_listener.cc
@@ -8,8 +8,8 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/i18n/case_conversion.h" #include "base/metrics/histogram_macros.h" #include "base/strings/string_piece.h"
diff --git a/chrome/browser/win/conflicts/module_load_attempt_log_listener.h b/chrome/browser/win/conflicts/module_load_attempt_log_listener.h index c6dac81..fbf8c14 100644 --- a/chrome/browser/win/conflicts/module_load_attempt_log_listener.h +++ b/chrome/browser/win/conflicts/module_load_attempt_log_listener.h
@@ -9,8 +9,8 @@ #include <utility> #include <vector> -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/synchronization/waitable_event.h"
diff --git a/chrome/browser/win/conflicts/module_load_attempt_log_listener_unittest.cc b/chrome/browser/win/conflicts/module_load_attempt_log_listener_unittest.cc index ee3a297d..7fffc4c 100644 --- a/chrome/browser/win/conflicts/module_load_attempt_log_listener_unittest.cc +++ b/chrome/browser/win/conflicts/module_load_attempt_log_listener_unittest.cc
@@ -8,7 +8,7 @@ #include <tuple> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/test/task_environment.h" #include "chrome/chrome_elf/sha1/sha1.h"
diff --git a/chrome/browser/win/conflicts/msi_util.h b/chrome/browser/win/conflicts/msi_util.h index 04ccff29..655dc29 100644 --- a/chrome/browser/win/conflicts/msi_util.h +++ b/chrome/browser/win/conflicts/msi_util.h
@@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" class MsiUtil { public:
diff --git a/chrome/browser/win/conflicts/registry_key_watcher.cc b/chrome/browser/win/conflicts/registry_key_watcher.cc index de03584c..1192c87 100644 --- a/chrome/browser/win/conflicts/registry_key_watcher.cc +++ b/chrome/browser/win/conflicts/registry_key_watcher.cc
@@ -8,7 +8,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" // static std::unique_ptr<RegistryKeyWatcher> RegistryKeyWatcher::Create(
diff --git a/chrome/browser/win/conflicts/registry_key_watcher.h b/chrome/browser/win/conflicts/registry_key_watcher.h index e11cce52..ab4aa5e 100644 --- a/chrome/browser/win/conflicts/registry_key_watcher.h +++ b/chrome/browser/win/conflicts/registry_key_watcher.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/win/registry.h" // This class monitors a registry key to detect if it gets deleted. Delete the
diff --git a/chrome/browser/win/conflicts/registry_key_watcher_unittest.cc b/chrome/browser/win/conflicts/registry_key_watcher_unittest.cc index 3d8dcff1..af8ed465 100644 --- a/chrome/browser/win/conflicts/registry_key_watcher_unittest.cc +++ b/chrome/browser/win/conflicts/registry_key_watcher_unittest.cc
@@ -4,7 +4,7 @@ #include "chrome/browser/win/conflicts/registry_key_watcher.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/run_loop.h" #include "base/test/task_environment.h" #include "base/test/test_reg_util_win.h"
diff --git a/chrome/browser/win/conflicts/third_party_blocking_browsertest.cc b/chrome/browser/win/conflicts/third_party_blocking_browsertest.cc index 84647a5..7fc3939 100644 --- a/chrome/browser/win/conflicts/third_party_blocking_browsertest.cc +++ b/chrome/browser/win/conflicts/third_party_blocking_browsertest.cc
@@ -3,10 +3,10 @@ // found in the LICENSE file. #include "base/base_paths.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/path_service.h" #include "base/run_loop.h" #include "base/scoped_native_library.h"
diff --git a/chrome/browser/win/conflicts/third_party_conflicts_manager.cc b/chrome/browser/win/conflicts/third_party_conflicts_manager.cc index 24b5363..4fc467d 100644 --- a/chrome/browser/win/conflicts/third_party_conflicts_manager.cc +++ b/chrome/browser/win/conflicts/third_party_conflicts_manager.cc
@@ -10,9 +10,9 @@ #include <utility> #include "base/base_paths.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/metrics/histogram_macros.h" #include "base/path_service.h"
diff --git a/chrome/browser/win/conflicts/third_party_conflicts_manager.h b/chrome/browser/win/conflicts/third_party_conflicts_manager.h index 6f668d7..9588d1c1 100644 --- a/chrome/browser/win/conflicts/third_party_conflicts_manager.h +++ b/chrome/browser/win/conflicts/third_party_conflicts_manager.h
@@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/win/conflicts/third_party_conflicts_manager_unittest.cc b/chrome/browser/win/conflicts/third_party_conflicts_manager_unittest.cc index 167c125..158b3dd 100644 --- a/chrome/browser/win/conflicts/third_party_conflicts_manager_unittest.cc +++ b/chrome/browser/win/conflicts/third_party_conflicts_manager_unittest.cc
@@ -7,10 +7,10 @@ #include <utility> #include "base/base_paths.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/path_service.h" #include "base/run_loop.h" #include "base/test/scoped_feature_list.h"
diff --git a/chrome/browser/win/conflicts/third_party_metrics_recorder.cc b/chrome/browser/win/conflicts/third_party_metrics_recorder.cc index 1bef64ee..26bffbc1 100644 --- a/chrome/browser/win/conflicts/third_party_metrics_recorder.cc +++ b/chrome/browser/win/conflicts/third_party_metrics_recorder.cc
@@ -8,7 +8,7 @@ #include <limits> #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h" #include "base/strings/string_piece.h"
diff --git a/chrome/browser/win/conflicts/uninstall_application.cc b/chrome/browser/win/conflicts/uninstall_application.cc index 3e95618..2bb7430 100644 --- a/chrome/browser/win/conflicts/uninstall_application.cc +++ b/chrome/browser/win/conflicts/uninstall_application.cc
@@ -9,8 +9,8 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h"
diff --git a/chrome/browser/win/jumplist.cc b/chrome/browser/win/jumplist.cc index ef7e948..6bb953f 100644 --- a/chrome/browser/win/jumplist.cc +++ b/chrome/browser/win/jumplist.cc
@@ -8,11 +8,11 @@ #include <utility> #include "base/base_paths.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/containers/flat_set.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/histogram_macros.h" #include "base/path_service.h" #include "base/strings/strcat.h"
diff --git a/chrome/browser/win/parental_controls.cc b/chrome/browser/win/parental_controls.cc index 5145cb3..052c89c9 100644 --- a/chrome/browser/win/parental_controls.cc +++ b/chrome/browser/win/parental_controls.cc
@@ -12,7 +12,7 @@ #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/memory/singleton.h"
diff --git a/chrome/browser/win/settings_app_monitor.cc b/chrome/browser/win/settings_app_monitor.cc index 9234ccd1..c419f8d 100644 --- a/chrome/browser/win/settings_app_monitor.cc +++ b/chrome/browser/win/settings_app_monitor.cc
@@ -9,8 +9,8 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/scoped_refptr.h" #include "base/metrics/histogram_macros.h"
diff --git a/chrome/browser/win/taskbar_icon_finder.cc b/chrome/browser/win/taskbar_icon_finder.cc index 06c4f2a..be40760 100644 --- a/chrome/browser/win/taskbar_icon_finder.cc +++ b/chrome/browser/win/taskbar_icon_finder.cc
@@ -14,7 +14,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/memory/ref_counted.h"
diff --git a/chrome/browser/win/taskbar_icon_finder.h b/chrome/browser/win/taskbar_icon_finder.h index 8d59cf6..10d6da3 100644 --- a/chrome/browser/win/taskbar_icon_finder.h +++ b/chrome/browser/win/taskbar_icon_finder.h
@@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_WIN_TASKBAR_ICON_FINDER_H_ #define CHROME_BROWSER_WIN_TASKBAR_ICON_FINDER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" namespace gfx { class Rect;
diff --git a/chrome/browser/win/taskbar_icon_finder_unittest.cc b/chrome/browser/win/taskbar_icon_finder_unittest.cc index 081c784..5ef13cc 100644 --- a/chrome/browser/win/taskbar_icon_finder_unittest.cc +++ b/chrome/browser/win/taskbar_icon_finder_unittest.cc
@@ -4,8 +4,8 @@ #include "chrome/browser/win/taskbar_icon_finder.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/run_loop.h" #include "base/test/scoped_run_loop_timeout.h"
diff --git a/chrome/build/linux.pgo.txt b/chrome/build/linux.pgo.txt index 6b0ccc5..ec54ab2a 100644 --- a/chrome/build/linux.pgo.txt +++ b/chrome/build/linux.pgo.txt
@@ -1 +1 @@ -chrome-linux-main-1673027968-e5ab873f6f0c7eba5a4b09089c7414051510c10f.profdata +chrome-linux-main-1673092343-fbd7486018000bcd58cd1f1e50ea7facf09eabf4.profdata
diff --git a/chrome/build/mac-arm.pgo.txt b/chrome/build/mac-arm.pgo.txt index 90dd21d..a5d4f87 100644 --- a/chrome/build/mac-arm.pgo.txt +++ b/chrome/build/mac-arm.pgo.txt
@@ -1 +1 @@ -chrome-mac-arm-main-1673027968-9000fe8d97b6b0721287b3504c3bbfc7d3e3f0c4.profdata +chrome-mac-arm-main-1673092343-1b45590a99cf6d863d28b53de330f6334c0723d5.profdata
diff --git a/chrome/build/mac.pgo.txt b/chrome/build/mac.pgo.txt index 1c713098..594c74b 100644 --- a/chrome/build/mac.pgo.txt +++ b/chrome/build/mac.pgo.txt
@@ -1 +1 @@ -chrome-mac-main-1673027968-f1b4a51eabffcafb52a33c6cc9d69c9a92fb9c01.profdata +chrome-mac-main-1673092343-b87a070f20d561db212a1e830d375406fb089f4f.profdata
diff --git a/chrome/build/win32.pgo.txt b/chrome/build/win32.pgo.txt index 5e090e0f..9fbbaa5 100644 --- a/chrome/build/win32.pgo.txt +++ b/chrome/build/win32.pgo.txt
@@ -1 +1 @@ -chrome-win32-main-1673027968-6b2763bc63f1cb1cfbff817f0fa7f6eb3880f9e5.profdata +chrome-win32-main-1673092343-d6a7a43516496f7b156fd0358a3ffa527f1ee565.profdata
diff --git a/chrome/build/win64.pgo.txt b/chrome/build/win64.pgo.txt index 2ca9a91..25303888 100644 --- a/chrome/build/win64.pgo.txt +++ b/chrome/build/win64.pgo.txt
@@ -1 +1 @@ -chrome-win64-main-1673027968-992f6868c74e565a98370c37ff798b63724e9a30.profdata +chrome-win64-main-1673103523-ed8aca935ead03bc06402de3aa8b2ef5e249c224.profdata
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn index 3b51a6d..a959dcb 100644 --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn
@@ -6934,11 +6934,10 @@ "../browser/ui/tabs/existing_window_sub_menu_model_unittest.cc", "../browser/ui/tabs/pinned_tab_codec_unittest.cc", "../browser/ui/tabs/pinned_tab_service_unittest.cc", - "../browser/ui/tabs/saved_tab_groups/saved_tab_group_model_listener_unittest.cc", + "../browser/ui/tabs/saved_tab_groups/saved_tab_group_keyed_service_unittest.cc", "../browser/ui/tabs/tab_menu_model_unittest.cc", "../browser/ui/tabs/tab_strip_model_stats_recorder_unittest.cc", "../browser/ui/tabs/tab_strip_model_unittest.cc", - "../browser/ui/tabs/tab_switch_event_latency_recorder_unittest.cc", "../browser/ui/tabs/test_tab_strip_model_delegate.cc", "../browser/ui/tabs/test_tab_strip_model_delegate.h", "../browser/ui/thumbnails/thumbnail_capture_driver_unittest.cc",
diff --git a/chrome/test/data/webui/chromeos/ash_common/.gitignore b/chrome/test/data/webui/chromeos/ash_common/.gitignore new file mode 100644 index 0000000..79f93fdd --- /dev/null +++ b/chrome/test/data/webui/chromeos/ash_common/.gitignore
@@ -0,0 +1,2 @@ +# Generated from ash/webui/personalization_app/tools/gen_tsconfig.py +tsconfig.json \ No newline at end of file
diff --git a/chrome/test/data/webui/chromeos/ash_common/BUILD.gn b/chrome/test/data/webui/chromeos/ash_common/BUILD.gn index 65cc7bd..774147e 100644 --- a/chrome/test/data/webui/chromeos/ash_common/BUILD.gn +++ b/chrome/test/data/webui/chromeos/ash_common/BUILD.gn
@@ -20,6 +20,7 @@ "cr_policy_strings.ts", "cr_scrollable_behavior_tests.ts", "list_property_update_behavior_tests.ts", + "typescript_utils/strict_query_test.ts", ] deps = [ "../..:build_ts",
diff --git a/chrome/test/data/webui/chromeos/ash_common/ash_common_resources_browsertest.js b/chrome/test/data/webui/chromeos/ash_common/ash_common_resources_browsertest.js index 4b69e30..383d7e3 100644 --- a/chrome/test/data/webui/chromeos/ash_common/ash_common_resources_browsertest.js +++ b/chrome/test/data/webui/chromeos/ash_common/ash_common_resources_browsertest.js
@@ -93,3 +93,16 @@ TEST_F('AshCommonResourcesScrollableBehaviorTest', 'All', function() { mocha.run(); }); + +var AshCommonResourcesTypescriptUtilsStrictQueryTest = + class extends AshCommonResourcesBrowserTest { + /** @override */ + get browsePreload() { + return 'chrome://webui-test/test_loader.html?module=chromeos/ash_common/' + + 'typescript_utils/strict_query_test.js' + } +}; + +TEST_F('AshCommonResourcesTypescriptUtilsStrictQueryTest', 'All', function() { + mocha.run(); +});
diff --git a/chrome/test/data/webui/chromeos/ash_common/typescript_utils/strict_query_test.ts b/chrome/test/data/webui/chromeos/ash_common/typescript_utils/strict_query_test.ts new file mode 100644 index 0000000..fc4047d --- /dev/null +++ b/chrome/test/data/webui/chromeos/ash_common/typescript_utils/strict_query_test.ts
@@ -0,0 +1,51 @@ +// Copyright 2023 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +import {strictQuery} from 'chrome://resources/ash/common/typescript_utils/strict_query.js'; +import {assertEquals, assertThrows} from 'chrome://webui-test/chai_assert.js'; + +const initSectionElement = (): HTMLElement => { + const sectionElement = document.createElement('section'); + sectionElement.innerText = 'test of strictQuery'; + document.body.appendChild(sectionElement); + return sectionElement; +}; + +suite('StrictQueryTest', function() { + let sectionElement: HTMLElement|null; + + setup(() => { + // Reset the document HTML before each test. We cast to unknown and string + // since TrustedHTML cannot be assigned to innerHTML (which is a string). + document.body.innerHTML = + (window.trustedTypes!.emptyHTML as unknown) as string; + }); + + teardown(() => { + if (sectionElement) { + sectionElement.remove(); + } + sectionElement = null; + }); + + test('BasicQuery', function() { + sectionElement = initSectionElement(); + const queriedElement = strictQuery('section', document.body, HTMLElement); + assertEquals(sectionElement, queriedElement); + }); + + test('ThrowsIfNotFound', function() { + sectionElement = initSectionElement(); + assertThrows(() => { + strictQuery('invalid-element', document.body, HTMLElement); + }); + }); + + test('ThrowsIfDifferentType', function() { + sectionElement = initSectionElement(); + assertThrows(() => { + strictQuery('section', document.body, HTMLInputElement); + }); + }); +}); \ No newline at end of file
diff --git a/chrome/test/data/webui/settings/chromeos/os_bluetooth_device_detail_subpage_tests.js b/chrome/test/data/webui/settings/chromeos/os_bluetooth_device_detail_subpage_tests.js index af6662e9..2796e28 100644 --- a/chrome/test/data/webui/settings/chromeos/os_bluetooth_device_detail_subpage_tests.js +++ b/chrome/test/data/webui/settings/chromeos/os_bluetooth_device_detail_subpage_tests.js
@@ -4,15 +4,16 @@ import 'chrome://os-settings/strings.m.js'; -import {Router, routes} from 'chrome://os-settings/chromeos/os_settings.js'; +import {OsBluetoothDevicesSubpageBrowserProxyImpl, Router, routes} from 'chrome://os-settings/chromeos/os_settings.js'; import {setBluetoothConfigForTesting} from 'chrome://resources/ash/common/bluetooth/cros_bluetooth_config.js'; import {AudioOutputCapability, BluetoothSystemProperties, DeviceConnectionState, DeviceType, SystemPropertiesObserverInterface} from 'chrome://resources/mojo/chromeos/ash/services/bluetooth_config/public/mojom/cros_bluetooth_config.mojom-webui.js'; import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; +import {assertEquals, assertFalse, assertNotEquals, assertTrue} from 'chrome://webui-test/chai_assert.js'; import {createDefaultBluetoothDevice, FakeBluetoothConfig} from 'chrome://webui-test/cr_components/chromeos/bluetooth/fake_bluetooth_config.js'; import {waitBeforeNextRender} from 'chrome://webui-test/polymer_test_util.js'; import {eventToPromise} from 'chrome://webui-test/test_util.js'; -import {assertEquals, assertFalse, assertNotEquals, assertTrue} from 'chrome://webui-test/chai_assert.js'; +import {TestOsBluetoothDevicesSubpageBrowserProxy} from './test_os_bluetooth_subpage_browser_proxy.js'; suite('OsBluetoothDeviceDetailPageTest', function() { /** @type {!FakeBluetoothConfig} */ @@ -26,12 +27,19 @@ */ let propertiesObserver; + /** @type {?OsBluetoothDevicesSubpageBrowserProxy} */ + let browserProxy = null; + setup(function() { bluetoothConfig = new FakeBluetoothConfig(); setBluetoothConfigForTesting(bluetoothConfig); }); function init() { + browserProxy = new TestOsBluetoothDevicesSubpageBrowserProxy(); + OsBluetoothDevicesSubpageBrowserProxyImpl.setInstanceForTesting( + browserProxy); + bluetoothDeviceDetailPage = document.createElement('os-settings-bluetooth-device-detail-subpage'); document.body.appendChild(bluetoothDeviceDetailPage); @@ -885,4 +893,15 @@ assertFalse(!!bluetoothDeviceDetailPage.getDeviceForTest()); assertFalse(!!bluetoothDeviceDetailPage.getDeviceIdForTest()); }); + + test('Route to device details page', function() { + init(); + assertEquals(0, browserProxy.getShowBluetoothRevampHatsSurveyCount()); + const params = new URLSearchParams(); + params.append('id', 'id'); + Router.getInstance().navigateTo(routes.BLUETOOTH_DEVICE_DETAIL, params); + assertEquals( + 1, browserProxy.getShowBluetoothRevampHatsSurveyCount(), + 'Count failed to increase'); + }); });
diff --git a/chrome/updater/device_management/dm_response_validator_unittest.cc b/chrome/updater/device_management/dm_response_validator_unittest.cc index b9034d4..abb7302 100644 --- a/chrome/updater/device_management/dm_response_validator_unittest.cc +++ b/chrome/updater/device_management/dm_response_validator_unittest.cc
@@ -78,6 +78,10 @@ } TEST_F(DMResponseValidatorTests, ValidationOKWithPublicKey) { + // Cached info should be created before parsing next policy response. + CachedPolicyInfo cached_info; + GetCachedInfoWithPublicKey(cached_info); + std::unique_ptr<::enterprise_management::DeviceManagementResponse> dm_response = GetDefaultTestingPolicyFetchDMResponse( /*first_request=*/false, /*rotate_to_new_key=*/false, @@ -87,8 +91,6 @@ const ::enterprise_management::PolicyFetchResponse& response = dm_response->policy_response().responses(0); - CachedPolicyInfo cached_info; - GetCachedInfoWithPublicKey(cached_info); DMResponseValidator validator(cached_info, "test-dm-token", "test-device-id"); PolicyValidationResult validation_result; EXPECT_TRUE(validator.ValidatePolicyResponse(response, validation_result)); @@ -160,6 +162,10 @@ } TEST_F(DMResponseValidatorTests, BadSignedPublicKey) { + // Cached info should be created before parsing next policy response. + CachedPolicyInfo cached_info; + GetCachedInfoWithPublicKey(cached_info); + // Validation should fail if the public key is not signed properly. std::unique_ptr<::enterprise_management::DeviceManagementResponse> dm_response = GetDefaultTestingPolicyFetchDMResponse( @@ -170,8 +176,6 @@ const ::enterprise_management::PolicyFetchResponse& response = dm_response->policy_response().responses(0); - CachedPolicyInfo cached_info; - GetCachedInfoWithPublicKey(cached_info); DMResponseValidator validator(cached_info, "test-dm-token", "test-device-id"); PolicyValidationResult validation_result; EXPECT_FALSE(validator.ValidatePolicyResponse(response, validation_result));
diff --git a/chrome/updater/win/app_command_runner.cc b/chrome/updater/win/app_command_runner.cc index 510c62f..d012f44 100644 --- a/chrome/updater/win/app_command_runner.cc +++ b/chrome/updater/win/app_command_runner.cc
@@ -20,6 +20,7 @@ #include "base/process/launch.h" #include "base/strings/strcat.h" #include "base/strings/string_util.h" +#include "base/strings/string_util_impl_helpers.h" #include "base/strings/utf_string_conversions.h" #include "base/version.h" #include "base/win/registry.h" @@ -105,48 +106,6 @@ return E_INVALIDARG; } -// Formats a single `parameter` and returns the result. Any placeholder `%N` in -// `parameter` is replaced with substitutions[N - 1]. Any literal `%` needs to -// be escaped with a `%`. -// -// Returns `absl::nullopt` if: -// * a placeholder %N is encountered where N > substitutions.size(). -// * a literal `%` is not escaped with a `%`. -// -// See examples in the WinUtil*FormatAppCommandLine unit tests. -absl::optional<std::wstring> FormatParameter( - const std::vector<std::wstring>& substitutions, - const std::wstring& parameter) { - DCHECK_LE(substitutions.size(), 9U); - - std::wstring formatted_parameter; - for (auto i = parameter.begin(); i != parameter.end(); ++i) { - if (*i != '%') { - formatted_parameter.push_back(*i); - continue; - } - - if (++i == parameter.end()) - return absl::nullopt; - - if (*i == '%') { - formatted_parameter.push_back('%'); - continue; - } - - if (*i < '1' || *i > '9') - return absl::nullopt; - - const size_t index = *i - '1'; - if (index >= substitutions.size()) - return absl::nullopt; - - formatted_parameter.append(substitutions[index]); - } - - return formatted_parameter; -} - bool IsParentOf(int key, const base::FilePath& child) { base::FilePath path; return base::PathService::Get(key, &path) && path.IsParent(child); @@ -168,6 +127,7 @@ default; AppCommandRunner::~AppCommandRunner() = default; +// static HResultOr<AppCommandRunner> AppCommandRunner::LoadAppCommand( UpdaterScope scope, const std::wstring& app_id, @@ -192,6 +152,7 @@ return app_command_runner; } +// static std::vector<AppCommandRunner> AppCommandRunner::LoadAutoRunOnOsUpgradeAppCommands( UpdaterScope scope, @@ -234,6 +195,18 @@ return ExecuteAppCommand(executable_, parameters_, substitutions, process); } +// static +absl::optional<std::wstring> AppCommandRunner::FormatParameter( + const std::wstring& parameter, + const std::vector<std::wstring>& substitutions) { + return base::internal::DoReplaceStringPlaceholders( + /*format_string*/ parameter, /*subst*/ substitutions, + /*placeholder_prefix*/ L'%', + /*should_escape_multiple_placeholder_prefixes*/ false, + /*is_strict_mode*/ true, /*offsets*/ nullptr); +} + +// static HRESULT AppCommandRunner::StartProcess(const base::FilePath& executable, const std::wstring& parameters, base::Process& process) { @@ -270,6 +243,7 @@ return S_OK; } +// static HRESULT AppCommandRunner::GetAppCommandFormatComponents( UpdaterScope scope, std::wstring command_format, @@ -300,13 +274,14 @@ return S_OK; } +// static absl::optional<std::wstring> AppCommandRunner::FormatAppCommandLine( const std::vector<std::wstring>& parameters, const std::vector<std::wstring>& substitutions) { std::wstring formatted_command_line; for (size_t i = 0; i < parameters.size(); ++i) { absl::optional<std::wstring> formatted_parameter = - FormatParameter(substitutions, parameters[i]); + FormatParameter(parameters[i], substitutions); if (!formatted_parameter) { VLOG(1) << __func__ << " FormatParameter failed: " << parameters[i] << ": " << substitutions.size(); @@ -328,6 +303,7 @@ return formatted_command_line; } +// static HRESULT AppCommandRunner::ExecuteAppCommand( const base::FilePath& executable, const std::vector<std::wstring>& parameters,
diff --git a/chrome/updater/win/app_command_runner.h b/chrome/updater/win/app_command_runner.h index 611ef9e..bf60ec4 100644 --- a/chrome/updater/win/app_command_runner.h +++ b/chrome/updater/win/app_command_runner.h
@@ -47,6 +47,18 @@ HRESULT Run(const std::vector<std::wstring>& substitutions, base::Process& process) const; + // Formats a single `parameter` using + // `base::internal::DoReplaceStringPlaceholders`. Any placeholder `%N` in + // `parameter` is replaced with substitutions[N - 1]. Any literal `%` needs to + // be escaped with a `%`. + // + // Returns `absl::nullopt` if: + // * a placeholder %N is encountered where N > substitutions.size(). + // * a literal `%` is not escaped with a `%`. + static absl::optional<std::wstring> FormatParameter( + const std::wstring& parameter, + const std::vector<std::wstring>& substitutions); + private: // Starts a process with separate `executable` and `parameters` components. // `executable` needs to be an absolute path.
diff --git a/chrome/updater/win/app_command_runner_unittest.cc b/chrome/updater/win/app_command_runner_unittest.cc index 2b6c54501..01dbbf7 100644 --- a/chrome/updater/win/app_command_runner_unittest.cc +++ b/chrome/updater/win/app_command_runner_unittest.cc
@@ -19,6 +19,7 @@ #include "base/ranges/algorithm.h" #include "base/strings/strcat.h" #include "base/strings/string_util.h" +#include "base/strings/string_util_impl_helpers.h" #include "base/strings/utf_string_conversions.h" #include "base/test/test_timeouts.h" #include "base/win/scoped_localalloc.h" @@ -498,4 +499,54 @@ }); } +TEST_F(AppCommandRunnerTest, ReplaceStringPercentPlaceholders) { + const std::vector<std::wstring> no_substitutions = {}; + const std::vector<std::wstring> p1p2p3 = {L"p1", L"p2", L"p3"}; + + const struct { + const std::wstring format_string; + const wchar_t* expected_output; + const std::vector<std::wstring>& substitutions; + } test_cases[] = { + // Format string does not have any placeholders. + {L"abc=1 xyz=2 q", L"abc=1 xyz=2 q", no_substitutions}, + {L" abc=1 xyz=2 q ", L" abc=1 xyz=2 q ", no_substitutions}, + + // Format string has placeholders. + {L"abc=%1", L"abc=p1", p1p2p3}, + {L"abc=%1 %3 %2=x ", L"abc=p1 p3 p2=x ", p1p2p3}, + + // Format string has correctly escaped literal `%` signs. + {L"%1", L"p1", p1p2p3}, + {L"%%1", L"%1", p1p2p3}, + {L"%%%1", L"%p1", p1p2p3}, + {L"abc%%def%%", L"abc%def%", p1p2p3}, + {L"%12", L"p12", p1p2p3}, + {L"%1%2", L"p1p2", p1p2p3}, + + // Format string has incorrect escaped `%` signs. + {L"unescaped percent %", nullptr, p1p2p3}, + {L"unescaped %%% percents", nullptr, p1p2p3}, + {L"always escape percent otherwise %error", nullptr, p1p2p3}, + {L"% percents need to be escaped%", nullptr, p1p2p3}, + + // Format string has invalid values for the placeholder index. + {L"placeholder needs to be between 1 and 9, not %A", nullptr, p1p2p3}, + {L"placeholder %4 is > size of substitutions vector", nullptr, p1p2p3}, + {L"%1 is ok, but %8 or %9 is not ok", nullptr, p1p2p3}, + {L"%4", nullptr, p1p2p3}, + {L"abc=%1", nullptr, no_substitutions}, + }; + + for (const auto& test_case : test_cases) { + absl::optional<std::wstring> output = AppCommandRunner::FormatParameter( + test_case.format_string, test_case.substitutions); + if (test_case.expected_output) { + EXPECT_EQ(output.value(), test_case.expected_output); + } else { + EXPECT_EQ(output, absl::nullopt); + } + } +} + } // namespace updater
diff --git a/chromeos/ash/services/assistant/public/cpp/BUILD.gn b/chromeos/ash/services/assistant/public/cpp/BUILD.gn index 043c5663..cd30414 100644 --- a/chromeos/ash/services/assistant/public/cpp/BUILD.gn +++ b/chromeos/ash/services/assistant/public/cpp/BUILD.gn
@@ -50,5 +50,6 @@ deps = [ "//chromeos/ash/components/assistant:buildflags", "//components/prefs", + "//sandbox/policy", ] }
diff --git a/chromeos/ash/services/assistant/public/cpp/DEPS b/chromeos/ash/services/assistant/public/cpp/DEPS new file mode 100644 index 0000000..7ac48f36 --- /dev/null +++ b/chromeos/ash/services/assistant/public/cpp/DEPS
@@ -0,0 +1,3 @@ +include_rules = [ + "+sandbox/policy/switches.h", +]
diff --git a/chromeos/ash/services/assistant/public/cpp/features.cc b/chromeos/ash/services/assistant/public/cpp/features.cc index 7135da0..172d33c 100644 --- a/chromeos/ash/services/assistant/public/cpp/features.cc +++ b/chromeos/ash/services/assistant/public/cpp/features.cc
@@ -5,7 +5,9 @@ #include "chromeos/ash/services/assistant/public/cpp/features.h" #include "ash/constants/ash_features.h" +#include "base/command_line.h" #include "base/feature_list.h" +#include "sandbox/policy/switches.h" namespace ash::assistant::features { @@ -106,6 +108,11 @@ } bool IsLibAssistantSandboxEnabled() { + if (base::CommandLine::ForCurrentProcess()->HasSwitch( + sandbox::policy::switches::kNoSandbox)) { + return false; + } + return IsLibAssistantV2Enabled() || base::FeatureList::IsEnabled(kEnableLibAssistantSandbox); }
diff --git a/chromeos/components/quick_answers/search_result_loader.cc b/chromeos/components/quick_answers/search_result_loader.cc index 9681da90..aa9462c 100644 --- a/chromeos/components/quick_answers/search_result_loader.cc +++ b/chromeos/components/quick_answers/search_result_loader.cc
@@ -57,22 +57,22 @@ std::string BuildSearchRequestPayload(const std::string& selected_text, const std::string& device_language) { - Value payload(Value::Type::DICTIONARY); + Value::Dict payload; - Value query(Value::Type::DICTIONARY); - query.SetStringKey(kRawQueryKey, selected_text); - payload.SetKey(kQueryKey, std::move(query)); + Value::Dict query; + query.Set(kRawQueryKey, selected_text); + payload.Set(kQueryKey, std::move(query)); // TODO(llin): Change the client type. - Value client_id(Value::Type::DICTIONARY); - client_id.SetKey(kClientTypeKey, Value(kClientType)); - payload.SetKey(kClientIdKey, std::move(client_id)); + Value::Dict client_id; + client_id.Set(kClientTypeKey, kClientType); + payload.Set(kClientIdKey, std::move(client_id)); - Value request_context(Value::Type::DICTIONARY); - Value language_context(Value::Type::DICTIONARY); - language_context.SetKey(kLanguageCodeKey, Value(device_language)); - request_context.SetKey(kLanguageContextKey, std::move(language_context)); - payload.SetKey(kRequestContextKey, std::move(request_context)); + Value::Dict request_context; + Value::Dict language_context; + language_context.Set(kLanguageCodeKey, device_language); + request_context.Set(kLanguageContextKey, std::move(language_context)); + payload.Set(kRequestContextKey, std::move(request_context)); std::string request_payload_str; base::JSONWriter::Write(payload, &request_payload_str);
diff --git a/chromeos/components/quick_answers/search_result_parsers/definition_result_parser.cc b/chromeos/components/quick_answers/search_result_parsers/definition_result_parser.cc index 6934d73..5e7ce78f 100644 --- a/chromeos/components/quick_answers/search_result_parsers/definition_result_parser.cc +++ b/chromeos/components/quick_answers/search_result_parsers/definition_result_parser.cc
@@ -32,27 +32,27 @@ } // namespace -bool DefinitionResultParser::Parse(const Value* result, +bool DefinitionResultParser::Parse(const base::Value::Dict& result, QuickAnswer* quick_answer) { - const Value* first_entry = - GetFirstListElement(*result, kDictionaryEntriesPath); + const Value::Dict* first_entry = + GetFirstListElement(result, kDictionaryEntriesPath); if (!first_entry) { LOG(ERROR) << "Can't find a definition entry."; return false; } // Get definition and phonetics. - const std::string* definition = ExtractDefinition(first_entry); + const std::string* definition = ExtractDefinition(*first_entry); if (!definition) { LOG(ERROR) << "Fail in extracting definition."; return false; } - const std::string* phonetics = ExtractPhoneticsText(first_entry); + const std::string* phonetics = ExtractPhoneticsText(*first_entry); // If query term path not found, fallback to use headword. - const std::string* query = result->FindStringPath(kQueryTermPath); + const std::string* query = result.FindStringByDottedPath(kQueryTermPath); if (!query) - query = first_entry->FindStringPath(kHeadwordKey); + query = first_entry->FindStringByDottedPath(kHeadwordKey); if (!query) { LOG(ERROR) << "Fail in extracting query."; return false; @@ -66,14 +66,14 @@ std::make_unique<QuickAnswerText>(secondary_answer)); quick_answer->first_answer_row.push_back( std::make_unique<QuickAnswerResultText>(*definition)); - ExtractPhoneticsInfo(&quick_answer->phonetics_info, first_entry); + ExtractPhoneticsInfo(&quick_answer->phonetics_info, *first_entry); return true; } -const Value* DefinitionResultParser::ExtractFirstSenseFamily( - const base::Value* definition_entry) { - const Value* first_sense_family = - GetFirstListElement(*definition_entry, kSenseFamiliesKey); +const Value::Dict* DefinitionResultParser::ExtractFirstSenseFamily( + const base::Value::Dict& definition_entry) { + const Value::Dict* first_sense_family = + GetFirstListElement(definition_entry, kSenseFamiliesKey); if (!first_sense_family) { LOG(ERROR) << "Can't find a sense family."; return nullptr; @@ -82,16 +82,16 @@ return first_sense_family; } -const Value* DefinitionResultParser::ExtractFirstPhonetics( - const base::Value* definition_entry) { - const Value* first_phonetics = - GetFirstListElement(*definition_entry, kPhoneticsKey); +const Value::Dict* DefinitionResultParser::ExtractFirstPhonetics( + const base::Value::Dict& definition_entry) { + const Value::Dict* first_phonetics = + GetFirstListElement(definition_entry, kPhoneticsKey); if (first_phonetics) return first_phonetics; // It is is possible to have phonetics per sense family in case of heteronyms // such as "arithmetic". - const Value* sense_family = ExtractFirstSenseFamily(definition_entry); + const Value::Dict* sense_family = ExtractFirstSenseFamily(definition_entry); if (sense_family) return GetFirstListElement(*sense_family, kPhoneticsKey); @@ -100,55 +100,62 @@ } const std::string* DefinitionResultParser::ExtractDefinition( - const base::Value* definition_entry) { - const Value* first_sense_family = ExtractFirstSenseFamily(definition_entry); + const base::Value::Dict& definition_entry) { + const Value::Dict* first_sense_family = + ExtractFirstSenseFamily(definition_entry); if (!first_sense_family) return nullptr; - const Value* first_sense = + const Value::Dict* first_sense = GetFirstListElement(*first_sense_family, kSensesKey); if (!first_sense) { LOG(ERROR) << "Can't find a sense."; return nullptr; } - return first_sense->FindStringPath(kDefinitionPathUnderSense); + return first_sense->FindStringByDottedPath(kDefinitionPathUnderSense); } const std::string* DefinitionResultParser::ExtractPhoneticsText( - const base::Value* definition_entry) { - const Value* first_phonetics = ExtractFirstPhonetics(definition_entry); + const base::Value::Dict& definition_entry) { + const Value::Dict* first_phonetics = ExtractFirstPhonetics(definition_entry); if (!first_phonetics) return nullptr; - return first_phonetics->FindStringPath(kPhoneticsTextKey); + return first_phonetics->FindStringByDottedPath(kPhoneticsTextKey); } void DefinitionResultParser::ExtractPhoneticsInfo( PhoneticsInfo* phonetics_info, - const base::Value* definition_entry) { + const base::Value::Dict& definition_entry) { // Check for the query text used for tts audio. - if (definition_entry->FindStringPath(kHeadwordKey)) + if (definition_entry.FindStringByDottedPath(kHeadwordKey)) { phonetics_info->query_text = - *definition_entry->FindStringPath(kHeadwordKey); + *definition_entry.FindStringByDottedPath(kHeadwordKey); + } // Check for the locale used for tts audio. - if (definition_entry->FindStringPath(kLocaleKey)) - phonetics_info->locale = *definition_entry->FindStringPath(kLocaleKey); + if (definition_entry.FindStringByDottedPath(kLocaleKey)) { + phonetics_info->locale = + *definition_entry.FindStringByDottedPath(kLocaleKey); + } - const Value* first_phonetics = ExtractFirstPhonetics(definition_entry); + const Value::Dict* first_phonetics = ExtractFirstPhonetics(definition_entry); if (!first_phonetics) return; // Check if the phonetics has an audio URL. - if (first_phonetics->FindStringPath(kPhoneticsAudioKey)) - phonetics_info->phonetics_audio = GURL( - kHttpsPrefix + *first_phonetics->FindStringPath(kPhoneticsAudioKey)); + if (first_phonetics->FindStringByDottedPath(kPhoneticsAudioKey)) { + phonetics_info->phonetics_audio = + GURL(kHttpsPrefix + + *first_phonetics->FindStringByDottedPath(kPhoneticsAudioKey)); + } // Check if tts audio is enabled for the query. - if (first_phonetics->FindBoolPath(kPhoneticsTtsAudioEnabledKey)) + if (first_phonetics->FindBoolByDottedPath(kPhoneticsTtsAudioEnabledKey)) { phonetics_info->tts_audio_enabled = true; + } } } // namespace quick_answers
diff --git a/chromeos/components/quick_answers/search_result_parsers/definition_result_parser.h b/chromeos/components/quick_answers/search_result_parsers/definition_result_parser.h index dd30f2a..2fb7711c 100644 --- a/chromeos/components/quick_answers/search_result_parsers/definition_result_parser.h +++ b/chromeos/components/quick_answers/search_result_parsers/definition_result_parser.h
@@ -5,11 +5,11 @@ #ifndef CHROMEOS_COMPONENTS_QUICK_ANSWERS_SEARCH_RESULT_PARSERS_DEFINITION_RESULT_PARSER_H_ #define CHROMEOS_COMPONENTS_QUICK_ANSWERS_SEARCH_RESULT_PARSERS_DEFINITION_RESULT_PARSER_H_ +#include "base/values.h" #include "chromeos/components/quick_answers/search_result_parsers/result_parser.h" namespace base { class GURL; -class Value; } // namespace base namespace quick_answers { @@ -17,16 +17,20 @@ class DefinitionResultParser : public ResultParser { public: // ResultParser: - bool Parse(const base::Value* result, QuickAnswer* quick_answer) override; + bool Parse(const base::Value::Dict& result, + QuickAnswer* quick_answer) override; private: - const base::Value* ExtractFirstSenseFamily( - const base::Value* definition_entry); - const base::Value* ExtractFirstPhonetics(const base::Value* definition_entry); - const std::string* ExtractDefinition(const base::Value* definition_entry); - const std::string* ExtractPhoneticsText(const base::Value* definition_entry); + const base::Value::Dict* ExtractFirstSenseFamily( + const base::Value::Dict& definition_entry); + const base::Value::Dict* ExtractFirstPhonetics( + const base::Value::Dict& definition_entry); + const std::string* ExtractDefinition( + const base::Value::Dict& definition_entry); + const std::string* ExtractPhoneticsText( + const base::Value::Dict& definition_entry); void ExtractPhoneticsInfo(PhoneticsInfo* phonetics_info, - const base::Value* definition_entry); + const base::Value::Dict& definition_entry); }; } // namespace quick_answers
diff --git a/chromeos/components/quick_answers/search_result_parsers/definition_result_parser_unittest.cc b/chromeos/components/quick_answers/search_result_parsers/definition_result_parser_unittest.cc index 1bfe0f72..df534dd 100644 --- a/chromeos/components/quick_answers/search_result_parsers/definition_result_parser_unittest.cc +++ b/chromeos/components/quick_answers/search_result_parsers/definition_result_parser_unittest.cc
@@ -28,62 +28,61 @@ delete; protected: - Value BuildDictionaryResult(const std::string& query_term, - const std::string& phonetic_str, - const std::string& definition) { - Value result(Value::Type::DICTIONARY); + Value::Dict BuildDictionaryResult(const std::string& query_term, + const std::string& phonetic_str, + const std::string& definition) { + Value::Dict result; if (!query_term.empty()) - result.SetStringPath("dictionaryResult.queryTerm", query_term); + result.SetByDottedPath("dictionaryResult.queryTerm", query_term); // Build definition entry. - Value entries(Value::Type::LIST); - Value entry(Value::Type::DICTIONARY); + Value::List entries; + Value::Dict entry; // Build phonetics. if (!phonetic_str.empty()) { - Value phonetics(Value::Type::LIST); - Value phonetic(Value::Type::DICTIONARY); - phonetic.SetStringPath("text", phonetic_str); + Value::List phonetics; + Value::Dict phonetic; + phonetic.Set("text", phonetic_str); phonetics.Append(std::move(phonetic)); - entry.SetPath("phonetics", std::move(phonetics)); + entry.Set("phonetics", std::move(phonetics)); } // Build definition. if (!definition.empty()) { - Value sense_families(Value::Type::LIST); - Value sense_family(Value::Type::DICTIONARY); - Value senses(Value::Type::LIST); - Value sense(Value::Type::DICTIONARY); - sense.SetStringPath("definition.text", definition); + Value::List sense_families; + Value::Dict sense_family; + Value::List senses; + Value::Dict sense; + sense.SetByDottedPath("definition.text", definition); senses.Append(std::move(sense)); - sense_family.SetPath("senses", std::move(senses)); + sense_family.Set("senses", std::move(senses)); sense_families.Append(std::move(sense_family)); - entry.SetPath("senseFamilies", std::move(sense_families)); + entry.Set("senseFamilies", std::move(sense_families)); } entries.Append(std::move(entry)); - result.SetPath("dictionaryResult.entries", std::move(entries)); + result.SetByDottedPath("dictionaryResult.entries", std::move(entries)); return result; } - void SetHeadWord(Value* result, const std::string& headword) { - result->FindListPath("dictionaryResult.entries") - ->GetList()[0] - .SetStringPath("headword", headword); + void SetHeadWord(Value::Dict& result, const std::string& headword) { + (*result.FindListByDottedPath("dictionaryResult.entries"))[0].GetDict().Set( + "headword", headword); } std::unique_ptr<DefinitionResultParser> parser_; }; TEST_F(DefinitionResultParserTest, Success) { - Value result = + Value::Dict result = BuildDictionaryResult("unfathomable", "ˌənˈfaT͟Həməb(ə)", "incapable of being fully explored or understood."); QuickAnswer quick_answer; - EXPECT_TRUE(parser_->Parse(&result, &quick_answer)); + EXPECT_TRUE(parser_->Parse(result, &quick_answer)); const auto& expected_title = "unfathomable · /ˌənˈfaT͟Həməb(ə)/"; const auto& expected_answer = @@ -103,48 +102,48 @@ } TEST_F(DefinitionResultParserTest, EmptyValue) { - Value result(Value::Type::DICTIONARY); + Value::Dict result; QuickAnswer quick_answer; - EXPECT_FALSE(parser_->Parse(&result, &quick_answer)); + EXPECT_FALSE(parser_->Parse(result, &quick_answer)); } TEST_F(DefinitionResultParserTest, NoQueryTerm) { - Value result = + Value::Dict result = BuildDictionaryResult("", "ˌənˈfaT͟Həməb(ə)", "incapable of being fully explored or understood."); QuickAnswer quick_answer; - EXPECT_FALSE(parser_->Parse(&result, &quick_answer)); + EXPECT_FALSE(parser_->Parse(result, &quick_answer)); } TEST_F(DefinitionResultParserTest, NoQueryTermShouldFallbackToHeadword) { - Value result = + Value::Dict result = BuildDictionaryResult("", "ˌənˈfaT͟Həməb(ə)", "incapable of being fully explored or understood."); - SetHeadWord(&result, "unfathomable"); + SetHeadWord(result, "unfathomable"); QuickAnswer quick_answer; - EXPECT_TRUE(parser_->Parse(&result, &quick_answer)); + EXPECT_TRUE(parser_->Parse(result, &quick_answer)); const auto& expected_title = "unfathomable · /ˌənˈfaT͟Həməb(ə)/"; EXPECT_EQ(expected_title, GetQuickAnswerTextForTesting(quick_answer.title)); } TEST_F(DefinitionResultParserTest, ShouldPrioritizeQueryTerm) { - Value result = + Value::Dict result = BuildDictionaryResult("Unfathomable", "ˌənˈfaT͟Həməb(ə)", "incapable of being fully explored or understood."); - SetHeadWord(&result, "Unfathomable"); + SetHeadWord(result, "Unfathomable"); QuickAnswer quick_answer; - EXPECT_TRUE(parser_->Parse(&result, &quick_answer)); + EXPECT_TRUE(parser_->Parse(result, &quick_answer)); const auto& expected_title = "Unfathomable · /ˌənˈfaT͟Həməb(ə)/"; EXPECT_EQ(expected_title, GetQuickAnswerTextForTesting(quick_answer.title)); } TEST_F(DefinitionResultParserTest, NoPhonetic) { - Value result = BuildDictionaryResult( + Value::Dict result = BuildDictionaryResult( "unfathomable", "", "incapable of being fully explored or understood."); QuickAnswer quick_answer; - EXPECT_TRUE(parser_->Parse(&result, &quick_answer)); + EXPECT_TRUE(parser_->Parse(result, &quick_answer)); const auto& expected_title = "unfathomable"; const auto& expected_answer = @@ -156,9 +155,10 @@ } TEST_F(DefinitionResultParserTest, NoDefinition) { - Value result = BuildDictionaryResult("unfathomable", "ˌənˈfaT͟Həməb(ə)l", ""); + Value::Dict result = + BuildDictionaryResult("unfathomable", "ˌənˈfaT͟Həməb(ə)l", ""); QuickAnswer quick_answer; - EXPECT_FALSE(parser_->Parse(&result, &quick_answer)); + EXPECT_FALSE(parser_->Parse(result, &quick_answer)); } } // namespace quick_answers
diff --git a/chromeos/components/quick_answers/search_result_parsers/kp_entity_result_parser.cc b/chromeos/components/quick_answers/search_result_parsers/kp_entity_result_parser.cc index 53a80a5..de20e51 100644 --- a/chromeos/components/quick_answers/search_result_parsers/kp_entity_result_parser.cc +++ b/chromeos/components/quick_answers/search_result_parsers/kp_entity_result_parser.cc
@@ -27,16 +27,17 @@ } // namespace // Extract |quick_answer| from knowledge panel entity result. -bool KpEntityResultParser::Parse(const Value* result, +bool KpEntityResultParser::Parse(const Value::Dict& result, QuickAnswer* quick_answer) { - const auto* entity = result->FindPath(kKnowledgeEntityPath); + const auto* entity = result.FindDictByDottedPath(kKnowledgeEntityPath); if (!entity) { LOG(ERROR) << "Can't find the knowledge panel entity."; return false; } - const auto average_score = entity->FindDoublePath(kScorePath); - const auto* aggregated_count = entity->FindStringPath(kRatingCountPath); + const auto average_score = entity->FindDoubleByDottedPath(kScorePath); + const auto* aggregated_count = + entity->FindStringByDottedPath(kRatingCountPath); if (average_score.has_value() && aggregated_count) { const auto& answer = BuildKpEntityTitleText( @@ -46,7 +47,7 @@ std::make_unique<QuickAnswerResultText>(answer)); } else { const std::string* localized_known_for_reason = - entity->FindStringPath(kKnownForReasonPath); + entity->FindStringByDottedPath(kKnownForReasonPath); if (!localized_known_for_reason) { LOG(ERROR) << "Can't find the localized known for reason field."; return false;
diff --git a/chromeos/components/quick_answers/search_result_parsers/kp_entity_result_parser.h b/chromeos/components/quick_answers/search_result_parsers/kp_entity_result_parser.h index fe5593c..c88b259 100644 --- a/chromeos/components/quick_answers/search_result_parsers/kp_entity_result_parser.h +++ b/chromeos/components/quick_answers/search_result_parsers/kp_entity_result_parser.h
@@ -5,18 +5,16 @@ #ifndef CHROMEOS_COMPONENTS_QUICK_ANSWERS_SEARCH_RESULT_PARSERS_KP_ENTITY_RESULT_PARSER_H_ #define CHROMEOS_COMPONENTS_QUICK_ANSWERS_SEARCH_RESULT_PARSERS_KP_ENTITY_RESULT_PARSER_H_ +#include "base/values.h" #include "chromeos/components/quick_answers/search_result_parsers/result_parser.h" -namespace base { -class Value; -} // namespace base - namespace quick_answers { class KpEntityResultParser : public ResultParser { public: // ResultParser: - bool Parse(const base::Value* result, QuickAnswer* quick_answer) override; + bool Parse(const base::Value::Dict& result, + QuickAnswer* quick_answer) override; }; } // namespace quick_answers
diff --git a/chromeos/components/quick_answers/search_result_parsers/kp_entity_result_parser_unittest.cc b/chromeos/components/quick_answers/search_result_parsers/kp_entity_result_parser_unittest.cc index ca5cad15..c4463a9d 100644 --- a/chromeos/components/quick_answers/search_result_parsers/kp_entity_result_parser_unittest.cc +++ b/chromeos/components/quick_answers/search_result_parsers/kp_entity_result_parser_unittest.cc
@@ -31,19 +31,19 @@ }; TEST_F(KpEntityResultParserTest, SuccessWithRating) { - Value result(Value::Type::DICTIONARY); - result.SetDoublePath( + Value::Dict result; + result.SetByDottedPath( "knowledgePanelEntityResult.entity.ratingsAndReviews.google." "aggregateRating.averageScore", 4.5); - result.SetStringPath( + result.SetByDottedPath( "knowledgePanelEntityResult.entity.ratingsAndReviews.google." "aggregateRating.aggregatedCount", "100"); QuickAnswer quick_answer; - EXPECT_TRUE(parser_->Parse(&result, &quick_answer)); + EXPECT_TRUE(parser_->Parse(result, &quick_answer)); EXPECT_EQ(ResultType::kKnowledgePanelEntityResult, quick_answer.result_type); EXPECT_EQ(0u, quick_answer.title.size()); @@ -53,19 +53,19 @@ } TEST_F(KpEntityResultParserTest, SuccessWithRatingScoreRound) { - Value result(Value::Type::DICTIONARY); - result.SetDoublePath( + Value::Dict result; + result.SetByDottedPath( "knowledgePanelEntityResult.entity.ratingsAndReviews.google." "aggregateRating.averageScore", 4.52); - result.SetStringPath( + result.SetByDottedPath( "knowledgePanelEntityResult.entity.ratingsAndReviews.google." "aggregateRating.aggregatedCount", "100"); QuickAnswer quick_answer; - EXPECT_TRUE(parser_->Parse(&result, &quick_answer)); + EXPECT_TRUE(parser_->Parse(result, &quick_answer)); EXPECT_EQ(ResultType::kKnowledgePanelEntityResult, quick_answer.result_type); EXPECT_EQ(0u, quick_answer.title.size()); @@ -76,13 +76,13 @@ GetQuickAnswerTextForTesting(quick_answer.first_answer_row)); EXPECT_EQ(ui::kColorLabelForegroundSecondary, answer->color_id); - result.SetDoublePath( + result.SetByDottedPath( "knowledgePanelEntityResult.entity.ratingsAndReviews.google." "aggregateRating.averageScore", 4.56); QuickAnswer quick_answer2; - EXPECT_TRUE(parser_->Parse(&result, &quick_answer2)); + EXPECT_TRUE(parser_->Parse(result, &quick_answer2)); EXPECT_EQ(0u, quick_answer2.title.size()); EXPECT_EQ(1u, quick_answer2.first_answer_row.size()); @@ -94,14 +94,14 @@ } TEST_F(KpEntityResultParserTest, SuccessWithKnownForReason) { - Value result(Value::Type::DICTIONARY); - result.SetStringPath( + Value::Dict result; + result.SetByDottedPath( "knowledgePanelEntityResult.entity.localizedKnownForReason", "44th U.S. President"); QuickAnswer quick_answer; - EXPECT_TRUE(parser_->Parse(&result, &quick_answer)); + EXPECT_TRUE(parser_->Parse(result, &quick_answer)); EXPECT_EQ(ResultType::kKnowledgePanelEntityResult, quick_answer.result_type); EXPECT_EQ(0u, quick_answer.title.size()); @@ -114,25 +114,25 @@ } TEST_F(KpEntityResultParserTest, EmptyValue) { - Value result(Value::Type::DICTIONARY); + Value::Dict result; QuickAnswer quick_answer; - EXPECT_FALSE(parser_->Parse(&result, &quick_answer)); + EXPECT_FALSE(parser_->Parse(result, &quick_answer)); } TEST_F(KpEntityResultParserTest, IncorrectType) { - Value result(Value::Type::DICTIONARY); - result.SetIntPath("ratingsAndReviews.google.aggregateRating.aggregatedCount", - 100); + Value::Dict result; + result.SetByDottedPath( + "ratingsAndReviews.google.aggregateRating.aggregatedCount", 100); QuickAnswer quick_answer; - EXPECT_FALSE(parser_->Parse(&result, &quick_answer)); + EXPECT_FALSE(parser_->Parse(result, &quick_answer)); } TEST_F(KpEntityResultParserTest, IncorrectPath) { - Value result(Value::Type::DICTIONARY); - result.SetStringPath( + Value::Dict result; + result.SetByDottedPath( "ratingsAndReviews.google.aggregateRating.aggregatedCounts", "100"); QuickAnswer quick_answer; - EXPECT_FALSE(parser_->Parse(&result, &quick_answer)); + EXPECT_FALSE(parser_->Parse(result, &quick_answer)); } } // namespace quick_answers
diff --git a/chromeos/components/quick_answers/search_result_parsers/result_parser.cc b/chromeos/components/quick_answers/search_result_parsers/result_parser.cc index 6c07095d..2e0c531 100644 --- a/chromeos/components/quick_answers/search_result_parsers/result_parser.cc +++ b/chromeos/components/quick_answers/search_result_parsers/result_parser.cc
@@ -15,21 +15,20 @@ using base::Value; } // namespace -const Value* ResultParser::GetFirstListElement(const Value& value, - const std::string& path) { - const Value* entries = value.FindListPath(path); +const Value::Dict* ResultParser::GetFirstListElement(const Value::Dict& dict, + const std::string& path) { + const Value::List* entries = dict.FindListByDottedPath(path); if (!entries) { // No list found. return nullptr; } - const auto& list = entries->GetList(); - if (list.empty()) { + if (entries->empty()) { // No valid dictionary entries found. return nullptr; } - return &list[0]; + return &(*entries)[0].GetDict(); } // static
diff --git a/chromeos/components/quick_answers/search_result_parsers/result_parser.h b/chromeos/components/quick_answers/search_result_parsers/result_parser.h index 552f1c7..8f3ccd8ea 100644 --- a/chromeos/components/quick_answers/search_result_parsers/result_parser.h +++ b/chromeos/components/quick_answers/search_result_parsers/result_parser.h
@@ -8,12 +8,9 @@ #include <memory> #include <string> +#include "base/values.h" #include "chromeos/components/quick_answers/quick_answers_model.h" -namespace base { -class Value; -} // namespace base - namespace quick_answers { // Parser interface. @@ -22,12 +19,14 @@ virtual ~ResultParser() = default; // Parse the result into |quick_answer|. - virtual bool Parse(const base::Value* result, QuickAnswer* quick_answer) = 0; + virtual bool Parse(const base::Value::Dict& result, + QuickAnswer* quick_answer) = 0; protected: - // Helper function to get the first element in a value list. - const base::Value* GetFirstListElement(const base::Value& value, - const std::string& path); + // Helper function to get the first element in a value list, which is expected + // to be a dictionary. + const base::Value::Dict* GetFirstListElement(const base::Value::Dict& dict, + const std::string& path); }; // A factory class for creating ResultParser based on the |one_namespace_type|.
diff --git a/chromeos/components/quick_answers/search_result_parsers/search_response_parser.cc b/chromeos/components/quick_answers/search_result_parsers/search_response_parser.cc index a376054f..03bf2d44 100644 --- a/chromeos/components/quick_answers/search_result_parsers/search_response_parser.cc +++ b/chromeos/components/quick_answers/search_result_parsers/search_response_parser.cc
@@ -56,13 +56,14 @@ } // Get the first result. - const Value* entries = result->FindListPath("results"); + const Value::List* entries = + result->GetDict().FindListByDottedPath("results"); if (!entries) { std::move(complete_callback_).Run(nullptr); return; } - for (const auto& entry : entries->GetList()) { + for (const auto& entry : *entries) { auto quick_answer = std::make_unique<QuickAnswer>(); if (ProcessResult(&entry, quick_answer.get())) { std::move(complete_callback_).Run(std::move(quick_answer)); @@ -75,7 +76,8 @@ bool SearchResponseParser::ProcessResult(const Value* result, QuickAnswer* quick_answer) { - auto one_namespace_type = result->FindIntPath("oneNamespaceType"); + const base::Value::Dict& dict = result->GetDict(); + auto one_namespace_type = dict.FindInt("oneNamespaceType"); if (!one_namespace_type.has_value()) { // Can't find valid one namespace type from the response. LOG(ERROR) << "Can't find valid one namespace type from the response."; @@ -87,7 +89,7 @@ if (!result_parser) return false; - return result_parser->Parse(result, quick_answer); + return result_parser->Parse(dict, quick_answer); } } // namespace quick_answers
diff --git a/chromeos/components/quick_answers/search_result_parsers/unit_conversion_result_parser.cc b/chromeos/components/quick_answers/search_result_parsers/unit_conversion_result_parser.cc index 7249ecd..b4f2b9e6 100644 --- a/chromeos/components/quick_answers/search_result_parsers/unit_conversion_result_parser.cc +++ b/chromeos/components/quick_answers/search_result_parsers/unit_conversion_result_parser.cc
@@ -22,29 +22,29 @@ } // namespace // Extract |quick_answer| from unit conversion result. -bool UnitConversionResultParser::Parse(const Value* result, +bool UnitConversionResultParser::Parse(const Value::Dict& result, QuickAnswer* quick_answer) { std::string result_string; - const auto src_amount = result->FindDoublePath(kSourceAmountPath); - const auto dst_amount = result->FindDoublePath(kDestAmountPath); + const auto src_amount = result.FindDoubleByDottedPath(kSourceAmountPath); + const auto dst_amount = result.FindDoubleByDottedPath(kDestAmountPath); // If the conversion ratio is not within the preferred range, try to find a // better destination unit type. if (src_amount.has_value() && dst_amount.has_value()) { const auto ratio = GetRatio(src_amount.value(), dst_amount.value()); if (ratio.has_value() && ratio.value() > kPreferredRatioRange) { - const auto* rule = result->FindListPath(kRuleSetPath); + const auto* rule = result.FindListByDottedPath(kRuleSetPath); if (rule) { - UnitConverter converter(rule->GetList()); + UnitConverter converter(*rule); - const auto* src_unit = result->FindPath(kSourceUnitPath); + const auto* src_unit = result.FindDictByDottedPath(kSourceUnitPath); if (src_unit) { - const auto* dst_unit = converter.FindProperDestinationUnit( - src_unit->GetDict(), ratio.value()); + const auto* dst_unit = + converter.FindProperDestinationUnit(*src_unit, ratio.value()); if (dst_unit) { - result_string = converter.Convert(src_amount.value(), - src_unit->GetDict(), *dst_unit); + result_string = + converter.Convert(src_amount.value(), *src_unit, *dst_unit); } } } @@ -53,7 +53,7 @@ // Fallback to the existing result. if (result_string.empty()) { - auto* dest = result->FindStringPath(kDestTextPath); + auto* dest = result.FindStringByDottedPath(kDestTextPath); if (!dest) { LOG(ERROR) << "Failed to get the conversion result."; return false;
diff --git a/chromeos/components/quick_answers/search_result_parsers/unit_conversion_result_parser.h b/chromeos/components/quick_answers/search_result_parsers/unit_conversion_result_parser.h index 12e68d9..83af296 100644 --- a/chromeos/components/quick_answers/search_result_parsers/unit_conversion_result_parser.h +++ b/chromeos/components/quick_answers/search_result_parsers/unit_conversion_result_parser.h
@@ -5,18 +5,16 @@ #ifndef CHROMEOS_COMPONENTS_QUICK_ANSWERS_SEARCH_RESULT_PARSERS_UNIT_CONVERSION_RESULT_PARSER_H_ #define CHROMEOS_COMPONENTS_QUICK_ANSWERS_SEARCH_RESULT_PARSERS_UNIT_CONVERSION_RESULT_PARSER_H_ +#include "base/values.h" #include "chromeos/components/quick_answers/search_result_parsers/result_parser.h" -namespace base { -class Value; -} // namespace base - namespace quick_answers { class UnitConversionResultParser : public ResultParser { public: // ResultParser: - bool Parse(const base::Value* result, QuickAnswer* quick_answer) override; + bool Parse(const base::Value::Dict& result, + QuickAnswer* quick_answer) override; }; } // namespace quick_answers
diff --git a/chromeos/components/quick_answers/search_result_parsers/unit_conversion_result_parser_unittest.cc b/chromeos/components/quick_answers/search_result_parsers/unit_conversion_result_parser_unittest.cc index f31a1ae4..0e45fc2 100644 --- a/chromeos/components/quick_answers/search_result_parsers/unit_conversion_result_parser_unittest.cc +++ b/chromeos/components/quick_answers/search_result_parsers/unit_conversion_result_parser_unittest.cc
@@ -39,35 +39,35 @@ Value CreateUnit(double rate_a, const std::string& name, const std::string& category = std::string()) { - Value unit(Type::DICTIONARY); - unit.SetDoubleKey(kConversionRateAPath, rate_a); - unit.SetStringKey(kNamePath, name); + Value::Dict unit; + unit.Set(kConversionRateAPath, rate_a); + unit.Set(kNamePath, name); if (!category.empty()) - unit.SetStringKey(kCategoryPath, category); + unit.Set(kCategoryPath, category); - return unit; + return Value(std::move(unit)); } Value BuildMassRuleSet() { - Value rule_set(Type::LIST); - Value conversion(Type::DICTIONARY); - Value units(Type::LIST); + Value::List rule_set; + Value::Dict conversion; + Value::List units; - conversion.SetStringKey(kCategoryPath, kMassCategory); + conversion.Set(kCategoryPath, kMassCategory); units.Append(CreateUnit(kKilogramRateA, kKilogramName)); units.Append(CreateUnit(kGramRateA, kGramName)); units.Append(CreateUnit(kPoundRateA, kPoundName)); - conversion.SetKey(kUnitsPath, std::move(units)); + conversion.Set(kUnitsPath, std::move(units)); rule_set.Append(std::move(conversion)); - return rule_set; + return Value(std::move(rule_set)); } } // namespace class UnitConversionResultParserTest : public testing::Test { public: - UnitConversionResultParserTest() : result_(Type::DICTIONARY) {} + UnitConversionResultParserTest() = default; UnitConversionResultParserTest(const UnitConversionResultParserTest&) = delete; @@ -75,31 +75,31 @@ const UnitConversionResultParserTest&) = delete; void SetDestText(const std::string& text) { - result_.SetStringPath(kDestTextPath, text); + result_.SetByDottedPath(kDestTextPath, text); } void SetSourceAmount(const double value) { - result_.SetDoublePath(kSourceAmountPath, value); + result_.SetByDottedPath(kSourceAmountPath, value); } void SetDestAmount(const double value) { - result_.SetDoublePath(kDestAmountPath, value); + result_.SetByDottedPath(kDestAmountPath, value); } void AddSourceUnit(Value src_unit) { - result_.SetPath(kSourceUnitPath, std::move(src_unit)); + result_.SetByDottedPath(kSourceUnitPath, std::move(src_unit)); } void AddRuleSet(Value rule_set) { - result_.SetPath(kRuleSetPath, std::move(rule_set)); + result_.SetByDottedPath(kRuleSetPath, std::move(rule_set)); } bool Parse(QuickAnswer* quick_answer) { - return parser_.Parse(&result_, quick_answer); + return parser_.Parse(result_, quick_answer); } protected: - Value result_; + Value::Dict result_; UnitConversionResultParser parser_; }; @@ -112,7 +112,7 @@ TEST_F(UnitConversionResultParserTest, ParseWithIncorrectTypeShouldReturnFalse) { - result_.SetIntPath(kDestTextPath, 1); + result_.SetByDottedPath(kDestTextPath, 1); QuickAnswer quick_answer; EXPECT_FALSE(Parse(&quick_answer)); @@ -120,7 +120,7 @@ TEST_F(UnitConversionResultParserTest, ParseWithIncorrectPathShouldReturnFalse) { - result_.SetStringPath("WrongPath", kDestRawTextPound); + result_.Set("WrongPath", kDestRawTextPound); QuickAnswer quick_answer; EXPECT_FALSE(Parse(&quick_answer));
diff --git a/chromeos/components/quick_answers/translation_response_parser.cc b/chromeos/components/quick_answers/translation_response_parser.cc index 760675e..fe41d3a 100644 --- a/chromeos/components/quick_answers/translation_response_parser.cc +++ b/chromeos/components/quick_answers/translation_response_parser.cc
@@ -42,17 +42,18 @@ return; } - auto* translations = result->FindListPath("data.translations"); + auto* translations = + result->GetDict().FindListByDottedPath("data.translations"); if (!translations) { LOG(ERROR) << "Can't find translations result list."; std::move(complete_callback_).Run(nullptr); return; } - DCHECK(translations->GetList().size() == 1); + DCHECK(translations->size() == 1); const std::string* translated_text_ptr = - translations->GetList().front().FindStringPath("translatedText"); + translations->front().GetDict().FindStringByDottedPath("translatedText"); if (!translated_text_ptr) { LOG(ERROR) << "Can't find a translated text."; std::move(complete_callback_).Run(nullptr);
diff --git a/chromeos/components/quick_answers/translation_result_loader.cc b/chromeos/components/quick_answers/translation_result_loader.cc index ae95be0..9b8557c7 100644 --- a/chromeos/components/quick_answers/translation_result_loader.cc +++ b/chromeos/components/quick_answers/translation_result_loader.cc
@@ -42,14 +42,14 @@ constexpr base::StringPiece kTargetLanguageKey = "target"; std::string BuildTranslationRequestBody(const IntentInfo& intent_info) { - Value payload(Value::Type::DICTIONARY); + Value::Dict payload; - Value query(Value::Type::LIST); + Value::List query; query.Append(intent_info.intent_text); - payload.SetKey(kQueryKey, std::move(query)); + payload.Set(kQueryKey, std::move(query)); - payload.SetKey(kSourceLanguageKey, Value(intent_info.source_language)); - payload.SetKey(kTargetLanguageKey, Value(intent_info.device_language)); + payload.Set(kSourceLanguageKey, intent_info.source_language); + payload.Set(kTargetLanguageKey, intent_info.device_language); std::string request_payload_str; base::JSONWriter::Write(payload, &request_payload_str);
diff --git a/chromeos/profiles/arm.afdo.newest.txt b/chromeos/profiles/arm.afdo.newest.txt index 2988f9c..101fa7765 100644 --- a/chromeos/profiles/arm.afdo.newest.txt +++ b/chromeos/profiles/arm.afdo.newest.txt
@@ -1 +1 @@ -chromeos-chrome-arm-none-110-5464.0-1672660372-benchmark-110.0.5481.25-r1-redacted.afdo.xz +chromeos-chrome-arm-none-110-5464.0-1672660372-benchmark-110.0.5481.26-r1-redacted.afdo.xz
diff --git a/components/cast_receiver/browser/streaming_controller_remoting.cc b/components/cast_receiver/browser/streaming_controller_remoting.cc index f3aaf2eff..16472a5f 100644 --- a/components/cast_receiver/browser/streaming_controller_remoting.cc +++ b/components/cast_receiver/browser/streaming_controller_remoting.cc
@@ -24,12 +24,6 @@ renderer_connection) { receiver_session->StartStreamingAsync(std::move(demuxer_connector), std::move(renderer_connection)); - - auto* renderer_controller = receiver_session->GetRendererControls(); - DCHECK(renderer_controller); - DCHECK(renderer_controller->IsValid()); - renderer_controller->StartPlayingFrom(base::Seconds(0)); - renderer_controller->SetPlaybackRate(1.0); } void StreamingControllerRemoting::ProcessConfig( @@ -38,6 +32,7 @@ if (!config.remoting) { DLOG(WARNING) << "Remoting configuration added to received ReceiverConfig"; config.remoting.emplace(); + config.remoting->supports_chrome_audio_codecs = true; } }
diff --git a/components/cast_streaming/browser/cast_streaming_session.cc b/components/cast_streaming/browser/cast_streaming_session.cc index c881fd1..c5a066c 100644 --- a/components/cast_streaming/browser/cast_streaming_session.cc +++ b/components/cast_streaming/browser/cast_streaming_session.cc
@@ -96,16 +96,58 @@ void CastStreamingSession::ReceiverSessionClient::GetAudioBuffer( base::OnceClosure no_frames_available_cb) { + if (preloaded_audio_buffer_) { + DCHECK(preloaded_audio_buffer_.value()); + client_->OnAudioBufferReceived(std::move(preloaded_audio_buffer_.value())); + preloaded_audio_buffer_ = absl::nullopt; + return; + } + DCHECK(audio_consumer_); audio_consumer_->ReadFrame(std::move(no_frames_available_cb)); } void CastStreamingSession::ReceiverSessionClient::GetVideoBuffer( base::OnceClosure no_frames_available_cb) { + if (preloaded_video_buffer_) { + DCHECK(preloaded_video_buffer_.value()); + client_->OnVideoBufferReceived(std::move(preloaded_video_buffer_.value())); + preloaded_video_buffer_ = absl::nullopt; + return; + } + DCHECK(video_consumer_); video_consumer_->ReadFrame(std::move(no_frames_available_cb)); } +void CastStreamingSession::ReceiverSessionClient::PreloadAudioBuffer( + media::mojom::DecoderBufferPtr buffer) { + DCHECK(!preloaded_audio_buffer_); + DCHECK(buffer); + + DVLOG(1) << "Audio buffer preloaded!"; + + preloaded_audio_buffer_ = std::move(buffer); + if (playback_command_dispatcher_ && !ongoing_session_has_video()) { + playback_command_dispatcher_->TryStartPlayback( + (*preloaded_audio_buffer_)->timestamp); + } +} + +void CastStreamingSession::ReceiverSessionClient::PreloadVideoBuffer( + media::mojom::DecoderBufferPtr buffer) { + DCHECK(!preloaded_video_buffer_); + DCHECK(buffer); + + DVLOG(1) << "Video buffer preloaded!"; + + preloaded_video_buffer_ = std::move(buffer); + if (playback_command_dispatcher_ && ongoing_session_has_video()) { + playback_command_dispatcher_->TryStartPlayback( + (*preloaded_video_buffer_)->timestamp); + } +} + CastStreamingSession::ReceiverSessionClient::~ReceiverSessionClient() = default; void CastStreamingSession::ReceiverSessionClient::OnInitializationTimeout() { @@ -180,6 +222,16 @@ DVLOG(1) << __func__; DCHECK_EQ(initialization_info.session, receiver_session_.get()); + // If a Flush() call is ongoing, its unsafe to begin streaming data, so + // instead stall this call until the Flush() call has completed. + DCHECK(!start_session_cb_); + if (is_flush_pending_) { + start_session_cb_ = base::BindOnce( + &CastStreamingSession::ReceiverSessionClient::StartStreamingSession, + weak_factory_.GetWeakPtr(), std::move(initialization_info)); + return; + } + // This is necessary in case the offer message had no audio and no video // stream. if (!initialization_info.audio_stream_info && @@ -193,13 +245,11 @@ bool is_new_offer = is_initialized_; if (is_new_offer) { // This is a second offer message, reinitialize the streams. - const bool existing_session_has_audio = !!audio_consumer_; - const bool existing_session_has_video = !!video_consumer_; const bool new_offer_has_audio = !!initialization_info.audio_stream_info; const bool new_offer_has_video = !!initialization_info.video_stream_info; - if (new_offer_has_audio != existing_session_has_audio || - new_offer_has_video != existing_session_has_video) { + if (new_offer_has_audio != ongoing_session_has_audio() || + new_offer_has_video != ongoing_session_has_video()) { // This call to StartStreamingSession() has support for audio and/or video // streaming which does not match the ones provided during a prior call to // this method. Return early here. @@ -289,11 +339,30 @@ client_->OnSessionEnded(); break; case ReceiversDestroyingReason::kRenegotiated: + if (playback_command_dispatcher_) { + DCHECK(!is_flush_pending_); + + DVLOG(1) << "Calling Flush()"; + is_flush_pending_ = true; + playback_command_dispatcher_->Flush(base::BindOnce( + &CastStreamingSession::ReceiverSessionClient::OnFlushComplete, + weak_factory_.GetWeakPtr())); + } client_->OnSessionReinitializationPending(); break; } } +void CastStreamingSession::ReceiverSessionClient::OnFlushComplete() { + DCHECK(is_flush_pending_); + + DVLOG(1) << "Flush() Complete!"; + is_flush_pending_ = false; + if (start_session_cb_) { + std::move(start_session_cb_).Run(); + } +} + void CastStreamingSession::ReceiverSessionClient::OnError( const openscreen::cast::ReceiverSession* session, openscreen::Error error) { @@ -362,4 +431,20 @@ receiver_session_->GetWeakPtr()); } +CastStreamingSession::PreloadBufferCB +CastStreamingSession::GetAudioBufferPreloader() { + DCHECK(receiver_session_); + return base::BindRepeating( + &CastStreamingSession::ReceiverSessionClient::PreloadAudioBuffer, + receiver_session_->GetWeakPtr()); +} + +CastStreamingSession::PreloadBufferCB +CastStreamingSession::GetVideoBufferPreloader() { + DCHECK(receiver_session_); + return base::BindRepeating( + &CastStreamingSession::ReceiverSessionClient::PreloadVideoBuffer, + receiver_session_->GetWeakPtr()); +} + } // namespace cast_streaming
diff --git a/components/cast_streaming/browser/cast_streaming_session.h b/components/cast_streaming/browser/cast_streaming_session.h index 4d09e89..fb6814a7 100644 --- a/components/cast_streaming/browser/cast_streaming_session.h +++ b/components/cast_streaming/browser/cast_streaming_session.h
@@ -113,6 +113,13 @@ AudioDemuxerStreamDataProvider::RequestBufferCB GetAudioBufferRequester(); VideoDemuxerStreamDataProvider::RequestBufferCB GetVideoBufferRequester(); + // Returns a callback to be used for pre-loading a single frame and then + // potentially using it to begin playback of the stream. + using PreloadBufferCB = + base::OnceCallback<void(media::mojom::DecoderBufferPtr)>; + PreloadBufferCB GetAudioBufferPreloader(); + PreloadBufferCB GetVideoBufferPreloader(); + private: // Owns the Open Screen ReceiverSession. The Streaming Session is tied to the // lifespan of this object. @@ -137,10 +144,19 @@ void GetAudioBuffer(base::OnceClosure no_frames_available_cb); void GetVideoBuffer(base::OnceClosure no_frames_available_cb); + // Stores the first frame of a DemuxerStream session, and then may use the + // frame to begin playback fo teh streaming session, depending on its + // configuration. + void PreloadAudioBuffer(media::mojom::DecoderBufferPtr buffer); + void PreloadVideoBuffer(media::mojom::DecoderBufferPtr buffer); + // Returns a WeakPtr associated with this instance; base::WeakPtr<ReceiverSessionClient> GetWeakPtr(); private: + bool ongoing_session_has_audio() const { return !!audio_consumer_; } + bool ongoing_session_has_video() const { return !!video_consumer_; } + void OnInitializationTimeout(); // Initializes the audio or video consumer, returning the data pipe to @@ -150,6 +166,9 @@ absl::optional<mojo::ScopedDataPipeConsumerHandle> InitializeVideoConsumer( const StreamingInitializationInfo& initialization_info); + // Called upon completion of a Flush call initiated by this class. + void OnFlushComplete(); + // remoting::PlaybackCommandDispatcher::Client implementation. void StartStreamingSession( StreamingInitializationInfo initialization_info) override; @@ -183,11 +202,25 @@ // seconds. base::OneShotTimer data_timeout_timer_; + bool is_flush_pending_ = false; + + // Populated with the most recent call to StartStreamingSession() if there + // is an ongoing call to Flush() at the time of its calling. In this case, + // this callback will be called upon completion of the Flush() call as part + // of OnFlushComplete(). + base::OnceCallback<void()> start_session_cb_; + bool is_initialized_ = false; const raw_ptr<CastStreamingSession::Client> client_; std::unique_ptr<StreamConsumer> audio_consumer_; std::unique_ptr<StreamConsumer> video_consumer_; + // The currently pre-loaded audio or video buffer, if any exists. + absl::optional<media::mojom::DecoderBufferPtr> preloaded_audio_buffer_ = + absl::nullopt; + absl::optional<media::mojom::DecoderBufferPtr> preloaded_video_buffer_ = + absl::nullopt; + base::WeakPtrFactory<ReceiverSessionClient> weak_factory_; };
diff --git a/components/cast_streaming/browser/demuxer_stream_data_provider.h b/components/cast_streaming/browser/demuxer_stream_data_provider.h index 8fe2f5d5..fe74c17 100644 --- a/components/cast_streaming/browser/demuxer_stream_data_provider.h +++ b/components/cast_streaming/browser/demuxer_stream_data_provider.h
@@ -92,9 +92,15 @@ // response to the ongoing GetBuffer() request. void ProvideBuffer(media::mojom::DecoderBufferPtr buffer) { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); + DCHECK(buffer); + + if (preload_buffeer_cb_) { + std::move(preload_buffeer_cb_).Run(std::move(buffer)); + return; + } + DCHECK(current_callback_); DCHECK(!next_stream_info_); - std::move(current_callback_) .Run(GetBufferResponseType::element_type::NewBuffer(std::move(buffer))); } @@ -109,10 +115,22 @@ client_ = std::move(client); } + // Pre-loads a buffer before receiving any calls from the DemuxerStream, then + // returns it via |callback|. + using PreloadBufferCB = + base::OnceCallback<void(media::mojom::DecoderBufferPtr)>; + void PreloadBuffer(PreloadBufferCB callback) { + DCHECK(!preload_buffeer_cb_); + DCHECK(!current_callback_); + preload_buffeer_cb_ = std::move(callback); + request_buffer_.Run( + base::BindOnce(&DemuxerStreamClient::OnNoBuffersAvailable, client_)); + } + private: - using GetBufferCallback = typename TMojoReceiverType::GetBufferCallback; using EnableBitstreamConverterCallback = typename TMojoReceiverType::EnableBitstreamConverterCallback; + using GetBufferCallback = typename TMojoReceiverType::GetBufferCallback; void OnFatalError() { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); @@ -146,8 +164,15 @@ return; } - request_buffer_.Run( - base::BindOnce(&DemuxerStreamClient::OnNoBuffersAvailable, client_)); + // If preloading is already ongoing, then a new buffer request isn't needed. + // Instead just replace the preloading callback with a real GetBuffer() + // callback. + if (!preload_buffeer_cb_) { + request_buffer_.Run( + base::BindOnce(&DemuxerStreamClient::OnNoBuffersAvailable, client_)); + } + + preload_buffeer_cb_.Reset(); } void EnableBitstreamConverter( @@ -165,6 +190,8 @@ // and all GetBuffer() calls prior to this change should be blocked. bool is_new_stream_info_pending_ = false; + PreloadBufferCB preload_buffeer_cb_; + // The most recently set config. ConfigType config_;
diff --git a/components/cast_streaming/browser/demuxer_stream_data_provider_unittest.cc b/components/cast_streaming/browser/demuxer_stream_data_provider_unittest.cc index 83ff7c44..798b75a 100644 --- a/components/cast_streaming/browser/demuxer_stream_data_provider_unittest.cc +++ b/components/cast_streaming/browser/demuxer_stream_data_provider_unittest.cc
@@ -76,6 +76,7 @@ public: MOCK_METHOD1(RequestBuffer, void(base::OnceClosure)); MOCK_METHOD0(OnMojoDisconnect, void()); + MOCK_METHOD1(OnPreloadComplete, void(media::mojom::DecoderBufferPtr)); MOCK_METHOD0(OnGetBufferDoneCalled, void()); void OnGetBufferDone(absl::optional<media::AudioDecoderConfig> config, @@ -222,4 +223,14 @@ task_environment_.RunUntilIdle(); } +TEST_F(DemuxerStreamDataProviderTest, BufferPreloading) { + EXPECT_CALL(callbacks_, RequestBuffer(testing::_)); + data_provider_->PreloadBuffer(base::BindOnce(&Callbacks::OnPreloadComplete, + base::Unretained(&callbacks_))); + + EXPECT_CALL(callbacks_, OnPreloadComplete(testing::_)); + data_provider_->ProvideBuffer( + media::mojom::DecoderBuffer::From(*first_buffer_)); +} + } // namespace cast_streaming
diff --git a/components/cast_streaming/browser/playback_command_dispatcher.cc b/components/cast_streaming/browser/playback_command_dispatcher.cc index d0492e5..569e7a6 100644 --- a/components/cast_streaming/browser/playback_command_dispatcher.cc +++ b/components/cast_streaming/browser/playback_command_dispatcher.cc
@@ -49,6 +49,15 @@ muxer_->RegisterController(std::move(controls)); } +void PlaybackCommandDispatcher::Flush( + media::mojom::Renderer::FlushCallback callback) { + muxer_->Flush(std::move(callback)); +} + +void PlaybackCommandDispatcher::TryStartPlayback(base::TimeDelta timestamp) { + muxer_->TryStartPlayback(std::move(timestamp)); +} + void PlaybackCommandDispatcher::OnRemotingSessionNegotiated( openscreen::cast::RpcMessenger* messenger) { DCHECK(messenger); @@ -116,6 +125,14 @@ return; } + // Don't log RPC_RC_ONTIMEUPDATE or RPC_RC_ONSTATISTICSUPDATE calls, as they + // will generate too much spam to be useful. + DVLOG_IF( + 1, message->proc() != openscreen::cast::RpcMessage::RPC_RC_ONTIMEUPDATE && + message->proc() != + openscreen::cast::RpcMessage::RPC_RC_ONSTATISTICSUPDATE) + << "SendRemotingRpcMessageToRemote() type=" << message->proc(); + message->set_handle(handle); messenger_->SendMessageToRemote(*message); } @@ -125,6 +142,8 @@ DCHECK(message); DCHECK(task_runner_->RunsTasksInCurrentSequence()); + DVLOG(1) << "ProcessRemotingRpcMessageFromRemote() type=" << message->proc(); + const bool did_dispatch_as_initialization_call = remoting::DispatchInitializationRpcCall(message.get(), this); if (did_dispatch_as_initialization_call) {
diff --git a/components/cast_streaming/browser/playback_command_dispatcher.h b/components/cast_streaming/browser/playback_command_dispatcher.h index de124c7..e140253 100644 --- a/components/cast_streaming/browser/playback_command_dispatcher.h +++ b/components/cast_streaming/browser/playback_command_dispatcher.h
@@ -56,6 +56,15 @@ void RegisterCommandSource( mojo::PendingReceiver<media::mojom::Renderer> controls); + // Call Flush() on the Renderer associated with this streaming session. + void Flush(media::mojom::Renderer::FlushCallback callback); + + // Begins playback of the streaming session via calls to the Renderer if it + // has not yet begun. This is required because the remote device will + // sometimes, but not always, call StartPlayingFrom() on a session that it + // wants to be playing. + void TryStartPlayback(base::TimeDelta timestamp); + // remoting::RemotingSessionClient overrides. void OnRemotingSessionNegotiated( openscreen::cast::RpcMessenger* messenger) override;
diff --git a/components/cast_streaming/browser/public/receiver_session.h b/components/cast_streaming/browser/public/receiver_session.h index 345cd502..66e9498 100644 --- a/components/cast_streaming/browser/public/receiver_session.h +++ b/components/cast_streaming/browser/public/receiver_session.h
@@ -59,13 +59,6 @@ // Returns true if calls may be made to this object. virtual bool IsValid() const = 0; - // Starts rendering from |time|. May only be called if this object is valid. - virtual void StartPlayingFrom(base::TimeDelta time) = 0; - - // Updates the current playback rate. The default playback rate should be 0. - // May only be called if this object is valid. - virtual void SetPlaybackRate(double playback_rate) = 0; - // Sets the output volume. The default volume should be 1. May only be // called if this object is valid. virtual void SetVolume(float volume) = 0;
diff --git a/components/cast_streaming/browser/receiver_session_impl.cc b/components/cast_streaming/browser/receiver_session_impl.cc index deda242..dc63a9f 100644 --- a/components/cast_streaming/browser/receiver_session_impl.cc +++ b/components/cast_streaming/browser/receiver_session_impl.cc
@@ -137,6 +137,7 @@ demuxer_connector_->OnStreamsInitialized(std::move(audio_info), std::move(video_info)); + PreloadBuffersAndStartPlayback(); InformClientOfConfigChange(); } @@ -202,6 +203,7 @@ } } + PreloadBuffersAndStartPlayback(); InformClientOfConfigChange(); } @@ -230,6 +232,22 @@ video_demuxer_stream_data_provider_.reset(); } +void ReceiverSessionImpl::PreloadBuffersAndStartPlayback() { + DCHECK(audio_demuxer_stream_data_provider_ || + video_demuxer_stream_data_provider_); + DVLOG(1) << __func__; + + if (audio_demuxer_stream_data_provider_) { + audio_demuxer_stream_data_provider_->PreloadBuffer( + cast_streaming_session_.GetAudioBufferPreloader()); + } + + if (video_demuxer_stream_data_provider_) { + video_demuxer_stream_data_provider_->PreloadBuffer( + cast_streaming_session_.GetVideoBufferPreloader()); + } +} + void ReceiverSessionImpl::OnMojoDisconnect() { DVLOG(1) << __func__; @@ -263,20 +281,9 @@ return renderer_controls_.is_bound() && renderer_controls_.is_connected(); } -void ReceiverSessionImpl::RendererControllerImpl::StartPlayingFrom( - base::TimeDelta time) { - DCHECK(IsValid()); - renderer_controls_->StartPlayingFrom(time); -} - -void ReceiverSessionImpl::RendererControllerImpl::SetPlaybackRate( - double playback_rate) { - DCHECK(IsValid()); - renderer_controls_->SetPlaybackRate(playback_rate); -} - void ReceiverSessionImpl::RendererControllerImpl::SetVolume(float volume) { DCHECK(IsValid()); + renderer_controls_->SetVolume(volume); }
diff --git a/components/cast_streaming/browser/receiver_session_impl.h b/components/cast_streaming/browser/receiver_session_impl.h index 60cfe7fa..f6c93c8 100644 --- a/components/cast_streaming/browser/receiver_session_impl.h +++ b/components/cast_streaming/browser/receiver_session_impl.h
@@ -57,8 +57,6 @@ // ReceiverSession::RendererController overrides. bool IsValid() const override; - void StartPlayingFrom(base::TimeDelta time) override; - void SetPlaybackRate(double playback_rate) override; void SetVolume(float volume) override; private: @@ -67,6 +65,8 @@ mojo::Remote<media::mojom::Renderer> renderer_controls_; }; + void PreloadBuffersAndStartPlayback(); + // Handler for |demuxer_connector_| disconnect. void OnMojoDisconnect();
diff --git a/components/cast_streaming/browser/renderer_control_multiplexer.cc b/components/cast_streaming/browser/renderer_control_multiplexer.cc index 573aeef..2ae8b7c 100644 --- a/components/cast_streaming/browser/renderer_control_multiplexer.cc +++ b/components/cast_streaming/browser/renderer_control_multiplexer.cc
@@ -5,8 +5,16 @@ #include "components/cast_streaming/browser/renderer_control_multiplexer.h" #include "base/task/bind_post_task.h" +#include "base/time/time.h" namespace cast_streaming { +namespace { + +// The delay that should be used between receiving a call to TryStartPlayback +// and attempting to start the Renderer with a StartPlayingFrom() call. +constexpr base::TimeDelta kStartPlaybackDelay = base::Milliseconds(500); + +} // namespace RendererControlMultiplexer::RendererControlMultiplexer( mojo::Remote<media::mojom::Renderer> renderer_remote, @@ -32,9 +40,32 @@ receiver_list_.push_back(std::move(bound_controls)); } -void RendererControlMultiplexer::StartPlayingFrom(::base::TimeDelta time) { +void RendererControlMultiplexer::TryStartPlayback(base::TimeDelta time) { + task_runner_->PostDelayedTask( + FROM_HERE, + base::BindOnce(&RendererControlMultiplexer::TryStartPlaybackAfterDelay, + weak_factory_.GetWeakPtr(), std::move(time)), + kStartPlaybackDelay); +} + +void RendererControlMultiplexer::TryStartPlaybackAfterDelay( + base::TimeDelta time) { DCHECK(task_runner_->RunsTasksInCurrentSequence()); - renderer_remote_->StartPlayingFrom(time); + if (is_playback_ongoing_) { + return; + } + + StartPlayingFrom(time + kStartPlaybackDelay); + SetPlaybackRate(1.0); +} + +void RendererControlMultiplexer::StartPlayingFrom(base::TimeDelta time) { + DCHECK(task_runner_->RunsTasksInCurrentSequence()); + if (!is_playback_ongoing_) { + DVLOG(1) << "Will start playing from time: " << time; + renderer_remote_->StartPlayingFrom(time); + is_playback_ongoing_ = true; + } } void RendererControlMultiplexer::SetPlaybackRate(double playback_rate) { @@ -69,11 +100,19 @@ void RendererControlMultiplexer::Flush(FlushCallback callback) { DCHECK(task_runner_->RunsTasksInCurrentSequence()); - renderer_remote_->Flush(std::move(callback)); + renderer_remote_->Flush( + base::BindOnce(&RendererControlMultiplexer::OnFlushComplete, + weak_factory_.GetWeakPtr(), std::move(callback))); } void RendererControlMultiplexer::OnMojoDisconnect() { receiver_list_.clear(); } +void RendererControlMultiplexer::OnFlushComplete(FlushCallback callback) { + DCHECK(task_runner_->RunsTasksInCurrentSequence()); + is_playback_ongoing_ = false; + std::move(callback).Run(); +} + } // namespace cast_streaming
diff --git a/components/cast_streaming/browser/renderer_control_multiplexer.h b/components/cast_streaming/browser/renderer_control_multiplexer.h index e385fe78a..091dcea9 100644 --- a/components/cast_streaming/browser/renderer_control_multiplexer.h +++ b/components/cast_streaming/browser/renderer_control_multiplexer.h
@@ -30,6 +30,9 @@ void RegisterController( mojo::PendingReceiver<media::mojom::Renderer> controls); + // Starts playback after a delay, if it has not already started. + void TryStartPlayback(base::TimeDelta time_delta); + // media::mojo::Renderer overrides. // // These calls only function to forward calls to |renderer_remote_|. Note that @@ -52,6 +55,14 @@ private: void OnMojoDisconnect(); + void OnFlushComplete(FlushCallback callback); + + // Called by TryStartPlayback after a delay to begin playback, if it has + // not yet started. + void TryStartPlaybackAfterDelay(base::TimeDelta time_delta); + + bool is_playback_ongoing_ = false; + mojo::Remote<media::mojom::Renderer> renderer_remote_; std::vector<std::unique_ptr<mojo::Receiver<media::mojom::Renderer>>> receiver_list_;
diff --git a/components/certificate_transparency/data/log_list.json b/components/certificate_transparency/data/log_list.json index e89276c2..f15f5fe 100644 --- a/components/certificate_transparency/data/log_list.json +++ b/components/certificate_transparency/data/log_list.json
@@ -1,6 +1,6 @@ { - "version": "17.36", - "log_list_timestamp": "2023-01-06T12:55:00Z", + "version": "17.37", + "log_list_timestamp": "2023-01-07T12:54:39Z", "operators": [ { "name": "Google",
diff --git a/components/history_clusters/core/context_clusterer_history_service_observer.cc b/components/history_clusters/core/context_clusterer_history_service_observer.cc index a1a925fe..470e682 100644 --- a/components/history_clusters/core/context_clusterer_history_service_observer.cc +++ b/components/history_clusters/core/context_clusterer_history_service_observer.cc
@@ -66,12 +66,9 @@ history::HistoryService* history_service, const history::URLRow& url_row, const history::VisitRow& new_visit) { - if (new_visit.is_known_to_sync) { - // Skip synced visits. - // - // Although local visits that have been synced can have this bit flipped, - // local visits do not automatically get sent to sync when they just get - // created. + if (!new_visit.originator_cache_guid.empty()) { + // Skip remote synced visits. Remote synced visits are context clustered on + // the originator machine and persisted via `HistorySyncBridge`. return; }
diff --git a/components/history_clusters/core/context_clusterer_history_service_observer_unittest.cc b/components/history_clusters/core/context_clusterer_history_service_observer_unittest.cc index 81d1ac48..8a22c81 100644 --- a/components/history_clusters/core/context_clusterer_history_service_observer_unittest.cc +++ b/components/history_clusters/core/context_clusterer_history_service_observer_unittest.cc
@@ -190,14 +190,14 @@ base::Time visit_time, history::VisitID opener_visit = history::kInvalidVisitID, history::VisitID referring_visit = history::kInvalidVisitID, - bool is_known_to_sync = false) { + bool is_synced_visit = false) { history::URLRow url_row(url); history::VisitRow new_visit; new_visit.visit_id = visit_id; new_visit.visit_time = visit_time; new_visit.opener_visit = opener_visit; new_visit.referring_visit = referring_visit; - new_visit.is_known_to_sync = is_known_to_sync; + new_visit.originator_cache_guid = is_synced_visit ? "otherdevice" : ""; observer_->OnURLVisited(history_service_.get(), url_row, new_visit); } @@ -403,7 +403,7 @@ VisitURL(GURL("https://example.com"), 1, base::Time::FromTimeT(123), history::kInvalidVisitID, history::kInvalidVisitID, - /*is_known_to_sync=*/true); + /*is_synced_visit=*/true); EXPECT_EQ(0, GetNumClustersCreated()); }
diff --git a/components/omnibox/browser/in_memory_url_index.h b/components/omnibox/browser/in_memory_url_index.h index 3b2f038a..0de782b5 100644 --- a/components/omnibox/browser/in_memory_url_index.h +++ b/components/omnibox/browser/in_memory_url_index.h
@@ -53,7 +53,7 @@ // The URL history source. // Holds portions of the URL database in memory in an indexed form. Used to // quickly look up matching URLs for a given query string. Used by -// the HistoryURLProvider for inline autocomplete and to provide URL +// the HistoryQuickProvider for inline autocomplete and to provide URL // matches to the omnibox. // // Note about multi-byte codepoints and the data structures in the
diff --git a/components/policy/resources/policy_templates_de.xtb b/components/policy/resources/policy_templates_de.xtb index 33581f9..198be55 100644 --- a/components/policy/resources/policy_templates_de.xtb +++ b/components/policy/resources/policy_templates_de.xtb
@@ -2822,19 +2822,6 @@ <translation id="3591584750136265240">Verhalten der Log-in-Authentifizierung konfigurieren</translation> <translation id="3593905652755912452">Bei deaktivierten Formularsteuerelementen wird die alte Ereignisweiterleitung verwendet.</translation> <translation id="3596112486106491038">Befehlszeilenzugriff auf virtuellen Maschinen aktivieren</translation> -<translation id="3596335476793146071">Liste der Aktionen, die ausgeführt werden sollen, wenn das Zeitlimit in der Richtlinie <ph name="IDLE_TIMEOUT_POLICY_NAME" /> erreicht ist. - - Wenn die Richtlinie <ph name="IDLE_TIMEOUT_POLICY_NAME" /> nicht konfiguriert ist, hat diese Richtlinie keine Auswirkungen. - - Wird das Zeitlimit in der Richtlinie <ph name="IDLE_TIMEOUT_POLICY_NAME" /> erreicht, führt <ph name="PRODUCT_NAME" /> die in dieser Richtlinie konfigurierten Aktionen aus. - - Wenn diese Richtlinie leer oder nicht konfiguriert ist, hat die Richtlinie <ph name="IDLE_TIMEOUT_POLICY_NAME" /> keine Auswirkungen. - - Unterstützte Aktionen: - - „<ph name="CLOSE_BROWSERS_ACTION" />“: Alle Browserfenster und PWAs für dieses Profil werden geschlossen. - - „<ph name="SHOW_PROFILE_PICKER_ACTION" />“: Das Fenster mit der Profilauswahl wird angezeigt.</translation> <translation id="3603469950773500315">Einschränkungen von <ph name="CORS" />-Prüfungen in der neuen <ph name="CORS" />-Implementierung erlauben, wodurch Erweiterungen kompatibles Verhalten beibehalten können und <ph name="PRODUCT_NAME" /> angegebene Header ohne <ph name="CORS" />-Prüfungen senden kann. Wird diese Liste leergelassen, versucht <ph name="PRODUCT_NAME" />, Erweiterungen auf kompatible Weise auszuführen und setzt keine <ph name="API" />-Änderungen für Version 79 von <ph name="PRODUCT_NAME" /> um, wie unter <ph name="WEB_REQUEST_API_MANUAL" /> erläutert.
diff --git a/components/policy/resources/policy_templates_es-419.xtb b/components/policy/resources/policy_templates_es-419.xtb index d0305f19..67160ad 100644 --- a/components/policy/resources/policy_templates_es-419.xtb +++ b/components/policy/resources/policy_templates_es-419.xtb
@@ -2835,19 +2835,6 @@ <translation id="3591584750136265240">Configurar el comportamiento de autenticación en el acceso</translation> <translation id="3593905652755912452">Usar el comportamiento anterior de envío de eventos en los controles de formularios inhabilitados</translation> <translation id="3596112486106491038">Habilitar el acceso a la línea de comandos de la máquina virtual</translation> -<translation id="3596335476793146071">Lista de respuestas para ejecutar cuando se alcanza el tiempo de espera de la política <ph name="IDLE_TIMEOUT_POLICY_NAME" />. - - Si no estableces la política <ph name="IDLE_TIMEOUT_POLICY_NAME" />, esta política no tendrá efecto. - - Cuando se alcanza el tiempo de espera de la política <ph name="IDLE_TIMEOUT_POLICY_NAME" />, <ph name="PRODUCT_NAME" /> ejecuta las respuestas configuradas en esta política. - - Si la dejas vacía o no la estableces, la política <ph name="IDLE_TIMEOUT_POLICY_NAME" /> no tendrá efecto. - - Se admiten las siguientes respuestas: - - "<ph name="CLOSE_BROWSERS_ACTION" />": cierra todas las ventanas del navegador y las AWPs de este perfil. - - "<ph name="SHOW_PROFILE_PICKER_ACTION" />": muestra la ventana del Selector de perfiles.</translation> <translation id="3603469950773500315">Habilita las mitigaciones de comprobación de <ph name="CORS" /> en la nueva implementación de <ph name="CORS" />, lo que permite que las extensiones mantengan su compatibilidad y que <ph name="PRODUCT_NAME" /> envíe encabezados específicos sin las comprobaciones de <ph name="CORS" />. Si esta lista se deja vacía, <ph name="PRODUCT_NAME" /> intentará ejecutar las extensiones de forma compatible y no introducirá cambios de <ph name="API" /> para <ph name="PRODUCT_NAME" /> 79, como se explica en el <ph name="WEB_REQUEST_API_MANUAL" />. @@ -3860,9 +3847,9 @@ * Si <ph name="FILTER_PLACEHOLDER" /> incluye las secciones <ph name="ISSUER_STRING_VALUE" /> y <ph name="SUBJECT_STRING_VALUE" />, solo se seleccionarán certificados de cliente que cumplan con ambas condiciones. - * Si <ph name="FILTER_PLACEHOLDER" /> incluye la sección <ph name="SUBJECT_STRING_VALUE" /> con el valor <ph name="FILTER_STRING_ORGANIZATION" />, el certificado deberá contar con al menos una unidad organizacional que coincida con el valor indicado para ser elegido. + * Si <ph name="FILTER_PLACEHOLDER" /> incluye la sección <ph name="SUBJECT_STRING_VALUE" /> con el valor <ph name="FILTER_STRING_ORGANIZATION" />, el certificado deberá contar con al menos una unidad organizativa que coincida con el valor indicado para ser elegido. - * Si <ph name="FILTER_PLACEHOLDER" /> incluye una sección <ph name="SUBJECT_STRING_VALUE" /> con el valor <ph name="FILTER_STRING_ORGANIZATIONAL_UNIT" />, el certificado deberá contar con al menos una unidad organizacional que coincida con el valor indicado para ser elegido. + * Si <ph name="FILTER_PLACEHOLDER" /> incluye una sección <ph name="SUBJECT_STRING_VALUE" /> con el valor <ph name="FILTER_STRING_ORGANIZATIONAL_UNIT" />, el certificado deberá contar con al menos una unidad organizativa que coincida con el valor indicado para ser elegido. * Si estableces <ph name="FILTER_PLACEHOLDER" /> como <ph name="EMPTY_DICTIONARY" />, no se aplicarán restricciones adicionales a la selección de certificados de cliente. Ten en cuenta que se seguirán aplicando los filtros que proporciona el servidor web. @@ -8487,9 +8474,9 @@ * Si <ph name="FILTER_PLACEHOLDER" /> incluye las secciones <ph name="ISSUER_STRING_VALUE" /> y <ph name="SUBJECT_STRING_VALUE" />, solo se seleccionarán certificados de cliente que cumplan con ambas condiciones. - * Si <ph name="FILTER_PLACEHOLDER" /> incluye la sección <ph name="SUBJECT_STRING_VALUE" /> con el valor <ph name="FILTER_STRING_ORGANIZATION" />, el certificado deberá contar con al menos una unidad organizacional que coincida con el valor indicado para ser elegido. + * Si <ph name="FILTER_PLACEHOLDER" /> incluye la sección <ph name="SUBJECT_STRING_VALUE" /> con el valor <ph name="FILTER_STRING_ORGANIZATION" />, el certificado deberá contar con al menos una unidad organizativa que coincida con el valor indicado para ser elegido. - * Si <ph name="FILTER_PLACEHOLDER" /> incluye una sección <ph name="SUBJECT_STRING_VALUE" /> con el valor <ph name="FILTER_STRING_ORGANIZATIONAL_UNIT" />, el certificado deberá contar con al menos una unidad organizacional que coincida con el valor indicado para ser elegido. + * Si <ph name="FILTER_PLACEHOLDER" /> incluye una sección <ph name="SUBJECT_STRING_VALUE" /> con el valor <ph name="FILTER_STRING_ORGANIZATIONAL_UNIT" />, el certificado deberá contar con al menos una unidad organizativa que coincida con el valor indicado para ser elegido. * Si estableces <ph name="FILTER_PLACEHOLDER" /> como <ph name="EMPTY_DICTIONARY" />, no se aplicarán restricciones adicionales a la selección de certificados de cliente. Ten en cuenta que se seguirán aplicando los filtros que proporciona el servidor web.
diff --git a/components/policy/resources/policy_templates_es.xtb b/components/policy/resources/policy_templates_es.xtb index f427aa5e..3e052230 100644 --- a/components/policy/resources/policy_templates_es.xtb +++ b/components/policy/resources/policy_templates_es.xtb
@@ -2834,19 +2834,6 @@ <translation id="3591584750136265240">Configurar el comportamiento de la autenticación de inicio de sesión</translation> <translation id="3593905652755912452">Se usará el comportamiento anterior de envío de eventos en controles de formulario inhabilitados.</translation> <translation id="3596112486106491038">Habilitar el acceso a la línea de comandos de las máquinas virtuales</translation> -<translation id="3596335476793146071">Lista de las acciones que se ejecutarán cuando se agote el tiempo de espera de la política <ph name="IDLE_TIMEOUT_POLICY_NAME" />. - - Si no se define la política <ph name="IDLE_TIMEOUT_POLICY_NAME" />, esta política no tendrá efecto. - - Cuando se agote el tiempo de espera de la política <ph name="IDLE_TIMEOUT_POLICY_NAME" />, <ph name="PRODUCT_NAME" /> ejecutará las acciones configuradas en esta política. - - Si esta política se deja vacía o no se define, la política <ph name="IDLE_TIMEOUT_POLICY_NAME" /> no tendrá efecto. - - Estas son las acciones que se pueden realizar: - - "<ph name="CLOSE_BROWSERS_ACTION" />": cierra todas las ventanas del navegador y PWAs de este perfil. - - "<ph name="SHOW_PROFILE_PICKER_ACTION" />": muestra la ventana del selector de perfil.</translation> <translation id="3603469950773500315">Habilita las mitigaciones de comprobación de <ph name="CORS" /> en la nueva implementación de <ph name="CORS" />. Así, las extensiones continúan siendo compatibles y <ph name="PRODUCT_NAME" /> puede enviar encabezados definidos sin comprobaciones de <ph name="CORS" />. Si esta lista se deja vacía, <ph name="PRODUCT_NAME" /> intentará ejecutar las extensiones de forma compatible y no introducirá cambios de <ph name="API" /> en <ph name="PRODUCT_NAME" /> 79, tal y como se explica en <ph name="WEB_REQUEST_API_MANUAL" />.
diff --git a/components/policy/resources/policy_templates_fr.xtb b/components/policy/resources/policy_templates_fr.xtb index 581ceec2..7f1c9b1 100644 --- a/components/policy/resources/policy_templates_fr.xtb +++ b/components/policy/resources/policy_templates_fr.xtb
@@ -2823,19 +2823,6 @@ <translation id="3591584750136265240">Configurer le mode d'authentification lors de la connexion</translation> <translation id="3593905652755912452">L'ancien comportement d'envoi des événements sur les commandes de formulaire désactivées sera utilisé.</translation> <translation id="3596112486106491038">Activer l'accès par ligne de commande aux machines virtuelles</translation> -<translation id="3596335476793146071">Liste des actions à exécuter lorsque le délai d'inactivité de la règle <ph name="IDLE_TIMEOUT_POLICY_NAME" /> est atteint. - - Cette règle n'a aucune incidence si la règle <ph name="IDLE_TIMEOUT_POLICY_NAME" /> n'est pas configurée. - - Lorsque le délai d'inactivité de la règle <ph name="IDLE_TIMEOUT_POLICY_NAME" /> est atteint, <ph name="PRODUCT_NAME" /> exécute les actions configurées dans celle-ci. - - La règle <ph name="IDLE_TIMEOUT_POLICY_NAME" /> n'a aucune incidence si elle est vide ou si elle n'est pas configurée. - - Actions acceptées : - - "<ph name="CLOSE_BROWSERS_ACTION" />" : ferme toutes les fenêtres du navigateur et les PWA pour ce profil. - - "<ph name="SHOW_PROFILE_PICKER_ACTION" />" : affiche la fenêtre de l'outil de sélection des profils.</translation> <translation id="3603469950773500315">Permet d'atténuer les contrôles <ph name="CORS" /> dans la nouvelle mise en œuvre de <ph name="CORS" />. Les extensions peuvent ainsi conserver un comportement compatible, et <ph name="PRODUCT_NAME" /> peut envoyer les en-têtes spécifiés sans contrôles <ph name="CORS" />. Si aucun paramètre d'atténuation n'est indiqué dans la liste, <ph name="PRODUCT_NAME" /> essaie d'exécuter les extensions de manière compatible, et n'introduit pas de modifications de <ph name="API" /> pour <ph name="PRODUCT_NAME" /> 79 (comme indiqué à la page <ph name="WEB_REQUEST_API_MANUAL" />).
diff --git a/components/policy/resources/policy_templates_id.xtb b/components/policy/resources/policy_templates_id.xtb index bd53e7ef..c1efb09 100644 --- a/components/policy/resources/policy_templates_id.xtb +++ b/components/policy/resources/policy_templates_id.xtb
@@ -2841,19 +2841,6 @@ <translation id="3591584750136265240">Mengonfigurasi perilaku autentikasi proses masuk</translation> <translation id="3593905652755912452">Perilaku lama pengiriman peristiwa pada kontrol formulir yang dinonaktifkan akan digunakan.</translation> <translation id="3596112486106491038">Aktifkan akses command line mesin virtual</translation> -<translation id="3596335476793146071">Daftar tindakan yang akan dijalankan saat waktu tunggu dari kebijakan <ph name="IDLE_TIMEOUT_POLICY_NAME" /> tercapai. - - Jika kebijakan <ph name="IDLE_TIMEOUT_POLICY_NAME" /> tidak disetel, kebijakan ini tidak akan berpengaruh. - - Saat waktu tunggu dari kebijakan <ph name="IDLE_TIMEOUT_POLICY_NAME" /> tercapai, <ph name="PRODUCT_NAME" /> akan menjalankan tindakan yang dikonfigurasi di kebijakan ini. - - Jika kebijakan ini disetel ke kosong atau tidak disetel, kebijakan <ph name="IDLE_TIMEOUT_POLICY_NAME" /> tidak akan berpengaruh. - - Tindakan yang didukung adalah: - - '<ph name="CLOSE_BROWSERS_ACTION" />': menutup semua jendela browser dan PWA untuk profil ini. - - '<ph name="SHOW_PROFILE_PICKER_ACTION" />': menampilkan jendela Pemilih Profil.</translation> <translation id="3603469950773500315">Mengaktifkan mitigasi pemeriksaan <ph name="CORS" /> dalam implementasi <ph name="CORS" /> baru, sehingga memungkinkan Ekstensi tetap kompatibel dan mengizinkan <ph name="PRODUCT_NAME" /> mengirim header tertentu tanpa pemeriksaan <ph name="CORS" />. Jika daftar ini dibiarkan kosong, <ph name="PRODUCT_NAME" /> akan mencoba menjalankan Ekstensi secara kompatibel, dan tidak menerapkan perubahan <ph name="API" /> untuk <ph name="PRODUCT_NAME" /> 79 seperti yang dijelaskan dalam <ph name="WEB_REQUEST_API_MANUAL" />.
diff --git a/components/policy/resources/policy_templates_it.xtb b/components/policy/resources/policy_templates_it.xtb index 97f1e31..b8d53c5 100644 --- a/components/policy/resources/policy_templates_it.xtb +++ b/components/policy/resources/policy_templates_it.xtb
@@ -2794,19 +2794,6 @@ <translation id="3591584750136265240">Configura il comportamento di autenticazione dell'accesso</translation> <translation id="3593905652755912452">Verrà utilizzato il comportamento precedente per l'esecuzione di eventi sui controlli dei moduli disattivati.</translation> <translation id="3596112486106491038">Attiva l'accesso alla riga di comando delle macchine virtuali</translation> -<translation id="3596335476793146071">Elenco di azioni da eseguire quando viene raggiunto il timeout del criterio <ph name="IDLE_TIMEOUT_POLICY_NAME" />. - - Se il criterio <ph name="IDLE_TIMEOUT_POLICY_NAME" /> non viene configurato, questo criterio non ha alcun effetto. - - Quando viene raggiunto il timeout del criterio <ph name="IDLE_TIMEOUT_POLICY_NAME" />, <ph name="PRODUCT_NAME" /> esegue le azioni configurate in questo criterio. - - Se il criterio è vuoto o se non viene configurato, il criterio <ph name="IDLE_TIMEOUT_POLICY_NAME" /> non ha alcun effetto. - - Le azioni supportate sono: - - "<ph name="CLOSE_BROWSERS_ACTION" />": vengono chiuse tutte le finestre del browser e le PWA di questo profilo. - - "<ph name="SHOW_PROFILE_PICKER_ACTION" />": viene mostrata la finestra Selettore profilo.</translation> <translation id="3603469950773500315">Consente di attivare le mitigazioni dei controlli <ph name="CORS" /> nella nuova implementazione <ph name="CORS" />, consentendo alle estensioni di mantenere un comportamento compatibile e a <ph name="PRODUCT_NAME" /> di inviare le intestazioni specificate senza controlli <ph name="CORS" />. Se questo elenco viene lasciato vuoto, <ph name="PRODUCT_NAME" /> prova a eseguire le estensioni in modalità compatibili e non introduce modifiche <ph name="API" /> per la versione 79 di <ph name="PRODUCT_NAME" />, come spiegato all'indirizzo <ph name="WEB_REQUEST_API_MANUAL" />.
diff --git a/components/policy/resources/policy_templates_ja.xtb b/components/policy/resources/policy_templates_ja.xtb index f27d49f..e6d8cec 100644 --- a/components/policy/resources/policy_templates_ja.xtb +++ b/components/policy/resources/policy_templates_ja.xtb
@@ -2688,19 +2688,6 @@ <translation id="3591584750136265240">ログイン認証の動作を設定する</translation> <translation id="3593905652755912452">無効化されたフォーム コントロールでのイベントのディスパッチで従来の動作を使用する。</translation> <translation id="3596112486106491038">仮想マシンのコマンドライン アクセスを有効にする</translation> -<translation id="3596335476793146071"><ph name="IDLE_TIMEOUT_POLICY_NAME" /> ポリシーで定義されるタイムアウトに達したときに行う動作のリストを指定します。 - - <ph name="IDLE_TIMEOUT_POLICY_NAME" /> ポリシーが設定されていない場合、このポリシーは無視されます。 - - <ph name="IDLE_TIMEOUT_POLICY_NAME" /> ポリシーで定義されるタイムアウトに達すると、<ph name="PRODUCT_NAME" /> は、このポリシーで指定された動作を行います。 - - このポリシーを空にするか未設定のままにした場合、<ph name="IDLE_TIMEOUT_POLICY_NAME" /> ポリシーは無視されます。 - - サポートされている動作は次のとおりです。 - - 「<ph name="CLOSE_BROWSERS_ACTION" />」: このプロフィールのすべてのブラウザ ウィンドウと PWA を閉じます。 - - 「<ph name="SHOW_PROFILE_PICKER_ACTION" />」: プロフィール選択ウィンドウを表示します。</translation> <translation id="3603469950773500315">新しい <ph name="CORS" /> の実装で <ph name="CORS" /> チェックの緩和措置を有効にして、拡張機能の互換性のある動作が保たれるように、また <ph name="PRODUCT_NAME" /> で <ph name="CORS" /> チェックなしに指定ヘッダーが送信されるようにします。 このリストを空に設定した場合、<ph name="PRODUCT_NAME" /> では拡張機能が互換性を保つように実行され、<ph name="PRODUCT_NAME" /> 79 での <ph name="API" /> の変更（<ph name="WEB_REQUEST_API_MANUAL" /> を参照）は適用されません。
diff --git a/components/policy/resources/policy_templates_ko.xtb b/components/policy/resources/policy_templates_ko.xtb index 77e1b2d..2d6444d 100644 --- a/components/policy/resources/policy_templates_ko.xtb +++ b/components/policy/resources/policy_templates_ko.xtb
@@ -2825,19 +2825,6 @@ <translation id="3591584750136265240">로그인 인증 동작 설정</translation> <translation id="3593905652755912452">disabled 양식 컨트롤에서 기존 이벤트 전달 동작이 사용됩니다.</translation> <translation id="3596112486106491038">가상 머신 명령줄 액세스 권한 사용 설정</translation> -<translation id="3596335476793146071"><ph name="IDLE_TIMEOUT_POLICY_NAME" /> 정책에 설정된 시간 초과 시 실행할 작업 목록입니다. - - <ph name="IDLE_TIMEOUT_POLICY_NAME" /> 정책이 설정되어 있지 않으면 이 정책이 적용되지 않습니다. - - <ph name="IDLE_TIMEOUT_POLICY_NAME" /> 정책에 설정된 시간 초과 시 <ph name="PRODUCT_NAME" />에서 이 정책에 구성된 작업을 실행합니다. - - 정책이 비어 있거나 설정되어 있지 않으면 <ph name="IDLE_TIMEOUT_POLICY_NAME" /> 정책이 적용되지 않습니다. - - 지원되는 작업: - - '<ph name="CLOSE_BROWSERS_ACTION" />': 프로필의 모든 브라우저 창과 PWA를 닫습니다. - - '<ph name="SHOW_PROFILE_PICKER_ACTION" />': 프로필 선택 도구 창을 표시합니다.</translation> <translation id="3603469950773500315">새로운 <ph name="CORS" /> 구현에서 <ph name="CORS" /> 확인 완화를 사용 설정하여 확장 프로그램이 호환되는 동작을 유지하도록 허용하고 <ph name="PRODUCT_NAME" />에서 <ph name="CORS" /> 확인 없이 지정된 헤더를 전송하도록 허용합니다. 목록이 빈 상태로 설정되어 있으면 <ph name="PRODUCT_NAME" />은 호환되는 방식으로 확장 프로그램을 실행하도록 시도하고 <ph name="WEB_REQUEST_API_MANUAL" />에 설명된 것처럼 <ph name="PRODUCT_NAME" /> 79의 <ph name="API" /> 변경사항을 적용하지 않습니다.
diff --git a/components/policy/resources/policy_templates_nl.xtb b/components/policy/resources/policy_templates_nl.xtb index 8b5acee9..00d46ff 100644 --- a/components/policy/resources/policy_templates_nl.xtb +++ b/components/policy/resources/policy_templates_nl.xtb
@@ -2793,19 +2793,6 @@ <translation id="3591584750136265240">Het verificatiegedrag voor inloggen configureren</translation> <translation id="3593905652755912452">Het oude gedrag voor de verzending van gebeurtenissen voor uitgezette bedieningselementen op formulieren wordt gebruikt.</translation> <translation id="3596112486106491038">Opdrachtregeltoegang tot virtuele machines aanzetten</translation> -<translation id="3596335476793146071">Lijst met acties die moeten worden uitgevoerd als de time-out van het beleid <ph name="IDLE_TIMEOUT_POLICY_NAME" /> is bereikt. - - Als het beleid <ph name="IDLE_TIMEOUT_POLICY_NAME" /> niet is ingesteld, heeft dit beleid geen effect. - - Als de time-out van het beleid <ph name="IDLE_TIMEOUT_POLICY_NAME" /> is bereikt, voert <ph name="PRODUCT_NAME" /> de acties uit die in dit beleid zijn geconfigureerd. - - Als je dit beleid leeg laat of niet instelt, heeft het beleid <ph name="IDLE_TIMEOUT_POLICY_NAME" /> geen effect. - - Deze acties worden ondersteund: - -<ph name="CLOSE_BROWSERS_ACTION" />: alle browservensters en PWA's voor dit profiel sluiten. - - <ph name="SHOW_PROFILE_PICKER_ACTION" />: het profielkiezervenster tonen.</translation> <translation id="3603469950773500315">Zet <ph name="CORS" />-controlebeperkingen voor de nieuwe <ph name="CORS" />-implementatie aan, waardoor extensies geschikt gedrag kunnen behouden en <ph name="PRODUCT_NAME" /> toestemming heeft om opgegeven headers te sturen zonder <ph name="CORS" />-controle. Als deze lijst leeg is, probeert <ph name="PRODUCT_NAME" /> extensies op geschikte manieren uit te voeren en worden er geen <ph name="API" />-wijzingen geïntroduceerd voor <ph name="PRODUCT_NAME" /> 79, zoals uitgelegd in <ph name="WEB_REQUEST_API_MANUAL" />.
diff --git a/components/policy/resources/policy_templates_pt-BR.xtb b/components/policy/resources/policy_templates_pt-BR.xtb index 5ddd72e..1d0acb5 100644 --- a/components/policy/resources/policy_templates_pt-BR.xtb +++ b/components/policy/resources/policy_templates_pt-BR.xtb
@@ -2833,19 +2833,6 @@ <translation id="3591584750136265240">Configura o comportamento de autenticação de login</translation> <translation id="3593905652755912452">O comportamento antigo para envio de eventos em controles de formulário desativados vai ser usado.</translation> <translation id="3596112486106491038">Ativar o acesso à linha de comando de máquinas virtuais</translation> -<translation id="3596335476793146071">Lista de ações a serem executadas quando o tempo limite da política <ph name="IDLE_TIMEOUT_POLICY_NAME" /> for atingido. - - Se a <ph name="IDLE_TIMEOUT_POLICY_NAME" /> não for definida, esta política não terá efeito. - - Quando o tempo limite da <ph name="IDLE_TIMEOUT_POLICY_NAME" /> é atingido, o <ph name="PRODUCT_NAME" /> executa as ações configuradas nesta política. - - Se esta política for deixada em branco ou sem definição, a <ph name="IDLE_TIMEOUT_POLICY_NAME" /> não vai ter efeito. - - As ações com suporte são: - - "<ph name="CLOSE_BROWSERS_ACTION" />": fechar todas as janelas e PWAs do navegador deste perfil. - - "<ph name="SHOW_PROFILE_PICKER_ACTION" />": mostrar a janela do seletor de perfil.</translation> <translation id="3603469950773500315">Ative as mitigações de verificação de <ph name="CORS" /> na nova implementação de <ph name="CORS" />, permitindo que as extensões mantenham um comportamento compatível e permitindo que o <ph name="PRODUCT_NAME" /> envie cabeçalhos especificados sem verificações de <ph name="CORS" />. Se esta lista for definida como vazia, o <ph name="PRODUCT_NAME" /> tentará executar extensões de maneiras compatíveis e não introduzirá mudanças de <ph name="API" /> para o <ph name="PRODUCT_NAME" /> 79, conforme explicado em <ph name="WEB_REQUEST_API_MANUAL" />.
diff --git a/components/policy/resources/policy_templates_ru.xtb b/components/policy/resources/policy_templates_ru.xtb index 0e615a8b..6cfef5c6 100644 --- a/components/policy/resources/policy_templates_ru.xtb +++ b/components/policy/resources/policy_templates_ru.xtb
@@ -2825,19 +2825,6 @@ <translation id="3591584750136265240">Настройка способа аутентификации</translation> <translation id="3593905652755912452">Для отключенных элементов управления формой будет использоваться старое поведение диспетчеризации событий</translation> <translation id="3596112486106491038">Разрешить доступ к командной строке виртуальной машины</translation> -<translation id="3596335476793146071">Список действий, которые необходимо выполнить, когда истечет период, заданный в правиле <ph name="IDLE_TIMEOUT_POLICY_NAME" />. - - Если правило <ph name="IDLE_TIMEOUT_POLICY_NAME" /> не настроено, текущее правило не работает. - - Когда период из правила <ph name="IDLE_TIMEOUT_POLICY_NAME" /> истечет, <ph name="PRODUCT_NAME" /> выполнит указанные действия. - - Если правило не настроено или значение для него не задано, правило <ph name="IDLE_TIMEOUT_POLICY_NAME" /> работать не будет. - - Поддерживаемые действия: - - <ph name="CLOSE_BROWSERS_ACTION" /> (будут закрыты все окна браузеров и современные веб-приложения в этом профиле). - - <ph name="SHOW_PROFILE_PICKER_ACTION" />.</translation> <translation id="3603469950773500315">Это правило позволяет смягчить проверки <ph name="CORS" /> в новой реализации <ph name="CORS" />, благодаря чему расширения продолжают работать в совместимом режиме, а <ph name="PRODUCT_NAME" /> может отправлять указанные заголовки без проверок <ph name="CORS" />. Если задан пустой список, <ph name="PRODUCT_NAME" /> пробует запустить расширения в совместимом режиме и не вносит изменения в <ph name="API" /> для <ph name="PRODUCT_NAME" /> 79, как описано на странице <ph name="WEB_REQUEST_API_MANUAL" />.
diff --git a/components/policy/resources/policy_templates_th.xtb b/components/policy/resources/policy_templates_th.xtb index 7051fc3..7bc4b07e 100644 --- a/components/policy/resources/policy_templates_th.xtb +++ b/components/policy/resources/policy_templates_th.xtb
@@ -2794,19 +2794,6 @@ <translation id="3591584750136265240">กำหนดค่าลักษณะการตรวจสอบสิทธิ์ของการเข้าสู่ระบบ</translation> <translation id="3593905652755912452">ระบบจะใช้การส่งเหตุการณ์แบบเก่าในลักษณะการทํางานของตัวควบคุมแบบฟอร์มที่ปิดใช้</translation> <translation id="3596112486106491038">เปิดใช้การเข้าถึงบรรทัดคำสั่งของเครื่องเสมือน</translation> -<translation id="3596335476793146071">รายการการดำเนินการที่จะเรียกใช้เมื่อถึงระยะหมดเวลาตามนโยบาย <ph name="IDLE_TIMEOUT_POLICY_NAME" /> - - หากไม่ได้ตั้งค่านโยบาย <ph name="IDLE_TIMEOUT_POLICY_NAME" /> ไว้ นโยบายนี้จะไม่มีผล - - เมื่อถึงระยะหมดเวลาตามนโยบาย <ph name="IDLE_TIMEOUT_POLICY_NAME" /> <ph name="PRODUCT_NAME" /> จะเรียกใช้การดำเนินการที่กำหนดค่าไว้ในนโยบายนี้ - - หากนโยบายนี้ว่างเปล่าหรือไม่ได้ตั้งค่า นโยบาย <ph name="IDLE_TIMEOUT_POLICY_NAME" /> จะไม่มีผล - - การดำเนินการที่รองรับ ได้แก่ - - "<ph name="CLOSE_BROWSERS_ACTION" />": ปิดหน้าต่างเบราว์เซอร์และ PWA ทั้งหมดสำหรับโปรไฟล์นี้ - - "<ph name="SHOW_PROFILE_PICKER_ACTION" />": แสดงหน้าต่างเครื่องมือเลือกโปรไฟล์</translation> <translation id="3603469950773500315">เปิดใช้การลดการตรวจสอบ <ph name="CORS" /> ในการนำ <ph name="CORS" /> ใหม่ไปใช้ เพื่อให้ส่วนขยายยังคงทำงานร่วมกันได้ และให้ <ph name="PRODUCT_NAME" /> ส่งส่วนหัวที่ระบุโดยไม่ต้องตรวจสอบ <ph name="CORS" /> หากตั้งค่ารายการนี้ให้ว่างเปล่า <ph name="PRODUCT_NAME" /> จะเรียกใช้ส่วนขยายในลักษณะการทำงานที่เข้ากันได้ และจะไม่แสดงการเปลี่ยนแปลง <ph name="API" /> สำหรับ <ph name="PRODUCT_NAME" /> 79 ดังที่อธิบายไว้ใน <ph name="WEB_REQUEST_API_MANUAL" />
diff --git a/components/policy/resources/policy_templates_tr.xtb b/components/policy/resources/policy_templates_tr.xtb index 4721753..d0923206 100644 --- a/components/policy/resources/policy_templates_tr.xtb +++ b/components/policy/resources/policy_templates_tr.xtb
@@ -2819,19 +2819,6 @@ <translation id="3591584750136265240">Giriş için kimlik doğrulama yöntemini yapılandır</translation> <translation id="3593905652755912452">Devre dışı bırakılan form kontrollerinde eski etkinlik gönderme davranışı kullanılacak.</translation> <translation id="3596112486106491038">Sanal makine komut satırı erişimini etkinleştir</translation> -<translation id="3596335476793146071"><ph name="IDLE_TIMEOUT_POLICY_NAME" /> politikasındaki zaman aşımına ulaşıldığında gerçekleştirilecek işlemlerin listesi. - - <ph name="IDLE_TIMEOUT_POLICY_NAME" /> politikası ayarlanmazsa bu politikanın hiçbir etkisi olmaz. - - <ph name="IDLE_TIMEOUT_POLICY_NAME" /> politikasındaki zaman aşımına ulaşıldığında <ph name="PRODUCT_NAME" />, bu politikada yapılandırılan işlemleri çalıştırır. - - Bu politika boşsa veya ayarlanmamışsa <ph name="IDLE_TIMEOUT_POLICY_NAME" /> politikasının hiçbir etkisi yoktur. - - Desteklenen işlemler şunlardır: - - "<ph name="CLOSE_BROWSERS_ACTION" />": Bu profildeki tüm tarayıcı pencerelerini ve PWA'ları (Progresif Web Uygulaması) kapatır. - - "<ph name="SHOW_PROFILE_PICKER_ACTION" />": Profil seçici penceresini gösterir.</translation> <translation id="3603469950773500315">Yeni <ph name="CORS" /> uygulamasındaki çözümlerin <ph name="CORS" /> tarafından kontrol edilmesini sağlayarak Uzantıların uyumlu davranışı sürdürmesine ve belirtilen üstbilgilerin <ph name="PRODUCT_NAME" /> tarafından <ph name="CORS" /> kontrolleri olmadan gönderilmesine olanak tanıyın. Bu liste boş değere ayarlanırsa <ph name="PRODUCT_NAME" />, Uzantıları uyumlu şekillerde çalıştırmayı dener ve <ph name="WEB_REQUEST_API_MANUAL" /> içinde açıklanan <ph name="PRODUCT_NAME" /> 79 için <ph name="API" /> değişikliklerini uygulamaz.
diff --git a/components/policy/resources/policy_templates_uk.xtb b/components/policy/resources/policy_templates_uk.xtb index 1d91f95..4cfd4d2 100644 --- a/components/policy/resources/policy_templates_uk.xtb +++ b/components/policy/resources/policy_templates_uk.xtb
@@ -2828,19 +2828,6 @@ <translation id="3591584750136265240">Налаштування автентифікації під час входу</translation> <translation id="3593905652755912452">Застосовуватиметься стара поведінка для диспетчеризації подій через вимкнені елементи керування формами.</translation> <translation id="3596112486106491038">Увімкнути доступ до командного рядка віртуальної машини</translation> -<translation id="3596335476793146071">Список дій, які виконуються, коли спливає час, заданий у правилі <ph name="IDLE_TIMEOUT_POLICY_NAME" />. - - Якщо правило <ph name="IDLE_TIMEOUT_POLICY_NAME" /> не налаштовано, це правило не діє. - - Коли спливає час, заданий у правилі <ph name="IDLE_TIMEOUT_POLICY_NAME" />, <ph name="PRODUCT_NAME" /> виконує дії, указані в цьому правилі. - - Якщо це правило не налаштувати або не вказати для нього значення, правило <ph name="IDLE_TIMEOUT_POLICY_NAME" /> не діятиме. - - Підтримувані дії: - - <ph name="CLOSE_BROWSERS_ACTION" />: закрити всі вікна веб-переглядача та прогресивні веб-додатки для цього профілю. - - <ph name="SHOW_PROFILE_PICKER_ACTION" />: показати вікно засобу вибору профілю.</translation> <translation id="3603469950773500315">Увімкнути для <ph name="CORS" /> зменшення кількості перевірок у новій реалізації <ph name="CORS" />, що дає змогу розширенням надалі мати сумісну поведінку, а <ph name="PRODUCT_NAME" /> – надсилати вказані заголовки без перевірок <ph name="CORS" />. Якщо цей список порожній, <ph name="PRODUCT_NAME" /> намагається сумісно запускати розширення й не впроваджує зміни <ph name="API" /> для <ph name="PRODUCT_NAME" /> 79, як це описано на сторінці <ph name="WEB_REQUEST_API_MANUAL" />.
diff --git a/components/policy/resources/policy_templates_vi.xtb b/components/policy/resources/policy_templates_vi.xtb index b83d17e..fde2f5c5 100644 --- a/components/policy/resources/policy_templates_vi.xtb +++ b/components/policy/resources/policy_templates_vi.xtb
@@ -2830,19 +2830,6 @@ <translation id="3591584750136265240">Định cấu hình hành vi xác thực thông tin đăng nhập</translation> <translation id="3593905652755912452">Thao tác gửi sự kiện cũ trên các đối tượng kiểm soát biểu mẫu đã tắt sẽ được sử dụng.</translation> <translation id="3596112486106491038">Bật quyền truy cập vào dòng lệnh của máy ảo</translation> -<translation id="3596335476793146071">Danh sách thao tác sẽ diễn ra khi hết thời gian chờ do chính sách <ph name="IDLE_TIMEOUT_POLICY_NAME" /> quy định. - - Nếu bạn không đặt chính sách <ph name="IDLE_TIMEOUT_POLICY_NAME" />, chính sách này sẽ không có hiệu lực. - - Khi hết thời gian chờ do chính sách <ph name="IDLE_TIMEOUT_POLICY_NAME" /> quy định, <ph name="PRODUCT_NAME" /> sẽ thực hiện các thao tác được định cấu hình trong chính sách này. - - Nếu bạn để trống hoặc không đặt chính sách này, thì chính sách <ph name="IDLE_TIMEOUT_POLICY_NAME" /> sẽ không có hiệu lực. - - Các thao tác được hỗ trợ là: - - "<ph name="CLOSE_BROWSERS_ACTION" />": đóng tất cả cửa sổ trình duyệt và PWA của hồ sơ này. - - "<ph name="SHOW_PROFILE_PICKER_ACTION" />": hiện cửa sổ Bộ chọn hồ sơ.</translation> <translation id="3603469950773500315">Bật tùy chọn giảm thiểu kiểm tra <ph name="CORS" /> trong quy trình triển khai <ph name="CORS" /> mới, cho phép Tiện ích duy trì chế độ tương thích và cho phép <ph name="PRODUCT_NAME" /> gửi tiêu đề đã chỉ định mà không cần kiểm tra <ph name="CORS" />. Nếu bạn đặt danh sách này thành trống, thì <ph name="PRODUCT_NAME" /> sẽ cố chạy Tiện ích theo cách thức tương thích và không làm thay đổi <ph name="API" /> đối với <ph name="PRODUCT_NAME" /> 79 như giải thích tại <ph name="WEB_REQUEST_API_MANUAL" />.
diff --git a/components/policy/resources/policy_templates_zh-CN.xtb b/components/policy/resources/policy_templates_zh-CN.xtb index c406b10f..9f75289a 100644 --- a/components/policy/resources/policy_templates_zh-CN.xtb +++ b/components/policy/resources/policy_templates_zh-CN.xtb
@@ -2786,19 +2786,6 @@ <translation id="3591584750136265240">配置登录身份验证行为</translation> <translation id="3593905652755912452">系统将使用针对已停用的表单控件分派事件的旧行为。</translation> <translation id="3596112486106491038">启用虚拟机命令行访问权限</translation> -<translation id="3596335476793146071">以列表形式指定在达到 <ph name="IDLE_TIMEOUT_POLICY_NAME" /> 政策所设的超时后要运行的一系列操作。 - - 如果 <ph name="IDLE_TIMEOUT_POLICY_NAME" /> 政策未设置，此政策将不会产生任何效力。 - - 达到 <ph name="IDLE_TIMEOUT_POLICY_NAME" /> 政策所设的超时后，<ph name="PRODUCT_NAME" /> 会运行此政策中配置的操作。 - - 如果此政策为空或未设置，<ph name="IDLE_TIMEOUT_POLICY_NAME" /> 政策将不会产生任何效力。 - - 支持的操作包括： - - “<ph name="CLOSE_BROWSERS_ACTION" />”：关闭此个人资料的所有浏览器窗口和 PWA。 - - “<ph name="SHOW_PROFILE_PICKER_ACTION" />”：显示“个人资料选择器”窗口。</translation> <translation id="3603469950773500315">在新版 <ph name="CORS" /> 实现方案中启用 <ph name="CORS" /> 检查缓解功能，从而允许扩展程序保持兼容的行为，并允许 <ph name="PRODUCT_NAME" /> 无需进行 <ph name="CORS" /> 检查便可发送指定标头。 如果此列表设为空，<ph name="PRODUCT_NAME" /> 会尝试以兼容的方式运行扩展程序，而不会激活 <ph name="PRODUCT_NAME" /> 79 版中引入的 <ph name="API" /> 更改（如 <ph name="WEB_REQUEST_API_MANUAL" /> 所述）。
diff --git a/components/policy/resources/policy_templates_zh-TW.xtb b/components/policy/resources/policy_templates_zh-TW.xtb index 1905ec21..4b80005 100644 --- a/components/policy/resources/policy_templates_zh-TW.xtb +++ b/components/policy/resources/policy_templates_zh-TW.xtb
@@ -2770,19 +2770,6 @@ <translation id="3591584750136265240">設定登入驗證行為</translation> <translation id="3593905652755912452">系統將使用在已停用表單控制項上傳送事件的舊行為。</translation> <translation id="3596112486106491038">啟用虛擬機器指令列存取權</translation> -<translation id="3596335476793146071">如達到 <ph name="IDLE_TIMEOUT_POLICY_NAME" /> 政策指定的逾時時間，要執行的動作清單。 - - 如果不設定 <ph name="IDLE_TIMEOUT_POLICY_NAME" /> 政策，這項政策就不會有任何作用。 - - 達到 <ph name="IDLE_TIMEOUT_POLICY_NAME" /> 政策指定的逾時時間時，<ph name="PRODUCT_NAME" /> 就會執行在這項政策中設定的動作。 - - 如果將這項政策留白或不予設定，<ph name="IDLE_TIMEOUT_POLICY_NAME" /> 政策便不會有任何作用。 - - 支援的動作為： - - 「<ph name="CLOSE_BROWSERS_ACTION" />」：關閉這個設定檔的所有瀏覽器視窗和 PWA。 - - 「<ph name="SHOW_PROFILE_PICKER_ACTION" />」：顯示設定檔選擇畫面視窗。</translation> <translation id="3603469950773500315">在新版 <ph name="CORS" /> 模式中啟用寬鬆檢查機制來放寬 <ph name="CORS" /> 檢查標準，讓擴充功能保持相容行為，並允許 <ph name="PRODUCT_NAME" /> 不需經過 <ph name="CORS" /> 檢查即可傳送指定標頭。 如果將這份清單設為空白，<ph name="PRODUCT_NAME" /> 會嘗試以相容方式執行擴充功能，且不會採用 <ph name="PRODUCT_NAME" /> 第 79 版的 <ph name="API" /> 變更，詳情請參閱 <ph name="WEB_REQUEST_API_MANUAL" />。
diff --git a/components/segmentation_platform/internal/BUILD.gn b/components/segmentation_platform/internal/BUILD.gn index 3a5d5c1..e02da9e7 100644 --- a/components/segmentation_platform/internal/BUILD.gn +++ b/components/segmentation_platform/internal/BUILD.gn
@@ -111,6 +111,8 @@ "segmentation_platform_service_impl.h", "segmentation_ukm_helper.cc", "segmentation_ukm_helper.h", + "selection/client_result_prefs.cc", + "selection/client_result_prefs.h", "selection/experimental_group_recorder.cc", "selection/experimental_group_recorder.h", "selection/request_dispatcher.cc", @@ -259,6 +261,7 @@ "segmentation_platform_service_test_base.cc", "segmentation_platform_service_test_base.h", "segmentation_ukm_helper_unittest.cc", + "selection/client_result_prefs_unittest.cc", "selection/request_dispatcher_unittest.cc", "selection/request_handler_unittest.cc", "selection/segment_result_provider_unittest.cc",
diff --git a/components/segmentation_platform/internal/constants.cc b/components/segmentation_platform/internal/constants.cc index 655896c..164b0bb 100644 --- a/components/segmentation_platform/internal/constants.cc +++ b/components/segmentation_platform/internal/constants.cc
@@ -9,6 +9,9 @@ const char kSegmentationResultPref[] = "segmentation_platform.segmentation_result"; +const char kSegmentationClientResultPrefs[] = + "segmentation_platform.client_result_prefs"; + const char kSegmentationUkmMostRecentAllowedTimeKey[] = "segmentation_platform.ukm_most_recent_allowed_time_key";
diff --git a/components/segmentation_platform/internal/constants.h b/components/segmentation_platform/internal/constants.h index 0f897b3..e78f600 100644 --- a/components/segmentation_platform/internal/constants.h +++ b/components/segmentation_platform/internal/constants.h
@@ -10,6 +10,10 @@ // The path to the pref storing the segmentation result. extern const char kSegmentationResultPref[]; +// The path to the prefs storing results for all the clients, supporting multi +// output models. +extern const char kSegmentationClientResultPrefs[]; + // The path to the pref storing when UKM are allowed recently. extern const char kSegmentationUkmMostRecentAllowedTimeKey[];
diff --git a/components/segmentation_platform/internal/proto/BUILD.gn b/components/segmentation_platform/internal/proto/BUILD.gn index c5ac8b8..86c0bf9 100644 --- a/components/segmentation_platform/internal/proto/BUILD.gn +++ b/components/segmentation_platform/internal/proto/BUILD.gn
@@ -7,8 +7,8 @@ proto_library("proto") { proto_in_dir = "//" sources = [ + "client_results.proto", "model_prediction.proto", - "prediction_result_pref_storage.proto", "signal.proto", "signal_storage_config.proto", ]
diff --git a/components/segmentation_platform/internal/proto/client_results.proto b/components/segmentation_platform/internal/proto/client_results.proto new file mode 100644 index 0000000..59ffd47 --- /dev/null +++ b/components/segmentation_platform/internal/proto/client_results.proto
@@ -0,0 +1,26 @@ +// Copyright 2022 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +syntax = "proto2"; +option optimize_for = LITE_RUNTIME; + +package segmentation_platform.proto; + +import "components/segmentation_platform/public/proto/prediction_result.proto"; + +// Model result for a single client. +message ClientResult { + // Result from the model evaluation for the client. + optional PredictionResult client_result = 1; + + // Timestamp when this result was written to prefs. + optional int64 timestamp_us = 2; +} + +// Proto containing model results for all clients. Used for storing in prefs. +message ClientResults { + // Contains results for all clients. Unique key associated with the client is + // the key for the map. + map<string, ClientResult> client_result_map = 1; +}
diff --git a/components/segmentation_platform/internal/proto/prediction_result_pref_storage.proto b/components/segmentation_platform/internal/proto/prediction_result_pref_storage.proto deleted file mode 100644 index fd8d373..0000000 --- a/components/segmentation_platform/internal/proto/prediction_result_pref_storage.proto +++ /dev/null
@@ -1,28 +0,0 @@ -// Copyright 2022 The Chromium Authors -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -syntax = "proto2"; -option optimize_for = LITE_RUNTIME; - -package segmentation_platform.proto; - -import "components/segmentation_platform/public/proto/prediction_result.proto"; - -// Proto containing model results for all clients. Used for storing in prefs. -message PredictionResultPrefStorage { - // Model result for a single client. - message PredictionResultForClient { - // The unique key associated with the client. - optional string segmentation_key = 1; - - // Result from the model evaluation for the client. - optional PredictionResult result = 2; - - // Timestamp when this result was written to prefs. - optional int64 timestamp_us = 3; - } - - // Contains results for all clients. - repeated PredictionResultForClient pred_results_for_clients = 1; -}
diff --git a/components/segmentation_platform/internal/selection/client_result_prefs.cc b/components/segmentation_platform/internal/selection/client_result_prefs.cc new file mode 100644 index 0000000..481addf5 --- /dev/null +++ b/components/segmentation_platform/internal/selection/client_result_prefs.cc
@@ -0,0 +1,64 @@ +// Copyright 2023 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "components/segmentation_platform/internal/selection/client_result_prefs.h" + +#include "components/prefs/pref_service.h" +#include "components/segmentation_platform/internal/constants.h" + +namespace segmentation_platform { + +ClientResultPrefs::ClientResultPrefs(PrefService* pref_service) + : prefs_(pref_service) {} + +void ClientResultPrefs::SaveClientResultToPrefs( + const std::string& client_key, + const absl::optional<proto::ClientResult>& client_result) { + proto::ClientResults client_results; + + auto decoded_client_results = + base::Base64Decode(prefs_->GetString(kSegmentationClientResultPrefs)); + const std::string& decoded_client_results_as_string = + decoded_client_results.has_value() + ? std::string(decoded_client_results.value().begin(), + decoded_client_results.value().end()) + : std::string(); + + client_results.ParseFromString(decoded_client_results_as_string); + if (client_result.has_value()) { + (*client_results.mutable_client_result_map())[client_key] = + client_result.value(); + } else { + // Erasing the entry if the new `client_result` is null. + auto client_result_iter = + client_results.client_result_map().find(client_key); + if (client_result_iter != client_results.client_result_map().end()) { + client_results.mutable_client_result_map()->erase(client_key); + } + } + std::string output; + base::Base64Encode(client_results.SerializeAsString(), &output); + prefs_->SetString(kSegmentationClientResultPrefs, output); +} + +absl::optional<proto::ClientResult> +ClientResultPrefs::ReadClientResultFromPrefs(const std::string& client_key) { + proto::ClientResults client_results; + + auto decoded_client_results = + base::Base64Decode(prefs_->GetString(kSegmentationClientResultPrefs)); + const std::string& decoded_client_results_as_string = + decoded_client_results.has_value() + ? std::string(decoded_client_results.value().begin(), + decoded_client_results.value().end()) + : std::string(); + + client_results.ParseFromString(decoded_client_results_as_string); + if (client_results.client_result_map().contains(client_key)) { + return client_results.client_result_map().at(client_key); + } + return absl::nullopt; +} + +} // namespace segmentation_platform \ No newline at end of file
diff --git a/components/segmentation_platform/internal/selection/client_result_prefs.h b/components/segmentation_platform/internal/selection/client_result_prefs.h new file mode 100644 index 0000000..d5d25d27 --- /dev/null +++ b/components/segmentation_platform/internal/selection/client_result_prefs.h
@@ -0,0 +1,50 @@ +// Copyright 2023 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef COMPONENTS_SEGMENTATION_PLATFORM_INTERNAL_SELECTION_PREDICTION_RESULT_PREFS_H_ +#define COMPONENTS_SEGMENTATION_PLATFORM_INTERNAL_SELECTION_PREDICTION_RESULT_PREFS_H_ + +#include "base/base64.h" +#include "base/memory/raw_ptr.h" +#include "base/time/time.h" +#include "components/segmentation_platform/internal/proto/client_results.pb.h" +#include "third_party/abseil-cpp/absl/types/optional.h" + +class PrefService; + +namespace segmentation_platform { +// Caching layer for client results. Uses prefs for persistent caching and fast +// lookup even before rest of the segmentation platform has been initialized. +// The cache consists of a single pref which consists of results for all the +// clients in a map. Each map entry consists of (1) Client key : The unique key +// for the client. (2) ClientResult : Consists of (a) The result of model +// evaluation. (b) The time when the prediction result was written to the +// prefs. Used to enforce TTL determining if the result is expired. +class ClientResultPrefs { + public: + explicit ClientResultPrefs(PrefService* pref_service); + virtual ~ClientResultPrefs() = default; + + // Disallow copy/assign. + ClientResultPrefs(const ClientResultPrefs& other) = delete; + ClientResultPrefs operator=(const ClientResultPrefs& other) = delete; + + // Writes the `ClientResult` containing prediction result from model + // evaluation to prefs. If the result for client is already present, update it + // with the new result. + virtual void SaveClientResultToPrefs( + const std::string& client_key, + const absl::optional<proto::ClientResult>& client_result); + + // Reads the `ClientResult` from prefs, if present. + virtual absl::optional<proto::ClientResult> ReadClientResultFromPrefs( + const std::string& client_key); + + private: + raw_ptr<PrefService> prefs_; +}; + +} // namespace segmentation_platform + +#endif // COMPONENTS_SEGMENTATION_PLATFORM_INTERNAL_SELECTION_PREDICTION_RESULT_PREFS_H_
diff --git a/components/segmentation_platform/internal/selection/client_result_prefs_unittest.cc b/components/segmentation_platform/internal/selection/client_result_prefs_unittest.cc new file mode 100644 index 0000000..90a8e179 --- /dev/null +++ b/components/segmentation_platform/internal/selection/client_result_prefs_unittest.cc
@@ -0,0 +1,104 @@ +// Copyright 2023 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "components/segmentation_platform/internal/selection/client_result_prefs.h" + +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/testing_pref_service.h" +#include "components/segmentation_platform/internal/constants.h" +#include "testing/gmock/include/gmock/gmock.h" +#include "testing/gtest/include/gtest/gtest.h" + +namespace segmentation_platform { + +const char kClientKey[] = "test_key"; +const char kClientKey2[] = "test_key2"; + +class ClientResultPrefsTest : public testing::Test { + public: + ClientResultPrefsTest() = default; + ~ClientResultPrefsTest() override = default; + + void SetUp() override { + result_prefs_ = std::make_unique<ClientResultPrefs>(&pref_service_); + pref_service_.registry()->RegisterStringPref(kSegmentationClientResultPrefs, + std::string()); + } + + proto::ClientResult CreateClientResult(std::vector<float> result) { + proto::ClientResult client_result; + auto* pred_result = client_result.mutable_client_result(); + pred_result->mutable_result()->Add(result.begin(), result.end()); + client_result.set_timestamp_us( + base::Time::Now().ToDeltaSinceWindowsEpoch().InMicroseconds()); + return client_result; + } + + protected: + TestingPrefServiceSimple pref_service_; + std::unique_ptr<ClientResultPrefs> result_prefs_; +}; + +TEST_F(ClientResultPrefsTest, ReadClientResultFromEmptyPrefs) { + absl::optional<proto::ClientResult> current_result = + result_prefs_->ReadClientResultFromPrefs(kClientKey); + EXPECT_FALSE(current_result.has_value()); +} + +TEST_F(ClientResultPrefsTest, SaveClientResultToEmptyPrefs) { + const proto::ClientResult& client_result = CreateClientResult({0.8}); + result_prefs_->SaveClientResultToPrefs(kClientKey, client_result); + + absl::optional<proto::ClientResult> current_result = + result_prefs_->ReadClientResultFromPrefs(kClientKey); + EXPECT_TRUE(current_result.has_value()); + EXPECT_EQ(client_result.SerializeAsString(), + current_result.value().SerializeAsString()); +} + +TEST_F(ClientResultPrefsTest, SaveMultipleClientResults) { + // Saving multiple keys and reading multiple keys. + const proto::ClientResult& client_result = CreateClientResult({0.8}); + result_prefs_->SaveClientResultToPrefs(kClientKey, client_result); + + const proto::ClientResult& client_result2 = CreateClientResult({0.7, 0.9}); + result_prefs_->SaveClientResultToPrefs(kClientKey2, client_result2); + + absl::optional<proto::ClientResult> current_result = + result_prefs_->ReadClientResultFromPrefs(kClientKey); + EXPECT_TRUE(current_result.has_value()); + EXPECT_EQ(client_result.SerializeAsString(), + current_result.value().SerializeAsString()); + + current_result = result_prefs_->ReadClientResultFromPrefs(kClientKey2); + EXPECT_TRUE(current_result.has_value()); + EXPECT_EQ(client_result2.SerializeAsString(), + current_result.value().SerializeAsString()); + + // Save empty result. It should delete the current result. + result_prefs_->SaveClientResultToPrefs(kClientKey2, absl::nullopt); + current_result = result_prefs_->ReadClientResultFromPrefs(kClientKey2); + EXPECT_FALSE(current_result.has_value()); + + current_result = result_prefs_->ReadClientResultFromPrefs(kClientKey); + EXPECT_TRUE(current_result.has_value()); + EXPECT_EQ(client_result.SerializeAsString(), + current_result.value().SerializeAsString()); + + // Updating client result for `kClientKey2`. It should overwrite the + // result. + const proto::ClientResult& client_result3 = CreateClientResult({}); + result_prefs_->SaveClientResultToPrefs(kClientKey2, client_result3); + current_result = result_prefs_->ReadClientResultFromPrefs(kClientKey2); + EXPECT_TRUE(current_result.has_value()); + EXPECT_EQ(client_result3.SerializeAsString(), + current_result.value().SerializeAsString()); + + current_result = result_prefs_->ReadClientResultFromPrefs(kClientKey); + EXPECT_TRUE(current_result.has_value()); + EXPECT_EQ(client_result.SerializeAsString(), + current_result.value().SerializeAsString()); +} + +} // namespace segmentation_platform \ No newline at end of file
diff --git a/components/variations/uniformity_unittest.cc b/components/variations/uniformity_unittest.cc index 550b5e7..eb27ad8 100644 --- a/components/variations/uniformity_unittest.cc +++ b/components/variations/uniformity_unittest.cc
@@ -25,12 +25,15 @@ // For these tests, we use a small LES range to make the expectations simpler. const uint32_t kMaxEntropy = 20; +const uint32_t kLayerId = 1; +const uint32_t kLayerSalt = kLayerId; const char kStudyName[] = "Uniformity"; struct LayerStudySeedOptions { bool layer_constrain_study = true; bool force_low_entropy_layer = true; bool force_low_entropy = false; + uint32_t salt = kLayerSalt; uint32_t slot_multiplier = 1; }; @@ -41,8 +44,8 @@ VariationsSeed LayerStudySeed(LayerStudySeedOptions options) { VariationsSeed seed; Layer* layer = seed.add_layers(); - layer->set_id(42); - layer->set_salt(42); + layer->set_id(kLayerId); + layer->set_salt(options.salt); layer->set_num_slots(10 * options.slot_multiplier); if (options.force_low_entropy_layer) layer->set_entropy_mode(Layer::LOW); @@ -64,7 +67,7 @@ if (options.layer_constrain_study) { LayerMemberReference* layer_membership = study->mutable_layer(); - layer_membership->set_layer_id(42); + layer_membership->set_layer_id(kLayerId); layer_membership->set_layer_member_id(82); } // Use 3 arms, which does not divide @@ -274,6 +277,23 @@ EXPECT_THAT(assignments, ::testing::ElementsAreArray(expected)); } +// Not specifying the `salt` field for the layer should fall back to using the +// `id` field as salt. Different salt values should result in different layer +// exclusions. +TEST(VariationsUniformityTest, LayerSalt) { + auto assignments = GetUniformityAssignments( + LayerStudySeed({.force_low_entropy_layer = false})); + + auto assignments_salt_not_specified = GetUniformityAssignments( + LayerStudySeed({.force_low_entropy_layer = false, .salt = 0})); + + auto assignments_alternative_salt = GetUniformityAssignments(LayerStudySeed( + {.force_low_entropy_layer = false, .salt = kLayerSalt + 1})); + + EXPECT_EQ(assignments, assignments_salt_not_specified); + EXPECT_NE(assignments, assignments_alternative_salt); +} + // When enable_benchmarking is passed, layered studies should never activate. TEST(VariationsUniformityTest, BenchmarkingDisablesLayeredStudies) { std::vector<std::string> expected( @@ -346,4 +366,4 @@ } } -} // namespace variations \ No newline at end of file +} // namespace variations
diff --git a/components/variations/variations_layers.cc b/components/variations/variations_layers.cc index 04afdbd..21a4644 100644 --- a/components/variations/variations_layers.cc +++ b/components/variations/variations_layers.cc
@@ -213,7 +213,7 @@ const auto& entropy_provider = (layer_proto.entropy_mode() != Layer::LOW) ? entropy_providers.default_entropy() : entropy_providers.low_entropy(); - uint32_t salt = layer_proto.salt() || layer_proto.id(); + uint32_t salt = layer_proto.salt() ? layer_proto.salt() : layer_proto.id(); ValueInRange pseudorandom = { .value = entropy_provider.GetPseudorandomValue(salt, range), .range = static_cast<uint32_t>(range),
diff --git a/content/browser/file_system_access/features.cc b/content/browser/file_system_access/features.cc index b77f98f..710f2a06 100644 --- a/content/browser/file_system_access/features.cc +++ b/content/browser/file_system_access/features.cc
@@ -8,6 +8,14 @@ namespace content::features { +// TODO(crbug.com/1370433): Remove this flag eventually. +// When enabled, drag-and-dropped files and directories will be checked against +// the File System Access blocklist. This feature was disabled since it broke +// some applications. +BASE_FEATURE(kFileSystemAccessDragAndDropCheckBlocklist, + "FileSystemAccessDragAndDropCheckBlocklist", + base::FEATURE_DISABLED_BY_DEFAULT); + // TODO(crbug.com/1381621): Remove this flag eventually. // When enabled, move() will result in a promise rejection when the specified // destination to move to exists. This feature was disabled since it does not
diff --git a/content/browser/file_system_access/features.h b/content/browser/file_system_access/features.h index 2c4c82e..1f61e0f 100644 --- a/content/browser/file_system_access/features.h +++ b/content/browser/file_system_access/features.h
@@ -14,6 +14,7 @@ // alongside the definition of their values in the .cc file. // Alphabetical: +CONTENT_EXPORT BASE_DECLARE_FEATURE(kFileSystemAccessDragAndDropCheckBlocklist); CONTENT_EXPORT BASE_DECLARE_FEATURE(kFileSystemAccessDoNotOverwriteOnMove); CONTENT_EXPORT BASE_DECLARE_FEATURE(kFileSystemAccessRemove); CONTENT_EXPORT BASE_DECLARE_FEATURE(kFileSystemAccessRemoveEntryExclusiveLock);
diff --git a/content/browser/file_system_access/file_system_access_manager_impl.cc b/content/browser/file_system_access/file_system_access_manager_impl.cc index 47110fb..f646003 100644 --- a/content/browser/file_system_access/file_system_access_manager_impl.cc +++ b/content/browser/file_system_access/file_system_access_manager_impl.cc
@@ -25,6 +25,7 @@ #include "build/build_config.h" #include "components/services/storage/public/cpp/buckets/bucket_id.h" #include "components/services/storage/public/cpp/buckets/bucket_locator.h" +#include "content/browser/file_system_access/features.h" #include "content/browser/file_system_access/file_system_access.pb.h" #include "content/browser/file_system_access/file_system_access_access_handle_host_impl.h" #include "content/browser/file_system_access/file_system_access_data_transfer_token_impl.h" @@ -672,7 +673,9 @@ HandleType file_type) { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); - if (!permission_context_) { + if (!permission_context_ || + !base::FeatureList::IsEnabled( + features::kFileSystemAccessDragAndDropCheckBlocklist)) { DidVerifySensitiveDirectoryAccessForDataTransfer( binding_context, file_path, url, file_type, std::move(token_resolved_callback), SensitiveEntryResult::kAllowed);
diff --git a/content/browser/file_system_access/file_system_access_manager_impl_unittest.cc b/content/browser/file_system_access/file_system_access_manager_impl_unittest.cc index 6711f331..c2337dd 100644 --- a/content/browser/file_system_access/file_system_access_manager_impl_unittest.cc +++ b/content/browser/file_system_access/file_system_access_manager_impl_unittest.cc
@@ -9,6 +9,7 @@ #include <vector> #include "base/callback_helpers.h" +#include "base/feature_list.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" #include "base/guid.h" @@ -23,6 +24,7 @@ #include "components/services/storage/public/cpp/buckets/bucket_id.h" #include "components/services/storage/public/cpp/buckets/bucket_locator.h" #include "components/services/storage/public/cpp/buckets/constants.h" +#include "content/browser/file_system_access/features.h" #include "content/browser/file_system_access/file_system_access_data_transfer_token_impl.h" #include "content/browser/file_system_access/file_system_access_directory_handle_impl.h" #include "content/browser/file_system_access/file_system_access_file_handle_impl.h" @@ -249,16 +251,19 @@ path_type, file_path, kBindingContext.process_id(), token_remote.InitWithNewPipeAndPassReceiver()); - EXPECT_CALL( - permission_context_, - ConfirmSensitiveEntryAccess_( - kTestStorageKey.origin(), - FileSystemAccessPermissionContext::PathType::kLocal, file_path, - FileSystemAccessPermissionContext::HandleType::kFile, - FileSystemAccessPermissionContext::UserAction::kDragAndDrop, - kFrameId, testing::_)) - .WillOnce(RunOnceCallback<6>( - FileSystemAccessPermissionContext::SensitiveEntryResult::kAllowed)); + if (base::FeatureList::IsEnabled( + features::kFileSystemAccessDragAndDropCheckBlocklist)) { + EXPECT_CALL( + permission_context_, + ConfirmSensitiveEntryAccess_( + kTestStorageKey.origin(), + FileSystemAccessPermissionContext::PathType::kLocal, file_path, + FileSystemAccessPermissionContext::HandleType::kFile, + FileSystemAccessPermissionContext::UserAction::kDragAndDrop, + kFrameId, testing::_)) + .WillOnce(RunOnceCallback<6>(FileSystemAccessPermissionContext:: + SensitiveEntryResult::kAllowed)); + } // Expect permission requests when the token is sent to be redeemed. EXPECT_CALL( @@ -307,16 +312,19 @@ path_type, dir_path, kBindingContext.process_id(), token_remote.InitWithNewPipeAndPassReceiver()); - EXPECT_CALL( - permission_context_, - ConfirmSensitiveEntryAccess_( - kTestStorageKey.origin(), - FileSystemAccessPermissionContext::PathType::kLocal, dir_path, - FileSystemAccessPermissionContext::HandleType::kDirectory, - FileSystemAccessPermissionContext::UserAction::kDragAndDrop, - kFrameId, testing::_)) - .WillOnce(RunOnceCallback<6>( - FileSystemAccessPermissionContext::SensitiveEntryResult::kAllowed)); + if (base::FeatureList::IsEnabled( + features::kFileSystemAccessDragAndDropCheckBlocklist)) { + EXPECT_CALL( + permission_context_, + ConfirmSensitiveEntryAccess_( + kTestStorageKey.origin(), + FileSystemAccessPermissionContext::PathType::kLocal, dir_path, + FileSystemAccessPermissionContext::HandleType::kDirectory, + FileSystemAccessPermissionContext::UserAction::kDragAndDrop, + kFrameId, testing::_)) + .WillOnce(RunOnceCallback<6>(FileSystemAccessPermissionContext:: + SensitiveEntryResult::kAllowed)); + } // Expect permission requests when the token is sent to be redeemed. EXPECT_CALL( @@ -1285,6 +1293,11 @@ TEST_F(FileSystemAccessManagerImplTest, GetEntryFromDataTransferToken_File_SensitivePath) { + if (!base::FeatureList::IsEnabled( + features::kFileSystemAccessDragAndDropCheckBlocklist)) { + return; + } + base::FilePath file_path = dir_.GetPath().AppendASCII("mr_file"); ASSERT_TRUE(base::CreateTemporaryFile(&file_path)); @@ -1320,6 +1333,11 @@ TEST_F(FileSystemAccessManagerImplTest, GetEntryFromDataTransferToken_Directory_SensitivePath) { + if (!base::FeatureList::IsEnabled( + features::kFileSystemAccessDragAndDropCheckBlocklist)) { + return; + } + const base::FilePath& kDirPath = dir_.GetPath().AppendASCII("mr_directory"); ASSERT_TRUE(base::CreateDirectory(kDirPath));
diff --git a/content/test/gpu/gpu_tests/test_expectations/info_collection_expectations.txt b/content/test/gpu/gpu_tests/test_expectations/info_collection_expectations.txt index 2026abc..1c1be38 100644 --- a/content/test/gpu/gpu_tests/test_expectations/info_collection_expectations.txt +++ b/content/test/gpu/gpu_tests/test_expectations/info_collection_expectations.txt
@@ -85,7 +85,7 @@ crbug.com/1079393 [ win intel-0x3e92 ] InfoCollection_direct_composition [ Failure ] # InfoCollection_basic is flaky on Fuchsia. -crbug.com/1154597 [ fuchsia ] InfoCollection_basic [ RetryOnFailure ] +crbug.com/1154597 [ angle-vulkan fuchsia fuchsia-chrome intel-gen-9 ] InfoCollection_basic [ RetryOnFailure ] ####################################################################### # Automated Entries After This Point - Do Not Manually Add Below Here #
diff --git a/content/test/gpu/gpu_tests/test_expectations/webgl_conformance_expectations.txt b/content/test/gpu/gpu_tests/test_expectations/webgl_conformance_expectations.txt index 6c80fdd8..82b5b3be 100644 --- a/content/test/gpu/gpu_tests/test_expectations/webgl_conformance_expectations.txt +++ b/content/test/gpu/gpu_tests/test_expectations/webgl_conformance_expectations.txt
@@ -330,26 +330,20 @@ #################### # Fuchsia failures # #################### -# OOM on hardware devices -crbug.com/1146483 [ fuchsia fuchsia-board-astro ] conformance/textures/misc/texture-video-transparent.html [ Failure ] + +crbug.com/1371306 [ fuchsia fuchsia-board-astro ] conformance/textures/misc/texture-video-transparent.html [ Failure ] +crbug.com/1371306 [ fuchsia fuchsia-board-sherlock ] conformance/textures/misc/texture-video-transparent.html [ Failure ] # Flaky tests [ fuchsia fuchsia-board-astro ] WebglExtension_EXT_float_blend [ Failure ] [ fuchsia fuchsia-board-sherlock ] WebglExtension_EXT_float_blend [ Failure ] -# GPU process crash - # Flaky tests # Anti-aliasing disabled on Fuchsia # TODO(crbug.com/1276153) uncomment after fix for updated part of test applies # [ fuchsia ] conformance/context/context-attributes-alpha-depth-stencil-antialias.html [ Failure ] -# Sherlock failures -crbug.com/1261867 [ fuchsia fuchsia-board-sherlock renderer-skia-vulkan ] conformance/textures/misc/texture-video-transparent.html [ Failure ] - -# Failing on emulator seemingly due to network issues. - #################### # Win failures # ####################
diff --git a/docs/android_build_instructions.md b/docs/android_build_instructions.md index c13a3b8..b6568cf 100644 --- a/docs/android_build_instructions.md +++ b/docs/android_build_instructions.md
@@ -91,7 +91,7 @@ Once you have checked out the code, run ```shell -build/install-build-deps-android.sh +build/install-build-deps.sh --android ``` to get all of the dependencies you need to build on Linux, *plus* all of the
diff --git a/docs/android_cast_build_instructions.md b/docs/android_cast_build_instructions.md index 62ca9da..3deb101 100644 --- a/docs/android_cast_build_instructions.md +++ b/docs/android_cast_build_instructions.md
@@ -91,7 +91,7 @@ Once you have checked out the code, run ```shell -$ build/install-build-deps-android.sh +$ build/install-build-deps.sh --android ``` to get all of the dependencies you need to build on Linux, *plus* all of the
diff --git a/docs/working_remotely_with_android.md b/docs/working_remotely_with_android.md index 2db3aeae..7d7f460f 100644 --- a/docs/working_remotely_with_android.md +++ b/docs/working_remotely_with_android.md
@@ -47,7 +47,7 @@ ```shell # May need to install dependencies on your laptop. -laptop$ sudo ./build/install-build-deps-android.sh +laptop$ sudo ./build/install-build-deps.sh --android # Rebuild the needed binaries on your laptop.
diff --git a/ios/chrome/app/strings/resources/ios_strings_en-GB.xtb b/ios/chrome/app/strings/resources/ios_strings_en-GB.xtb index a0bbd0f5..ba6ed52e 100644 --- a/ios/chrome/app/strings/resources/ios_strings_en-GB.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_en-GB.xtb
@@ -531,6 +531,7 @@ <translation id="4916679969857390442">Lens</translation> <translation id="4922154083994158612">More security?</translation> <translation id="4930714375720679147">Turn On</translation> +<translation id="4938338714234463591">This will let you use your voice with certain features on websites.</translation> <translation id="4941089862236492464">Sorry, there was a problem sharing your item.</translation> <translation id="4944543191714094452">Find in page…</translation> <translation id="4945756290001680296">Access password settings</translation> @@ -902,6 +903,7 @@ <translation id="7649070708921625228">Help</translation> <translation id="7658239707568436148">Cancel</translation> <translation id="7671141431838911305">INSTALL</translation> +<translation id="7679915578945954324">Site addresses copied</translation> <translation id="7687508192620387263">Calendar file available</translation> <translation id="7701040980221191251">None</translation> <translation id="7720410380936703141">TRY AGAIN</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_et.xtb b/ios/chrome/app/strings/resources/ios_strings_et.xtb index 133dacf..e858cf9 100644 --- a/ios/chrome/app/strings/resources/ios_strings_et.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_et.xtb
@@ -453,6 +453,7 @@ <translation id="4420409367264901497">Muuda järjehoidjat</translation> <translation id="4442550905108052454">Avage menüü <ph name="BEGIN_BOLD" />Seaded<ph name="END_BOLD" /></translation> <translation id="4454246407045105932">Lisa keel</translation> +<translation id="4461286950227634995">Paku paroolide salvestamist</translation> <translation id="4462491365653392320">Vahelehtedel hindade jälgimine</translation> <translation id="4469418912670346607">Jätka seadistamist</translation> <translation id="4474494258097106883">Loodud teie iPhone'ile</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_kn.xtb b/ios/chrome/app/strings/resources/ios_strings_kn.xtb index fe265a7f..4d3f5e1 100644 --- a/ios/chrome/app/strings/resources/ios_strings_kn.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_kn.xtb
@@ -453,6 +453,7 @@ <translation id="4420409367264901497">ಬುಕ್ಮಾರ್ಕ್ ಎಡಿಟ್ ಮಾಡಿ</translation> <translation id="4442550905108052454"><ph name="BEGIN_BOLD" />ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು<ph name="END_BOLD" /> ತೆರೆಯಿರಿ</translation> <translation id="4454246407045105932">ಭಾಷೆ ಸೇರಿಸಿ</translation> +<translation id="4461286950227634995">ಪಾಸ್ವರ್ಡ್ಗಳನ್ನು ಉಳಿಸಲು ಸೂಚಿಸಿ</translation> <translation id="4462491365653392320">ಟ್ಯಾಬ್ಗಳಲ್ಲಿ ಬೆಲೆಗಳನ್ನು ಟ್ರ್ಯಾಕ್ ಮಾಡಿ</translation> <translation id="4469418912670346607">ಸೆಟಪ್ ಮುಂದುವರಿಸಿ</translation> <translation id="4474494258097106883">ನಿಮ್ಮ iPhone ಗಾಗಿ ನಿರ್ಮಿಸಲಾಗಿದೆ</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_ml.xtb b/ios/chrome/app/strings/resources/ios_strings_ml.xtb index 39f9e044..dd3a8673 100644 --- a/ios/chrome/app/strings/resources/ios_strings_ml.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_ml.xtb
@@ -453,6 +453,7 @@ <translation id="4420409367264901497">ബുക്ക്മാർക്ക് എഡിറ്റ് ചെയ്യുക</translation> <translation id="4442550905108052454"><ph name="BEGIN_BOLD" />ക്രമീകരണം<ph name="END_BOLD" /> തുറക്കുക</translation> <translation id="4454246407045105932">ഭാഷ ചേർക്കുക</translation> +<translation id="4461286950227634995">പാസ്വേഡുകൾ സംരക്ഷിക്കുന്നതിനുള്ള നിർദ്ദേശം</translation> <translation id="4462491365653392320">ടാബുകളിൽ നിരക്കുകൾ ട്രാക്ക് ചെയ്യൂ</translation> <translation id="4469418912670346607">സജ്ജീകരണം തുടരുക</translation> <translation id="4474494258097106883">നിങ്ങളുടെ iPhone-നായി നിർമ്മിച്ചത്</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_ne.xtb b/ios/chrome/app/strings/resources/ios_strings_ne.xtb index eb27cf47..a2b21dd 100644 --- a/ios/chrome/app/strings/resources/ios_strings_ne.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_ne.xtb
@@ -453,6 +453,7 @@ <translation id="4420409367264901497">बुकमार्क सम्पादन गर्नुहोस्</translation> <translation id="4442550905108052454"><ph name="BEGIN_BOLD" />सेटिङ<ph name="END_BOLD" /> खोल्नुहोस्</translation> <translation id="4454246407045105932">भाषा हाल्नुहोस्</translation> +<translation id="4461286950227634995">पासवर्ड सेभ गर्ने कि नगर्ने भनी सोधियोस्</translation> <translation id="4462491365653392320">ट्याबहरूमा मूल्य ट्र्याक गर्नुहोस्</translation> <translation id="4469418912670346607">सेटअप जारी राख्नुहोस्</translation> <translation id="4474494258097106883">तपाईंको iPhone का लागि बनाइएको</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_nl.xtb b/ios/chrome/app/strings/resources/ios_strings_nl.xtb index 6bcd1242..6b7850e 100644 --- a/ios/chrome/app/strings/resources/ios_strings_nl.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_nl.xtb
@@ -453,6 +453,7 @@ <translation id="4420409367264901497">Bookmark bewerken</translation> <translation id="4442550905108052454">Open <ph name="BEGIN_BOLD" />Instellingen<ph name="END_BOLD" />.</translation> <translation id="4454246407045105932">Taal toevoegen</translation> +<translation id="4461286950227634995">Aanbieden wachtwoorden op te slaan</translation> <translation id="4462491365653392320">Prijzen volgen op tabbladen</translation> <translation id="4469418912670346607">Doorgaan met instellen</translation> <translation id="4474494258097106883">Ontworpen voor je iPhone</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_pt-PT.xtb b/ios/chrome/app/strings/resources/ios_strings_pt-PT.xtb index abd4ba0..6d66d8b 100644 --- a/ios/chrome/app/strings/resources/ios_strings_pt-PT.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_pt-PT.xtb
@@ -531,6 +531,7 @@ <translation id="4916679969857390442">Lente</translation> <translation id="4922154083994158612">Mais segurança?</translation> <translation id="4930714375720679147">Ativar</translation> +<translation id="4938338714234463591">Isto permite-lhe usar a sua voz com determinadas funcionalidades em Websites.</translation> <translation id="4941089862236492464">Lamentamos, mas ocorreu um erro ao partilhar o seu item.</translation> <translation id="4944543191714094452">Localizar na página…</translation> <translation id="4945756290001680296">Aceder às definições de palavras-passe</translation> @@ -902,6 +903,7 @@ <translation id="7649070708921625228">Ajuda</translation> <translation id="7658239707568436148">Cancelar</translation> <translation id="7671141431838911305">INSTALAR</translation> +<translation id="7679915578945954324">Endereços dos sites copiados</translation> <translation id="7687508192620387263">Ficheiro de calendário disponível</translation> <translation id="7701040980221191251">Nenhuma</translation> <translation id="7720410380936703141">TENTAR NOVAMENTE</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_ta.xtb b/ios/chrome/app/strings/resources/ios_strings_ta.xtb index 5f006132..9874d74 100644 --- a/ios/chrome/app/strings/resources/ios_strings_ta.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_ta.xtb
@@ -453,6 +453,7 @@ <translation id="4420409367264901497">புக்மார்க்கை மாற்று</translation> <translation id="4442550905108052454"><ph name="BEGIN_BOLD" />அமைப்புகளைத்<ph name="END_BOLD" /> திறக்கவும்</translation> <translation id="4454246407045105932">மொழியைச் சேர்த்தல்</translation> +<translation id="4461286950227634995">கடவுச்சொற்களைச் சேமிப்பதற்குக் கேள்</translation> <translation id="4462491365653392320">உலாவிப் பக்கங்களில் விலைகளைக் கண்காணித்தல்</translation> <translation id="4469418912670346607">அமைவைத் தொடர்க</translation> <translation id="4474494258097106883">iPhoneனுக்காக உருவாக்கப்பட்டது</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_zh-HK.xtb b/ios/chrome/app/strings/resources/ios_strings_zh-HK.xtb index 8189e58..e48bf7a 100644 --- a/ios/chrome/app/strings/resources/ios_strings_zh-HK.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_zh-HK.xtb
@@ -531,6 +531,7 @@ <translation id="4916679969857390442">透鏡</translation> <translation id="4922154083994158612">想增強安全性嗎？</translation> <translation id="4930714375720679147">開啟</translation> +<translation id="4938338714234463591">這會讓您在網站上透過語音使用特定功能。</translation> <translation id="4941089862236492464">很抱歉，分享您的項目時發生問題。</translation> <translation id="4944543191714094452">從網頁中尋找…</translation> <translation id="4945756290001680296">存取密碼設定</translation> @@ -900,6 +901,7 @@ <translation id="7649070708921625228">說明</translation> <translation id="7658239707568436148">取消</translation> <translation id="7671141431838911305">安裝</translation> +<translation id="7679915578945954324">已複製網址</translation> <translation id="7687508192620387263">有可用的日曆檔案</translation> <translation id="7701040980221191251">沒有</translation> <translation id="7720410380936703141">再試一次</translation>
diff --git a/ios/chrome/app/strings/resources/ios_strings_zu.xtb b/ios/chrome/app/strings/resources/ios_strings_zu.xtb index e2efcca1..85a2646 100644 --- a/ios/chrome/app/strings/resources/ios_strings_zu.xtb +++ b/ios/chrome/app/strings/resources/ios_strings_zu.xtb
@@ -453,6 +453,7 @@ <translation id="4420409367264901497">Hlela ibhukhimakhi</translation> <translation id="4442550905108052454">Vula <ph name="BEGIN_BOLD" />Amasethingi<ph name="END_BOLD" /></translation> <translation id="4454246407045105932">Engeza ulimi</translation> +<translation id="4461286950227634995">Nikezela Ukulondoloza Amaphasiwedi</translation> <translation id="4462491365653392320">Landelela Izintengo Kumathebhu</translation> <translation id="4469418912670346607">Qhubeka nokusetha</translation> <translation id="4474494258097106883">Yakhelwe i-iPhone yakho</translation>
diff --git a/ios/google_internal/frameworks/ChromeInternal.framework.dSYM.ios.zip.sha1 b/ios/google_internal/frameworks/ChromeInternal.framework.dSYM.ios.zip.sha1 index 3a7092c..ad79f1c 100644 --- a/ios/google_internal/frameworks/ChromeInternal.framework.dSYM.ios.zip.sha1 +++ b/ios/google_internal/frameworks/ChromeInternal.framework.dSYM.ios.zip.sha1
@@ -1 +1 @@ -8a6a1748684751ff8f7b08b402c72d8a7e5a0103 \ No newline at end of file +04ea11a853fcd5b41ce201c0f8e77328e8b8cf23 \ No newline at end of file
diff --git a/ios/google_internal/frameworks/ChromeSSOInternal.framework.dSYM.ios.zip.sha1 b/ios/google_internal/frameworks/ChromeSSOInternal.framework.dSYM.ios.zip.sha1 index 7e532d7..1f15f630 100644 --- a/ios/google_internal/frameworks/ChromeSSOInternal.framework.dSYM.ios.zip.sha1 +++ b/ios/google_internal/frameworks/ChromeSSOInternal.framework.dSYM.ios.zip.sha1
@@ -1 +1 @@ -4bc4a1ed4c6d1c8c7077f26dfb005bd34f2c5e5b \ No newline at end of file +7f5259e40b4bece91934618ef6c86516c42c2e31 \ No newline at end of file
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 362cab4..0c848e5 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 @@ -c57bc03656c8bf2c0641c3666942374c4438d7b8 \ No newline at end of file +d1683385a041fd51ab378870108c8aad53213902 \ 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 4dc7eee..a42deed2 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 @@ -bcb45dbdcc88697949d058108dc8fe34da386fd7 \ No newline at end of file +f0fd7c898adea7711a826132aaf2c8224e35cc4f \ 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 007116d8..01fb165 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 @@ -11fa1b51cb64465386a37f14d0848bd39c429a6e \ No newline at end of file +3b136643bc83ca8790e06848db13235184c37ade \ 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 d9a70c2..a7f66dd 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 @@ -2910509d1b7953d3482656c299d402837328e55f \ No newline at end of file +c20929b92348e19c5fa675f8df0c74932737d7f2 \ No newline at end of file
diff --git a/ios/google_internal/frameworks/chrome_test_internal_dynamic_framework.ios.zip.sha1 b/ios/google_internal/frameworks/chrome_test_internal_dynamic_framework.ios.zip.sha1 index 396bc4a..cf2aa701 100644 --- a/ios/google_internal/frameworks/chrome_test_internal_dynamic_framework.ios.zip.sha1 +++ b/ios/google_internal/frameworks/chrome_test_internal_dynamic_framework.ios.zip.sha1
@@ -1 +1 @@ -6ec42657d416d030d4579c34685d9bdbd304df26 \ No newline at end of file +320bf12fa42d346c8123ff380b5fe2c1cb182505 \ No newline at end of file
diff --git a/ios/google_internal/frameworks/chrome_test_internal_dynamic_framework.iossimulator.zip.sha1 b/ios/google_internal/frameworks/chrome_test_internal_dynamic_framework.iossimulator.zip.sha1 index d82ab4f..6cc7ddda 100644 --- a/ios/google_internal/frameworks/chrome_test_internal_dynamic_framework.iossimulator.zip.sha1 +++ b/ios/google_internal/frameworks/chrome_test_internal_dynamic_framework.iossimulator.zip.sha1
@@ -1 +1 @@ -8c13dc6e3029f56a943ff06cd1228f7460a7a933 \ No newline at end of file +bd4cd51e7b691d64acb4f7369244ab19f797a866 \ 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 00b5919d..7e2d31d 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 @@ -78d6f5abd6abe2b1d2a002c4502ce67a7f3bf80c \ No newline at end of file +a6f2bcc3e595003d89b5fac00723aeaa9dd3f98e \ 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 ed6706c..852f01e 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 @@ -c35691c8d5f0358c3f3f0e3822ed5f0295e1f425 \ No newline at end of file +aef3f27ac941093b74a17303638ceb48c509759f \ 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 cb5f4fff..026c963 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 @@ -9d57faf06f77485076421f0b8f865171e524d6b5 \ No newline at end of file +bc37b230fc1196bdcf19812022b6c7d783e145d2 \ 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 fc34cc250..1868a99b 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 @@ -784eb87e0e003237bb62f10f07f41f85d8b06655 \ No newline at end of file +b81a3bfaea43c742e2982aa30787237b19c83530 \ No newline at end of file
diff --git a/media/audio/audio_device_description.cc b/media/audio/audio_device_description.cc index 4f71c9a5..33dbcff 100644 --- a/media/audio/audio_device_description.cc +++ b/media/audio/audio_device_description.cc
@@ -18,6 +18,8 @@ const char AudioDeviceDescription::kLoopbackInputDeviceId[] = "loopback"; const char AudioDeviceDescription::kLoopbackWithMuteDeviceId[] = "loopbackWithMute"; +const char AudioDeviceDescription::kLoopbackWithoutChromeId[] = + "loopbackWithoutChrome"; namespace { constexpr char kAirpodsNameSubstring[] = "AirPods";
diff --git a/media/audio/audio_device_description.h b/media/audio/audio_device_description.h index 47f24bd..bfb01c8 100644 --- a/media/audio/audio_device_description.h +++ b/media/audio/audio_device_description.h
@@ -37,6 +37,10 @@ // will mute system audio during capturing. static const char kLoopbackWithMuteDeviceId[]; + // Similar to |kLoopbackInputDeviceId|, but without audio from Chrome. + // Only supported on ChromeOS. + static const char kLoopbackWithoutChromeId[]; + // Returns true if |device_id| represents the default device. static bool IsDefaultDevice(const std::string& device_id);
diff --git a/media/audio/cras/cras_input.cc b/media/audio/cras/cras_input.cc index 64898d4a..d51298a 100644 --- a/media/audio/cras/cras_input.cc +++ b/media/audio/cras/cras_input.cc
@@ -72,6 +72,8 @@ stream_direction_(CRAS_STREAM_INPUT), pin_device_(NO_DEVICE), is_loopback_(AudioDeviceDescription::IsLoopbackDevice(device_id)), + is_loopback_without_chrome_( + device_id == AudioDeviceDescription::kLoopbackWithoutChromeId), mute_system_audio_(device_id == AudioDeviceDescription::kLoopbackWithMuteDeviceId), mute_done_(false), @@ -155,7 +157,17 @@ return OpenOutcome::kFailed; } - int rc = libcras_client_get_loopback_dev_idx(client_, &pin_device_); + int rc; + if (is_loopback_without_chrome_) { + uint32_t client_types = 0; + client_types |= 1 << CRAS_CLIENT_TYPE_CHROME; + client_types |= 1 << CRAS_CLIENT_TYPE_LACROS; + client_types = ~client_types; + rc = pin_device_ = libcras_client_get_floop_dev_idx_by_client_types( + client_, client_types); + } else { + rc = libcras_client_get_loopback_dev_idx(client_, &pin_device_); + } if (rc < 0) { DLOG(WARNING) << "Couldn't find CRAS loopback device."; ReportStreamOpenResult(
diff --git a/media/audio/cras/cras_input.h b/media/audio/cras/cras_input.h index 9f4c1959..6bb7f83 100644 --- a/media/audio/cras/cras_input.h +++ b/media/audio/cras/cras_input.h
@@ -130,6 +130,8 @@ // True if the stream is a system-wide loopback stream. bool is_loopback_; + // True if the loopback stream does not contain chrome audio. + bool is_loopback_without_chrome_; // True if we want to mute system audio during capturing. bool mute_system_audio_;
diff --git a/net/http/transport_security_state_static.pins b/net/http/transport_security_state_static.pins index 6107d96..c7cd8f2 100644 --- a/net/http/transport_security_state_static.pins +++ b/net/http/transport_security_state_static.pins
@@ -43,9 +43,9 @@ # hash function for preloaded entries again (we have already done so once). # -# Last updated: 2023-01-06 12:55 UTC +# Last updated: 2023-01-07 12:54 UTC PinsListTimestamp -1673009700 +1673096079 TestSPKI sha256/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=
diff --git a/storage/browser/file_system/copy_or_move_operation_delegate.cc b/storage/browser/file_system/copy_or_move_operation_delegate.cc index 133cef4..a999227 100644 --- a/storage/browser/file_system/copy_or_move_operation_delegate.cc +++ b/storage/browser/file_system/copy_or_move_operation_delegate.cc
@@ -833,9 +833,12 @@ num_copied_bytes_ += result; // Check the elapsed time since last |file_progress_callback_| invocation. + // Make sure to report the last progress update (when there are no bytes + // remaining) regardless of the time so consumers don't miss it. base::Time now = base::Time::Now(); if (now - last_progress_callback_invocation_time_ >= - min_progress_callback_invocation_span_) { + min_progress_callback_invocation_span_ || + buffer->BytesRemaining() <= 0) { file_progress_callback_.Run(num_copied_bytes_); last_progress_callback_invocation_time_ = now; }
diff --git a/testing/buildbot/chromium.updater.json b/testing/buildbot/chromium.updater.json index d6309d8..5f7174c 100644 --- a/testing/buildbot/chromium.updater.json +++ b/testing/buildbot/chromium.updater.json
@@ -757,5 +757,10 @@ "test_id_prefix": "ninja://chrome/updater:updater_tests_system/" } ] + }, + "win32-updater-builder-rel": { + "additional_compile_targets": [ + "updater_tests_all" + ] } }
diff --git a/testing/buildbot/filters/fuchsia.browser_tests.filter b/testing/buildbot/filters/fuchsia.browser_tests.filter index 1cb7d635..e0c62c8 100644 --- a/testing/buildbot/filters/fuchsia.browser_tests.filter +++ b/testing/buildbot/filters/fuchsia.browser_tests.filter
@@ -607,8 +607,5 @@ -PersistentBackground/ExtensionWebRequestApiTestWithContextType.WebRequestPacRequestProtection/0 -ServiceWorker/ExtensionWebRequestApiTestWithContextType.WebRequestPacRequestProtection/0 -# TODO(crbug.com/1402821): Print is not correctly enabled in browser tests. --PrintPreviewBrowserTest.PrintCommands - # TODO(crbug.com/1348646): `navigator.platform` returns the empty string. -ReduceUserAgentPlatformBrowserTest.NavigatorPlatform
diff --git a/testing/buildbot/gn_isolate_map.pyl b/testing/buildbot/gn_isolate_map.pyl index 08edbaa..dcb8334 100644 --- a/testing/buildbot/gn_isolate_map.pyl +++ b/testing/buildbot/gn_isolate_map.pyl
@@ -1913,6 +1913,10 @@ "--ui-test-action-timeout=40000", ], }, + "updater_tests_all": { + "label": "//chrome/updater:all", + "type": "additional_compile_target", + }, "upload_trace_processor": { "label": "//tools/perf/core/perfetto_binary_roller:upload_trace_processor", "type": "generated_script",
diff --git a/testing/buildbot/waterfalls.pyl b/testing/buildbot/waterfalls.pyl index 707415b..494a5e8 100644 --- a/testing/buildbot/waterfalls.pyl +++ b/testing/buildbot/waterfalls.pyl
@@ -5801,7 +5801,7 @@ ] }, }, - # TODO(crbug.com/1381588): replace `updater_gtests_mac_user` with + # TODO(crbug.com/1405483): replace `updater_gtests_mac_user` with # `updater_gtests_mac` once crbug.com/1394839 is resolved. 'mac13-arm64-updater-tester-dbg': { 'test_suites': { @@ -5816,7 +5816,7 @@ ] }, }, - # TODO(crbug.com/1381588): replace `updater_gtests_mac_user` with + # TODO(crbug.com/1405483): replace `updater_gtests_mac_user` with # `updater_gtests_mac` once crbug.com/1394839 is resolved. 'mac13-x64-updater-tester-rel': { 'test_suites': { @@ -5931,6 +5931,9 @@ ] }, }, + 'win32-updater-builder-rel': { + 'additional_compile_targets': ['updater_tests_all'], + }, } }, {
diff --git a/third_party/blink/web_tests/FlagExpectations/disable-site-isolation-trials b/third_party/blink/web_tests/FlagExpectations/disable-site-isolation-trials index 8bd9610e..b329492 100644 --- a/third_party/blink/web_tests/FlagExpectations/disable-site-isolation-trials +++ b/third_party/blink/web_tests/FlagExpectations/disable-site-isolation-trials
@@ -46,8 +46,8 @@ # These started failing when network service was enabled by default. crbug.com/933880 external/wpt/service-workers/service-worker/request-end-to-end.https.html [ Failure ] -crbug.com/933880 http/tests/inspector-protocol/network/raw-headers-for-protected-document.js [ Failure ] -crbug.com/933880 http/tests/inspector-protocol/network/security-info-on-response.js [ Failure ] +crbug.com/933880 [ Release ] http/tests/inspector-protocol/network/raw-headers-for-protected-document.js [ Failure ] +crbug.com/933880 [ Release ] http/tests/inspector-protocol/network/security-info-on-response.js [ Failure ] crbug.com/933880 http/tests/inspector-protocol/network/xhr-interception-auth-fail.js [ Failure ] crbug.com/933880 http/tests/misc/redirect-to-about-blank.html [ Timeout ]
diff --git a/third_party/blink/web_tests/SlowTests b/third_party/blink/web_tests/SlowTests index 3a613d12..351c02f 100644 --- a/third_party/blink/web_tests/SlowTests +++ b/third_party/blink/web_tests/SlowTests
@@ -39,20 +39,36 @@ crbug.com/24182 http/tests/storage/callbacks-are-called-in-correct-context.html [ Slow ] crbug.com/24182 http/tests/notifications/close-dispatch-asynchronous.html [ Slow ] crbug.com/24182 images/png-suite/test.html [ Slow ] -crbug.com/24182 jquery/attributes.html [ Slow ] +crbug.com/24182 [ Linux ] jquery/attributes.html [ Slow ] +crbug.com/24182 [ Mac10.15 Release ] jquery/attributes.html [ Slow ] +crbug.com/24182 [ Mac11 Release ] jquery/attributes.html [ Slow ] +crbug.com/24182 [ Mac12 ] jquery/attributes.html [ Slow ] +crbug.com/24182 [ Mac12-arm64 Release ] jquery/attributes.html [ Slow ] +crbug.com/24182 [ Release Win ] jquery/attributes.html [ Slow ] crbug.com/24182 jquery/core.html [ Slow ] crbug.com/24182 jquery/css.html [ Slow ] crbug.com/24182 jquery/data.html [ Slow ] crbug.com/24182 jquery/dimensions.html [ Slow ] -crbug.com/24182 jquery/event.html [ Slow ] +crbug.com/24182 [ Linux ] jquery/event.html [ Slow ] +crbug.com/24182 [ Mac10.15 Release ] jquery/event.html [ Slow ] +crbug.com/24182 [ Mac11 Release ] jquery/event.html [ Slow ] +crbug.com/24182 [ Mac11-arm64 Release ] jquery/event.html [ Slow ] +crbug.com/24182 [ Mac12 ] jquery/event.html [ Slow ] +crbug.com/24182 [ Release Win ] jquery/event.html [ Slow ] crbug.com/24182 jquery/manipulation.html [ Slow ] crbug.com/24182 jquery/offset.html [ Slow ] -crbug.com/24182 jquery/traversing.html [ Slow ] +crbug.com/24182 [ Linux ] jquery/traversing.html [ Slow ] +crbug.com/24182 [ Mac10.15 Release ] jquery/traversing.html [ Slow ] +crbug.com/24182 [ Mac11 Release ] jquery/traversing.html [ Slow ] +crbug.com/24182 [ Mac12 ] jquery/traversing.html [ Slow ] +crbug.com/24182 [ Release Win ] jquery/traversing.html [ Slow ] crbug.com/24182 media/controls/controls-cast-do-not-fade-out.html [ Slow ] -crbug.com/24182 media/controls/controls-cast-overlay-slow-fade.html [ Slow ] +crbug.com/24182 [ Debug Mac12 ] media/controls/controls-cast-overlay-slow-fade.html [ Slow ] +crbug.com/24182 [ Release ] media/controls/controls-cast-overlay-slow-fade.html [ Slow ] crbug.com/24182 svg/filters/big-sized-filter.svg [ Slow ] crbug.com/24182 tables/mozilla/other/slashlogo.html [ Slow ] -crbug.com/24182 fast/dom/timer-throttling-background-page-near-alignment-interval.html [ Slow ] +crbug.com/24182 [ Debug Mac12 ] fast/dom/timer-throttling-background-page-near-alignment-interval.html [ Slow ] +crbug.com/24182 [ Release ] fast/dom/timer-throttling-background-page-near-alignment-interval.html [ Slow ] crbug.com/24182 http/tests/perf/large-inlined-script.html [ Slow ] crbug.com/24182 fast/css/should-not-insert-stylesheet-into-detached-document.html [ Slow ] crbug.com/24182 fast/encoding/char-encoding.html [ Slow ] @@ -73,7 +89,12 @@ crbug.com/420008 virtual/threaded/http/tests/devtools/tracing/* [ Slow ] # Misc DevTools tests that are slow crbug.com/243492 inspector-protocol/injected-script-discard.js [ Slow ] -crbug.com/678482 http/tests/devtools/debugger/fetch-breakpoints.js [ Slow ] +crbug.com/678482 [ Linux ] http/tests/devtools/debugger/fetch-breakpoints.js [ Slow ] +crbug.com/678482 [ Mac10.15 Release ] http/tests/devtools/debugger/fetch-breakpoints.js [ Slow ] +crbug.com/678482 [ Mac11 Release ] http/tests/devtools/debugger/fetch-breakpoints.js [ Slow ] +crbug.com/678482 [ Mac11-arm64 Release ] http/tests/devtools/debugger/fetch-breakpoints.js [ Slow ] +crbug.com/678482 [ Mac12 ] http/tests/devtools/debugger/fetch-breakpoints.js [ Slow ] +crbug.com/678482 [ Release Win ] http/tests/devtools/debugger/fetch-breakpoints.js [ Slow ] crbug.com/1236466 inspector-protocol/runtime/runtime-execution-contexts-events.js [ Slow ] crbug.com/1229701 http/tests/inspector-protocol/network/disable-cache-media-resource.js [ Slow ] crbug.com/1300409 http/tests/inspector-protocol/network/websocket/offline-no-send.js [ Slow ] @@ -116,8 +137,16 @@ crbug.com/453312 html5lib/generated/run-domjs-unsafe-data.html [ Slow ] crbug.com/453312 html5lib/generated/run-entities01-data.html [ Slow ] crbug.com/453312 html5lib/generated/run-entities02-data.html [ Slow ] -crbug.com/453312 html5lib/generated/run-template-data.html [ Slow ] -crbug.com/453312 html5lib/generated/run-tests1-data.html [ Slow ] +crbug.com/453312 [ Linux ] html5lib/generated/run-template-data.html [ Slow ] +crbug.com/453312 [ Mac10.15 Release ] html5lib/generated/run-template-data.html [ Slow ] +crbug.com/453312 [ Mac11 Release ] html5lib/generated/run-template-data.html [ Slow ] +crbug.com/453312 [ Mac12 ] html5lib/generated/run-template-data.html [ Slow ] +crbug.com/453312 [ Release Win ] html5lib/generated/run-template-data.html [ Slow ] +crbug.com/453312 [ Linux ] html5lib/generated/run-tests1-data.html [ Slow ] +crbug.com/453312 [ Mac10.15 Release ] html5lib/generated/run-tests1-data.html [ Slow ] +crbug.com/453312 [ Mac11 Release ] html5lib/generated/run-tests1-data.html [ Slow ] +crbug.com/453312 [ Mac12 ] html5lib/generated/run-tests1-data.html [ Slow ] +crbug.com/453312 [ Release Win ] html5lib/generated/run-tests1-data.html [ Slow ] crbug.com/453312 html5lib/generated/run-tests2-data.html [ Slow ] crbug.com/453312 html5lib/generated/run-tests6-data.html [ Slow ] crbug.com/453312 html5lib/generated/run-tests7-data.html [ Slow ] @@ -158,7 +187,13 @@ # Most crypto/subtle tests are slow some or most of the time. crbug.com/459009 crypto/subtle/* [ Slow ] -crbug.com/802029 fast/dom/shadow/focus-controller-recursion-crash.html [ Slow ] +crbug.com/802029 [ Linux ] fast/dom/shadow/focus-controller-recursion-crash.html [ Slow ] +crbug.com/802029 [ Mac10.13 Release ] fast/dom/shadow/focus-controller-recursion-crash.html [ Slow ] +crbug.com/802029 [ Mac10.14 Release ] fast/dom/shadow/focus-controller-recursion-crash.html [ Slow ] +crbug.com/802029 [ Mac10.15 Release ] fast/dom/shadow/focus-controller-recursion-crash.html [ Slow ] +crbug.com/802029 [ Mac11 Release ] fast/dom/shadow/focus-controller-recursion-crash.html [ Slow ] +crbug.com/802029 [ Mac12 ] fast/dom/shadow/focus-controller-recursion-crash.html [ Slow ] +crbug.com/802029 [ Release Win ] fast/dom/shadow/focus-controller-recursion-crash.html [ Slow ] crbug.com/614910 virtual/gpu-rasterization/images/yuv-decode-eligible/color-profile-filter.html [ Slow ] @@ -167,7 +202,11 @@ crbug.com/606649 fast/dom/gc-dom-tree-lifetime.html [ Slow ] # Slow on many platforms. -crbug.com/866165 webexposed/global-interface-listing.html [ Slow ] +crbug.com/866165 [ Linux ] webexposed/global-interface-listing.html [ Slow ] +crbug.com/866165 [ Mac10.15 Release ] webexposed/global-interface-listing.html [ Slow ] +crbug.com/866165 [ Mac11 Release ] webexposed/global-interface-listing.html [ Slow ] +crbug.com/866165 [ Mac12 ] webexposed/global-interface-listing.html [ Slow ] +crbug.com/866165 [ Release Win ] webexposed/global-interface-listing.html [ Slow ] crbug.com/1074122 http/tests/serviceworker/webexposed/global-interface-listing-service-worker.html [ Slow ] @@ -282,14 +321,18 @@ crbug.com/866850 [ Linux ] virtual/gpu/fast/canvas/canvas-shadow-source-in.html [ Slow ] crbug.com/866850 [ Mac ] virtual/gpu/fast/canvas/canvas-shadow-source-in.html [ Slow ] crbug.com/866850 [ Linux ] virtual/gpu/fast/canvas/OffscreenCanvas-filter.html [ Slow ] -crbug.com/866850 [ Mac ] virtual/gpu/fast/canvas/OffscreenCanvas-filter.html [ Slow ] +crbug.com/866850 [ Mac10.15 Release ] virtual/gpu/fast/canvas/OffscreenCanvas-filter.html [ Slow ] +crbug.com/866850 [ Mac11 Release ] virtual/gpu/fast/canvas/OffscreenCanvas-filter.html [ Slow ] +crbug.com/866850 [ Mac12 ] virtual/gpu/fast/canvas/OffscreenCanvas-filter.html [ Slow ] crbug.com/866850 [ Linux ] virtual/gpu/fast/canvas/OffscreenCanvas-filter-in-worker.html [ Slow ] crbug.com/866850 [ Mac ] virtual/gpu/fast/canvas/OffscreenCanvas-filter-in-worker.html [ Slow ] ### Some timeout tests in xmlhttprequest/timeout/ are slow -crbug.com/869800 http/tests/xmlhttprequest/timeout/xmlhttprequest-timeout-worker-aborted.html [ Slow ] +crbug.com/869800 [ Debug Mac12 ] http/tests/xmlhttprequest/timeout/xmlhttprequest-timeout-worker-aborted.html [ Slow ] +crbug.com/869800 [ Release ] http/tests/xmlhttprequest/timeout/xmlhttprequest-timeout-worker-aborted.html [ Slow ] crbug.com/869800 http/tests/xmlhttprequest/timeout/xmlhttprequest-timeout-worker-simple.html [ Slow ] -crbug.com/869800 http/tests/xmlhttprequest/timeout/xmlhttprequest-timeout-worker-synconworker.html [ Slow ] +crbug.com/869800 [ Debug Mac12 ] http/tests/xmlhttprequest/timeout/xmlhttprequest-timeout-worker-synconworker.html [ Slow ] +crbug.com/869800 [ Release ] http/tests/xmlhttprequest/timeout/xmlhttprequest-timeout-worker-synconworker.html [ Slow ] ### Slow only on Mac10.13 @@ -298,7 +341,7 @@ # Tests where |3s <= slowest_run < 10s| on flakiness dashboard for site_per_process_blink_web_tests crbug.com/874695 accessibility/is-ignored-change-sends-notification.html [ Slow ] crbug.com/874695 animations/svg/animated-filter-svg-element.html [ Slow ] -crbug.com/874695 compositing/animation/busy-indicator.html [ Slow ] +crbug.com/874695 [ Release ] compositing/animation/busy-indicator.html [ Slow ] crbug.com/874695 compositing/culling/filter-occlusion-blur.html [ Slow ] crbug.com/874695 compositing/lots-of-img-layers-with-opacity.html [ Slow ] crbug.com/874695 compositing/masks/mask-with-added-filters.html [ Slow ] @@ -341,17 +384,21 @@ crbug.com/874695 fast/css-grid-layout/grid-auto-repeat-huge-grid-018.html [ Slow ] crbug.com/874695 fast/css-grid-layout/grid-auto-repeat-huge-grid-019.html [ Slow ] crbug.com/874695 fast/dnd/dropEffect-for-link.html [ Slow ] -crbug.com/874695 fast/dom/HTMLLinkElement/link-preload-unused.html [ Slow ] -crbug.com/874695 fast/dom/timer-throttling-hidden-page.html [ Slow ] +crbug.com/874695 [ Release ] fast/dom/HTMLLinkElement/link-preload-unused.html [ Slow ] +crbug.com/874695 [ Release ] fast/dom/timer-throttling-hidden-page.html [ Slow ] crbug.com/874695 fast/events/frame-detached-in-mousedown.html [ Slow ] crbug.com/874695 fast/events/popup-blocking-timers4.html [ Slow ] crbug.com/874695 fast/forms/color/* [ Slow ] crbug.com/874695 fast/forms/color-scheme/* [ Slow ] -crbug.com/874695 fast/forms/number/number-spinbutton-gets-disabled-or-readonly.html [ Slow ] +crbug.com/874695 [ Release ] fast/forms/number/number-spinbutton-gets-disabled-or-readonly.html [ Slow ] crbug.com/874695 fast/forms/select/input-select-after-resize.html [ Slow ] crbug.com/874695 fast/history/history-back-twice-with-subframes-assert.html [ Slow ] crbug.com/874695 fast/media/mq-color-gamut-picture.html [ Slow ] -crbug.com/874695 fast/peerconnection/RTCPeerConnection-many.html [ Slow ] +crbug.com/874695 [ Linux ] fast/peerconnection/RTCPeerConnection-many.html [ Slow ] +crbug.com/874695 [ Mac10.15 Release ] fast/peerconnection/RTCPeerConnection-many.html [ Slow ] +crbug.com/874695 [ Mac11 Release ] fast/peerconnection/RTCPeerConnection-many.html [ Slow ] +crbug.com/874695 [ Mac12 ] fast/peerconnection/RTCPeerConnection-many.html [ Slow ] +crbug.com/874695 [ Release Win ] fast/peerconnection/RTCPeerConnection-many.html [ Slow ] crbug.com/874695 fast/peerconnection/RTCRtpSender-setParameters.html [ Slow ] crbug.com/874695 fast/scroll-behavior/overscroll-behavior.html [ Slow ] crbug.com/874695 fast/scrolling/autoscroll-iframe-no-scrolling.html [ Slow ] @@ -380,7 +427,8 @@ crbug.com/874695 http/tests/fetch/window/body-mixin-base-https-other-https.html [ Slow ] crbug.com/874695 http/tests/fetch/window/body-mixin.html [ Slow ] crbug.com/874695 http/tests/fetch/window/stream-reader-base-https-other-https.html [ Slow ] -crbug.com/874695 http/tests/fetch/window/stream-reader.html [ Slow ] +crbug.com/874695 [ Debug Mac12 ] http/tests/fetch/window/stream-reader.html [ Slow ] +crbug.com/874695 [ Release ] http/tests/fetch/window/stream-reader.html [ Slow ] crbug.com/874695 http/tests/fetch/window/thorough/* [ Slow ] crbug.com/874695 http/tests/fetch/workers/body-mixin-base-https-other-https.html [ Slow ] crbug.com/874695 http/tests/fetch/workers/body-mixin.html [ Slow ] @@ -396,9 +444,11 @@ crbug.com/874695 http/tests/misc/adopt-iframe-src-attr-after-remove.html [ Slow ] crbug.com/874695 http/tests/misc/async-script-removed.html [ Slow ] crbug.com/874695 http/tests/misc/client-hints-accept-meta-preloader.html [ Slow ] -crbug.com/874695 http/tests/misc/drag-not-loaded-image.html [ Slow ] -crbug.com/874695 http/tests/misc/object-embedding-svg-delayed-size-negotiation.xhtml [ Slow ] -crbug.com/874695 http/tests/misc/svg-image-delayed-size-negotiation.html [ Slow ] +crbug.com/874695 [ Release ] http/tests/misc/drag-not-loaded-image.html [ Slow ] +crbug.com/874695 [ Debug Mac12 ] http/tests/misc/object-embedding-svg-delayed-size-negotiation.xhtml [ Slow ] +crbug.com/874695 [ Release ] http/tests/misc/object-embedding-svg-delayed-size-negotiation.xhtml [ Slow ] +crbug.com/874695 [ Debug Mac12 ] http/tests/misc/svg-image-delayed-size-negotiation.html [ Slow ] +crbug.com/874695 [ Release ] http/tests/misc/svg-image-delayed-size-negotiation.html [ Slow ] crbug.com/874695 http/tests/multipart/multipart-main-resource.html [ Slow ] crbug.com/874695 http/tests/multipart/stop-loading-after-onload2.html [ Slow ] crbug.com/874695 http/tests/notifications/permission-behaviour.html [ Slow ] @@ -408,24 +458,31 @@ crbug.com/874695 http/tests/permissions/chromium/test-request-window.html [ Slow ] crbug.com/874695 http/tests/permissions/chromium/test-request-worker.html [ Slow ] crbug.com/874695 http/tests/permissions/test-query.html [ Slow ] -crbug.com/874695 http/tests/security/contentSecurityPolicy/redirect-with-delay.html [ Slow ] +crbug.com/874695 [ Debug Mac12 ] http/tests/security/contentSecurityPolicy/redirect-with-delay.html [ Slow ] +crbug.com/874695 [ Release ] http/tests/security/contentSecurityPolicy/redirect-with-delay.html [ Slow ] crbug.com/874695 http/tests/security/cross-frame-mouse-source-capabilities.html [ Slow ] crbug.com/874695 http/tests/security/frameNavigation/xss-ALLOWED-same-origin-top-navigation-without-user-gesture.html [ Slow ] crbug.com/874695 http/tests/security/video-poster-cross-origin-crash2.html [ Slow ] -crbug.com/874695 http/tests/webfont/crbug-655076.html [ Slow ] -crbug.com/874695 http/tests/webfont/slow-loading.html [ Slow ] +crbug.com/874695 [ Debug Mac12 ] http/tests/webfont/crbug-655076.html [ Slow ] +crbug.com/874695 [ Release ] http/tests/webfont/crbug-655076.html [ Slow ] +crbug.com/874695 [ Debug Mac12 ] http/tests/webfont/slow-loading.html [ Slow ] +crbug.com/874695 [ Release ] http/tests/webfont/slow-loading.html [ Slow ] crbug.com/874695 http/tests/webmidi/midi-default-feature-policy.https.sub.html [ Slow ] crbug.com/874695 http/tests/workers/shared-worker-in-iframe.html [ Slow ] crbug.com/874695 http/tests/workers/shared-worker-usecounter.html [ Slow ] crbug.com/874695 http/tests/xmlhttprequest/navigation-abort-detaches-frame.html [ Slow ] -crbug.com/874695 http/tests/xmlhttprequest/timeout/xmlhttprequest-timeout-aborted.html [ Slow ] +crbug.com/874695 [ Debug Mac12 ] http/tests/xmlhttprequest/timeout/xmlhttprequest-timeout-aborted.html [ Slow ] +crbug.com/874695 [ Release ] http/tests/xmlhttprequest/timeout/xmlhttprequest-timeout-aborted.html [ Slow ] crbug.com/874695 http/tests/xmlhttprequest/timeout/xmlhttprequest-timeout-overridesexpires.html [ Slow ] crbug.com/874695 http/tests/xmlhttprequest/timeout/xmlhttprequest-timeout-simple.html [ Slow ] -crbug.com/874695 http/tests/xmlhttprequest/timeout/xmlhttprequest-timeout-twice.html [ Slow ] -crbug.com/874695 http/tests/xmlhttprequest/timeout/xmlhttprequest-timeout-worker-overridesexpires.html [ Slow ] +crbug.com/874695 [ Debug Mac12 ] http/tests/xmlhttprequest/timeout/xmlhttprequest-timeout-twice.html [ Slow ] +crbug.com/874695 [ Release ] http/tests/xmlhttprequest/timeout/xmlhttprequest-timeout-twice.html [ Slow ] +crbug.com/874695 [ Debug Mac12 ] http/tests/xmlhttprequest/timeout/xmlhttprequest-timeout-worker-overridesexpires.html [ Slow ] +crbug.com/874695 [ Release ] http/tests/xmlhttprequest/timeout/xmlhttprequest-timeout-worker-overridesexpires.html [ Slow ] crbug.com/874695 http/tests/xmlhttprequest/timeout/xmlhttprequest-timeout-worker-twice.html [ Slow ] crbug.com/874695 http/tests/xmlhttprequest/web-apps/013.html [ Slow ] -crbug.com/874695 images/image-page-injected-script-crash.html [ Slow ] +crbug.com/874695 [ Debug Mac12 ] images/image-page-injected-script-crash.html [ Slow ] +crbug.com/874695 [ Release ] images/image-page-injected-script-crash.html [ Slow ] crbug.com/874695 images/yuv-decode-eligible/color-profile-layer-filter.html [ Slow ] crbug.com/874695 http/tests/inspector-protocol/accessibility/accessibility-nameSources-input-buttons.js [ Slow ] crbug.com/874695 inspector-protocol/debugger/debugger-evaluate-in-worker-while-pause-in-page.js [ Slow ] @@ -434,22 +491,29 @@ crbug.com/874695 media/color-profile-video-seek-filter.html [ Slow ] crbug.com/874695 media/controls/video-enter-exit-fullscreen-while-hovering-shows-controls.html [ Slow ] crbug.com/874695 media/encrypted-media/encrypted-media-onencrypted.html [ Slow ] -crbug.com/874695 media/encrypted-media/encrypted-media-setmediakeys-at-same-time.html [ Slow ] +crbug.com/874695 [ Debug Mac12 ] media/encrypted-media/encrypted-media-setmediakeys-at-same-time.html [ Slow ] +crbug.com/874695 [ Release ] media/encrypted-media/encrypted-media-setmediakeys-at-same-time.html [ Slow ] crbug.com/874695 media/media-controls-tap-show-controls-without-activating.html [ Slow ] -crbug.com/874695 media/media-ended.html [ Slow ] +crbug.com/874695 [ Debug Mac12 ] media/media-ended.html [ Slow ] +crbug.com/874695 [ Release ] media/media-ended.html [ Slow ] crbug.com/874695 media/remoteplayback/prompt-twice-throws.html [ Slow ] -crbug.com/874695 media/track/track-cue-gc-wrapper.html [ Slow ] +crbug.com/874695 [ Debug Mac12 ] media/track/track-cue-gc-wrapper.html [ Slow ] +crbug.com/874695 [ Release ] media/track/track-cue-gc-wrapper.html [ Slow ] crbug.com/874695 media/unsupported-rtsp.html [ Slow ] crbug.com/874695 media/video-controls-always-visible-when-control-hovered.html [ Slow ] -crbug.com/874695 media/video-controls-auto-hide-after-play-by-touch.html [ Slow ] -crbug.com/874695 media/video-controls-dont-show-on-focus-when-disabled.html [ Slow ] +crbug.com/874695 [ Debug Mac12 ] media/video-controls-auto-hide-after-play-by-touch.html [ Slow ] +crbug.com/874695 [ Release ] media/video-controls-auto-hide-after-play-by-touch.html [ Slow ] +crbug.com/874695 [ Debug Mac12 ] media/video-controls-dont-show-on-focus-when-disabled.html [ Slow ] +crbug.com/874695 [ Release ] media/video-controls-dont-show-on-focus-when-disabled.html [ Slow ] crbug.com/874695 media/video-controls-focus-movement-on-hide.html [ Slow ] crbug.com/874695 media/video-controls-hide-after-touch-on-control.html [ Slow ] crbug.com/874695 media/video-controls-hide-on-move-outside-controls.html [ Slow ] crbug.com/874695 media/video-controls-show-on-focus.html [ Slow ] crbug.com/874695 media/video-controls-visibility-multimodal-mouse-after-touch.html [ Slow ] -crbug.com/874695 media/video-controls-visibility-multimodal-touch-after-mouse.html [ Slow ] -crbug.com/874695 media/video-played-collapse.html [ Slow ] +crbug.com/874695 [ Debug Mac12 ] media/video-controls-visibility-multimodal-touch-after-mouse.html [ Slow ] +crbug.com/874695 [ Release ] media/video-controls-visibility-multimodal-touch-after-mouse.html [ Slow ] +crbug.com/874695 [ Debug Mac12 ] media/video-played-collapse.html [ Slow ] +crbug.com/874695 [ Release ] media/video-played-collapse.html [ Slow ] crbug.com/874695 paint/invalidation/filters/filter-repaint-accelerated-child-with-filter-child.html [ Slow ] crbug.com/874695 paint/invalidation/filters/filter-repaint-accelerated-on-accelerated-filter.html [ Slow ] crbug.com/874695 paint/invalidation/filters/filter-repaint-on-accelerated-layer.html [ Slow ] @@ -498,7 +562,12 @@ crbug.com/874695 virtual/threaded/http/tests/devtools/tracing/timeline-layout/timeline-layout-with-invalidations.js [ Slow ] crbug.com/874695 virtual/threaded/http/tests/devtools/tracing/timeline-paint/paint-profiler-update.js [ Slow ] crbug.com/874695 virtual/threaded/http/tests/devtools/tracing/timeline-script-parse.js [ Slow ] -crbug.com/874695 virtual/threaded/http/tests/devtools/tracing/timeline-style/timeline-style-recalc-all-invalidator-types.js [ Slow ] +crbug.com/874695 [ Linux ] virtual/threaded/http/tests/devtools/tracing/timeline-style/timeline-style-recalc-all-invalidator-types.js [ Slow ] +crbug.com/874695 [ Mac10.15 Release ] virtual/threaded/http/tests/devtools/tracing/timeline-style/timeline-style-recalc-all-invalidator-types.js [ Slow ] +crbug.com/874695 [ Mac11 Release ] virtual/threaded/http/tests/devtools/tracing/timeline-style/timeline-style-recalc-all-invalidator-types.js [ Slow ] +crbug.com/874695 [ Mac11-arm64 Release ] virtual/threaded/http/tests/devtools/tracing/timeline-style/timeline-style-recalc-all-invalidator-types.js [ Slow ] +crbug.com/874695 [ Mac12 ] virtual/threaded/http/tests/devtools/tracing/timeline-style/timeline-style-recalc-all-invalidator-types.js [ Slow ] +crbug.com/874695 [ Release Win ] virtual/threaded/http/tests/devtools/tracing/timeline-style/timeline-style-recalc-all-invalidator-types.js [ Slow ] crbug.com/874695 virtual/threaded/synthetic_gestures/synthetic-pinch-zoom-gesture-touchpad-zoom-in-slow.html [ Slow ] crbug.com/874695 virtual/threaded/synthetic_gestures/synthetic-pinch-zoom-gesture-touchscreen-zoom-in-slow-desktop.html [ Slow ] crbug.com/874695 virtual/threaded/synthetic_gestures/synthetic-pinch-zoom-gesture-touchscreen-zoom-in-slow.html [ Slow ] @@ -537,10 +606,18 @@ crbug.com/1091716 svg/as-object/sizing/svg-in-object-placeholder-auto-auto-intrinsic-ratio.html [ Slow ] crbug.com/1091716 svg/as-object/sizing/svg-in-object-placeholder-auto-auto-no-intrinsic-ratio.html [ Slow ] -crbug.com/1091716 svg/as-object/sizing/svg-in-object-placeholder-auto-fixed-intrinsic-ratio.html [ Slow ] +crbug.com/1091716 [ Linux ] svg/as-object/sizing/svg-in-object-placeholder-auto-fixed-intrinsic-ratio.html [ Slow ] +crbug.com/1091716 [ Mac10.15 Release ] svg/as-object/sizing/svg-in-object-placeholder-auto-fixed-intrinsic-ratio.html [ Slow ] +crbug.com/1091716 [ Mac11 Release ] svg/as-object/sizing/svg-in-object-placeholder-auto-fixed-intrinsic-ratio.html [ Slow ] +crbug.com/1091716 [ Mac12 ] svg/as-object/sizing/svg-in-object-placeholder-auto-fixed-intrinsic-ratio.html [ Slow ] +crbug.com/1091716 [ Release Win ] svg/as-object/sizing/svg-in-object-placeholder-auto-fixed-intrinsic-ratio.html [ Slow ] crbug.com/1091716 svg/as-object/sizing/svg-in-object-placeholder-auto-fixed-no-intrinsic-ratio.html [ Slow ] crbug.com/1091716 svg/as-object/sizing/svg-in-object-placeholder-auto-percentage-intrinsic-ratio.html [ Slow ] -crbug.com/1091716 svg/as-object/sizing/svg-in-object-placeholder-auto-percentage-no-intrinsic-ratio.html [ Slow ] +crbug.com/1091716 [ Linux ] svg/as-object/sizing/svg-in-object-placeholder-auto-percentage-no-intrinsic-ratio.html [ Slow ] +crbug.com/1091716 [ Mac10.15 Release ] svg/as-object/sizing/svg-in-object-placeholder-auto-percentage-no-intrinsic-ratio.html [ Slow ] +crbug.com/1091716 [ Mac11 Release ] svg/as-object/sizing/svg-in-object-placeholder-auto-percentage-no-intrinsic-ratio.html [ Slow ] +crbug.com/1091716 [ Mac12 ] svg/as-object/sizing/svg-in-object-placeholder-auto-percentage-no-intrinsic-ratio.html [ Slow ] +crbug.com/1091716 [ Release Win ] svg/as-object/sizing/svg-in-object-placeholder-auto-percentage-no-intrinsic-ratio.html [ Slow ] crbug.com/1091716 svg/as-object/sizing/svg-in-object-placeholder-fixed-auto-intrinsic-ratio.html [ Slow ] crbug.com/1091716 svg/as-object/sizing/svg-in-object-placeholder-fixed-auto-no-intrinsic-ratio.html [ Slow ] crbug.com/1091716 svg/as-object/sizing/svg-in-object-placeholder-fixed-fixed-intrinsic-ratio.html [ Slow ] @@ -549,11 +626,23 @@ crbug.com/1091716 svg/as-object/sizing/svg-in-object-placeholder-fixed-percentage-no-intrinsic-ratio.html [ Slow ] crbug.com/1091716 svg/as-object/sizing/svg-in-object-placeholder-percentage-auto-intrinsic-ratio.html [ Slow ] crbug.com/1091716 svg/as-object/sizing/svg-in-object-placeholder-percentage-auto-no-intrinsic-ratio.html [ Slow ] -crbug.com/1091716 svg/as-object/sizing/svg-in-object-placeholder-percentage-fixed-intrinsic-ratio.html [ Slow ] +crbug.com/1091716 [ Linux ] svg/as-object/sizing/svg-in-object-placeholder-percentage-fixed-intrinsic-ratio.html [ Slow ] +crbug.com/1091716 [ Mac10.15 Release ] svg/as-object/sizing/svg-in-object-placeholder-percentage-fixed-intrinsic-ratio.html [ Slow ] +crbug.com/1091716 [ Mac11 Release ] svg/as-object/sizing/svg-in-object-placeholder-percentage-fixed-intrinsic-ratio.html [ Slow ] +crbug.com/1091716 [ Mac12 ] svg/as-object/sizing/svg-in-object-placeholder-percentage-fixed-intrinsic-ratio.html [ Slow ] +crbug.com/1091716 [ Release Win ] svg/as-object/sizing/svg-in-object-placeholder-percentage-fixed-intrinsic-ratio.html [ Slow ] crbug.com/1091716 svg/as-object/sizing/svg-in-object-placeholder-percentage-fixed-no-intrinsic-ratio.html [ Slow ] crbug.com/1091716 svg/as-object/sizing/svg-in-object-placeholder-percentage-percentage-intrinsic-ratio.html [ Slow ] -crbug.com/1091716 svg/as-object/sizing/svg-in-object-placeholder-percentage-percentage-no-intrinsic-ratio.html [ Slow ] -crbug.com/1233743 svg/filters/feDisplacementMap.svg [ Slow ] +crbug.com/1091716 [ Linux ] svg/as-object/sizing/svg-in-object-placeholder-percentage-percentage-no-intrinsic-ratio.html [ Slow ] +crbug.com/1091716 [ Mac10.15 Release ] svg/as-object/sizing/svg-in-object-placeholder-percentage-percentage-no-intrinsic-ratio.html [ Slow ] +crbug.com/1091716 [ Mac11 Release ] svg/as-object/sizing/svg-in-object-placeholder-percentage-percentage-no-intrinsic-ratio.html [ Slow ] +crbug.com/1091716 [ Mac12 ] svg/as-object/sizing/svg-in-object-placeholder-percentage-percentage-no-intrinsic-ratio.html [ Slow ] +crbug.com/1091716 [ Release Win ] svg/as-object/sizing/svg-in-object-placeholder-percentage-percentage-no-intrinsic-ratio.html [ Slow ] +crbug.com/1233743 [ Linux ] svg/filters/feDisplacementMap.svg [ Slow ] +crbug.com/1233743 [ Mac10.15 Release ] svg/filters/feDisplacementMap.svg [ Slow ] +crbug.com/1233743 [ Mac11 Release ] svg/filters/feDisplacementMap.svg [ Slow ] +crbug.com/1233743 [ Mac12 ] svg/filters/feDisplacementMap.svg [ Slow ] +crbug.com/1233743 [ Release Win ] svg/filters/feDisplacementMap.svg [ Slow ] crbug.com/1043669 [ Mac ] inspector-protocol/emulation/set-vision-deficiency.js [ Slow ] crbug.com/1092121 fast/css/large-list-of-rules-crash.html [ Slow ] @@ -561,7 +650,13 @@ crbug.com/1093849 external/wpt/dom/nodes/Element-classlist.html [ Slow ] crbug.com/1093853 external/wpt/dom/ranges/Range-surroundContents.html [ Slow ] crbug.com/1093478 external/wpt/quirks/unitless-length/limited-quirks.html [ Slow ] -crbug.com/1133836 external/wpt/scroll-to-text-fragment/redirects.html [ Slow ] +crbug.com/1133836 [ Linux ] external/wpt/scroll-to-text-fragment/redirects.html [ Slow ] +crbug.com/1133836 [ Mac10.13 Release ] external/wpt/scroll-to-text-fragment/redirects.html [ Slow ] +crbug.com/1133836 [ Mac10.14 Release ] external/wpt/scroll-to-text-fragment/redirects.html [ Slow ] +crbug.com/1133836 [ Mac10.15 Release ] external/wpt/scroll-to-text-fragment/redirects.html [ Slow ] +crbug.com/1133836 [ Mac11-arm64 Release ] external/wpt/scroll-to-text-fragment/redirects.html [ Slow ] +crbug.com/1133836 [ Mac12 ] external/wpt/scroll-to-text-fragment/redirects.html [ Slow ] +crbug.com/1133836 [ Release Win ] external/wpt/scroll-to-text-fragment/redirects.html [ Slow ] crbug.com/1134580 http/tests/eye-dropper/color-picker-show-eye-dropper.php [ Slow ] crbug.com/1145716 fast/forms/calendar-picker/datetimelocal-picker-open-to-focused-field.html [ Slow ] @@ -602,8 +697,18 @@ crbug.com/947383 inspector-protocol/css/reattach-after-editing-styles.js [ Slow ] crbug.com/949167 external/wpt/html/semantics/links/links-created-by-a-and-area-elements/target_blank_implicit_noopener.html [ Slow ] crbug.com/949207 external/wpt/html/semantics/links/links-created-by-a-and-area-elements/target_blank_implicit_noopener_base.html [ Slow ] -crbug.com/959002 crbug.com/959042 http/tests/devtools/elements/styles-3/style-autocomplete.js [ Slow ] -crbug.com/959002 crbug.com/959042 http/tests/devtools/elements/styles-4/styles-keyframes.js [ Slow ] +crbug.com/959002 crbug.com/959042 [ Linux ] http/tests/devtools/elements/styles-3/style-autocomplete.js [ Slow ] +crbug.com/959002 crbug.com/959042 [ Mac10.15 Release ] http/tests/devtools/elements/styles-3/style-autocomplete.js [ Slow ] +crbug.com/959002 crbug.com/959042 [ Mac11 Release ] http/tests/devtools/elements/styles-3/style-autocomplete.js [ Slow ] +crbug.com/959002 crbug.com/959042 [ Mac11-arm64 Release ] http/tests/devtools/elements/styles-3/style-autocomplete.js [ Slow ] +crbug.com/959002 crbug.com/959042 [ Mac12 ] http/tests/devtools/elements/styles-3/style-autocomplete.js [ Slow ] +crbug.com/959002 crbug.com/959042 [ Release Win ] http/tests/devtools/elements/styles-3/style-autocomplete.js [ Slow ] +crbug.com/959002 crbug.com/959042 [ Linux ] http/tests/devtools/elements/styles-4/styles-keyframes.js [ Slow ] +crbug.com/959002 crbug.com/959042 [ Mac10.15 Release ] http/tests/devtools/elements/styles-4/styles-keyframes.js [ Slow ] +crbug.com/959002 crbug.com/959042 [ Mac11 Release ] http/tests/devtools/elements/styles-4/styles-keyframes.js [ Slow ] +crbug.com/959002 crbug.com/959042 [ Mac11-arm64 Release ] http/tests/devtools/elements/styles-4/styles-keyframes.js [ Slow ] +crbug.com/959002 crbug.com/959042 [ Mac12 ] http/tests/devtools/elements/styles-4/styles-keyframes.js [ Slow ] +crbug.com/959002 crbug.com/959042 [ Release Win ] http/tests/devtools/elements/styles-4/styles-keyframes.js [ Slow ] crbug.com/959002 crbug.com/959042 http/tests/devtools/elements/styles-4/undo-add-new-rule.js [ Slow ] crbug.com/937170 external/wpt/IndexedDB/interleaved-cursors-large.html [ Slow ] crbug.com/971319 [ Mac ] media/audio-garbage-collect.html [ Slow ] @@ -634,24 +739,44 @@ crbug.com/1043381 [ Release Win ] http/tests/devtools/elements/highlight/highlight-node-scroll.js [ Slow ] crbug.com/1043381 [ Mac Release ] http/tests/devtools/elements/highlight/highlight-node-scroll.js [ Slow ] crbug.com/1043356 [ Release ] http/tests/devtools/elements/styles-4/keyframes-source-offsets.js [ Slow ] -crbug.com/1043354 [ Release ] http/tests/devtools/service-workers/service-worker-pause.js [ Slow ] +crbug.com/1043354 [ Linux Release ] http/tests/devtools/service-workers/service-worker-pause.js [ Slow ] +crbug.com/1043354 [ Mac10.15 Release ] http/tests/devtools/service-workers/service-worker-pause.js [ Slow ] +crbug.com/1043354 [ Mac11 Release ] http/tests/devtools/service-workers/service-worker-pause.js [ Slow ] +crbug.com/1043354 [ Mac11-arm64 Release ] http/tests/devtools/service-workers/service-worker-pause.js [ Slow ] +crbug.com/1043354 [ Mac12 Release ] http/tests/devtools/service-workers/service-worker-pause.js [ Slow ] +crbug.com/1043354 [ Release Win ] http/tests/devtools/service-workers/service-worker-pause.js [ Slow ] crbug.com/1043350 [ Release ] http/tests/devtools/elements/edit/set-attribute.js [ Slow ] crbug.com/1043310 [ Release Win ] external/wpt/css/cssom-view/idlharness.html [ Slow ] crbug.com/1043310 [ Mac Release ] external/wpt/css/cssom-view/idlharness.html [ Slow ] -crbug.com/1043285 [ Release ] http/tests/devtools/elements/styles/selector-line.js [ Slow ] +crbug.com/1043285 [ Linux Release ] http/tests/devtools/elements/styles/selector-line.js [ Slow ] +crbug.com/1043285 [ Mac10.15 Release ] http/tests/devtools/elements/styles/selector-line.js [ Slow ] +crbug.com/1043285 [ Mac11 Release ] http/tests/devtools/elements/styles/selector-line.js [ Slow ] +crbug.com/1043285 [ Mac11-arm64 Release ] http/tests/devtools/elements/styles/selector-line.js [ Slow ] +crbug.com/1043285 [ Mac12 Release ] http/tests/devtools/elements/styles/selector-line.js [ Slow ] +crbug.com/1043285 [ Release Win ] http/tests/devtools/elements/styles/selector-line.js [ Slow ] crbug.com/1043398 [ Release Win ] http/tests/devtools/tracing-browser-thread.js [ Slow ] crbug.com/1043398 [ Mac Release ] http/tests/devtools/tracing-browser-thread.js [ Slow ] crbug.com/1043434 [ Release ] http/tests/devtools/animation/animation-transition-setTiming-crash.js [ Slow ] crbug.com/1043453 [ Release Win ] virtual/threaded/external/wpt/css/css-animations/idlharness.html [ Slow ] crbug.com/1043453 [ Mac Release ] virtual/threaded/external/wpt/css/css-animations/idlharness.html [ Slow ] crbug.com/1043454 [ Release ] http/tests/devtools/console-xhr-logging-async.js [ Slow ] -crbug.com/1043785 [ Release ] http/tests/devtools/elements/edit/switch-panels-while-editing-as-html.js [ Slow ] +crbug.com/1043785 [ Linux Release ] http/tests/devtools/elements/edit/switch-panels-while-editing-as-html.js [ Slow ] +crbug.com/1043785 [ Mac10.15 Release ] http/tests/devtools/elements/edit/switch-panels-while-editing-as-html.js [ Slow ] +crbug.com/1043785 [ Mac11 Release ] http/tests/devtools/elements/edit/switch-panels-while-editing-as-html.js [ Slow ] +crbug.com/1043785 [ Mac11-arm64 Release ] http/tests/devtools/elements/edit/switch-panels-while-editing-as-html.js [ Slow ] +crbug.com/1043785 [ Mac12 Release ] http/tests/devtools/elements/edit/switch-panels-while-editing-as-html.js [ Slow ] +crbug.com/1043785 [ Release Win ] http/tests/devtools/elements/edit/switch-panels-while-editing-as-html.js [ Slow ] crbug.com/1043792 [ Release Win ] http/tests/devtools/template-content-inspect-crash.js [ Slow ] crbug.com/1043792 [ Mac Release ] http/tests/devtools/template-content-inspect-crash.js [ Slow ] crbug.com/1043893 [ Release ] webexposed/global-interface-listing-dedicated-worker.html [ Slow ] crbug.com/1043920 [ Release Win ] http/tests/devtools/stylesheet-source-mapping.js [ Slow ] crbug.com/1043920 [ Mac Release ] http/tests/devtools/stylesheet-source-mapping.js [ Slow ] -crbug.com/1044350 [ Release ] http/tests/devtools/network/network-xhr-replay.js [ Slow ] +crbug.com/1044350 [ Linux Release ] http/tests/devtools/network/network-xhr-replay.js [ Slow ] +crbug.com/1044350 [ Mac10.15 Release ] http/tests/devtools/network/network-xhr-replay.js [ Slow ] +crbug.com/1044350 [ Mac11 Release ] http/tests/devtools/network/network-xhr-replay.js [ Slow ] +crbug.com/1044350 [ Mac11-arm64 Release ] http/tests/devtools/network/network-xhr-replay.js [ Slow ] +crbug.com/1044350 [ Mac12 Release ] http/tests/devtools/network/network-xhr-replay.js [ Slow ] +crbug.com/1044350 [ Release Win ] http/tests/devtools/network/network-xhr-replay.js [ Slow ] crbug.com/1044414 [ Release ] http/tests/devtools/elements/styles/selector-line-sourcemap-header.js [ Slow ] crbug.com/1044415 [ Release ] http/tests/devtools/runtime/evaluate-without-side-effects.js [ Slow ] crbug.com/1044425 [ Release ] http/tests/devtools/elements/shadow/elements-panel-shadow-selection-on-refresh-1.js [ Slow ] @@ -659,29 +784,66 @@ crbug.com/1044459 [ Release ] http/tests/devtools/elements/edit/set-outer-html-for-xhtml.js [ Slow ] crbug.com/1044506 [ Release Win ] http/tests/devtools/tracing-model-storage.js [ Slow ] crbug.com/1044506 [ Mac Release ] http/tests/devtools/tracing-model-storage.js [ Slow ] -crbug.com/1044516 [ Release ] http/tests/devtools/elements/edit/undo-set-outer-html-2.js [ Slow ] +crbug.com/1044516 [ Linux Release ] http/tests/devtools/elements/edit/undo-set-outer-html-2.js [ Slow ] +crbug.com/1044516 [ Mac10.15 Release ] http/tests/devtools/elements/edit/undo-set-outer-html-2.js [ Slow ] +crbug.com/1044516 [ Mac11 Release ] http/tests/devtools/elements/edit/undo-set-outer-html-2.js [ Slow ] +crbug.com/1044516 [ Mac11-arm64 Release ] http/tests/devtools/elements/edit/undo-set-outer-html-2.js [ Slow ] +crbug.com/1044516 [ Mac12 Release ] http/tests/devtools/elements/edit/undo-set-outer-html-2.js [ Slow ] +crbug.com/1044516 [ Release Win ] http/tests/devtools/elements/edit/undo-set-outer-html-2.js [ Slow ] crbug.com/1044518 [ Release Win ] http/tests/devtools/bindings/suspendtarget-navigator.js [ Slow ] crbug.com/1044518 [ Mac Release ] http/tests/devtools/bindings/suspendtarget-navigator.js [ Slow ] -crbug.com/1044544 [ Release ] http/tests/devtools/network/network-disable-cache-preloads-twice.js [ Slow ] +crbug.com/1044544 [ Linux Release ] http/tests/devtools/network/network-disable-cache-preloads-twice.js [ Slow ] +crbug.com/1044544 [ Mac10.15 Release ] http/tests/devtools/network/network-disable-cache-preloads-twice.js [ Slow ] +crbug.com/1044544 [ Mac11 Release ] http/tests/devtools/network/network-disable-cache-preloads-twice.js [ Slow ] +crbug.com/1044544 [ Mac11-arm64 Release ] http/tests/devtools/network/network-disable-cache-preloads-twice.js [ Slow ] +crbug.com/1044544 [ Mac12 Release ] http/tests/devtools/network/network-disable-cache-preloads-twice.js [ Slow ] +crbug.com/1044544 [ Release Win ] http/tests/devtools/network/network-disable-cache-preloads-twice.js [ Slow ] crbug.com/1044545 [ Release ] http/tests/devtools/service-workers/service-workers-bypass-for-network-cors.js [ Slow ] crbug.com/1044561 [ Release ] http/tests/devtools/elements/styles/show-all-properties.js [ Slow ] crbug.com/1044562 [ Release Win ] http/tests/devtools/modify-cross-domain-rule.js [ Slow ] -crbug.com/1044562 [ Mac Release ] http/tests/devtools/modify-cross-domain-rule.js [ Slow ] -crbug.com/1044563 [ Release ] http/tests/devtools/background-services/background-services-panel.js [ Slow ] -crbug.com/1044822 [ Release ] http/tests/devtools/cache-storage/cache-entry-deletion.js [ Slow ] +crbug.com/1044562 [ Mac10.15 Release ] http/tests/devtools/modify-cross-domain-rule.js [ Slow ] +crbug.com/1044562 [ Mac11 Release ] http/tests/devtools/modify-cross-domain-rule.js [ Slow ] +crbug.com/1044562 [ Mac12 Release ] http/tests/devtools/modify-cross-domain-rule.js [ Slow ] +crbug.com/1044563 [ Linux Release ] http/tests/devtools/background-services/background-services-panel.js [ Slow ] +crbug.com/1044563 [ Mac10.15 Release ] http/tests/devtools/background-services/background-services-panel.js [ Slow ] +crbug.com/1044563 [ Mac11 Release ] http/tests/devtools/background-services/background-services-panel.js [ Slow ] +crbug.com/1044563 [ Mac12 Release ] http/tests/devtools/background-services/background-services-panel.js [ Slow ] +crbug.com/1044563 [ Release Win ] http/tests/devtools/background-services/background-services-panel.js [ Slow ] +crbug.com/1044822 [ Linux Release ] http/tests/devtools/cache-storage/cache-entry-deletion.js [ Slow ] +crbug.com/1044822 [ Mac10.15 Release ] http/tests/devtools/cache-storage/cache-entry-deletion.js [ Slow ] +crbug.com/1044822 [ Mac11 Release ] http/tests/devtools/cache-storage/cache-entry-deletion.js [ Slow ] +crbug.com/1044822 [ Mac11-arm64 Release ] http/tests/devtools/cache-storage/cache-entry-deletion.js [ Slow ] +crbug.com/1044822 [ Mac12 Release ] http/tests/devtools/cache-storage/cache-entry-deletion.js [ Slow ] +crbug.com/1044822 [ Release Win ] http/tests/devtools/cache-storage/cache-entry-deletion.js [ Slow ] crbug.com/1044823 http/tests/devtools/extensions/extensions-resources.js [ Slow ] crbug.com/1044823 http/tests/devtools/extensions/extensions-timeline-api.js [ Slow ] crbug.com/1044829 [ Release Win ] http/tests/devtools/cache-storage/cache-deletion.js [ Slow ] -crbug.com/1044829 [ Mac Release ] http/tests/devtools/cache-storage/cache-deletion.js [ Slow ] +crbug.com/1044829 [ Mac10.15 Release ] http/tests/devtools/cache-storage/cache-deletion.js [ Slow ] +crbug.com/1044829 [ Mac11 Release ] http/tests/devtools/cache-storage/cache-deletion.js [ Slow ] +crbug.com/1044829 [ Mac12 Release ] http/tests/devtools/cache-storage/cache-deletion.js [ Slow ] crbug.com/1043901 [ Release Win ] external/wpt/preload/preload-with-type.html [ Slow ] crbug.com/1044418 [ Mac Release ] http/tests/devtools/elements/shadow/elements-panel-shadow-selection-on-refresh-2.js [ Slow ] -crbug.com/1046784 http/tests/devtools/elements/styles-4/styles-formatting.js [ Slow ] +crbug.com/1046784 [ Linux ] http/tests/devtools/elements/styles-4/styles-formatting.js [ Slow ] +crbug.com/1046784 [ Mac10.15 Release ] http/tests/devtools/elements/styles-4/styles-formatting.js [ Slow ] +crbug.com/1046784 [ Mac11 Release ] http/tests/devtools/elements/styles-4/styles-formatting.js [ Slow ] +crbug.com/1046784 [ Mac11-arm64 Release ] http/tests/devtools/elements/styles-4/styles-formatting.js [ Slow ] +crbug.com/1046784 [ Mac12 ] http/tests/devtools/elements/styles-4/styles-formatting.js [ Slow ] +crbug.com/1046784 [ Release Win ] http/tests/devtools/elements/styles-4/styles-formatting.js [ Slow ] crbug.com/1046784 http/tests/devtools/search/search-in-sourcemap.js [ Slow ] -crbug.com/1046784 http/tests/devtools/elements/styles-1/edit-inspector-stylesheet.js [ Slow ] +crbug.com/1046784 [ Linux ] http/tests/devtools/elements/styles-1/edit-inspector-stylesheet.js [ Slow ] +crbug.com/1046784 [ Mac10.15 Release ] http/tests/devtools/elements/styles-1/edit-inspector-stylesheet.js [ Slow ] +crbug.com/1046784 [ Mac11 Release ] http/tests/devtools/elements/styles-1/edit-inspector-stylesheet.js [ Slow ] +crbug.com/1046784 [ Mac12 ] http/tests/devtools/elements/styles-1/edit-inspector-stylesheet.js [ Slow ] +crbug.com/1046784 [ Release Win ] http/tests/devtools/elements/styles-1/edit-inspector-stylesheet.js [ Slow ] crbug.com/1046784 http/tests/devtools/animation/animation-after-navigation.js [ Slow ] crbug.com/1046784 http/tests/devtools/search/search-in-script.js [ Slow ] crbug.com/1046784 http/tests/devtools/service-workers/service-worker-network-fetch-blocked.js [ Slow ] -crbug.com/1046784 http/tests/devtools/fragment.js [ Slow ] +crbug.com/1046784 [ Linux ] http/tests/devtools/fragment.js [ Slow ] +crbug.com/1046784 [ Mac10.15 Release ] http/tests/devtools/fragment.js [ Slow ] +crbug.com/1046784 [ Mac11 Release ] http/tests/devtools/fragment.js [ Slow ] +crbug.com/1046784 [ Mac11-arm64 Release ] http/tests/devtools/fragment.js [ Slow ] +crbug.com/1046784 [ Mac12 ] http/tests/devtools/fragment.js [ Slow ] +crbug.com/1046784 [ Release Win ] http/tests/devtools/fragment.js [ Slow ] crbug.com/1046784 http/tests/devtools/coverage/coverage-view.js [ Slow ] crbug.com/1046784 http/tests/devtools/elements/edit/set-outer-html-body.js [ Slow ] crbug.com/1046784 http/tests/devtools/elements/styles-1/add-new-rule-inline-style-csp.js [ Slow ] @@ -695,13 +857,27 @@ crbug.com/1046784 http/tests/devtools/elements/event-listener-sidebar-jquery1.js [ Slow ] crbug.com/1046784 http/tests/devtools/persistence/persistence-tabbed-editor-tabs-order.js [ Slow ] crbug.com/1046784 http/tests/devtools/elements/styles-4/styles-update-links-3.js [ Slow ] -crbug.com/1046784 http/tests/devtools/elements/styles-4/styles-update-links-2.js [ Slow ] +crbug.com/1046784 [ Linux ] http/tests/devtools/elements/styles-4/styles-update-links-2.js [ Slow ] +crbug.com/1046784 [ Mac10.15 Release ] http/tests/devtools/elements/styles-4/styles-update-links-2.js [ Slow ] +crbug.com/1046784 [ Mac11 Release ] http/tests/devtools/elements/styles-4/styles-update-links-2.js [ Slow ] +crbug.com/1046784 [ Mac11-arm64 Release ] http/tests/devtools/elements/styles-4/styles-update-links-2.js [ Slow ] +crbug.com/1046784 [ Mac12 ] http/tests/devtools/elements/styles-4/styles-update-links-2.js [ Slow ] +crbug.com/1046784 [ Release Win ] http/tests/devtools/elements/styles-4/styles-update-links-2.js [ Slow ] crbug.com/1046784 http/tests/devtools/coverage/coverage-suspended.js [ Slow ] crbug.com/1046784 http/tests/devtools/network/network-search.js [ Slow ] -crbug.com/1046784 http/tests/devtools/elements/styles-4/styles-update-links-1.js [ Slow ] +crbug.com/1046784 [ Linux ] http/tests/devtools/elements/styles-4/styles-update-links-1.js [ Slow ] +crbug.com/1046784 [ Mac10.15 Release ] http/tests/devtools/elements/styles-4/styles-update-links-1.js [ Slow ] +crbug.com/1046784 [ Mac11 Release ] http/tests/devtools/elements/styles-4/styles-update-links-1.js [ Slow ] +crbug.com/1046784 [ Mac11-arm64 Release ] http/tests/devtools/elements/styles-4/styles-update-links-1.js [ Slow ] +crbug.com/1046784 [ Mac12 ] http/tests/devtools/elements/styles-4/styles-update-links-1.js [ Slow ] +crbug.com/1046784 [ Release Win ] http/tests/devtools/elements/styles-4/styles-update-links-1.js [ Slow ] crbug.com/1046784 http/tests/devtools/elements/edit/set-outer-html.js [ Slow ] crbug.com/1046784 http/tests/devtools/network/failed-request-response-mimetype.js [ Slow ] -crbug.com/1046784 http/tests/devtools/elements/selected-element-changes-execution-context.js [ Slow ] +crbug.com/1046784 [ Linux ] http/tests/devtools/elements/selected-element-changes-execution-context.js [ Slow ] +crbug.com/1046784 [ Mac10.15 Release ] http/tests/devtools/elements/selected-element-changes-execution-context.js [ Slow ] +crbug.com/1046784 [ Mac11 Release ] http/tests/devtools/elements/selected-element-changes-execution-context.js [ Slow ] +crbug.com/1046784 [ Mac12 ] http/tests/devtools/elements/selected-element-changes-execution-context.js [ Slow ] +crbug.com/1046784 [ Release Win ] http/tests/devtools/elements/selected-element-changes-execution-context.js [ Slow ] crbug.com/1046784 http/tests/devtools/file-system-project.js [ Slow ] crbug.com/1046784 http/tests/devtools/bindings/navigator-frame-attach-detach.js [ Slow ] crbug.com/1046784 http/tests/devtools/forced-layout-in-microtask.js [ Slow ] @@ -714,8 +890,8 @@ crbug.com/984467 fast/canvas/canvas-composite-stroke-alpha.html [ Slow ] crbug.com/1078863 [ Mac ] wpt_internal/speech/scripted/speechrecognition-restart-onend.html [ Slow ] crbug.com/1091948 [ Linux ] external/wpt/html/canvas/element/manual/fill-and-stroke-styles/canvas_colorsandstyles_createlineargradient_001.htm [ Slow ] -crbug.com/1176802 [ Debug ] external/wpt/feature-policy/feature-policy-frame-policy-timing.https.sub.html [ Slow ] -crbug.com/1176802 [ Debug ] external/wpt/permissions-policy/permissions-policy-frame-policy-timing.https.sub.html [ Slow ] +crbug.com/1176802 [ Debug Mac12 ] external/wpt/feature-policy/feature-policy-frame-policy-timing.https.sub.html [ Slow ] +crbug.com/1176802 [ Debug Mac12 ] external/wpt/permissions-policy/permissions-policy-frame-policy-timing.https.sub.html [ Slow ] crbug.com/1044825 http/tests/devtools/network/resource-priority.js [ Slow ] crbug.com/1105270 [ Mac10.15 ] fast/events/open-window-from-another-frame.html [ Slow ] crbug.com/1046784 http/tests/devtools/profiler/cpu-profiler-bottom-up-large-tree-search.js [ Slow ]
diff --git a/third_party/blink/web_tests/TestExpectations b/third_party/blink/web_tests/TestExpectations index a3d24a8..39ebdcf 100644 --- a/third_party/blink/web_tests/TestExpectations +++ b/third_party/blink/web_tests/TestExpectations
@@ -661,7 +661,7 @@ crbug.com/432153 external/wpt/css/css-masking/mask-image/mask-size-percent.html [ Failure ] # CSS clip-path: shape() not implemented -crbug.com/1308431 [ Win ] external/wpt/css/css-masking/animations/clip-path-interpolation-shape.html [ Failure ] +crbug.com/1308431 [ Win11 ] external/wpt/css/css-masking/animations/clip-path-interpolation-shape.html [ Failure ] crbug.com/1308431 [ Win ] external/wpt/css/css-masking/parsing/clip-path-shape-parsing.html [ Failure ] crbug.com/1308431 external/wpt/css/css-masking/clip-path/clip-path-shape-001.html [ Failure ] crbug.com/1308431 external/wpt/css/css-masking/clip-path/clip-path-shape-002-units.html [ Failure ] @@ -1229,7 +1229,10 @@ crbug.com/807497 external/wpt/css/css-flexbox/anonymous-flex-item-005.html [ Failure ] crbug.com/1311206 external/wpt/css/css-sizing/aspect-ratio/flex-aspect-ratio-038.html [ Failure ] -crbug.com/1299946 [ Mac ] external/wpt/css/css-sizing/min-content-negative-margin-crash.html [ Pass Timeout ] +crbug.com/1299946 [ Mac10.14 Release ] external/wpt/css/css-sizing/min-content-negative-margin-crash.html [ Pass Timeout ] +crbug.com/1299946 [ Mac10.15 Release ] external/wpt/css/css-sizing/min-content-negative-margin-crash.html [ Pass Timeout ] +crbug.com/1299946 [ Mac11 Release ] external/wpt/css/css-sizing/min-content-negative-margin-crash.html [ Pass Timeout ] +crbug.com/1299946 [ Mac12 ] external/wpt/css/css-sizing/min-content-negative-margin-crash.html [ Pass Timeout ] # Needs "new" flex container intrinsic size algorithm. crbug.com/240765 external/wpt/css/css-flexbox/flex-container-max-content-001.html [ Failure ] @@ -1548,7 +1551,7 @@ crbug.com/958381 [ Mac ] external/wpt/css/CSS2/tables/table-anonymous-objects-092.xht [ Failure ] crbug.com/958381 [ Mac ] virtual/text-antialias/hyphen-min-preferred-width.html [ Failure ] crbug.com/958381 [ Win ] virtual/text-antialias/hyphen-min-preferred-width.html [ Failure ] -crbug.com/958381 [ Mac ] fragmentation/single-line-cells-paginated-with-text.html [ Failure ] +crbug.com/958381 [ Debug Mac12 ] fragmentation/single-line-cells-paginated-with-text.html [ Failure ] # TablesNG ends @@ -1629,7 +1632,8 @@ crbug.com/1353560 [ Linux ] external/wpt/css/css-content/quotes-001.html [ Failure ] crbug.com/1353560 [ Mac ] external/wpt/css/css-content/quotes-006.html [ Failure ] -crbug.com/1341208 [ Mac ] external/wpt/css/css-content/quotes-007.html [ Crash Failure Pass Timeout ] +crbug.com/1341208 [ Mac10.13 Release ] external/wpt/css/css-content/quotes-007.html [ Crash Failure Pass Timeout ] +crbug.com/1341208 [ Mac10.14 Release ] external/wpt/css/css-content/quotes-007.html [ Crash Failure Pass Timeout ] crbug.com/1353560 [ Mac ] external/wpt/css/css-content/quotes-009.html [ Failure ] crbug.com/1353560 [ Mac10.13 ] external/wpt/css/css-content/quotes-012.html [ Failure ] crbug.com/1353560 [ Mac10.14 ] external/wpt/css/css-content/quotes-012.html [ Failure ] @@ -1935,7 +1939,7 @@ # Flaky tests on Mac after enabling scroll animations in web_tests crbug.com/944583 [ Mac ] fast/events/platform-wheelevent-paging-xy-in-scrolling-div.html [ Failure Pass ] crbug.com/944583 [ Mac ] fast/scrolling/percentage-mousewheel-scroll-on-iframe.html [ Failure Pass ] -crbug.com/944583 [ Mac ] fast/events/platform-wheelevent-paging-x-in-scrolling-page.html [ Failure Pass Timeout ] +crbug.com/944583 [ Debug Mac12 ] fast/events/platform-wheelevent-paging-x-in-scrolling-page.html [ Failure Pass Timeout ] crbug.com/944583 [ Mac ] fast/events/platform-wheelevent-paging-y-in-scrolling-page.html [ Failure Pass Timeout ] # Sheriff: 2020-05-18 @@ -1978,7 +1982,7 @@ crbug.com/552494 virtual/prefer_compositing_to_lcd_text/scrollbars/overflow-scrollbar-combinations.html [ Failure Pass ] crbug.com/305376 external/wpt/css/css-overflow/webkit-line-clamp-018.html [ Failure ] -crbug.com/305376 external/wpt/css/css-overflow/webkit-line-clamp-024.html [ Failure ] +crbug.com/305376 [ Mac ] external/wpt/css/css-overflow/webkit-line-clamp-024.html [ Failure ] crbug.com/1134483 [ Mac ] external/wpt/css/css-overflow/webkit-line-clamp-036.html [ Failure ] crbug.com/745905 external/wpt/css/css-ui/text-overflow-021.html [ Failure ] @@ -1989,9 +1993,24 @@ crbug.com/745905 external/wpt/css/css-overflow/text-overflow-scroll-vertical-rl-001.html [ Failure ] crbug.com/745905 external/wpt/css/css-overflow/text-overflow-scroll-vertical-rl-rtl-001.html [ Failure ] -crbug.com/710214 [ Mac ] external/wpt/css/css-overflow/scrollbar-gutter-002.html [ Failure ] -crbug.com/710214 [ Mac ] external/wpt/css/css-overflow/scrollbar-gutter-vertical-lr-002.html [ Failure ] -crbug.com/710214 [ Mac ] external/wpt/css/css-overflow/scrollbar-gutter-vertical-rl-002.html [ Crash Failure ] +crbug.com/710214 [ Mac10.14 Release ] external/wpt/css/css-overflow/scrollbar-gutter-002.html [ Failure ] +crbug.com/710214 [ Mac10.15 Release ] external/wpt/css/css-overflow/scrollbar-gutter-002.html [ Failure ] +crbug.com/710214 [ Mac11 Release ] external/wpt/css/css-overflow/scrollbar-gutter-002.html [ Failure ] +crbug.com/710214 [ Mac11-arm64 Release ] external/wpt/css/css-overflow/scrollbar-gutter-002.html [ Failure ] +crbug.com/710214 [ Mac12 ] external/wpt/css/css-overflow/scrollbar-gutter-002.html [ Failure ] +crbug.com/710214 [ Mac12-arm64 Release ] external/wpt/css/css-overflow/scrollbar-gutter-002.html [ Failure ] +crbug.com/710214 [ Mac10.14 Release ] external/wpt/css/css-overflow/scrollbar-gutter-vertical-lr-002.html [ Failure ] +crbug.com/710214 [ Mac10.15 Release ] external/wpt/css/css-overflow/scrollbar-gutter-vertical-lr-002.html [ Failure ] +crbug.com/710214 [ Mac11 Release ] external/wpt/css/css-overflow/scrollbar-gutter-vertical-lr-002.html [ Failure ] +crbug.com/710214 [ Mac11-arm64 Release ] external/wpt/css/css-overflow/scrollbar-gutter-vertical-lr-002.html [ Failure ] +crbug.com/710214 [ Mac12 ] external/wpt/css/css-overflow/scrollbar-gutter-vertical-lr-002.html [ Failure ] +crbug.com/710214 [ Mac12-arm64 Release ] external/wpt/css/css-overflow/scrollbar-gutter-vertical-lr-002.html [ Failure ] +crbug.com/710214 [ Mac10.14 Release ] external/wpt/css/css-overflow/scrollbar-gutter-vertical-rl-002.html [ Crash Failure ] +crbug.com/710214 [ Mac10.15 Release ] external/wpt/css/css-overflow/scrollbar-gutter-vertical-rl-002.html [ Crash Failure ] +crbug.com/710214 [ Mac11 Release ] external/wpt/css/css-overflow/scrollbar-gutter-vertical-rl-002.html [ Crash Failure ] +crbug.com/710214 [ Mac11-arm64 Release ] external/wpt/css/css-overflow/scrollbar-gutter-vertical-rl-002.html [ Crash Failure ] +crbug.com/710214 [ Mac12 ] external/wpt/css/css-overflow/scrollbar-gutter-vertical-rl-002.html [ Crash Failure ] +crbug.com/710214 [ Mac12-arm64 Release ] external/wpt/css/css-overflow/scrollbar-gutter-vertical-rl-002.html [ Crash Failure ] crbug.com/1339525 [ Win ] external/wpt/css/css-shapes/shape-outside/values/shape-margin-001.html [ Failure Pass ] @@ -2081,7 +2100,7 @@ # Not yet investigated crbug.com/1404464 external/wpt/css/css-text/bidi/bidi-lines-002.html [ Failure ] crbug.com/1404467 external/wpt/css/css-text/letter-spacing/letter-spacing-ligatures-001.html [ Failure ] -crbug.com/1404467 external/wpt/css/css-text/letter-spacing/letter-spacing-ligatures-002.html [ Failure ] +crbug.com/1404467 [ Release Win ] external/wpt/css/css-text/letter-spacing/letter-spacing-ligatures-002.html [ Failure ] crbug.com/1404467 external/wpt/css/css-text/letter-spacing/letter-spacing-ligatures-003.html [ Failure ] crbug.com/1404466 external/wpt/css/css-text/line-breaking/line-breaking-022.html [ Failure ] crbug.com/1404466 external/wpt/css/css-text/line-breaking/line-breaking-023.html [ Failure ] @@ -2528,7 +2547,7 @@ crbug.com/1299212 crbug.com/1047176 fast/forms/suggestion-picker/datetimelocal-suggestion-picker-mouse-operations.html [ Failure Pass Timeout ] crbug.com/1299212 fast/forms/color-scheme/select/select-appearance-after-closing-popup.html [ Failure Pass Timeout ] crbug.com/1299212 fast/forms/color-scheme/select/select-popup-appearance-basic.html [ Failure Pass Timeout ] -crbug.com/1299212 fast/forms/select/menulist-popup-type-ahead-style-change.html [ Failure Pass Timeout ] +crbug.com/1299212 [ Mac ] fast/forms/select/menulist-popup-type-ahead-style-change.html [ Failure Pass Timeout ] crbug.com/1299212 fast/forms/calendar-picker/date-picker-choose-default-value-after-set-value.html [ Failure Pass ] crbug.com/1299212 fast/forms/calendar-picker/date-picker-input-change-events.html [ Crash Pass Timeout ] crbug.com/1299212 fast/forms/datetimelocal/datetimelocal-picker-input-change-events.html [ Crash Pass Timeout ] @@ -3011,6 +3030,7 @@ crbug.com/626703 [ Win ] virtual/partitioned-cookies/http/tests/inspector-protocol/network/disabled-cache-navigation.js [ Failure ] # ====== New tests from wpt-importer added here ====== +crbug.com/626703 [ Win11 ] external/wpt/html/semantics/forms/the-input-element/email-set-value.html [ Failure ] crbug.com/626703 [ Linux ] external/wpt/html/semantics/forms/the-input-element/email-set-value.html [ Failure ] crbug.com/626703 [ Mac10.15 ] external/wpt/html/semantics/forms/the-input-element/email-set-value.html [ Failure ] crbug.com/626703 [ Mac11 ] external/wpt/html/semantics/forms/the-input-element/email-set-value.html [ Failure ] @@ -3106,7 +3126,6 @@ crbug.com/626703 [ Linux ] wpt_internal/webxr/xrDevice_supportsSession_immersive.https.html [ Timeout ] crbug.com/626703 [ Linux ] wpt_internal/webxr/xrSession_dataProviderDisconnect_immersive.https.html [ Timeout ] crbug.com/626703 [ Linux ] wpt_internal/webxr/xrSession_environmentProviderDisconnect.https.html [ Timeout ] -crbug.com/626703 [ Linux ] wpt_internal/webxr/xrSession_framesThrottled.https.html [ Timeout ] crbug.com/626703 [ Mac11 ] external/wpt/fetch/private-network-access/iframe.tentative.https.window.html [ Timeout ] crbug.com/626703 [ Mac12 ] external/wpt/webrtc-encoded-transform/RTCPeerConnection-insertable-streams-video.https.html [ Timeout ] crbug.com/626703 [ Mac12 ] virtual/pending-beacon/external/wpt/pending-beacon/pending_beacon-sendonhidden.tentative.https.window.html [ Timeout ] @@ -3235,7 +3254,6 @@ crbug.com/626703 external/wpt/selection/textcontrols/selectionchange-bubble.html [ Timeout ] crbug.com/626703 external/wpt/density-size-correction/density-corrected-image-svg-aspect-ratio-cross-origin.sub.html [ Failure ] crbug.com/626703 external/wpt/density-size-correction/image-set-003.html [ Failure ] -crbug.com/626703 external/wpt/infrastructure/assumptions/non-local-ports.sub.window.html [ Timeout ] crbug.com/626703 external/wpt/webrtc-extensions/transfer-datachannel-service-worker.https.html [ Timeout ] crbug.com/626703 external/wpt/webrtc-extensions/transfer-datachannel.html [ Timeout ] crbug.com/626703 [ Win ] external/wpt/websockets/Create-blocked-port.any.worker.html?wpt_flags=h2 [ Failure Timeout ] @@ -4161,7 +4179,7 @@ # Tests using testRunner.useUnfortunateSynchronousResizeMode occasionally timeout, # but the test coverage is still good. -crbug.com/1021627 fast/dom/rtl-scroll-to-leftmost-and-resize.html [ Failure Pass Timeout ] +crbug.com/1021627 [ Mac ] fast/dom/rtl-scroll-to-leftmost-and-resize.html [ Failure Pass Timeout ] # Sheriff 2019-03-28 crbug.com/946711 http/tests/devtools/editor/text-editor-search-switch-editor.js [ Failure Pass ] @@ -4218,7 +4236,12 @@ crbug.com/978966 [ Mac ] paint/markers/ellipsis-mixed-text-in-ltr-flow-with-markers.html [ Failure Pass ] # Sheriff 2019-06-27 -crbug.com/979243 [ Mac ] editing/selection/inline-closest-leaf-child.html [ Failure Pass ] +crbug.com/979243 [ Mac10.14 Release ] editing/selection/inline-closest-leaf-child.html [ Failure Pass ] +crbug.com/979243 [ Mac10.15 Release ] editing/selection/inline-closest-leaf-child.html [ Failure Pass ] +crbug.com/979243 [ Mac11 Release ] editing/selection/inline-closest-leaf-child.html [ Failure Pass ] +crbug.com/979243 [ Mac11-arm64 Release ] editing/selection/inline-closest-leaf-child.html [ Failure Pass ] +crbug.com/979243 [ Mac12 ] editing/selection/inline-closest-leaf-child.html [ Failure Pass ] +crbug.com/979243 [ Mac12-arm64 Release ] editing/selection/inline-closest-leaf-child.html [ Failure Pass ] crbug.com/979336 [ Mac ] fast/dynamic/anonymous-block-orphaned-lines.html [ Failure Pass ] # Sheriff 2019-07-04 @@ -4474,7 +4497,12 @@ crbug.com/1131977 [ Mac ] http/tests/misc/hover-state-recomputed-on-main-frame.html [ Timeout ] ### sheriff 2020-03-03 -crbug.com/1058073 [ Mac ] http/tests/devtools/service-workers/sw-navigate-useragent.js [ Failure Pass ] +crbug.com/1058073 [ Mac10.14 Release ] http/tests/devtools/service-workers/sw-navigate-useragent.js [ Failure Pass ] +crbug.com/1058073 [ Mac10.15 Release ] http/tests/devtools/service-workers/sw-navigate-useragent.js [ Failure Pass ] +crbug.com/1058073 [ Mac11 Release ] http/tests/devtools/service-workers/sw-navigate-useragent.js [ Failure Pass ] +crbug.com/1058073 [ Mac11-arm64 Release ] http/tests/devtools/service-workers/sw-navigate-useragent.js [ Failure Pass ] +crbug.com/1058073 [ Mac12 ] http/tests/devtools/service-workers/sw-navigate-useragent.js [ Failure Pass ] +crbug.com/1058073 [ Mac12-arm64 Release ] http/tests/devtools/service-workers/sw-navigate-useragent.js [ Failure Pass ] crbug.com/1058137 virtual/threaded/http/tests/devtools/tracing/timeline-paint/timeline-paint.js [ Failure Pass ] # Ecosystem-Infra Sheriff 2020-03-04 @@ -4781,7 +4809,12 @@ crbug.com/1065085 external/wpt/html/webappapis/user-prompts/cannot-show-simple-dialogs/prompt-different-origin-frame.sub.html [ Failure ] # Sheriff 2021-01-27 -crbug.com/1171331 [ Mac ] tables/mozilla_expected_failures/bugs/bug89315.html [ Failure Pass ] +crbug.com/1171331 [ Mac10.14 Release ] tables/mozilla_expected_failures/bugs/bug89315.html [ Failure Pass ] +crbug.com/1171331 [ Mac10.15 Release ] tables/mozilla_expected_failures/bugs/bug89315.html [ Failure Pass ] +crbug.com/1171331 [ Mac11 Release ] tables/mozilla_expected_failures/bugs/bug89315.html [ Failure Pass ] +crbug.com/1171331 [ Mac11-arm64 Release ] tables/mozilla_expected_failures/bugs/bug89315.html [ Failure Pass ] +crbug.com/1171331 [ Mac12 ] tables/mozilla_expected_failures/bugs/bug89315.html [ Failure Pass ] +crbug.com/1171331 [ Mac12-arm64 Release ] tables/mozilla_expected_failures/bugs/bug89315.html [ Failure Pass ] # flaky test crbug.com/1173956 http/tests/xsl/xslt-transform-with-javascript-disabled.html [ Failure Pass ] @@ -5159,8 +5192,8 @@ crbug.com/1048761 [ Win ] external/wpt/websockets/interfaces/WebSocket/send/006.html?wpt_flags=h2 [ Failure ] # Sheriff on 2021-05-26 -crbug.com/1213322 [ Mac ] external/wpt/css/css-values/minmax-percentage-serialize.html [ Failure Pass ] -crbug.com/1213322 [ Mac ] external/wpt/html/browsers/the-window-object/named-access-on-the-window-object/window-named-properties.html [ Failure Pass ] +crbug.com/1213322 [ Mac10.14 Release ] external/wpt/css/css-values/minmax-percentage-serialize.html [ Failure Pass ] +crbug.com/1213322 [ Mac10.14 Release ] external/wpt/html/browsers/the-window-object/named-access-on-the-window-object/window-named-properties.html [ Failure Pass ] # Do not retry slow tests that also timeouts crbug.com/1210687 [ Mac10.15 ] fast/events/open-window-from-another-frame.html [ Pass Timeout ] @@ -5297,7 +5330,8 @@ crbug.com/1239175 http/tests/navigation/same-and-different-back.html [ Failure Pass ] crbug.com/1239164 http/tests/inspector-protocol/network/navigate-iframe-in2in.js [ Failure Pass ] crbug.com/1237909 external/wpt/webrtc-svc/RTCRtpParameters-scalability.html [ Crash Failure Pass Timeout ] -crbug.com/1237909 [ Mac ] external/wpt/webrtc-svc/RTCRtpParameters-scalability-h264.html [ Crash Pass Timeout ] +crbug.com/1237909 [ Mac11-arm64 Release ] external/wpt/webrtc-svc/RTCRtpParameters-scalability-h264.html [ Crash Pass Timeout ] +crbug.com/1237909 [ Mac12-arm64 Release ] external/wpt/webrtc-svc/RTCRtpParameters-scalability-h264.html [ Crash Pass Timeout ] # Sheriff 2021-08-19 crbug.com/1234315 [ Mac ] virtual/threaded/external/wpt/animation-worklet/worklet-animation-with-scroll-timeline-and-overflow-hidden.https.html [ Failure Timeout ] @@ -5460,27 +5494,17 @@ crbug.com/1378476 [ Mac12-arm64 ] compositing/webgl/* [ Crash Failure ] crbug.com/1378476 [ Mac11-arm64 ] compositing/webgl/* [ Crash Failure ] crbug.com/1378476 [ Mac12-arm64 ] external/wpt/html/canvas/offscreen/manual/the-offscreen-canvas/offscreencanvas.getcontext.html [ Crash Failure ] -crbug.com/1378476 [ Mac11-arm64 ] external/wpt/html/canvas/offscreen/manual/the-offscreen-canvas/offscreencanvas.getcontext.html [ Crash Failure ] crbug.com/1378476 [ Mac12-arm64 ] external/wpt/html/canvas/offscreen/manual/the-offscreen-canvas/offscreencanvas.getcontext.worker.html [ Crash Failure ] -crbug.com/1378476 [ Mac11-arm64 ] external/wpt/html/canvas/offscreen/manual/the-offscreen-canvas/offscreencanvas.getcontext.worker.html [ Crash Failure ] crbug.com/1378476 [ Mac12-arm64 ] external/wpt/html/canvas/offscreen/manual/the-offscreen-canvas/offscreencanvas.transfer.to.imagebitmap.html [ Crash Failure ] -crbug.com/1378476 [ Mac11-arm64 ] external/wpt/html/canvas/offscreen/manual/the-offscreen-canvas/offscreencanvas.transfer.to.imagebitmap.html [ Crash Failure ] crbug.com/1378476 [ Mac12-arm64 ] external/wpt/html/canvas/offscreen/manual/the-offscreen-canvas/offscreencanvas.transfer.to.imagebitmap.w.html [ Crash Failure ] crbug.com/1378476 [ Mac11-arm64 ] external/wpt/html/canvas/offscreen/manual/the-offscreen-canvas/offscreencanvas.transfer.to.imagebitmap.w.html [ Crash Failure ] crbug.com/1378476 [ Mac12-arm64 ] external/wpt/html/canvas/offscreen/manual/the-offscreen-canvas/offscreencanvas.transferrable.w.html [ Crash Failure ] -crbug.com/1378476 [ Mac11-arm64 ] external/wpt/html/canvas/offscreen/manual/the-offscreen-canvas/offscreencanvas.transferrable.w.html [ Crash Failure ] crbug.com/1378476 [ Mac12-arm64 ] external/wpt/paint-timing/with-first-paint/first-contentful-canvas-webgl2.html [ Crash Failure ] -crbug.com/1378476 [ Mac11-arm64 ] external/wpt/paint-timing/with-first-paint/first-contentful-canvas-webgl2.html [ Crash Failure ] crbug.com/1378476 [ Mac12-arm64 ] external/wpt/pointerevents/coalesced_events_attributes_under_load.html?touch [ Crash Failure ] -crbug.com/1378476 [ Mac11-arm64 ] external/wpt/pointerevents/coalesced_events_attributes_under_load.html?touch [ Crash Failure ] crbug.com/1378476 [ Mac12-arm64 ] external/wpt/video-rvfc/request-video-frame-callback-before-xr-session.https.html [ Crash Failure ] -crbug.com/1378476 [ Mac11-arm64 ] external/wpt/video-rvfc/request-video-frame-callback-before-xr-session.https.html [ Crash Failure ] crbug.com/1378476 [ Mac12-arm64 ] external/wpt/video-rvfc/request-video-frame-callback-during-xr-session.https.html [ Crash Failure ] -crbug.com/1378476 [ Mac11-arm64 ] external/wpt/video-rvfc/request-video-frame-callback-during-xr-session.https.html [ Crash Failure ] crbug.com/1378476 [ Mac12-arm64 ] external/wpt/webcodecs/videoFrame-texImage.any.html [ Crash Failure ] -crbug.com/1378476 [ Mac11-arm64 ] external/wpt/webcodecs/videoFrame-texImage.any.html [ Crash Failure ] crbug.com/1378476 [ Mac12-arm64 ] external/wpt/webcodecs/videoFrame-texImage.any.worker.html [ Crash Failure ] -crbug.com/1378476 [ Mac11-arm64 ] external/wpt/webcodecs/videoFrame-texImage.any.worker.html [ Crash Failure ] crbug.com/1378476 [ Mac12-arm64 ] external/wpt/webxr/* [ Crash Failure ] crbug.com/1378476 [ Mac11-arm64 ] external/wpt/webxr/* [ Crash Failure ] crbug.com/1378476 [ Mac12-arm64 ] fast/arraybuffer/webgl2_size_check.html [ Crash Failure ] @@ -5614,7 +5638,7 @@ # Sheriff 2021-10-05 crbug.com/1256755 http/tests/xmlhttprequest/cross-origin-unsupported-url.html [ Failure Pass ] -crbug.com/1256770 [ Mac ] svg/dynamic-updates/SVGFEComponentTransferElement-dom-intercept-attr.html [ Failure Pass ] +crbug.com/1256770 [ Debug Mac12 ] svg/dynamic-updates/SVGFEComponentTransferElement-dom-intercept-attr.html [ Failure Pass ] # Disabled to allow devtools-frontend roll crbug.com/1258618 virtual/portals/http/tests/devtools/portals/portals-elements-nesting-after-adoption.js [ Crash Failure Pass Timeout ] @@ -5671,7 +5695,7 @@ crbug.com/1272352 virtual/threaded/http/tests/devtools/isolated-code-cache/stale-revalidation-test.js [ Failure Pass Timeout ] # Flaky on mac -crbug.com/1263709 [ Mac ] http/tests/devtools/elements/node-xpath.js [ Failure ] +crbug.com/1263709 [ Mac10.14 Release ] http/tests/devtools/elements/node-xpath.js [ Failure ] # Flaky on Mac and Windows crbug.com/1272199 external/wpt/websockets/stream/tentative/backpressure-receive.any.serviceworker.html?wpt_flags=h2 [ Failure Pass ] @@ -5711,7 +5735,7 @@ crbug.com/1276201 [ Mac ] external/wpt/html/browsers/the-window-object/open-close/open-features-tokenization-screenx-screeny.html [ Crash Failure Pass Timeout ] crbug.com/1276201 [ Mac ] external/wpt/html/browsers/the-window-object/open-close/open-features-tokenization-innerheight-innerwidth.html [ Crash Failure Pass Timeout ] crbug.com/1276201 [ Mac ] external/wpt/html/browsers/the-window-object/open-close/open-features-tokenization-width-height.html [ Crash Failure Pass Timeout ] -crbug.com/1275967 [ Linux ] external/wpt/permissions-policy/permissions-policy-frame-policy-timing.https.sub.html [ Failure Pass ] +crbug.com/1275967 [ Debug Linux ] external/wpt/permissions-policy/permissions-policy-frame-policy-timing.https.sub.html [ Failure Pass ] crbug.com/1276207 virtual/gpu-rasterization/images/color-profile-image-object-fit.html [ Failure Pass ] crbug.com/1276290 [ Mac ] wpt_internal/mediastream/mediastreamtrackprocessor-transfer-to-worker.html [ Crash Failure Pass Timeout ] @@ -5781,12 +5805,12 @@ # Sheriff 2022-02-01 # Flaky test on Mac -crbug.com/1292843 [ Mac ] external/wpt/css/css-transforms/animation/perspective-origin-interpolation.html [ Failure Pass ] -crbug.com/1292865 [ Mac ] external/wpt/resource-timing/iframe-sequence-of-events.html [ Failure Pass ] -crbug.com/1292869 [ Mac ] external/wpt/webaudio/the-audio-api/the-audioparam-interface/audioparam-cancel-and-hold.html [ Failure Pass ] -crbug.com/1292871 [ Mac ] external/wpt/webaudio/the-audio-api/the-audioparam-interface/k-rate-dynamics-compressor-connections.html [ Failure Pass ] +crbug.com/1292843 [ Mac11-arm64 Release ] external/wpt/css/css-transforms/animation/perspective-origin-interpolation.html [ Failure Pass ] +crbug.com/1292865 [ Mac11-arm64 Release ] external/wpt/resource-timing/iframe-sequence-of-events.html [ Failure Pass ] +crbug.com/1292869 [ Mac11-arm64 Release ] external/wpt/webaudio/the-audio-api/the-audioparam-interface/audioparam-cancel-and-hold.html [ Failure Pass ] +crbug.com/1292871 [ Mac11-arm64 Release ] external/wpt/webaudio/the-audio-api/the-audioparam-interface/k-rate-dynamics-compressor-connections.html [ Failure Pass ] crbug.com/1292873 [ Mac ] html/selectmenu/selectmenu-slot-warning-button.html [ Failure Pass ] -crbug.com/1292874 [ Mac ] html/selectmenu/selectmenu-slot-warning-listbox.html [ Failure Pass ] +crbug.com/1292874 [ Debug Mac12 ] html/selectmenu/selectmenu-slot-warning-listbox.html [ Failure Pass ] crbug.com/1292876 [ Mac ] http/tests/devtools/console/console-time.js [ Failure Pass ] crbug.com/1038139 [ Linux ] virtual/gpu-rasterization/images/2-comp.html [ Failure Pass ] @@ -5885,11 +5909,14 @@ crbug.com/1309756 [ Mac11-arm64 ] http/tests/images/force-reload-image-document.html [ Crash Failure Pass Timeout ] # Sheriff 2022-03-25 -crbug.com/1197296 [ Linux ] virtual/unified-autoplay/external/wpt/feature-policy/feature-policy-frame-policy-timing.https.sub.html [ Failure Pass ] -crbug.com/1197296 [ Linux ] external/wpt/feature-policy/feature-policy-frame-policy-timing.https.sub.html [ Failure Pass ] +crbug.com/1197296 [ Debug Linux ] virtual/unified-autoplay/external/wpt/feature-policy/feature-policy-frame-policy-timing.https.sub.html [ Failure Pass ] +crbug.com/1197296 [ Debug Linux ] external/wpt/feature-policy/feature-policy-frame-policy-timing.https.sub.html [ Failure Pass ] # Sheriff 2022-03-28 -crbug.com/1311015 [ Mac ] external/wpt/paint-timing/fcp-only/fcp-document-opacity-image.html [ Failure Pass ] +crbug.com/1311015 [ Mac10.13 Release ] external/wpt/paint-timing/fcp-only/fcp-document-opacity-image.html [ Failure Pass ] +crbug.com/1311015 [ Mac10.14 Release ] external/wpt/paint-timing/fcp-only/fcp-document-opacity-image.html [ Failure Pass ] +crbug.com/1311015 [ Mac10.15 Release ] external/wpt/paint-timing/fcp-only/fcp-document-opacity-image.html [ Failure Pass ] +crbug.com/1311015 [ Mac11-arm64 Release ] external/wpt/paint-timing/fcp-only/fcp-document-opacity-image.html [ Failure Pass ] crbug.com/1311128 external/wpt/paint-timing/fcp-only/fcp-document-opacity-text.html [ Crash Failure Pass Timeout ] # Scroll Unification known issues (go/su-web-tests) for enabling in test: @@ -5914,7 +5941,8 @@ crbug.com/1314130 [ Mac ] fast/events/touch/gesture/touch-gesture-scroll-listbox.html [ Failure Pass ] # Sheriff 2022-04-07 -crbug.com/1314314 virtual/percent-based-scrolling/fast/scrolling/scrollbars/mouse-autoscrolling-on-deleted-scrollbar.html [ Crash Failure Pass Timeout ] +crbug.com/1314314 [ Linux ] virtual/percent-based-scrolling/fast/scrolling/scrollbars/mouse-autoscrolling-on-deleted-scrollbar.html [ Crash Failure Pass Timeout ] +crbug.com/1314314 [ Release Win ] virtual/percent-based-scrolling/fast/scrolling/scrollbars/mouse-autoscrolling-on-deleted-scrollbar.html [ Crash Failure Pass Timeout ] crbug.com/1314323 [ Win ] virtual/compositor-threaded-percent-based-scrolling/fast/scrolling/wheel-scrolling-over-custom-scrollbar.html [ Crash Failure Pass Timeout ] # Sheriff 2022-04-08 @@ -6006,7 +6034,9 @@ crbug.com/1322405 virtual/plz-dedicated-worker/external/wpt/fetch/metadata/generated/window-history.https.sub.html [ Pass Timeout ] # Sheriff 2022-05-06 -crbug.com/1322072 external/wpt/fetch/content-type/script.window.html [ Failure Pass ] +crbug.com/1322072 [ Mac10.13 Release ] external/wpt/fetch/content-type/script.window.html [ Failure Pass ] +crbug.com/1322072 [ Mac10.14 Release ] external/wpt/fetch/content-type/script.window.html [ Failure Pass ] +crbug.com/1322072 [ Mac10.15 Release ] external/wpt/fetch/content-type/script.window.html [ Failure Pass ] crbug.com/1286883 [ Mac ] fast/canvas/OffscreenCanvas-Bitmaprenderer-toBlob.html [ Failure Pass ] # Sheriff 2022-05-11
diff --git a/third_party/blink/web_tests/external/WPT_BASE_MANIFEST_8.json b/third_party/blink/web_tests/external/WPT_BASE_MANIFEST_8.json index 67ba6b782..594f02ba 100644 --- a/third_party/blink/web_tests/external/WPT_BASE_MANIFEST_8.json +++ b/third_party/blink/web_tests/external/WPT_BASE_MANIFEST_8.json
@@ -261383,11 +261383,11 @@ "support": { ".cache": { "gitignore2.json": [ - "08ada8d46d4c8b1ea592c9454d9818f94f5b3090", + "dd9a02a4f116350a9320b78a6d6a27f08f620a7c", [] ], "mtime.json": [ - "542b0b0e28a89fdf5b8bfcdbefdb6b414fa6a10f", + "646e234379ef91adb262f37741968b60af50d00b", [] ] }, @@ -261605,8 +261605,12 @@ "19732b3c16a8f3a47c2cae40cc2e2f8b74b74d8b", [] ], - "url-lifetime.html.ini": [ - "3e6ab19ca17f6d77be657f4451f7793fdbb719ad", + "url-charset.window.js.ini": [ + "bf7e035b0f4fe29c89de1cb228abd31ce882e4ec", + [] + ], + "url-in-tags-revoke.window.js.ini": [ + "20ae216a3ddb82f8f03192c8e6af7e5b1af1056c", [] ], "url-reload.window-expected.txt": [ @@ -261648,6 +261652,10 @@ "e9ec6bf98544bbbf3bf03b0aca3ccbfdef063eb6", [] ], + "bindings-inject-values-bypass-chain.html.ini": [ + "ab75b1b8be2142a31c2653c6cbef5204d9df5c75", + [] + ], "database-names-by-origin.html.ini": [ "21e89fe0a7caf86946c6fe5d345b6fb4b68defa9", [] @@ -264035,7 +264043,7 @@ [] ], "storage.https.html.ini": [ - "bd565d8eade647b149ffc6254017f5c2c88bdb29", + "f0ade331bd10269e366b877fc6be58ecaca77bb3", [] ], "support": { @@ -265809,6 +265817,10 @@ "d11fb83aa3df46da56f4a1bee0616b89f128bae0", [] ], + "frame-ancestors-nested-cross-in-same-url-block.html.ini": [ + "8d9f7acc9b0e0510628043e99a198292299ec53f", + [] + ], "support": { "content-security-policy-report-only.sub.html": [ "c8317b91cf76047a251828029b4dbe2dd99ce241", @@ -266592,7 +266604,7 @@ [] ], "sharedworker-import.https.html.ini": [ - "0a36cef54c837b264728708b6b0c9751a528ff16", + "9f9d6f647b8b4bc9fd690db2b2bbed3592fbf7c3", [] ], "worker-import.http-expected.txt": [ @@ -268082,8 +268094,16 @@ "2f130b5c296b494ba9f39dc632959496c37137bd", [] ], + "cookieListItem_attributes.https.any.js.ini": [ + "d9dec7c6f42d65f9c554e55177781b9c0dfa268b", + [] + ], + "cookieStore_set_arguments.https.any.js.ini": [ + "f613706ffed075c9425b07623d20296be344717a", + [] + ], "cookieStore_subscribe_arguments.https.any.js.ini": [ - "41b23796c7a433ef9bb7fb18bcf4fac1da67baf3", + "34953177ddb91440b621909d3ad37e0484da5a0a", [] ], "resources": { @@ -268563,7 +268583,7 @@ ] }, "fedcm-network-requests.https.html.ini": [ - "14f5926ca2a04ae196d5790b037cc2bf662c9b2a", + "f41f6de6f2d1380d6ce9fdaf49ddfeff3040ea51", [] ], "federatedcredential-framed-get.sub.https-expected.txt": [ @@ -271441,7 +271461,7 @@ [] ], "float-nowrap-3-ref.html.ini": [ - "7aafc872267ce5394a828408cbac9c6b06b73bc6", + "d235fbd2179b49b8b0d14cd1b7a6f07b31414e29", [] ], "float-nowrap-3.html.ini": [ @@ -277186,18 +277206,34 @@ "785880543878eebbb3db60db0488c693cba51fa7", [] ], + "align-tracks-computed-expected.txt": [ + "6f5ea85ba016648d5f8a31f85ab17f6c6353b973", + [] + ], "align-tracks-computed.html.ini": [ "e63929a5b30c661a0e3a733f65dc0fb908bf9b0a", [] ], + "align-tracks-valid-expected.txt": [ + "6fa0052fba6847c96343ea002d1cc0eeb9c7285f", + [] + ], "align-tracks-valid.html.ini": [ "cbe763cc1513a353160d85bb7560fd4ddc5a6761", [] ], + "justify-tracks-computed-expected.txt": [ + "7d81e3ffc77d6516f3848f3695703fe00a7df721", + [] + ], "justify-tracks-computed.html.ini": [ "c5b835863d7d9c1669c1e684a3cbe531d5548d4d", [] ], + "justify-tracks-valid-expected.txt": [ + "d2f4a190e0abaaaeaed9119878adddbdd8a314bd", + [] + ], "justify-tracks-valid.html.ini": [ "641b10fa7bddbfb9f4054ba0272017ffe475813c", [] @@ -301443,7 +301479,7 @@ [] ], "Initial-letter-breaking-rtl.html.ini": [ - "46ebc05b8e015794e21ad5efbbb278c2a1c4a978", + "9451204c3f8e54260349e0a2b1aaf03911bce7bd", [] ], "Initial-letter-breaking-vlr-ref.html": [ @@ -301451,7 +301487,7 @@ [] ], "Initial-letter-breaking-vlr.html.ini": [ - "0a5f574510cb5f345a90739935b5e98b45045d91", + "eb1934959aac2f6cb97b9e30c1779095f18306f6", [] ], "Initial-letter-breaking-vrl-ref.html": [ @@ -301459,7 +301495,7 @@ [] ], "Initial-letter-breaking-vrl.html.ini": [ - "e5040afd3078b86080090466669e3b0db6411fad", + "5e2b2a74cc4d9e4f8705bcd7b03560faf6b02136", [] ], "Initial-letter-breaking.html.ini": [ @@ -301475,7 +301511,7 @@ [] ], "initial-letter-block-position-drop-over-ruby-tall.html.ini": [ - "c971ae336f29936e17db2f18d4d396216a7c1f69", + "6c2775276ea718ec41d046d428e706a9d6b35dfa", [] ], "initial-letter-block-position-drop-over-ruby.html.ini": [ @@ -301491,11 +301527,11 @@ [] ], "initial-letter-block-position-drop-under-ruby-tall.html.ini": [ - "8a8fc7e35d6c2844ddcb99c6fb2a940718703711", + "38527a1d13f5fb3341c71066d7067a196d846034", [] ], "initial-letter-block-position-drop-under-ruby.html.ini": [ - "0cde71b8671f96fb1bf248107ba2b6ac54e7b44f", + "7357bcde9dde90a385361409acfd96ede1c811ef", [] ], "initial-letter-block-position-margins-ref.html": [ @@ -301515,7 +301551,7 @@ [] ], "initial-letter-block-position-margins-vlr.html.ini": [ - "7634056a1e6ca0245394199993d863525e382431", + "42eebbaaf54f98d3f17fa9d2bc36d703e934af17", [] ], "initial-letter-block-position-margins-vrl-ref.html": [ @@ -301543,7 +301579,7 @@ [] ], "initial-letter-block-position-raise-over-ruby.html.ini": [ - "222f169ade480a02df5c82b976fa48ae818f4d4e", + "d0e63cbe55940c116e42193bc820d14f37b81d4d", [] ], "initial-letter-block-position-raise-under-ruby-ref.html": [ @@ -301555,7 +301591,7 @@ [] ], "initial-letter-block-position-raise-under-ruby-tall.html.ini": [ - "60f3521d23121d823dd9aa9651134b35bc1ba7ef", + "9de6f5239f65c9b9304e7e3cde450b6955382295", [] ], "initial-letter-block-position-raise-under-ruby.html.ini": [ @@ -301575,7 +301611,7 @@ [] ], "initial-letter-drop-initial-rtl.html.ini": [ - "87b705faac38dfa92828e92d52e4453959c7db5f", + "78b44088d937d10093ff2f6ee912ace65c88a3ee", [] ], "initial-letter-drop-initial-vlr-ref.html": [ @@ -301583,7 +301619,7 @@ [] ], "initial-letter-drop-initial-vlr.html.ini": [ - "984123ce1ba95aaa082597019805d29f51c77e3b", + "1e3e90322b20750c45315a4553d727d330e621e8", [] ], "initial-letter-drop-initial-vrl-ref.html": [ @@ -301595,7 +301631,7 @@ [] ], "initial-letter-drop-initial.html.ini": [ - "bda49d3ccb569063ca848311b14c11d0f95c0743", + "497ccbc87b10a361c6b9e430069b7a98ab683bcf", [] ], "initial-letter-float-001-ref.html": [ @@ -301607,7 +301643,7 @@ [] ], "initial-letter-float-001-rtl.html.ini": [ - "339ba097181503a01941c72029c50429997669b5", + "d350ddf83f1e17d4136d8752eb9a1968572ec2f3", [] ], "initial-letter-float-001-vlr-ref.html": [ @@ -301623,7 +301659,7 @@ [] ], "initial-letter-float-001-vrl.html.ini": [ - "a18c5464f5026e45a21f831363c83c8eca388b34", + "ff51dd5cdcff0bccc5d40823c59f455f9227ecb4", [] ], "initial-letter-float-001.html.ini": [ @@ -301659,7 +301695,7 @@ [] ], "initial-letter-float-005.html.ini": [ - "e71bd47b8463f6d2fc0774151440f4a915526894", + "3a202330395249fa458027618aae33361521910f", [] ], "initial-letter-indentation-ref.html": [ @@ -301675,7 +301711,7 @@ [] ], "initial-letter-indentation.html.ini": [ - "fa4f632920609af9da9d8b38fd9c3ed74962f7b9", + "b5046078b3627326c5ffdfe3c77ce849d4445dbe", [] ], "initial-letter-layout-text-decoration-underline-ref.html": [ @@ -301695,7 +301731,7 @@ [] ], "initial-letter-raise-initial-rtl.html.ini": [ - "d4d53907e2d301f6ad68a0fe340c7140c809eadb", + "518607759b544245fcf09960370b14928f1905dc", [] ], "initial-letter-raise-initial-vlr-ref.html": [ @@ -301723,7 +301759,7 @@ [] ], "initial-letter-raised-sunken-caps-raise.html.ini": [ - "20d257d084d1c674f557b5675678b67b2cef6e2e", + "56b3ed619093439c9fb4fcb32570ff49c56afd09", [] ], "initial-letter-raised-sunken-caps-sunken-ref.html": [ @@ -301731,7 +301767,7 @@ [] ], "initial-letter-raised-sunken-caps-sunken.html.ini": [ - "0c64a2fddcfde3da4a10a9ed49a4be090dade4ea", + "b0631f923a6cf89fe35ed7628a5a15b4d75443bf", [] ], "initial-letter-short-para-initial-letter-clears-ref.html": [ @@ -301739,7 +301775,7 @@ [] ], "initial-letter-short-para-initial-letter-clears.html.ini": [ - "7ae823d44f2b8fe3fc776229d802cf97155bb4ba", + "b6d8780a6fb98b2d3c88d923e00bf6e18130c930", [] ], "initial-letter-short-para-initial-letter-wraps-ref.html": [ @@ -301747,7 +301783,7 @@ [] ], "initial-letter-short-para-initial-letter-wraps.html.ini": [ - "f6b2dff151eef1ae4b8f6dcbd82438d80aed3abf", + "322c6d7af1b0763dff3d28573395ad1007c14fee", [] ], "initial-letter-sunk-initial-ref.html": [ @@ -301759,7 +301795,7 @@ [] ], "initial-letter-sunk-initial-rtl.html.ini": [ - "71d972f6af307fd68e803bf9248816d8f321f855", + "a303baa7f4f2a3c3c2cfde888f63771d064fcaed", [] ], "initial-letter-sunk-initial-vlr-ref.html": [ @@ -301767,7 +301803,7 @@ [] ], "initial-letter-sunk-initial-vlr.html.ini": [ - "63edb9daefeaa31d03daeaadcb51df9c06d934a9", + "82403e6cdd18b0ebec9a7c35b1b47fc6b75784e1", [] ], "initial-letter-sunk-initial-vrl-ref.html": [ @@ -301775,7 +301811,7 @@ [] ], "initial-letter-sunk-initial-vrl.html.ini": [ - "77a501b58596bd661170dd5bd74ceaac0d7c228d", + "145423c11791d55ae88c994d027a2d62c7a4c7e1", [] ], "initial-letter-sunk-initial.html.ini": [ @@ -301791,7 +301827,7 @@ [] ], "initial-letter-with-first-line.html.ini": [ - "7f69acbb5b8b735f2cc960f4832090c3f085738a", + "56e94a8670efbccb3863be467419c218b0835400", [] ], "initial-letter-with-tab-ref.html": [ @@ -301807,7 +301843,7 @@ [] ], "initial-letter-with-tab.html.ini": [ - "f5d901abf3445f2afae935465204fbd3edb613d1", + "50911265f400c0642670afd19b2c58a309ac2678", [] ] }, @@ -317032,10 +317068,6 @@ "c06d2b0fcf72d84e5512352f5f74279544c73498", [] ], - "text-transform-capitalize-007.html.ini": [ - "4dd4f078df482979aef56a6f67251ad514fe3ad0", - [] - ], "text-transform-capitalize-010.html.ini": [ "892a514c8de51b620ba30af9b89244aaa370327e", [] @@ -325292,7 +325324,7 @@ [] ], "text-overflow-015.html.ini": [ - "f2a3668f2f1e3788b08f3775a1cd2b67d9b5c027", + "ad294fc42685c3ece5460680adb52397a6de770a", [] ], "text-overflow-017.html.ini": [ @@ -332833,7 +332865,7 @@ [] ], "has-complexity.html.ini": [ - "abe15aeacde200f0388f4f5429cb6dcc5498773e", + "c58a580bf38b9de40c071eeffddf9a7a42280983", [] ], "logical-combinations-in-has-expected.txt": [ @@ -333618,7 +333650,7 @@ [] ], "ElementInternals-validation-expected.txt": [ - "ed5a28ed1e0622c5fb7749d1ed189191ed746998", + "f1a880c5be7fa54fb6e31b0e1ee50823e08b0111", [] ], "ElementInternals-validation.html.ini": [ @@ -333724,10 +333756,6 @@ "ccbf58c940db4432178d3cd3b9077feeb0bcd910", [] ], - "throw-on-dynamic-markup-insertion-counter-construct.html.ini": [ - "c55cfb33c1674b547d2d3c0e1a9f5d4f60fa8897", - [] - ], "throw-on-dynamic-markup-insertion-counter-reactions-xml-parser-expected.txt": [ "dbabad2b149e08983eaea6654b3aad53351d4b2c", [] @@ -335249,8 +335277,8 @@ "2657bb761955202e50cd65f00431fdc415a09eb3", [] ], - "Range-mutations-dataChange.html.ini": [ - "7158a50a34d3428f41cd3a6672018936c2c3c088", + "Range-mutations-deleteData.html.ini": [ + "8a4d2feb07a10de291aaf74a7996c09fef195942", [] ], "Range-mutations-insertData.html.ini": [ @@ -337301,7 +337329,7 @@ "legacy-mb-japanese": { "euc-jp": { "eucjp-decode.html.ini": [ - "de9286bf0bdf3273f3a741fa128d80a7e5b72762", + "db39b753038645dca84a2a47ec6bc6ffa68765bd", [] ], "eucjp-decoder.js": [ @@ -337313,7 +337341,7 @@ [] ], "eucjp-encode-form-cseucpkdfmtjapanese.html.ini": [ - "8ea50943215a5de991e38f6339577540715953a2", + "f5c8ad37ff922fadcd7230d2bbd2eda62083ad97", [] ], "eucjp-encode-form-errors-han.html.headers": [ @@ -337344,10 +337372,6 @@ "9a64388b411ed15ffe4db2502d486609c0fbb055", [] ], - "eucjp-encode-href-errors-han.html.ini": [ - "6d63d06811a685ea1c830840abd3bec9b98fab91", - [] - ], "eucjp-encode-href-errors-hangul.html.headers": [ "9a64388b411ed15ffe4db2502d486609c0fbb055", [] @@ -337501,7 +337525,7 @@ [] ], "sjis-decode-ms_kanji.html.ini": [ - "e96013683378ebbd4203b9d0442316885510636b", + "712808c111cba2f3df208d8b4013b6efa2e7cd88", [] ], "sjis-decoder.js": [ @@ -338175,7 +338199,7 @@ [] ], "unsupported-labels.window.js.ini": [ - "72fcc23679cf61018636461a1d65bf7ad76b30fe", + "0ee7bbb8b865238b9135b6666a8d9ccba375d66b", [] ] }, @@ -338296,10 +338320,6 @@ "b2249939b4269f855d5fb8de18b8d2a867e27afa", [] ], - "pl-windows-1250-late.tentative.html.ini": [ - "dc3210e7b8a707f0a03da3eed7e90d784f4d2bd0", - [] - ], "support": { "__dir__.headers": [ "a50d2c8454fd943a3e26a80398ad11e8fa9e9551", @@ -338430,6 +338450,10 @@ [] ] }, + "th-windows-874-late.tentative.html.ini": [ + "44e3b0314125ad46b0f0ef25b891312620da1afe", + [] + ], "tr-windows-1254-late.tentative.html.ini": [ "e9578ecf3f7c336d7bdac27c039a3923711e8a32", [] @@ -341518,6 +341542,10 @@ "be183287eb3b80035a7bb3d1a3843fce41ffe7d5", [] ], + "window-history.https.sub.html.ini": [ + "961d7a601bc2ef54d8e3115a857147c8fcc31286", + [] + ], "worker-dedicated-constructor.sub.html.ini": [ "da6289c1350e26985fe621228331fbcfb802ce0d", [] @@ -342072,11 +342100,7 @@ ] }, "service-worker-background-fetch.https.window.js.ini": [ - "a5d4b8f638c4a46feb13700b68314204bb0d23a0", - [] - ], - "service-worker-fetch.https.window.js.ini": [ - "eaa7acf656311a660b824eedda6b958feb5d0e34", + "1bd4cb760c8eff199744929d0616b9d78d4da114", [] ], "shared-worker.window.js.ini": [ @@ -342409,7 +342433,7 @@ [] ], "focus-already-focused-iframe-same-site.html.ini": [ - "c8cb0f97f7b02f70990a80ee9fe25f1d9b8db7a2", + "4f0bb0ce512506e160d3de8c8bdf6bbc231d11df", [] ], "focus-event-after-focusing-iframes-expected.txt": [ @@ -342441,7 +342465,7 @@ [] ], "focus-restoration-in-different-site-iframes.html.ini": [ - "f68eda98e54c537337b58f6f2dd82f4a07c87a4b", + "ad6f99995d1cdeedf5550c03e45987d9d6929f10", [] ], "focus-restoration-in-same-site-iframes-window-expected.txt": [ @@ -344848,7 +344872,7 @@ [] ], "embedding.tentative.https.window.js.ini": [ - "2df9e267cafeb8c85d341025ed2dd50766978154", + "06a4cb9c0ce2e7e47dc74731eb71138a579237c9", [] ], "fenced-frame-bypass.tentative.https.window-expected.txt": [ @@ -346195,6 +346219,10 @@ "78547019f3a43b3a318618a9221dd23283cd78a8", [] ], + "history_back_cross_realm_method.html.ini": [ + "04556407ba4228d1da303d89d1daa73ed220f69b", + [] + ], "history_entry.html": [ "e5929ddbe84389641a083f29057a3ea7b9f5076b", [] @@ -346712,6 +346740,10 @@ "25b59d55b3ff51436b120a4cfef4fdcd600385c8", [] ], + "parent-no-child-yeswithparams-subdomain.sub.https.html.ini": [ + "b8908297e24c4d3e50da801af46e51367b87b640", + [] + ], "parent-yes-child-no-port.sub.https.html.headers": [ "79a20f30fc0f486014c8b93edef7483605101504", [] @@ -346725,7 +346757,7 @@ [] ], "parent-yes-child-no-same.sub.https.html.ini": [ - "2066f0aa9ca91dd53bc2d525ebcf3a6e723370e7", + "c5662b40305800686cf263cc61750628ee4e991c", [] ], "parent-yes-child-no-subdomain.sub.https.html.headers": [ @@ -346749,7 +346781,7 @@ [] ], "parent-yes-child-yes-same.sub.https.html.ini": [ - "e3a89c0f7ce9961f842110f8818e4e27fd505f8b", + "2b7fa4f27546ce75c088fb484df17a380bfb685f", [] ], "parent-yes-child-yes-subdomain.sub.https.html.headers": [ @@ -346763,7 +346795,7 @@ }, "2-iframes": { "parent-no-child1-no-subdomain-child2-yes-subdomain.sub.https.html.ini": [ - "9be6e053e2e35fc8317599a32e5bc7ec77d05524", + "08e1ae5832fe0799debbd6d5b225aa687ecd438b", [] ], "parent-no-child1-no-subdomain-child2-yes-subdomainport.sub.https.html.ini": [ @@ -346831,7 +346863,7 @@ [] ], "parent-yes-child1-yes-subdomain-child2-no-subdomain.sub.https.html.ini": [ - "bb8a3cbbad45f294edb5ba2e60bdee1f32acd5ea", + "a2c292b9ea8608401216c12e8f237a181a952b8e", [] ], "parent-yes-child1-yes-subdomain-child2-yes-subdomain.sub.https.html.headers": [ @@ -346839,7 +346871,7 @@ [] ], "parent-yes-child1-yes-subdomain-child2-yes-subdomain.sub.https.html.ini": [ - "3be8b66c60fbd9a158e332ffde611ae30634ba03", + "fd34c1f97540ffeb14d314a0c5bb4ba76b24efb0", [] ], "parent-yes-child1-yes-subdomain-child2-yes-subdomain2.sub.https.html.headers": [ @@ -346847,7 +346879,7 @@ [] ], "parent-yes-child1-yes-subdomain-child2-yes-subdomain2.sub.https.html.ini": [ - "1702c5018d7456ac590c1e3fc32b4a6720f9987a", + "bea8c5ec62efd683a1429b574b5f55b3f247a674", [] ], "parent-yes-child1-yes-subdomain-child2-yes-subdomainport.sub.https.html.headers": [ @@ -346855,7 +346887,7 @@ [] ], "parent-yes-child1-yes-subdomain-child2-yes-subdomainport.sub.https.html.ini": [ - "e3b0508f4657609580638d04ce6d4902d3c18ee9", + "5d32ec5292fe848a54d90077ed51e6a7dbba3c9e", [] ] }, @@ -346883,6 +346915,10 @@ "79a20f30fc0f486014c8b93edef7483605101504", [] ], + "document-domain.sub.https.html.ini": [ + "86cb856fc7942752c7c3fba6e828b5d875a45809", + [] + ], "getter-special-cases": { "cross-origin-isolated.sub.https.html.headers": [ "5f8621ef83660c66f0d037ea28fafefb558140f1", @@ -346893,7 +346929,7 @@ [] ], "csp-sandbox-no.https.html.ini": [ - "0c3339d57696257f7c21ddb88c28ec7d5979e7dd", + "56a8acf0dd7d50b81cede6d497a5bf336f6d45c6", [] ], "csp-sandbox-yes.https.html.headers": [ @@ -346904,10 +346940,6 @@ "79a20f30fc0f486014c8b93edef7483605101504", [] ], - "data-url-no.https.html.ini": [ - "46583a988391132031bf8b591b1b18717ab34641", - [] - ], "data-url-yes.https.html.headers": [ "79a20f30fc0f486014c8b93edef7483605101504", [] @@ -346920,6 +346952,10 @@ "79a20f30fc0f486014c8b93edef7483605101504", [] ], + "removed-iframe.sub.https.html.ini": [ + "55f11aaf08ab4b06ada0ae665685c483a7805dd2", + [] + ], "resources": { "data-to-javascript-test.mjs": [ "3a88253ee3053465472ef7d6ecba74b92fab79ce", @@ -346959,7 +346995,7 @@ [] ], "sandboxed-same-origin-iframe-yes.https.html.ini": [ - "db937cb02a58c05b98a7496e8bf2afda87514684", + "14cb1e6c42653c1e9878b1b91c0d340f355c96a9", [] ] }, @@ -346973,27 +347009,27 @@ ], "iframe-navigation": { "parent-no-1-no-same-2-yes-port.sub.https.html.ini": [ - "43e1bec1c03d27c5865143a3f0a76fccf9ff6020", + "325cebf6432291f5aa8dda682e98061e6a314c36", [] ], "parent-no-1-no-same-2-yes-subdomain.sub.https.html.ini": [ - "07e840aa1aa45d80c842900925aff20031150f63", + "983a7736bceec7820967dea1c8070456ca99f370", [] ], "parent-no-1-no-subdomain-2-yes-subdomain.sub.https.html.ini": [ - "d2ecf81d4fc59a4b6d7b940b0169265f0d156127", + "ea1a234ef77cac38c67f7c28feb0e7d5484f74fb", [] ], "parent-no-1-no-subdomain-2-yes-subdomain2.sub.https.html.ini": [ - "f4e8bf347531ec925787ec1f10be0977ec803f08", + "9a902da12f67db0b7d639ad1c0e0d588a12c07be", [] ], "parent-no-1-subdomain-yes-2-subdomain2-no.sub.https.html.ini": [ - "35333f9b959a07147d57b1b08cd59a0291c3f02f", + "419e0eddeabce0c5d49adc26ddcc7b14293393e3", [] ], "parent-no-1-yes-subdomain-2-no-subdomain.sub.https.html.ini": [ - "88927c4b28d125a44c3875aad74858a81a7133ef", + "240de0d552e3ba8f0d610591f98e4a16ad7bf173", [] ], "parent-yes-1-no-same-2-no-port.sub.https.html.headers": [ @@ -347009,7 +347045,7 @@ [] ], "parent-yes-1-no-same-2-no-subdomain.sub.https.html.ini": [ - "dae0b9ef27d588d3baf975a8e60c72533985207e", + "4c693c6fed278c768348cfba52493c69f988d9d8", [] ] }, @@ -347023,15 +347059,15 @@ ], "popups": { "opener-no-openee-yes-port.sub.https.html.ini": [ - "b40a081d2e60fb5e2d6343e8555495cc2336a87c", + "31826e4cff13a577307c3e57ac3107f1b8deb590", [] ], "opener-no-openee-yes-same.sub.https.html.ini": [ - "ed54867d1836a0c0407e1e3ae5430197e389632e", + "f4e691e9d6ee44ee2bb5c26522f0b80039c5db61", [] ], "opener-no-openee-yes-subdomain.sub.https.html.ini": [ - "62147f92d7da81fdd9d781d9fc6fe51a8caf5b18", + "439cca16d012a8696705a281e741447c8155d2a1", [] ], "opener-yes-openee-no-port.sub.https.html.headers": [ @@ -347070,16 +347106,12 @@ "79a20f30fc0f486014c8b93edef7483605101504", [] ], - "opener-yes-openee-yes-same.sub.https.html.ini": [ - "851a368312622c507f15313d07d8639a593a7979", - [] - ], "opener-yes-openee-yes-subdomain.sub.https.html.headers": [ "79a20f30fc0f486014c8b93edef7483605101504", [] ], "opener-yes-openee-yes-subdomain.sub.https.html.ini": [ - "890153093f50f72aef81b54ccf835bd7fcd7fb4d", + "d6b4f05a7f2746db2ba2ebff19ebd970081ed85a", [] ] }, @@ -347438,7 +347470,7 @@ ] }, "open-features-is-popup-condition.html.ini": [ - "fff169d3200a45d1bc4881ebb4e21bd380503cab", + "f6953e6cf749292d69453bab38f8590be6c5209f", [] ], "open-features-negative-innerwidth-innerheight.html.ini": [ @@ -347599,7 +347631,7 @@ [] ], "window-open-windowfeatures-values.html.ini": [ - "d9e0e4f30172d211e80db333678752d7aedbe94b", + "ef909a9fbff128dcd041f2de23ab974043d2a261", [] ], "window-properties.https-expected.txt": [ @@ -347660,7 +347692,7 @@ [] ], "opener-noopener.html.ini": [ - "08977dee0d9a7433bdef47526adb09fb77d6eab1", + "bbfffcc12ec11457b2a23a67e963f7976a3c049f", [] ], "opener-setter.html.ini": [ @@ -349731,7 +349763,7 @@ [] ], "offscreencanvas.resize.html.ini": [ - "362466fae983cd839b0ecc92bb651b873092d7f1", + "378d6a639666f772777e8759a15df7625104191e", [] ], "offscreencanvas.transferrable-expected.txt": [ @@ -350322,7 +350354,7 @@ [] ], "cross-origin-isolated-permission-worker.https.window.js.ini": [ - "1cda697821f262d6ecbc160bfecc3bb8adceeec1", + "6e7bbd4c2a84c882cbbda69b8c029d1be6adbaa2", [] ], "data.https.html.headers": [ @@ -350751,10 +350783,6 @@ "63b60e490f47f4db77d33d7a4ca2f5b9a4181de8", [] ], - "coep-with-same-site.https.html.ini": [ - "06986c34c07abae401f3ef56c52e1eccc891aba9", - [] - ], "coop-coep-sandbox.https.html.headers": [ "4fff9d9fba4c81f953826ffea010a75be626b95d", [] @@ -350796,7 +350824,7 @@ [] ], "header-parsing-failures.https.html.ini": [ - "85c7b35523b6991a4dc24e2930c723bd07969d86", + "53b1c226b9b6ceca7477d94324f8ab521105f4fd", [] ], "header-parsing-non-ascii.https.html.headers": [ @@ -350807,12 +350835,8 @@ "85c58be8a1c60ed64b2efaed8a155fc5e087537e", [] ], - "header-parsing-repeated.https.html.ini": [ - "0ff031216698bcc77afe7110f069d5f7d0fd27e9", - [] - ], "header-parsing-successes.https.html.ini": [ - "f545d7b1ba24a55f980a8cfdee522fd7d71f230d", + "caf5a0c1572c350fb3cc61383968807b67bb6c26", [] ], "historical": { @@ -350820,10 +350844,6 @@ "a19f4400cea33a60c99807330704a23ee363b146", [] ], - "popup-same-origin-unsafe-allow-outgoing-with-cross-origin.https.html.ini": [ - "da1992e875f4b4b66c82c8a9be845a4ef6f6445c", - [] - ], "popup-same-origin-unsafe-allow-outgoing-with-same-origin.https.html.headers": [ "a19f4400cea33a60c99807330704a23ee363b146", [] @@ -350848,6 +350868,10 @@ "ab7b28948150ff64101ef080b0d9c7cc9a6a34d2", [] ], + "popup-same-site-unsafe-allow-outgoing-with-same-origin.https.html.ini": [ + "0ece312708b561da25f350af89dc0abe0c211465", + [] + ], "popup-same-site-unsafe-allow-outgoing-with-same-site.https.html.headers": [ "ab7b28948150ff64101ef080b0d9c7cc9a6a34d2", [] @@ -350878,7 +350902,7 @@ [] ], "iframe-popup-same-origin-allow-popups-to-same-origin-allow-popups.https.html.ini": [ - "9813f106a943082c0ada51f0901e211e4976fda1", + "eb7663ee62b0c5bc9075a0dca54d5d909f6f32b4", [] ], "iframe-popup-same-origin-allow-popups-to-same-origin.https.html.headers": [ @@ -350902,7 +350926,7 @@ [] ], "iframe-popup-same-origin-to-same-origin.https.html.ini": [ - "c6cd6b730183649c8f3a41dd1e35837e05470862", + "79b696010a173e30f79a6e092a7495b49b067323", [] ], "iframe-popup-same-origin-to-unsafe-none.https.html.headers": [ @@ -350910,7 +350934,7 @@ [] ], "iframe-popup-same-origin-to-unsafe-none.https.html.ini": [ - "872be04701bdb2dcc3fb9da108f1f23edaa18c0b", + "8eec1633c1b737c49a14249cda902fca3a7199de", [] ], "iframe-popup-unsafe-none-to-same-origin.https.html.headers": [ @@ -350918,7 +350942,7 @@ [] ], "iframe-popup-unsafe-none-to-same-origin.https.html.ini": [ - "91095c61ccf4c92563cafdd9f97121c029b229f4", + "3e09c283deb3d8ca3eb84b95803a97ca16aff88d", [] ], "iframe-popup-unsafe-none-to-unsafe-none.https.html.headers": [ @@ -350926,11 +350950,11 @@ [] ], "iframe-popup-unsafe-none-to-unsafe-none.https.html.ini": [ - "3deb888f6a7785ad9af9dac239d60e1473bb47d5", + "c1f50620461237a83c2f199dfa2b83c85c300407", [] ], "javascript-url.https.html.ini": [ - "019f715a7edc4c419c4ee58d83a31554c2412e60", + "5f8bd9ef941cb84f2bff227ac8e5313160f6940a", [] ], "navigate-to-aboutblank.https.html.ini": [ @@ -350938,7 +350962,7 @@ [] ], "navigate-top-to-aboutblank.https.html.ini": [ - "1aeca853cfa3c55b386ca9cb36493b699d321c2b", + "d5c6b7629520bbf8969208c96e72707a0ef0454e", [] ], "no-https.html.headers": [ @@ -350961,10 +350985,6 @@ "d83ed86fb9b5d159b9f380424887402edc96cb75", [] ], - "popup-same-origin-allow-popups-with-cross-origin.https.html.ini": [ - "78395f064089f40dea0d537a111ffc600cd17768", - [] - ], "popup-same-origin-allow-popups-with-same-origin.https.html.headers": [ "d83ed86fb9b5d159b9f380424887402edc96cb75", [] @@ -351005,6 +351025,10 @@ "073ce7adfbd81cb7c0b2f91f96c8349b6677f26c", [] ], + "popup-unsafe-none-with-cross-origin.https.html.ini": [ + "1693ee1d806331a9a4ef3e315e8d0108b817346f", + [] + ], "popup-unsafe-none-with-same-origin.https.html.headers": [ "073ce7adfbd81cb7c0b2f91f96c8349b6677f26c", [] @@ -351040,11 +351064,11 @@ ], "access-reporting": { "access-from-coop-page-to-openee_coop-ro.https.html.ini": [ - "4ce7bb588067000923184657324c1353b1a9ed83", + "59258e97f4655d24edc749db900a792e73a39960", [] ], "access-from-coop-page-to-openee_coop-ro_cross-origin.https.html.ini": [ - "dea0df34f17c89afe7e12398c47513999297ff13", + "4ae0b27567920752e0a513c6dd5d8877cb84e3af", [] ], "access-from-coop-page-to-opener_coop-ro.https.html.ini": [ @@ -351056,15 +351080,15 @@ [] ], "access-from-coop-page-to-other_coop-ro.https.html.ini": [ - "dd923b49d338c61b1c701f72a0fe7c9d21a51306", + "ad1f3046344665f83be193b63ccc46c1a691c671", [] ], "access-from-coop-page-to-other_coop-ro_cross-origin.https.html.ini": [ - "dd5c96b2e6d713af4e5402595b2b6e459a64352e", + "cf7454f5ccfcb2a81768f574300d22d52abcbc85", [] ], "access-to-coop-page-from-openee_coop-ro.https.html.ini": [ - "eeab671e4388a7129d9b5b38a7d7dcd3a9ea211c", + "134b798f764f0800dd2afe669d3a5763d88e6768", [] ], "access-to-coop-page-from-openee_coop-ro_cross-origin.https.html.ini": [ @@ -351096,11 +351120,11 @@ [] ], "property-closed.https.html.ini": [ - "ad0e9b09c8038704d41611c2b79cea264d3166a5", + "3ee2c65727bbe62139956bca2812b7f5ca1986eb", [] ], "property-focus.https.html.ini": [ - "2db32f1edef3c5c1def240fb6fa5fbf980b5e42b", + "82c8de373481ed99ed4539e9781a19f6001a19d0", [] ], "property-frames.https.html.ini": [ @@ -351120,7 +351144,7 @@ [] ], "property-location-get.https.html.ini": [ - "dcfc817f31fcf4a341eb76091e727fe7c65216a4", + "e48075ce4e2a4af8072fae88e9b06b515a8a9ea5", [] ], "property-location-set.https.html.ini": [ @@ -351131,18 +351155,10 @@ "64f4d5fedffd208b7174c7d8e0bce4e99ce1ac0f", [] ], - "property-named-getter.https.html.ini": [ - "a713a5f1fd7eea7cfad4e994ae94b6f4efea9a42", - [] - ], "property-opener-get.https.html.ini": [ "e053a92320caf24980ff5f4d623361e7485303db", [] ], - "property-opener-set.https.html.ini": [ - "5c096b165ef8879b38c62e8c116bc3dc39ae7263", - [] - ], "property-postmessage-1.https.html.ini": [ "09ccef31f32cf818f3442c5a456bea04f5a7b4e9", [] @@ -351152,7 +351168,7 @@ [] ], "property-self.https.html.ini": [ - "189215bc7f4f6a65585c207e1ea409f9b0320ac5", + "911a48fe0d6eaeb845e1ec91e968d70a1ba6b4f2", [] ], "property-top.https.html.ini": [ @@ -351160,11 +351176,11 @@ [] ], "property-window.https.html.ini": [ - "78ab09d6a8d589bf1883847508b9769c9cd037dc", + "1bf848bbdfa59581e703105bcf9d933302e645be", [] ], "report-to-both_coop-ro.https.html.ini": [ - "bafa86121377825c4a6a429e8c76e7b5bbfd2732", + "46d3e2453d8b141994297fa9ca23abea51bbb623", [] ], "reporting-observer.html.ini": [ @@ -351174,7 +351190,7 @@ }, "document-reporting": { "report-only-four-reports.https.html.ini": [ - "c7e7616ada186d8e45cc986b7a6cb636236405f4", + "a8b9622cea607a960e3d4f1e21189071bfc2d2d9", [] ], "report-only-four-reports.https.html.sub.headers": [ @@ -351380,7 +351396,7 @@ [] ], "iframe-popup-to-so.https.html.ini": [ - "f8a499bad12ec011584e053acd36ac42680e7d1c", + "da58f27fb7b8428ecc21b1243aa4cbb033cee871", [] ], "iframe-popup-to-soap.https.html.headers": [ @@ -351463,10 +351479,6 @@ "46ad58d83bf6e98913ca4c564b7acb8f19fa0093", [] ], - "popup-so.https.html.ini": [ - "81084dfeb2aab191721f3ecca3c350b0f4d0fba0", - [] - ], "popup-soap.https-expected.txt": [ "8c40e7b3b1e288546cc4f2a9a739c4ada36e2df0", [] @@ -351476,7 +351488,7 @@ [] ], "popup-soap.https.html.ini": [ - "75e0479d6d2166149de81f39c592b534987d71e9", + "d4cfb804c1cda4b1271b3a5e605bfb31db94812a", [] ], "popup-u.https-expected.txt": [ @@ -351532,7 +351544,7 @@ [] ], "popup-with-same-site.https.html.ini": [ - "63f2627e40d1fb29933a49fc42739cd7f898378c", + "3a041615f7f308fb0c8f2869d86440d2ef622f63", [] ] } @@ -357819,11 +357831,11 @@ [] ], "resource-selection-invoke-insert-source-not-in-document.html.ini": [ - "41a50745049437d84eec1d4158cb72f73ebed365", + "dc6d43f374a5a42841f9ea006273fa931dcb4ac1", [] ], "resource-selection-invoke-insert-source.html.ini": [ - "6deb2ed2ae79b8c13df2b3cd1d9aa16d5620dbf0", + "936ae2c7803dc9e7375c58c07375825e2eec4d23", [] ], "resource-selection-invoke-load.html.ini": [ @@ -357843,19 +357855,19 @@ [] ], "resource-selection-invoke-remove-from-document-networkState.html.ini": [ - "b7a901442cf2baea2b46b83419ad4c92a689d6f8", + "89c1c9ae096610a55029198f90b767d283b8bc23", [] ], "resource-selection-invoke-remove-src.html.ini": [ - "6797a25644aa22b2fbfd3537da0a73446a2449ec", + "d0030362dda225bf805e4804743b90d939bb965a", [] ], "resource-selection-invoke-set-src-not-in-document.html.ini": [ - "7f054e1fc6804348e116679ec2e8abe5f9ba54ac", + "c747a6717563dd6a0a85cd59310bca1abbb61544", [] ], "resource-selection-invoke-set-src.html.ini": [ - "b5d4fab4683eeab180851133b7c4cfe35681208b", + "87b5d619fbaae0a367aa7c72bf2532149c36e391", [] ], "resource-selection-pointer-control-expected.txt": [ @@ -358342,7 +358354,7 @@ [] ], "track-cue-rendering-after-controls-removed.html.ini": [ - "867decbd41b11f218e013404812fc7a53d61d7ee", + "cd1b74eeb79be9307b34f5ed97d40da43b33b932", [] ], "track-cue-rendering-line-doesnt-fit-ref.html": [ @@ -358812,7 +358824,7 @@ [] ], "sandbox-top-navigation-child-special-cases.tentative.sub.window.js.ini": [ - "53c099f427582128a58d77c26cbad4ef5873302d", + "9a594bd4ec3b593c885b61805442fbf70f9a2b73", [] ], "sandbox-top-navigation-child.tentative.sub.window.js.ini": [ @@ -358820,11 +358832,11 @@ [] ], "sandbox-top-navigation-escalate-privileges.tentative.sub.window.js.ini": [ - "4d6ee23c7ec435e95dc2d0a9d162d473e8f92e85", + "ae3370f78198955144375363786e6be34e977508", [] ], "sandbox-top-navigation-grandchild.tentative.sub.window.js.ini": [ - "f6d097fe095955bb078b69bde166b123ba27c40a", + "0f880d19a60c4a6828e6646a4ffe8c3be47f1fb8", [] ], "sandbox_026.htm.ini": [ @@ -359104,7 +359116,7 @@ [] ], "image-loading-lazy-base-url-2.html.ini": [ - "7db569e54a1aeda53a763786baead693eb89104d", + "b0363e4de7578bd60156bcdc1d7a525b8227181a", [] ], "image-loading-lazy-base-url-expected.txt": [ @@ -359112,7 +359124,7 @@ [] ], "image-loading-lazy-base-url.html.ini": [ - "031fb3b92387285dcaa95bbe69ea331dca2a674f", + "5aa4bedf5edf48ad70d638f385b8ac7ce8749d2f", [] ], "image-loading-lazy-clip-path-ref.html": [ @@ -359512,7 +359524,7 @@ [] ], "multipart-formdata.window.js.ini": [ - "53ef1d001130237fbf92582295f320419c4093c7", + "ded39f6c67e30a6cd0a94bf1d028ba57a0ad9063", [] ], "resources": { @@ -359920,7 +359932,7 @@ [] ], "selectmenu-form-state-restore.tentative.html.ini": [ - "2ea1f96065bb88c5198bc9d39de2b8549bfc7d32", + "bd74d07a163ff17bd6c402076952ef3497ce96da", [] ], "selectmenu-keyboard.tentative.html.ini": [ @@ -360349,6 +360361,10 @@ } }, "links-created-by-a-and-area-elements": { + "htmlanchorelement_noopener.html.ini": [ + "caa321ab11c29c38ab3b6643b504fff50f25ebde", + [] + ], "support": { "noopener-popup.html": [ "2057dbf0beab37916a44d57c5ea234f1ac5810b5", @@ -364331,11 +364347,7 @@ ], "integration-with-the-javascript-job-queue": { "promise-job-entry-different-function-realm.html.ini": [ - "e2f5d1c7b399cb822111ad0ebcb20d0cf8b10e6e", - [] - ], - "promise-job-entry.html.ini": [ - "c7de4281de4df6272942ff189c6e155bb45682f9", + "d529e4797d053d70f7bc2f32c280abf1e2f7793b", [] ], "promise-job-incumbent-expected.txt": [ @@ -365135,7 +365147,7 @@ } }, "http-url-like-specifiers.sub.html.ini": [ - "c6c9a75b0c369a777f4c623fd3ed909127fc28a1", + "f151d6404c8642bcbd3a85fe7e4c8ecf1753b751", [] ], "resources": { @@ -367165,7 +367177,7 @@ [] ], "cross-origin-iframe.sub.html.ini": [ - "d48fe922cd3054d3237b84cb9b35c0a2c114c354", + "07d81d61eb21ccacea7007af6c7d05c7a789caf1", [] ], "idlharness.window-expected.txt": [ @@ -367473,7 +367485,7 @@ [] ], "first-paint-equals-lcp-text.html.ini": [ - "cb0c8f13f401ec94aeac1dc716ac9f31a32f5003", + "f748fb6533d6e3f880a4b25bf20d4ed0e0548bee", [] ], "image-upscaling-expected.txt": [ @@ -367556,10 +367568,6 @@ "b38d1c1514bbf415663d15f834b7b95af0a35298", [] ], - "child-shift-with-parent-overflow-x-clip.html.ini": [ - "727203c001a3c24d0ef3e9097b993b8a3c5dce88", - [] - ], "main-frame.html.ini": [ "319ab838cbc3b2c4866816c87627845e0a46247a", [] @@ -367686,7 +367694,7 @@ [] ], "csp-early-hints-allowed-final-allowed.h2.window.js.ini": [ - "8774e47e65660d86070ba1ff2678709bf339e585", + "9071ef7f0474c8d2bbe0e1e89b29749e23406017", [] ], "csp-early-hints-allowed-final-disallowed.h2.window.js.ini": [ @@ -367710,7 +367718,7 @@ [] ], "modulepreload-in-early-hints.h2.window.js.ini": [ - "09b074d5d75194fbae0722585764fcf7feb3e2b5", + "5d40100e4d35b82f688d97b3269322b62932626f", [] ], "multiple-early-hints-responses.h2.window.js.ini": [ @@ -367718,7 +367726,7 @@ [] ], "preconnect-in-early-hints.h2.window.js.ini": [ - "44bab0130afdb54b1150b07992afbb422005c142", + "7f528f05a3aedf26ee2cf33efb5adba153f8f06a", [] ], "preload-finished-before-final-response.h2.window.js.ini": [ @@ -367782,7 +367790,7 @@ [] ], "referrer-policy-same-origin.h2.window.js.ini": [ - "cc4aae74893e26d44c5c1257abb789d305e23b3d", + "c87d9d932d697b2bc9d7d875954889d53d95e1c4", [] ], "referrer-policy-unsafe-url.h2.window.js.ini": [ @@ -368364,10 +368372,6 @@ "4fd4b225f3527a151b9d63e7603ab224453d7721", [] ], - "legacy-mstyle-attributes.html.ini": [ - "be13767bc72bc889393b43bcd0a1a7d1b2c7856d", - [] - ], "mrow-painting-order-ref.html": [ "72694959a86f1917cbd3db13b7f1a8b71714b711", [] @@ -368753,7 +368757,7 @@ ] }, "ignored-properties-001.html.ini": [ - "94caa7eebd3699e272b4befd1f537c3e320d6a25", + "c890db57b4dd7470205e9f7b61110ecd7ad827fc", [] ], "legacy-scriptminsize-attribute-ref.html": [ @@ -369764,7 +369768,7 @@ [] ], "mediasource-worker-play-terminate-worker.html.ini": [ - "edc72e26a4f9b4c46fbf52d8790deec802214fc6", + "75488dff1a717fd6624daa0dd7d60b6745221365", [] ], "mediasource-worker-play-terminate-worker.js": [ @@ -369813,11 +369817,11 @@ [] ], "mediasource-appendbuffer-quota-exceeded.html.ini": [ - "627cac7406b16bd173b468381a1c6267077da484", + "3763a2bc3420f9cfa71ada329dd33c0bfe6fc63d", [] ], "mediasource-avtracks.html.ini": [ - "cf16bf59f16ed119490b3c876b184a8af21098e2", + "da841489f93497f3eb5893593338a3a306d57fff", [] ], "mediasource-buffered-expected.txt": [ @@ -369889,7 +369893,7 @@ [] ], "mediasource-duration.html.ini": [ - "1946fb5473cfb5f39c4fbe0ed41de1e010caa651", + "1cbec73b8b4fcc16e86349cbfd3b79c60d32023c", [] ], "mediasource-endofstream-expected.txt": [ @@ -371500,6 +371504,10 @@ "580dc21c19e71cbc51833c5d458ee34bc5e66717", [] ], + "navigate-initial-about-blank.html.ini": [ + "fad0e6e5b3608f35b0def760741677a477c924cf", + [] + ], "navigate-intercept-interrupted.html.ini": [ "5df966b3082d4dd15b10bad9ef94202e51794b84", [] @@ -371771,7 +371779,7 @@ ] }, "test-performance-attributes.sub.html.ini": [ - "47d75920efa4ff2749eb551ff212abe5adec6984", + "2b9f61abd92799af8957fe8a1117040573fcb529", [] ] }, @@ -372543,7 +372551,7 @@ [] ], "pending_beacon-sendondiscard.tentative.https.window.js.ini": [ - "7c8da316650c4dbc6a987bca7cf1bffb270c4abc", + "3150981433d33d4b9bab5c633af4455521a39d6a", [] ], "pending_beacon-sendonhidden.tentative.https.window.js.ini": [ @@ -372632,7 +372640,7 @@ [] ], "performance-navigation-timing-same-origin-bfcache.tentative.window.js.ini": [ - "2f32ea7d405d8fd8916ca78354b365ff92bafec1", + "facb63157e34a88425ad70af95431da057f89ffb", [] ], "performance-navigation-timing-same-origin-replace.tentative.window.js.ini": [ @@ -372876,7 +372884,7 @@ [] ], "unload-allowed-by-default.tentative.window.js.ini": [ - "041aee22275f57b2ff32f9481e29fe1d43f9fa63", + "6360a03d9b2e0a9a6e94ac5a30cf26dc57b5e32c", [] ], "vertical-scroll-main-frame-manual.tentative.html.headers": [ @@ -376295,11 +376303,7 @@ [] ], "deadline-max-rAF-dynamic.html.ini": [ - "e3970f541ee3bfca84f0ebb22be35a36be6087d1", - [] - ], - "deadline-max-rAF.html.ini": [ - "c2a9bbc2d2bfc59f1c6b4b8823275c23b7419994", + "3dbee2d405f07199581fab3a2352b0f24261e47b", [] ], "deadline-max-timeout-dynamic.html.ini": [ @@ -376407,7 +376411,7 @@ [] ], "content-type-parsing.html.ini": [ - "0b6bb698efea9bc7cc5c58c90eb2840377509a51", + "53105638e5270ddc714bde35f3ecdb5b22ccb6c2", [] ], "frameset-timing.html": [ @@ -376459,7 +376463,7 @@ [] ], "no-entries-for-cross-origin-css-fetched-memory-cache.sub.html.ini": [ - "fd988bde1566e0b4f7124b5336dcabbcf26f9ef3", + "1d9ea2f91acb2183c63eb009a13beab9d0f0d4fb", [] ], "ping-rt-entries-expected.txt": [ @@ -376857,7 +376861,7 @@ ] }, "response-status-code.html.ini": [ - "8913fe9dcf022b0948cd61f9538c2e52f8a40cda", + "ed87eaff08ab2fd69980dc9017501b1ce78824b1", [] ], "sleep.py": [ @@ -378832,7 +378836,7 @@ [] ], "cache-add.https.any.js.ini": [ - "260e24a8820e19afb6fb376a5aea53fc2218c6c5", + "6e8112910d931e29fd8b86654e19cdd363ddc1d0", [] ], "cache-add.https.any.serviceworker-expected.txt": [ @@ -379094,7 +379098,7 @@ [] ], "client-navigate.https.html.ini": [ - "51fc6484ab8d2c32bfbe042ca7ebd0cc8902d923", + "ed96e18bfc432651cc62c5b31786bd7fbde3f820", [] ], "client-url-of-blob-url-worker.https-expected.txt": [ @@ -380990,7 +380994,7 @@ [] ], "unregister-immediately-during-extendable-events.https.html.ini": [ - "4507f109d4a7c9681a8acaa819e15213d5906200", + "17f97e1da1a97754550e82e5d01aa548f75b18c1", [] ], "unregister-then-register-new-script.https-expected.txt": [ @@ -381884,7 +381888,7 @@ }, "prerender": { "about-blank-iframes.html.ini": [ - "3d5f37710fbe92a7b92dd99ee712d60f344703a1", + "bd9a22f221c82584a08d46a691e785cae84eec57", [] ], "accept-clint-hint-cache.https.html.ini": [ @@ -381892,7 +381896,7 @@ [] ], "activation-start.html.ini": [ - "0bc05254d0b6ed7c8f9b5b529bbbf592dc64134f", + "6292f6caa3de1e81e060a2e479c384176463261a", [] ], "cache-storage.https.html.ini": [ @@ -381936,7 +381940,7 @@ [] ], "csp-script-src-self.html.ini": [ - "df90d9b8419196097911de28d5c7984011ec164a", + "a85027a5d037376f15157105b98757de136b2a7e", [] ], "csp-script-src-unsafe-inline.html.ini": [ @@ -381952,11 +381956,11 @@ [] ], "iframe-added-post-activation.html.ini": [ - "639ddc1b8df708a9655f77e69e9ca9fe83c28ed6", + "6b9bf4fd20cef688bed633eea961bafe048aa419", [] ], "indexeddb.html.ini": [ - "d3393972fbdada59a2f814402fbe608d71388d0c", + "e16ee6be70082c5413fcb5624aed940a342e2447", [] ], "local-storage.html.ini": [ @@ -381976,7 +381980,7 @@ [] ], "navigator-plugins.tentative.html.ini": [ - "6d40224b5f63c0761e26dcc880f5c97c2302d641", + "a9fa26cb4b1628423ea781bd5ae1792dd1da06ba", [] ], "navigator-subapp.https.tentative.html.ini": [ @@ -382418,7 +382422,7 @@ ] }, "response-code-non-successful.html.ini": [ - "8269e5dfff7bd63dfd7bcba3ea6a13a907b6f19f", + "ec248a715e6a33375f1a305a7404a2dfea344751", [] ], "response-code-successful.html.ini": [ @@ -382442,7 +382446,7 @@ [] ], "restriction-battery-status.https.html.ini": [ - "1cc8950da7e3dc47451962299f0c22334b91adf1", + "d2f70556afc9a947673bf782ff58d67896b7fb6c", [] ], "restriction-bluetooth.tentative.https.html.ini": [ @@ -382478,7 +382482,7 @@ [] ], "restriction-media-auto-play-attribute.html.ini": [ - "8abf5802b335c8d5bbfdb1c5d75db484fa20ce1c", + "66ea6cb7d2ce1982cbd5b55389211dd5ff9b5f9e", [] ], "restriction-media-camera.https.html.ini": [ @@ -382494,7 +382498,7 @@ [] ], "restriction-media-play.html.ini": [ - "f3cd2a6ed719fd44ddf2f706d3cdd06f06ea2b68", + "abcfbde38ceb5d2060d3a39b997fba963315af5c", [] ], "restriction-message-boxes.html.ini": [ @@ -382518,7 +382522,7 @@ [] ], "restriction-presentation-request.https.html.ini": [ - "1a3d08e01fc261eb3f67b39a5b187e720f064db8", + "ea367f55fa13cd7d3e128989989eae7f859f378a", [] ], "restriction-prompt-by-before-unload.html.ini": [ @@ -382530,7 +382534,7 @@ [] ], "restriction-request-picture-in-picture.html.ini": [ - "9bfa95ff89d6b4a022ac7a56aa4a2714c610007a", + "32004d9c3e0882ddf1626a064294901da9c192c3", [] ], "restriction-screen-capture.https.html.ini": [ @@ -382570,7 +382574,7 @@ [] ], "restriction-speech-synthesis.html.ini": [ - "ad1ad4c2b02022f3bdfe9a9b47eb552ff4a2e77f", + "6984300e6cd9030dfa2b49775fba95f141b0a14c", [] ], "restriction-storage-persist.https.html.ini": [ @@ -382594,7 +382598,7 @@ [] ], "restriction-web-serial.tentative.https.html.ini": [ - "94eabafcfb25bbc3ac9d18ce4f29d2813091271b", + "5b44cb6670ba91fd42154802cb65915cc71327e0", [] ], "restriction-web-share.https.html.ini": [ @@ -382614,7 +382618,7 @@ [] ], "restriction-window-move.html.ini": [ - "241db3c6ae3ceca2e0028c3a96405802838fa6ab", + "87802b2eb28eb268058b152c573e7e727f6b22de", [] ], "restriction-window-open.html.ini": [ @@ -382654,7 +382658,7 @@ [] ], "session-history-subframe-navigation.https.html.ini": [ - "95f1641d56e89c34405436df1f987a855f51ace6", + "c03d8141b5440c71ca0344f3e22c252e412ca629", [] ], "session-history-subframe-reload.https.html.ini": [ @@ -382678,7 +382682,7 @@ [] ], "windowclient-navigate-to-same-origin-url-on-iframe.https.html.ini": [ - "1366d5901a52beecff9b91e3214d6decf1a3492b", + "dd3486d9a7e44ab5f89b4b5a60d927c901fe2d07", [] ], "windowclient-navigate.https.html.ini": [ @@ -382686,7 +382690,7 @@ [] ], "workers.html.ini": [ - "3ed7eaa9d7a0ebdf08697f3d1bf81a8412a5614b", + "a986d42ada540991b539b92e5597b2487a0aafc3", [] ] } @@ -382785,7 +382789,7 @@ [] ], "partitioned-estimate-usage-details-caches.tentative.https.sub.html.ini": [ - "a92177d69f97a8040a9c10bf415b91ac2440f71a", + "d95804af09687c10ced44d69e856cfa2927c32eb", [] ], "resources": { @@ -386487,7 +386491,7 @@ [] ], "a-element-xhtml.xhtml.ini": [ - "b73f309edbe0be6e79384aa0a2574eeb8def671f", + "5d13145ff5f21a316c99c114e01f72806d541d52", [] ], "a-element-xhtml_include=javascript-expected.txt": [ @@ -386499,7 +386503,7 @@ [] ], "a-element.html.ini": [ - "844cd32e097d55e1fe2672709f5c17796890fa57", + "fda81b92fd68dd17b1e75a8e8e9e606e3b6786d5", [] ], "a-element_include=javascript-expected.txt": [ @@ -386511,7 +386515,7 @@ [] ], "failure.html.ini": [ - "97ce9874698c763da51039b3e9d709d2bb581aff", + "5f3314da573f67b736b3308e0d9a782c3778fde1", [] ], "idlharness-shadowrealm.window-expected.txt": [ @@ -386522,6 +386526,10 @@ "1fb49415db04546f898a6416b2794ee4d1c1e4ad", [] ], + "percent-encoding.window.js.ini": [ + "1091bffa2c6ebfc3c45547eb4ba0f53edaab55cc", + [] + ], "resources": { "a-element-origin.js": [ "cb7d4a895c40c456c3f4c0ade050115319ad410c", @@ -386585,7 +386593,7 @@ [] ], "url-setters-a-area.window.js.ini": [ - "9dea791714342d3d25b01dfd723455efea4b30c6", + "d812cea69800680c25e432bacca931bdf61dba0a", [] ], "url-setters-a-area.window_include=javascript-expected.txt": [ @@ -386601,7 +386609,7 @@ [] ], "url-setters-stripping.any.js.ini": [ - "d2c3ff181aaf8d67b9845359f03b64478e9a4982", + "ad2f860fc3677f34b0f5d29d7f7248d15cd4099b", [] ], "url-setters-stripping.any.worker-expected.txt": [ @@ -386633,7 +386641,7 @@ [] ], "urlsearchparams-delete.any.js.ini": [ - "e35316b04d7b07af1c492394667bdc0a1388039d", + "8c158fa34ac4150093a4f6cb864d42e3e0f50722", [] ], "urlsearchparams-delete.any.worker-expected.txt": [ @@ -386643,10 +386651,6 @@ "urlsearchparams-get.any.js.ini": [ "e0afce635f0b70de1d746af7d99c52f03a2f4aab", [] - ], - "urlsearchparams-stringifier.any.js.ini": [ - "e43de9d302fbde4b6d3e1f38354e898a5af58685", - [] ] }, "urlpattern": { @@ -387859,7 +387863,7 @@ [] ], "sibling-iframe-timeline.html.ini": [ - "fda793bb285bae3f6cddefbd47036b789da06e18", + "1a24dbb77431c43d983761c568f3cbac1ab5598c", [] ], "timelines.html.ini": [ @@ -388282,7 +388286,11 @@ "f67ac706866e6dcbcce770d3bdd637e4e0af59ce", [] ] - } + }, + "reuse-web-bundle-resource.https.tentative.html.ini": [ + "cdd8260daf9e3c43436a78d750ca90a200718d7d", + [] + ] }, "wbn-from-network": { "wbn-location.tentative.html.ini": [ @@ -388343,7 +388351,7 @@ [] ], "query-ordering.tentative.https.html.ini": [ - "b63d722ab7dd33bb4eac37228311c006f2ed749b", + "236f81ad0bebb737c8cf24c41b4b375df775be5a", [] ], "query.tentative.https.any.js.ini": [ @@ -388645,7 +388653,7 @@ }, "the-analysernode-interface": { "test-analyser-output.html.ini": [ - "46c0f33d523445e66925373e5ff601b757d07600", + "553f41aa08b80bb27bce146c6534611271036059", [] ] }, @@ -388754,6 +388762,10 @@ "5574a563d6f48095e521ecc4aaf7060541d3c725", [] ], + "audioworkletnode-output-channel-count.https.html.ini": [ + "97f1aa6933157db4fc4564d7095f4c274919d1ec", + [] + ], "audioworkletprocessor-promises.https-expected.txt": [ "ecc24fe05e8a87fcd79a9de92e21f7e38207ca0f", [] @@ -388929,13 +388941,17 @@ }, "the-mediaelementaudiosourcenode-interface": { "mediaElementAudioSourceToScriptProcessorTest.html.ini": [ - "c9987cad278dfcf204f42662a2c945bc355f0ce2", + "b4bd5dd9d652b2033253c4ec2a8e9b5dde8eac3a", [] ] }, "the-pannernode-interface": { + "distance-exponential.html.ini": [ + "a3874a7ad801efe775a3b2413439dc447ba78e67", + [] + ], "test-pannernode-automation.html.ini": [ - "20900aabd2ca3a1adb92d1b2b0a46bf8a4213bb2", + "a0c0660a92aa922fcd5abc7c4ebc6b417cc3b4ee", [] ] } @@ -390063,6 +390079,10 @@ "78a2399e152728ede2bb513b81091cbdee406093", [] ], + "origin.window.js.ini": [ + "cdb616cc1387455567a580a04b52598e97e408e2", + [] + ], "resources": { "cross-origin.html": [ "5078b6fc8e46f556fe1b86c7e1aa5a141c132be1", @@ -390088,7 +390108,11 @@ "ee2d51a254256761626e9d3e7743dad89caf0233", [] ] - } + }, + "workers.html.ini": [ + "49c27878b8e2dd76c9318c237adb8158c68ad935", + [] + ] }, "message-channels": { "close-expected.txt": [ @@ -390144,7 +390168,7 @@ [] ], "broadcastchannel-incumbent.sub.html.ini": [ - "6742e10278a81a61ec2e9df0addcb894fba30326", + "b15baab7faf137cd6228e0ad84e836adfd76dd0e", [] ], "support": { @@ -390240,7 +390264,7 @@ [] ], "020.html.ini": [ - "265c7a6def4cc8db611bbcb8f304bdfab086a23c", + "71f5f910e01500a9a5e516fbcc194725e3af2187", [] ], "021.html.ini": [ @@ -390519,7 +390543,7 @@ [] ], "RTCDTMFSender-ontonechange.https.html.ini": [ - "7f85bcb60e81dc7eacbe1f70e19e66fc60d77b48", + "1c21bda5d1d3036550bd4ece5b1b5bf843534b3b", [] ], "RTCDataChannel-binaryType.window-expected.txt": [ @@ -390936,7 +390960,7 @@ [] ], "negotiation-encodings.https-expected.txt": [ - "8d422446b1aec200dea8f4a98553d2b1fb25f42b", + "209bbf9187669c03ecb4bf364ae344d971ba1665", [] ], "negotiation-encodings.https.html.ini": [ @@ -390996,6 +391020,10 @@ "6365c8d16af94db42f2948a50c41c43bd296ca5f", [] ], + "RTCPeerConnection-insertable-streams-simulcast.https.html.ini": [ + "efdf9fee8fd0a53c2aa34691ac4fd9d05e1c627d", + [] + ], "RTCPeerConnection-insertable-streams-worker.https.html.ini": [ "afc28cbfd683af69abf9a75d8fc90d4cc19fa3c4", [] @@ -395501,7 +395529,7 @@ [] ], "events_referenceSpace_reset_inline.https.html.ini": [ - "00c1d56bf0b835c4ab75baee491703b102791134", + "1e5b84d1f009f868ae735f0208210eaa8365be26", [] ], "events_session_select.https.html.ini": [ @@ -395857,7 +395885,7 @@ [] ], "xrSession_requestAnimationFrame_getViewerPose.https.html.ini": [ - "fd22b34a0c12a853179814f71a3c2bcc1eca2838", + "13ee403018cff6c6a876a924f21469c64bebaf7a", [] ], "xrSession_requestAnimationFrame_timestamp.https.html.ini": [ @@ -395869,7 +395897,7 @@ [] ], "xrSession_requestReferenceSpace_features.https.html.ini": [ - "2e02a8cdd773669852af2fbffb2c8a445e254dc2", + "0671cade77e66ac619bd5d2c5659c058c759af60", [] ], "xrSession_requestSessionDuringEnd.https.html.ini": [ @@ -395893,7 +395921,7 @@ [] ], "xrStationaryReferenceSpace_floorlevel_updates.https.html.ini": [ - "01e2cc2c1e2d6aa9d37d070598be7387473b11bd", + "66f1822acf687c891474dcea9dd63a3f4c5537c5", [] ], "xrView_eyes.https.html.ini": [ @@ -396016,6 +396044,10 @@ ], "baseurl": { "alpha": { + "importScripts-in-worker.html.ini": [ + "b871ad55841b590ec3aa1a040827b918a5778067", + [] + ], "sharedworker-in-worker-expected.txt": [ "882a37d0a3642f4a415edbdb040cb3e369b7f615", [] @@ -396418,7 +396450,7 @@ [] ], "redirect.html.ini": [ - "fd33d33be2f9c0d25ef8afed8d0a024b96686d2f", + "3a0f10f26cb7bf5f58f70a9cb9691f6886a5421a", [] ], "redirect.js": [ @@ -396624,7 +396656,7 @@ [] ], "dedicated-worker-import-meta.html.ini": [ - "f8185f10976eba9cc50ff6423ba9337629f38735", + "1457ee30dc6f11cbb7c828c35e02aecbb3d8d32a", [] ], "dedicated-worker-options-credentials.html.headers": [ @@ -397089,6 +397121,10 @@ "002.js": [ "627272aaefa3457f90417ed0f19e967a2c036273", [] + ], + "003.html.ini": [ + "df5625513ab314bd0b1b1468fd54a697f69f4879", + [] ] }, "structured-clone": { @@ -397122,10 +397158,6 @@ "68d7e91d451e6143ef5a68c2686b785ba178e1f0", [] ], - "003.html.ini": [ - "d78390839335a1bcdc75a17f3efd17b836a18f5b", - [] - ], "003.js": [ "1a9c5a7ee816a95c8bbd8510ea234c917d8df2f0", [] @@ -465228,7 +465260,7 @@ ] ], "ElementInternals-labels.html": [ - "02e8a0f2eb5dcae95fa684e2a2ed830b669a1096", + "b27be5f2fc3b157e3217f15256558fec528ef69c", [ null, {} @@ -465249,7 +465281,7 @@ ] ], "ElementInternals-validation.html": [ - "4890cee7212cc2ab422dd98ab7e55c40ad9c25bc", + "2b8fd6afadfdd718fbc32956825fb682530a30fd", [ null, {}
diff --git a/third_party/blink/web_tests/external/wpt/FileAPI/url/url-charset.window.js.ini b/third_party/blink/web_tests/external/wpt/FileAPI/url/url-charset.window.js.ini new file mode 100644 index 0000000..bf7e035b --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/FileAPI/url/url-charset.window.js.ini
@@ -0,0 +1,3 @@ +[url-charset.window.html] + expected: + if product == "chrome": [OK, ERROR]
diff --git a/third_party/blink/web_tests/external/wpt/FileAPI/url/url-in-tags-revoke.window.js.ini b/third_party/blink/web_tests/external/wpt/FileAPI/url/url-in-tags-revoke.window.js.ini new file mode 100644 index 0000000..20ae216 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/FileAPI/url/url-in-tags-revoke.window.js.ini
@@ -0,0 +1,3 @@ +[url-in-tags-revoke.window.html] + expected: + if product == "chrome": [OK, ERROR]
diff --git a/third_party/blink/web_tests/external/wpt/FileAPI/url/url-lifetime.html.ini b/third_party/blink/web_tests/external/wpt/FileAPI/url/url-lifetime.html.ini deleted file mode 100644 index 3e6ab19..0000000 --- a/third_party/blink/web_tests/external/wpt/FileAPI/url/url-lifetime.html.ini +++ /dev/null
@@ -1,4 +0,0 @@ -[url-lifetime.html] - [Terminating worker revokes its URLs] - expected: - if product == "chrome": FAIL
diff --git a/third_party/blink/web_tests/external/wpt/IndexedDB/bindings-inject-values-bypass-chain.html.ini b/third_party/blink/web_tests/external/wpt/IndexedDB/bindings-inject-values-bypass-chain.html.ini new file mode 100644 index 0000000..ab75b1b --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/IndexedDB/bindings-inject-values-bypass-chain.html.ini
@@ -0,0 +1,3 @@ +[bindings-inject-values-bypass-chain.html] + expected: + if product == "chrome": [OK, ERROR]
diff --git a/third_party/blink/web_tests/external/wpt/clear-site-data/storage.https.html.ini b/third_party/blink/web_tests/external/wpt/clear-site-data/storage.https.html.ini index bd565d8e..f0ade331 100644 --- a/third_party/blink/web_tests/external/wpt/clear-site-data/storage.https.html.ini +++ b/third_party/blink/web_tests/external/wpt/clear-site-data/storage.https.html.ini
@@ -1,2 +1,4 @@ [storage.https.html] - expected: TIMEOUT + expected: + if product == "chrome": [ERROR, TIMEOUT] + TIMEOUT
diff --git a/third_party/blink/web_tests/external/wpt/content-security-policy/frame-ancestors/frame-ancestors-nested-cross-in-same-url-block.html.ini b/third_party/blink/web_tests/external/wpt/content-security-policy/frame-ancestors/frame-ancestors-nested-cross-in-same-url-block.html.ini new file mode 100644 index 0000000..8d9f7ac --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/content-security-policy/frame-ancestors/frame-ancestors-nested-cross-in-same-url-block.html.ini
@@ -0,0 +1,3 @@ +[frame-ancestors-nested-cross-in-same-url-block.html] + expected: + if product == "chrome": [OK, ERROR]
diff --git a/third_party/blink/web_tests/external/wpt/content-security-policy/gen/top.meta/script-src-self/sharedworker-import.https.html.ini b/third_party/blink/web_tests/external/wpt/content-security-policy/gen/top.meta/script-src-self/sharedworker-import.https.html.ini index 0a36cef..9f9d6f6 100644 --- a/third_party/blink/web_tests/external/wpt/content-security-policy/gen/top.meta/script-src-self/sharedworker-import.https.html.ini +++ b/third_party/blink/web_tests/external/wpt/content-security-policy/gen/top.meta/script-src-self/sharedworker-import.https.html.ini
@@ -1,4 +1,6 @@ [sharedworker-import.https.html] + expected: + if flag_specific == "disable-site-isolation-trials": [OK, TIMEOUT] [Content Security Policy: Expects blocked for sharedworker-import to cross-https origin and keep-origin redirection from https context.: securitypolicyviolation] expected: FAIL
diff --git a/third_party/blink/web_tests/external/wpt/cookie-store/cookieListItem_attributes.https.any.js.ini b/third_party/blink/web_tests/external/wpt/cookie-store/cookieListItem_attributes.https.any.js.ini new file mode 100644 index 0000000..d9dec7c --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/cookie-store/cookieListItem_attributes.https.any.js.ini
@@ -0,0 +1,18 @@ +[cookieListItem_attributes.https.any.serviceworker.html] + [CookieListItem - cookieStore.set with expires set to a timestamp 10 years in the future] + expected: + if os == "win": [PASS, FAIL] + + [CookieListItem - cookieStore.set with expires set to a Date 10 years in the future] + expected: + if os == "win": [PASS, FAIL] + + +[cookieListItem_attributes.https.any.html] + [CookieListItem - cookieStore.set with expires set to a timestamp 10 years in the future] + expected: + if os == "win": [PASS, FAIL] + + [CookieListItem - cookieStore.set with expires set to a Date 10 years in the future] + expected: + if os == "win": [PASS, FAIL]
diff --git a/third_party/blink/web_tests/external/wpt/cookie-store/cookieStore_set_arguments.https.any.js.ini b/third_party/blink/web_tests/external/wpt/cookie-store/cookieStore_set_arguments.https.any.js.ini new file mode 100644 index 0000000..f613706 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/cookie-store/cookieStore_set_arguments.https.any.js.ini
@@ -0,0 +1,11 @@ +[cookieStore_set_arguments.https.any.html] + [cookieStore.set with expires set to a future Date] + expected: + if os == "win": [FAIL, PASS] + + [cookieStore.set with expires set to a future timestamp] + expected: + if os == "win": [FAIL, PASS] + + +[cookieStore_set_arguments.https.any.serviceworker.html]
diff --git a/third_party/blink/web_tests/external/wpt/cookie-store/cookieStore_subscribe_arguments.https.any.js.ini b/third_party/blink/web_tests/external/wpt/cookie-store/cookieStore_subscribe_arguments.https.any.js.ini index 41b23796..3495317 100644 --- a/third_party/blink/web_tests/external/wpt/cookie-store/cookieStore_subscribe_arguments.https.any.js.ini +++ b/third_party/blink/web_tests/external/wpt/cookie-store/cookieStore_subscribe_arguments.https.any.js.ini
@@ -1,17 +1,17 @@ [cookieStore_subscribe_arguments.https.any.html] expected: - if os == "win": [OK, ERROR] + if (os == "linux") and (product == "chrome"): [ERROR, OK] [cookieStore.subscribe with invalid url path in option] expected: - if os == "win": [PASS, NOTRUN] + if (os == "linux") and (product == "chrome"): [PASS, NOTRUN] [cookieStore.subscribe is idempotent] expected: - if os == "win": [PASS, NOTRUN] + if (os == "linux") and (product == "chrome"): [PASS, NOTRUN] [CookieStore.unsubscribe is idempotent] expected: - if os == "win": [PASS, NOTRUN] + if (os == "linux") and (product == "chrome"): [PASS, NOTRUN] [cookieStore_subscribe_arguments.https.any.serviceworker.html]
diff --git a/third_party/blink/web_tests/external/wpt/credential-management/fedcm-network-requests.https.html.ini b/third_party/blink/web_tests/external/wpt/credential-management/fedcm-network-requests.https.html.ini index 14f5926..f41f6de 100644 --- a/third_party/blink/web_tests/external/wpt/credential-management/fedcm-network-requests.https.html.ini +++ b/third_party/blink/web_tests/external/wpt/credential-management/fedcm-network-requests.https.html.ini
@@ -1,7 +1,7 @@ [fedcm-network-requests.https.html] expected: - if (product == "content_shell") and (os == "win"): [OK, TIMEOUT] - if product == "chrome": TIMEOUT + if (os == "linux") and (product == "content_shell") and (flag_specific == "disable-layout-ng"): [OK, TIMEOUT] + if (os == "linux") and (product == "chrome"): TIMEOUT [nonce is not required in FederatedIdentityProvider.] expected: if product == "chrome": NOTRUN
diff --git a/third_party/blink/web_tests/external/wpt/css/CSS2/floats/float-nowrap-3-ref.html.ini b/third_party/blink/web_tests/external/wpt/css/CSS2/floats/float-nowrap-3-ref.html.ini index 7aafc87..d235fbd 100644 --- a/third_party/blink/web_tests/external/wpt/css/CSS2/floats/float-nowrap-3-ref.html.ini +++ b/third_party/blink/web_tests/external/wpt/css/CSS2/floats/float-nowrap-3-ref.html.ini
@@ -1,5 +1,4 @@ [float-nowrap-3-ref.html] expected: - if (flag_specific == "") and (os == "win"): [TIMEOUT, CRASH] - if flag_specific == "disable-layout-ng": PASS + if (os == "linux") and (flag_specific == "disable-layout-ng"): PASS CRASH
diff --git a/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/Initial-letter-breaking-rtl.html.ini b/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/Initial-letter-breaking-rtl.html.ini index 46ebc05b..9451204 100644 --- a/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/Initial-letter-breaking-rtl.html.ini +++ b/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/Initial-letter-breaking-rtl.html.ini
@@ -1,3 +1,4 @@ [Initial-letter-breaking-rtl.html] expected: - if flag_specific == "disable-layout-ng": FAIL + if (os == "linux") and (product == "content_shell") and (flag_specific == "disable-layout-ng"): FAIL + if (os == "linux") and (product == "chrome"): FAIL
diff --git a/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/Initial-letter-breaking-vlr.html.ini b/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/Initial-letter-breaking-vlr.html.ini index 0a5f5745..eb19349 100644 --- a/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/Initial-letter-breaking-vlr.html.ini +++ b/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/Initial-letter-breaking-vlr.html.ini
@@ -1,3 +1,4 @@ [Initial-letter-breaking-vlr.html] expected: - if flag_specific == "disable-layout-ng": FAIL + if (os == "linux") and (product == "content_shell") and (flag_specific == "disable-layout-ng"): FAIL + if (os == "linux") and (product == "chrome"): FAIL
diff --git a/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/Initial-letter-breaking-vrl.html.ini b/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/Initial-letter-breaking-vrl.html.ini index e5040af..5e2b2a7 100644 --- a/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/Initial-letter-breaking-vrl.html.ini +++ b/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/Initial-letter-breaking-vrl.html.ini
@@ -1,3 +1,4 @@ [Initial-letter-breaking-vrl.html] expected: - if flag_specific == "disable-layout-ng": FAIL + if (os == "linux") and (product == "content_shell") and (flag_specific == "disable-layout-ng"): FAIL + if (os == "linux") and (product == "chrome"): FAIL
diff --git a/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-block-position-drop-over-ruby-tall.html.ini b/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-block-position-drop-over-ruby-tall.html.ini index c971ae3..6c27752 100644 --- a/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-block-position-drop-over-ruby-tall.html.ini +++ b/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-block-position-drop-over-ruby-tall.html.ini
@@ -1,3 +1,4 @@ [initial-letter-block-position-drop-over-ruby-tall.html] expected: - if flag_specific == "disable-layout-ng": FAIL + if (os == "linux") and (product == "content_shell") and (flag_specific == "disable-layout-ng"): FAIL + if (os == "linux") and (product == "chrome"): FAIL
diff --git a/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-block-position-drop-under-ruby-tall.html.ini b/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-block-position-drop-under-ruby-tall.html.ini index 8a8fc7e3..38527a1d 100644 --- a/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-block-position-drop-under-ruby-tall.html.ini +++ b/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-block-position-drop-under-ruby-tall.html.ini
@@ -1,3 +1,4 @@ [initial-letter-block-position-drop-under-ruby-tall.html] expected: - if flag_specific == "disable-layout-ng": FAIL + if (os == "linux") and (product == "content_shell") and (flag_specific == "disable-layout-ng"): FAIL + if (os == "linux") and (product == "chrome"): FAIL
diff --git a/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-block-position-drop-under-ruby.html.ini b/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-block-position-drop-under-ruby.html.ini index 0cde71b8..7357bcde9 100644 --- a/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-block-position-drop-under-ruby.html.ini +++ b/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-block-position-drop-under-ruby.html.ini
@@ -1,3 +1,4 @@ [initial-letter-block-position-drop-under-ruby.html] expected: - if flag_specific == "disable-layout-ng": FAIL + if (os == "linux") and (product == "content_shell") and (flag_specific == "disable-layout-ng"): FAIL + if (os == "linux") and (product == "chrome"): FAIL
diff --git a/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-block-position-margins-vlr.html.ini b/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-block-position-margins-vlr.html.ini index 7634056..42eebbaa 100644 --- a/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-block-position-margins-vlr.html.ini +++ b/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-block-position-margins-vlr.html.ini
@@ -1,3 +1,4 @@ [initial-letter-block-position-margins-vlr.html] expected: - if flag_specific == "disable-layout-ng": FAIL + if (os == "linux") and (product == "content_shell") and (flag_specific == "disable-layout-ng"): FAIL + if (os == "linux") and (product == "chrome"): FAIL
diff --git a/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-block-position-raise-over-ruby.html.ini b/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-block-position-raise-over-ruby.html.ini index 222f169a..d0e63cbe 100644 --- a/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-block-position-raise-over-ruby.html.ini +++ b/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-block-position-raise-over-ruby.html.ini
@@ -1,3 +1,4 @@ [initial-letter-block-position-raise-over-ruby.html] expected: - if flag_specific == "disable-layout-ng": FAIL + if (os == "linux") and (product == "content_shell") and (flag_specific == "disable-layout-ng"): FAIL + if (os == "linux") and (product == "chrome"): FAIL
diff --git a/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-block-position-raise-under-ruby-tall.html.ini b/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-block-position-raise-under-ruby-tall.html.ini index 60f3521d2..9de6f52 100644 --- a/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-block-position-raise-under-ruby-tall.html.ini +++ b/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-block-position-raise-under-ruby-tall.html.ini
@@ -1,4 +1,3 @@ [initial-letter-block-position-raise-under-ruby-tall.html] expected: - if (os == "linux") and (product == "content_shell") and (flag_specific == "disable-layout-ng"): FAIL - if (os == "linux") and (product == "chrome"): FAIL + if flag_specific == "disable-layout-ng": FAIL
diff --git a/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-drop-initial-rtl.html.ini b/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-drop-initial-rtl.html.ini index 87b705fa..78b4408 100644 --- a/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-drop-initial-rtl.html.ini +++ b/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-drop-initial-rtl.html.ini
@@ -1,3 +1,4 @@ [initial-letter-drop-initial-rtl.html] expected: - if flag_specific == "disable-layout-ng": FAIL + if (os == "linux") and (product == "content_shell") and (flag_specific == "disable-layout-ng"): FAIL + if (os == "linux") and (product == "chrome"): FAIL
diff --git a/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-drop-initial-vlr.html.ini b/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-drop-initial-vlr.html.ini index 984123ce..1e3e903 100644 --- a/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-drop-initial-vlr.html.ini +++ b/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-drop-initial-vlr.html.ini
@@ -1,3 +1,4 @@ [initial-letter-drop-initial-vlr.html] expected: - if flag_specific == "disable-layout-ng": FAIL + if (os == "linux") and (product == "content_shell") and (flag_specific == "disable-layout-ng"): FAIL + if (os == "linux") and (product == "chrome"): FAIL
diff --git a/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-drop-initial.html.ini b/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-drop-initial.html.ini index bda49d3..497ccbc 100644 --- a/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-drop-initial.html.ini +++ b/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-drop-initial.html.ini
@@ -1,4 +1,3 @@ [initial-letter-drop-initial.html] expected: - if (os == "linux") and (product == "content_shell") and (flag_specific == "disable-layout-ng"): FAIL - if (os == "linux") and (product == "chrome"): FAIL + if flag_specific == "disable-layout-ng": FAIL
diff --git a/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-float-001-rtl.html.ini b/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-float-001-rtl.html.ini index 339ba097..d350ddf 100644 --- a/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-float-001-rtl.html.ini +++ b/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-float-001-rtl.html.ini
@@ -1,4 +1,3 @@ [initial-letter-float-001-rtl.html] expected: - if (os == "linux") and (product == "content_shell") and (flag_specific == "disable-layout-ng"): FAIL - if (os == "linux") and (product == "chrome"): FAIL + if flag_specific == "disable-layout-ng": FAIL
diff --git a/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-float-001-vrl.html.ini b/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-float-001-vrl.html.ini index a18c546..ff51dd5 100644 --- a/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-float-001-vrl.html.ini +++ b/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-float-001-vrl.html.ini
@@ -1,3 +1,4 @@ [initial-letter-float-001-vrl.html] expected: - if flag_specific == "disable-layout-ng": FAIL + if (os == "linux") and (product == "content_shell") and (flag_specific == "disable-layout-ng"): FAIL + if (os == "linux") and (product == "chrome"): FAIL
diff --git a/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-float-005.html.ini b/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-float-005.html.ini index e71bd47..3a20233 100644 --- a/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-float-005.html.ini +++ b/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-float-005.html.ini
@@ -1,3 +1,4 @@ [initial-letter-float-005.html] expected: - if flag_specific == "disable-layout-ng": FAIL + if (os == "linux") and (product == "content_shell") and (flag_specific == "disable-layout-ng"): FAIL + if (os == "linux") and (product == "chrome"): FAIL
diff --git a/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-indentation.html.ini b/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-indentation.html.ini index fa4f6329..b504607 100644 --- a/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-indentation.html.ini +++ b/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-indentation.html.ini
@@ -1,4 +1,3 @@ [initial-letter-indentation.html] expected: - if (os == "linux") and (product == "content_shell") and (flag_specific == "disable-layout-ng"): FAIL - if (os == "linux") and (product == "chrome"): FAIL + if flag_specific == "disable-layout-ng": FAIL
diff --git a/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-raise-initial-rtl.html.ini b/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-raise-initial-rtl.html.ini index d4d53907..51860775 100644 --- a/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-raise-initial-rtl.html.ini +++ b/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-raise-initial-rtl.html.ini
@@ -1,3 +1,4 @@ [initial-letter-raise-initial-rtl.html] expected: - if flag_specific == "disable-layout-ng": FAIL + if (os == "linux") and (product == "content_shell") and (flag_specific == "disable-layout-ng"): FAIL + if (os == "linux") and (product == "chrome"): FAIL
diff --git a/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-raised-sunken-caps-raise.html.ini b/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-raised-sunken-caps-raise.html.ini index 20d257d..56b3ed6 100644 --- a/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-raised-sunken-caps-raise.html.ini +++ b/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-raised-sunken-caps-raise.html.ini
@@ -1,4 +1,3 @@ [initial-letter-raised-sunken-caps-raise.html] expected: - if (os == "linux") and (product == "content_shell") and (flag_specific == "disable-layout-ng"): FAIL - if (os == "linux") and (product == "chrome"): FAIL + if flag_specific == "disable-layout-ng": FAIL
diff --git a/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-raised-sunken-caps-sunken.html.ini b/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-raised-sunken-caps-sunken.html.ini index 0c64a2fd..b0631f92 100644 --- a/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-raised-sunken-caps-sunken.html.ini +++ b/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-raised-sunken-caps-sunken.html.ini
@@ -1,4 +1,3 @@ [initial-letter-raised-sunken-caps-sunken.html] expected: - if (os == "linux") and (product == "content_shell") and (flag_specific == "disable-layout-ng"): FAIL - if (os == "linux") and (product == "chrome"): FAIL + if flag_specific == "disable-layout-ng": FAIL
diff --git a/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-short-para-initial-letter-clears.html.ini b/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-short-para-initial-letter-clears.html.ini index 7ae823d..b6d8780 100644 --- a/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-short-para-initial-letter-clears.html.ini +++ b/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-short-para-initial-letter-clears.html.ini
@@ -1,3 +1,4 @@ [initial-letter-short-para-initial-letter-clears.html] expected: - if flag_specific == "disable-layout-ng": FAIL + if (os == "linux") and (product == "content_shell") and (flag_specific == "disable-layout-ng"): FAIL + if (os == "linux") and (product == "chrome"): FAIL
diff --git a/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-short-para-initial-letter-wraps.html.ini b/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-short-para-initial-letter-wraps.html.ini index f6b2dff15..322c6d7 100644 --- a/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-short-para-initial-letter-wraps.html.ini +++ b/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-short-para-initial-letter-wraps.html.ini
@@ -1,3 +1,4 @@ [initial-letter-short-para-initial-letter-wraps.html] expected: - if flag_specific == "disable-layout-ng": FAIL + if (os == "linux") and (product == "content_shell") and (flag_specific == "disable-layout-ng"): FAIL + if (os == "linux") and (product == "chrome"): FAIL
diff --git a/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-sunk-initial-rtl.html.ini b/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-sunk-initial-rtl.html.ini index 71d972f..a303baa7 100644 --- a/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-sunk-initial-rtl.html.ini +++ b/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-sunk-initial-rtl.html.ini
@@ -1,3 +1,4 @@ [initial-letter-sunk-initial-rtl.html] expected: - if flag_specific == "disable-layout-ng": FAIL + if (os == "linux") and (product == "content_shell") and (flag_specific == "disable-layout-ng"): FAIL + if (os == "linux") and (product == "chrome"): FAIL
diff --git a/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-sunk-initial-vlr.html.ini b/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-sunk-initial-vlr.html.ini index 63edb9d..82403e6 100644 --- a/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-sunk-initial-vlr.html.ini +++ b/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-sunk-initial-vlr.html.ini
@@ -1,3 +1,4 @@ [initial-letter-sunk-initial-vlr.html] expected: - if flag_specific == "disable-layout-ng": FAIL + if (os == "linux") and (product == "content_shell") and (flag_specific == "disable-layout-ng"): FAIL + if (os == "linux") and (product == "chrome"): FAIL
diff --git a/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-sunk-initial-vrl.html.ini b/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-sunk-initial-vrl.html.ini index 77a501b5..145423c1 100644 --- a/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-sunk-initial-vrl.html.ini +++ b/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-sunk-initial-vrl.html.ini
@@ -1,3 +1,4 @@ [initial-letter-sunk-initial-vrl.html] expected: - if flag_specific == "disable-layout-ng": FAIL + if (os == "linux") and (product == "content_shell") and (flag_specific == "disable-layout-ng"): FAIL + if (os == "linux") and (product == "chrome"): FAIL
diff --git a/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-with-first-line.html.ini b/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-with-first-line.html.ini index 7f69acb..56e94a867 100644 --- a/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-with-first-line.html.ini +++ b/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-with-first-line.html.ini
@@ -1,3 +1,4 @@ [initial-letter-with-first-line.html] expected: - if flag_specific == "disable-layout-ng": FAIL + if (os == "linux") and (product == "content_shell") and (flag_specific == "disable-layout-ng"): FAIL + if (os == "linux") and (product == "chrome"): FAIL
diff --git a/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-with-tab.html.ini b/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-with-tab.html.ini index f5d901a..5091126 100644 --- a/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-with-tab.html.ini +++ b/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-with-tab.html.ini
@@ -1,3 +1,4 @@ [initial-letter-with-tab.html] expected: - if flag_specific == "disable-layout-ng": FAIL + if (os == "linux") and (product == "content_shell") and (flag_specific == "disable-layout-ng"): FAIL + if (os == "linux") and (product == "chrome"): FAIL
diff --git a/third_party/blink/web_tests/external/wpt/css/css-text/text-transform/text-transform-capitalize-007.html.ini b/third_party/blink/web_tests/external/wpt/css/css-text/text-transform/text-transform-capitalize-007.html.ini deleted file mode 100644 index 4dd4f07..0000000 --- a/third_party/blink/web_tests/external/wpt/css/css-text/text-transform/text-transform-capitalize-007.html.ini +++ /dev/null
@@ -1,3 +0,0 @@ -[text-transform-capitalize-007.html] - expected: - if product == "chrome": FAIL
diff --git a/third_party/blink/web_tests/external/wpt/css/css-ui/text-overflow-015.html.ini b/third_party/blink/web_tests/external/wpt/css/css-ui/text-overflow-015.html.ini index f2a3668..ad294fc 100644 --- a/third_party/blink/web_tests/external/wpt/css/css-ui/text-overflow-015.html.ini +++ b/third_party/blink/web_tests/external/wpt/css/css-ui/text-overflow-015.html.ini
@@ -1,4 +1,2 @@ [text-overflow-015.html] - expected: - if flag_specific == "disable-layout-ng": PASS - FAIL + expected: FAIL
diff --git a/third_party/blink/web_tests/external/wpt/css/selectors/invalidation/has-complexity.html.ini b/third_party/blink/web_tests/external/wpt/css/selectors/invalidation/has-complexity.html.ini index abe15aea..c58a580b 100644 --- a/third_party/blink/web_tests/external/wpt/css/selectors/invalidation/has-complexity.html.ini +++ b/third_party/blink/web_tests/external/wpt/css/selectors/invalidation/has-complexity.html.ini
@@ -1,4 +1,4 @@ [has-complexity.html] expected: - if product == "chrome": OK + if product == "chrome": [OK, TIMEOUT] TIMEOUT
diff --git a/third_party/blink/web_tests/external/wpt/custom-elements/form-associated/ElementInternals-labels.html b/third_party/blink/web_tests/external/wpt/custom-elements/form-associated/ElementInternals-labels.html index 02e8a0f..b27be5f 100644 --- a/third_party/blink/web_tests/external/wpt/custom-elements/form-associated/ElementInternals-labels.html +++ b/third_party/blink/web_tests/external/wpt/custom-elements/form-associated/ElementInternals-labels.html
@@ -40,6 +40,10 @@ container.innerHTML = '<my-control></my-control>'; control = container.querySelector('my-control'); assert_array_equals(control.i.labels, []); + + container.innerHTML = '<label><x-foo></x-foo></label>'; + label = container.querySelector('label'); + assert_equals(label.control, null); }, 'LABEL association'); test(() => {
diff --git a/third_party/blink/web_tests/external/wpt/custom-elements/form-associated/ElementInternals-validation-expected.txt b/third_party/blink/web_tests/external/wpt/custom-elements/form-associated/ElementInternals-validation-expected.txt index ed5a28ed..f1a880c5 100644 --- a/third_party/blink/web_tests/external/wpt/custom-elements/form-associated/ElementInternals-validation-expected.txt +++ b/third_party/blink/web_tests/external/wpt/custom-elements/form-associated/ElementInternals-validation-expected.txt
@@ -1,6 +1,7 @@ This is a testharness.js-based test. PASS willValidate PASS willValidate after upgrade +PASS willValidate after upgrade (document.createElement) PASS willValidate should throw NotSupportedError if the target element is not a form-associated custom element PASS validity and setValidity() FAIL "anchor" argument of setValidity() assert_throws_js: Not a HTMLElement function "() => {
diff --git a/third_party/blink/web_tests/external/wpt/custom-elements/form-associated/ElementInternals-validation.html b/third_party/blink/web_tests/external/wpt/custom-elements/form-associated/ElementInternals-validation.html index 4890cee..2b8fd6af 100644 --- a/third_party/blink/web_tests/external/wpt/custom-elements/form-associated/ElementInternals-validation.html +++ b/third_party/blink/web_tests/external/wpt/custom-elements/form-associated/ElementInternals-validation.html
@@ -85,6 +85,20 @@ assert_false(controls[4].i.willValidate, 'in disabled fieldset'); }, 'willValidate after upgrade'); +test(t => { + const control = document.createElement('will-be-defined-2'); + + customElements.define('will-be-defined-2', class extends HTMLElement { + static get formAssociated() { return true; } + }); + + container.append(control); + t.add_cleanup(() => { container.innerHTML = ''; }); + + const i = control.attachInternals(); + assert_true(i.willValidate); +}, 'willValidate after upgrade (document.createElement)'); + test(() => { const element = new NotFormAssociatedElement(); assert_throws_dom('NotSupportedError', () => element.i.willValidate);
diff --git a/third_party/blink/web_tests/external/wpt/custom-elements/throw-on-dynamic-markup-insertion-counter-construct.html.ini b/third_party/blink/web_tests/external/wpt/custom-elements/throw-on-dynamic-markup-insertion-counter-construct.html.ini deleted file mode 100644 index c55cfb3..0000000 --- a/third_party/blink/web_tests/external/wpt/custom-elements/throw-on-dynamic-markup-insertion-counter-construct.html.ini +++ /dev/null
@@ -1,3 +0,0 @@ -[throw-on-dynamic-markup-insertion-counter-construct.html] - expected: - if (flag_specific == "") and (os == "linux") and (product == "content_shell"): CRASH
diff --git a/third_party/blink/web_tests/external/wpt/dom/ranges/Range-mutations-dataChange.html.ini b/third_party/blink/web_tests/external/wpt/dom/ranges/Range-mutations-dataChange.html.ini deleted file mode 100644 index 7158a50..0000000 --- a/third_party/blink/web_tests/external/wpt/dom/ranges/Range-mutations-dataChange.html.ini +++ /dev/null
@@ -1,3 +0,0 @@ -[Range-mutations-dataChange.html] - expected: - if flag_specific == "disable-site-isolation-trials": CRASH
diff --git a/third_party/blink/web_tests/external/wpt/dom/ranges/Range-mutations-deleteData.html.ini b/third_party/blink/web_tests/external/wpt/dom/ranges/Range-mutations-deleteData.html.ini new file mode 100644 index 0000000..8a4d2fe --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/dom/ranges/Range-mutations-deleteData.html.ini
@@ -0,0 +1,3 @@ +[Range-mutations-deleteData.html] + expected: + if flag_specific == "disable-site-isolation-trials": [OK, CRASH]
diff --git a/third_party/blink/web_tests/external/wpt/encoding-detection/pl-windows-1250-late.tentative.html.ini b/third_party/blink/web_tests/external/wpt/encoding-detection/pl-windows-1250-late.tentative.html.ini deleted file mode 100644 index dc3210e..0000000 --- a/third_party/blink/web_tests/external/wpt/encoding-detection/pl-windows-1250-late.tentative.html.ini +++ /dev/null
@@ -1,3 +0,0 @@ -[pl-windows-1250-late.tentative.html] - expected: - if product == "chrome": ERROR
diff --git a/third_party/blink/web_tests/external/wpt/encoding-detection/th-windows-874-late.tentative.html.ini b/third_party/blink/web_tests/external/wpt/encoding-detection/th-windows-874-late.tentative.html.ini new file mode 100644 index 0000000..44e3b03 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/encoding-detection/th-windows-874-late.tentative.html.ini
@@ -0,0 +1,3 @@ +[th-windows-874-late.tentative.html] + expected: + if product == "chrome": [OK, ERROR]
diff --git a/third_party/blink/web_tests/external/wpt/encoding/legacy-mb-japanese/euc-jp/eucjp-decode.html.ini b/third_party/blink/web_tests/external/wpt/encoding/legacy-mb-japanese/euc-jp/eucjp-decode.html.ini index de9286b..db39b75 100644 --- a/third_party/blink/web_tests/external/wpt/encoding/legacy-mb-japanese/euc-jp/eucjp-decode.html.ini +++ b/third_party/blink/web_tests/external/wpt/encoding/legacy-mb-japanese/euc-jp/eucjp-decode.html.ini
@@ -17,12 +17,12 @@ [eucjp-decode.html?7001-8000] [eucjp-decode.html?9001-10000] - expected: - if os == "win": [OK, CRASH] [eucjp-decode.html?12001-13000] [eucjp-decode.html?2001-3000] + expected: + if os == "win": [OK, CRASH] [eucjp-decode.html?3001-4000]
diff --git a/third_party/blink/web_tests/external/wpt/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-form-cseucpkdfmtjapanese.html.ini b/third_party/blink/web_tests/external/wpt/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-form-cseucpkdfmtjapanese.html.ini index 8ea50943..f5c8ad3 100644 --- a/third_party/blink/web_tests/external/wpt/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-form-cseucpkdfmtjapanese.html.ini +++ b/third_party/blink/web_tests/external/wpt/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-form-cseucpkdfmtjapanese.html.ini
@@ -1,6 +1,8 @@ [eucjp-encode-form-cseucpkdfmtjapanese.html?7001-last] [eucjp-encode-form-cseucpkdfmtjapanese.html?4001-5000] + expected: + if os == "win": [OK, CRASH] [eucjp-encode-form-cseucpkdfmtjapanese.html?2001-3000] @@ -11,7 +13,5 @@ [eucjp-encode-form-cseucpkdfmtjapanese.html?6001-7000] [eucjp-encode-form-cseucpkdfmtjapanese.html?1001-2000] - expected: - if os == "win": [OK, CRASH] [eucjp-encode-form-cseucpkdfmtjapanese.html?5001-6000]
diff --git a/third_party/blink/web_tests/external/wpt/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-href-errors-han.html.ini b/third_party/blink/web_tests/external/wpt/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-href-errors-han.html.ini deleted file mode 100644 index 6d63d06..0000000 --- a/third_party/blink/web_tests/external/wpt/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-href-errors-han.html.ini +++ /dev/null
@@ -1,45 +0,0 @@ -[eucjp-encode-href-errors-han.html?17001-18000] - expected: - if (flag_specific == "") and (os == "linux") and (product == "content_shell"): CRASH - -[eucjp-encode-href-errors-han.html?12001-13000] - -[eucjp-encode-href-errors-han.html?1001-2000] - -[eucjp-encode-href-errors-han.html?7001-8000] - -[eucjp-encode-href-errors-han.html?13001-14000] - -[eucjp-encode-href-errors-han.html?5001-6000] - -[eucjp-encode-href-errors-han.html?15001-16000] - -[eucjp-encode-href-errors-han.html?1-1000] - -[eucjp-encode-href-errors-han.html?20001-21000] - -[eucjp-encode-href-errors-han.html?10001-11000] - -[eucjp-encode-href-errors-han.html?11001-12000] - -[eucjp-encode-href-errors-han.html?8001-9000] - -[eucjp-encode-href-errors-han.html?18001-19000] - -[eucjp-encode-href-errors-han.html?16001-17000] - -[eucjp-encode-href-errors-han.html?19001-20000] - -[eucjp-encode-href-errors-han.html?14001-15000] - -[eucjp-encode-href-errors-han.html?3001-4000] - -[eucjp-encode-href-errors-han.html?21001-last] - -[eucjp-encode-href-errors-han.html?9001-10000] - -[eucjp-encode-href-errors-han.html?6001-7000] - -[eucjp-encode-href-errors-han.html?2001-3000] - -[eucjp-encode-href-errors-han.html?4001-5000]
diff --git a/third_party/blink/web_tests/external/wpt/encoding/legacy-mb-japanese/shift_jis/sjis-decode-ms_kanji.html.ini b/third_party/blink/web_tests/external/wpt/encoding/legacy-mb-japanese/shift_jis/sjis-decode-ms_kanji.html.ini index e960136..712808c 100644 --- a/third_party/blink/web_tests/external/wpt/encoding/legacy-mb-japanese/shift_jis/sjis-decode-ms_kanji.html.ini +++ b/third_party/blink/web_tests/external/wpt/encoding/legacy-mb-japanese/shift_jis/sjis-decode-ms_kanji.html.ini
@@ -1,14 +1,14 @@ [sjis-decode-ms_kanji.html?6001-7000] [sjis-decode-ms_kanji.html?4001-5000] + expected: + if (flag_specific == "") and (os == "linux") and (product == "content_shell"): [OK, CRASH] [sjis-decode-ms_kanji.html?3001-4000] [sjis-decode-ms_kanji.html?5001-6000] [sjis-decode-ms_kanji.html?2001-3000] - expected: - if os == "win": [OK, CRASH] [sjis-decode-ms_kanji.html?7001-last]
diff --git a/third_party/blink/web_tests/external/wpt/encoding/unsupported-labels.window.js.ini b/third_party/blink/web_tests/external/wpt/encoding/unsupported-labels.window.js.ini index 72fcc23..0ee7bbb 100644 --- a/third_party/blink/web_tests/external/wpt/encoding/unsupported-labels.window.js.ini +++ b/third_party/blink/web_tests/external/wpt/encoding/unsupported-labels.window.js.ini
@@ -1,5 +1,7 @@ [unsupported-labels.window.html] - expected: TIMEOUT + expected: + if product == "chrome": OK + TIMEOUT [_autodetect_all is not supported by the Encoding Standard] expected: [PASS, TIMEOUT]
diff --git a/third_party/blink/web_tests/external/wpt/fetch/metadata/generated/window-history.https.sub.html.ini b/third_party/blink/web_tests/external/wpt/fetch/metadata/generated/window-history.https.sub.html.ini new file mode 100644 index 0000000..961d7a60 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/fetch/metadata/generated/window-history.https.sub.html.ini
@@ -0,0 +1,3 @@ +[window-history.https.sub.html] + expected: + if os == "win": [OK, TIMEOUT]
diff --git a/third_party/blink/web_tests/external/wpt/fetch/private-network-access/service-worker-background-fetch.https.window.js.ini b/third_party/blink/web_tests/external/wpt/fetch/private-network-access/service-worker-background-fetch.https.window.js.ini index a5d4b8f..1bd4cb7 100644 --- a/third_party/blink/web_tests/external/wpt/fetch/private-network-access/service-worker-background-fetch.https.window.js.ini +++ b/third_party/blink/web_tests/external/wpt/fetch/private-network-access/service-worker-background-fetch.https.window.js.ini
@@ -1,15 +1,13 @@ [service-worker-background-fetch.https.window.html] expected: - if (flag_specific == "") and (os == "linux") and (product == "content_shell"): [OK, TIMEOUT] + if flag_specific == "disable-site-isolation-trials": [OK, TIMEOUT] [local to local: success.] expected: - if (product == "content_shell") and (flag_specific == "disable-site-isolation-trials"): [PASS, FAIL] - if product == "chrome": FAIL + if (flag_specific == "") and (product == "chrome"): FAIL [private to local: success.] expected: - if (flag_specific == "") and (os == "linux") and (product == "chrome"): FAIL - if flag_specific == "disable-layout-ng": FAIL + if product == "chrome": FAIL [private to private: success.] expected: @@ -17,7 +15,8 @@ [public to local: success.] expected: - if (flag_specific == "") and (product == "chrome"): FAIL + if (product == "content_shell") and (flag_specific == "") and (os == "linux"): [PASS, FAIL] + if product == "chrome": FAIL [public to private: success.] expected:
diff --git a/third_party/blink/web_tests/external/wpt/fetch/private-network-access/service-worker-fetch.https.window.js.ini b/third_party/blink/web_tests/external/wpt/fetch/private-network-access/service-worker-fetch.https.window.js.ini deleted file mode 100644 index eaa7acf65..0000000 --- a/third_party/blink/web_tests/external/wpt/fetch/private-network-access/service-worker-fetch.https.window.js.ini +++ /dev/null
@@ -1,3 +0,0 @@ -[service-worker-fetch.https.window.html] - expected: - if (flag_specific == "") and (os == "linux") and (product == "content_shell"): TIMEOUT
diff --git a/third_party/blink/web_tests/external/wpt/focus/focus-already-focused-iframe-same-site.html.ini b/third_party/blink/web_tests/external/wpt/focus/focus-already-focused-iframe-same-site.html.ini index c8cb0f97..4f0bb0c 100644 --- a/third_party/blink/web_tests/external/wpt/focus/focus-already-focused-iframe-same-site.html.ini +++ b/third_party/blink/web_tests/external/wpt/focus/focus-already-focused-iframe-same-site.html.ini
@@ -1,4 +1,2 @@ [focus-already-focused-iframe-same-site.html] - expected: - if flag_specific == "disable-site-isolation-trials": CRASH - TIMEOUT + expected: TIMEOUT
diff --git a/third_party/blink/web_tests/external/wpt/focus/focus-restoration-in-different-site-iframes.html.ini b/third_party/blink/web_tests/external/wpt/focus/focus-restoration-in-different-site-iframes.html.ini index f68eda9..ad6f999 100644 --- a/third_party/blink/web_tests/external/wpt/focus/focus-restoration-in-different-site-iframes.html.ini +++ b/third_party/blink/web_tests/external/wpt/focus/focus-restoration-in-different-site-iframes.html.ini
@@ -1,5 +1,5 @@ [focus-restoration-in-different-site-iframes.html] expected: - if product == "chrome": [OK, ERROR] + if product == "chrome": ERROR [Check result] expected: FAIL
diff --git a/third_party/blink/web_tests/external/wpt/html/anonymous-iframe/embedding.tentative.https.window.js.ini b/third_party/blink/web_tests/external/wpt/html/anonymous-iframe/embedding.tentative.https.window.js.ini index 2df9e267..06a4cb9 100644 --- a/third_party/blink/web_tests/external/wpt/html/anonymous-iframe/embedding.tentative.https.window.js.ini +++ b/third_party/blink/web_tests/external/wpt/html/anonymous-iframe/embedding.tentative.https.window.js.ini
@@ -17,8 +17,6 @@ if product == "chrome": ERROR [embedding.tentative.https.window.html?11-11] - expected: - if product == "chrome": ERROR [embedding.tentative.https.window.html?5-5] @@ -37,6 +35,12 @@ [embedding.tentative.https.window.html?4-4] [embedding.tentative.https.window.html?8-8] + expected: + if product == "chrome": [OK, ERROR] + [COOP:same-origin + COEP:require-corp embeds cross-origin credentialless iframe] + expected: + if os == "win": [PASS, FAIL] + [embedding.tentative.https.window.html?3-3]
diff --git a/third_party/blink/web_tests/external/wpt/html/browsers/history/the-history-interface/history_back_cross_realm_method.html.ini b/third_party/blink/web_tests/external/wpt/html/browsers/history/the-history-interface/history_back_cross_realm_method.html.ini new file mode 100644 index 0000000..0455640 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/html/browsers/history/the-history-interface/history_back_cross_realm_method.html.ini
@@ -0,0 +1,3 @@ +[history_back_cross_realm_method.html] + expected: + if flag_specific == "disable-layout-ng": [OK, CRASH]
diff --git a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-yeswithparams-subdomain.sub.https.html.ini b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-yeswithparams-subdomain.sub.https.html.ini new file mode 100644 index 0000000..b890829 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-no-child-yeswithparams-subdomain.sub.https.html.ini
@@ -0,0 +1,8 @@ +[parent-no-child-yeswithparams-subdomain.sub.https.html] + [setting document.domain must not give sync access] + expected: + if flag_specific == "disable-site-isolation-trials": [PASS, FAIL] + + [child: originAgentCluster must equal true] + expected: + if flag_specific == "disable-site-isolation-trials": [PASS, FAIL]
diff --git a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-no-same.sub.https.html.ini b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-no-same.sub.https.html.ini index 2066f0aa..c5662b4 100644 --- a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-no-same.sub.https.html.ini +++ b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-no-same.sub.https.html.ini
@@ -1,8 +1,10 @@ [parent-yes-child-no-same.sub.https.html] [parent: originAgentCluster must equal true] expected: + if (product == "content_shell") and (flag_specific == "disable-site-isolation-trials"): [PASS, FAIL] if product == "chrome": FAIL [child: originAgentCluster must equal true] expected: + if (product == "content_shell") and (flag_specific == "disable-site-isolation-trials"): [PASS, FAIL] if product == "chrome": FAIL
diff --git a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-yes-same.sub.https.html.ini b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-yes-same.sub.https.html.ini index e3a89c0f..2b7fa4f 100644 --- a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-yes-same.sub.https.html.ini +++ b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/1-iframe/parent-yes-child-yes-same.sub.https.html.ini
@@ -1,8 +1,10 @@ [parent-yes-child-yes-same.sub.https.html] [parent: originAgentCluster must equal true] expected: + if (product == "content_shell") and (flag_specific == "disable-site-isolation-trials"): [PASS, FAIL] if product == "chrome": FAIL [child: originAgentCluster must equal true] expected: + if (product == "content_shell") and (flag_specific == "disable-site-isolation-trials"): [PASS, FAIL] if product == "chrome": FAIL
diff --git a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-no-child1-no-subdomain-child2-yes-subdomain.sub.https.html.ini b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-no-child1-no-subdomain-child2-yes-subdomain.sub.https.html.ini index 9be6e053..08e1ae5 100644 --- a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-no-child1-no-subdomain-child2-yes-subdomain.sub.https.html.ini +++ b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-no-child1-no-subdomain-child2-yes-subdomain.sub.https.html.ini
@@ -10,3 +10,11 @@ if (flag_specific == "") and (product == "chrome"): PASS if flag_specific == "disable-site-isolation-trials": PASS FAIL + + [child1: originAgentCluster must equal false] + expected: + if (flag_specific == "") and (os == "linux") and (product == "content_shell"): [PASS, FAIL] + + [child2: originAgentCluster must equal false] + expected: + if (flag_specific == "") and (os == "linux") and (product == "content_shell"): [PASS, FAIL]
diff --git a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-no-subdomain.sub.https.html.ini b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-no-subdomain.sub.https.html.ini index bb8a3cbb..a2c292b 100644 --- a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-no-subdomain.sub.https.html.ini +++ b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-no-subdomain.sub.https.html.ini
@@ -5,8 +5,10 @@ [child1: originAgentCluster must equal true] expected: + if (os == "linux") and (flag_specific == "disable-site-isolation-trials"): [PASS, FAIL] if os == "win": FAIL [child2: originAgentCluster must equal true] expected: + if (os == "linux") and (flag_specific == "disable-site-isolation-trials"): [PASS, FAIL] if os == "win": FAIL
diff --git a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomain.sub.https.html.ini b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomain.sub.https.html.ini index 3be8b66..fd34c1f97 100644 --- a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomain.sub.https.html.ini +++ b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomain.sub.https.html.ini
@@ -1,12 +1,21 @@ [parent-yes-child1-yes-subdomain-child2-yes-subdomain.sub.https.html] [parent: originAgentCluster must equal true] expected: + if (product == "content_shell") and (flag_specific == "disable-site-isolation-trials"): [PASS, FAIL] if product == "chrome": FAIL [child1: originAgentCluster must equal true] expected: - if flag_specific == "disable-site-isolation-trials": FAIL + if flag_specific == "disable-site-isolation-trials": [PASS, FAIL] [child2: originAgentCluster must equal true] expected: - if flag_specific == "disable-site-isolation-trials": FAIL + if flag_specific == "disable-site-isolation-trials": [PASS, FAIL] + + [Parent to child1: setting document.domain must not give sync access] + expected: + if flag_specific == "disable-site-isolation-trials": [PASS, FAIL] + + [Parent to child2: setting document.domain must not give sync access] + expected: + if flag_specific == "disable-site-isolation-trials": [PASS, FAIL]
diff --git a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomain2.sub.https.html.ini b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomain2.sub.https.html.ini index 1702c50..bea8c5e 100644 --- a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomain2.sub.https.html.ini +++ b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomain2.sub.https.html.ini
@@ -1,16 +1,16 @@ [parent-yes-child1-yes-subdomain-child2-yes-subdomain2.sub.https.html] [child1 to child2: setting document.domain must not give sync access] expected: - if flag_specific == "disable-site-isolation-trials": [PASS, FAIL] + if flag_specific == "disable-site-isolation-trials": FAIL [child2 to child1: setting document.domain must not give sync access] expected: - if flag_specific == "disable-site-isolation-trials": [PASS, FAIL] + if flag_specific == "disable-site-isolation-trials": FAIL [child1: originAgentCluster must equal true] expected: - if flag_specific == "disable-site-isolation-trials": [PASS, FAIL] + if flag_specific == "disable-site-isolation-trials": FAIL [child2: originAgentCluster must equal true] expected: - if flag_specific == "disable-site-isolation-trials": [PASS, FAIL] + if flag_specific == "disable-site-isolation-trials": FAIL
diff --git a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomainport.sub.https.html.ini b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomainport.sub.https.html.ini index e3b0508..5d32ec5 100644 --- a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomainport.sub.https.html.ini +++ b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-yes-subdomain-child2-yes-subdomainport.sub.https.html.ini
@@ -1,4 +1,6 @@ [parent-yes-child1-yes-subdomain-child2-yes-subdomainport.sub.https.html] + expected: + if flag_specific == "disable-site-isolation-trials": [OK, CRASH] [parent: originAgentCluster must equal true] expected: if product == "chrome": FAIL
diff --git a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/document-domain.sub.https.html.ini b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/document-domain.sub.https.html.ini new file mode 100644 index 0000000..86cb856 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/document-domain.sub.https.html.ini
@@ -0,0 +1,4 @@ +[document-domain.sub.https.html] + [Setting document.domain must not change same-originness] + expected: + if product == "chrome": FAIL
diff --git a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/csp-sandbox-no.https.html.ini b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/csp-sandbox-no.https.html.ini index 0c3339d5..56a8acf 100644 --- a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/csp-sandbox-no.https.html.ini +++ b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/csp-sandbox-no.https.html.ini
@@ -1,3 +1,3 @@ [csp-sandbox-no.https.html] expected: - if flag_specific == "disable-site-isolation-trials": [OK, CRASH] + if flag_specific == "disable-site-isolation-trials": CRASH
diff --git a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-url-no.https.html.ini b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-url-no.https.html.ini deleted file mode 100644 index 46583a98..0000000 --- a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/data-url-no.https.html.ini +++ /dev/null
@@ -1,3 +0,0 @@ -[data-url-no.https.html] - expected: - if os == "win": TIMEOUT
diff --git a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/removed-iframe.sub.https.html.ini b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/removed-iframe.sub.https.html.ini new file mode 100644 index 0000000..55f11aaf --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/removed-iframe.sub.https.html.ini
@@ -0,0 +1,4 @@ +[removed-iframe.sub.https.html] + [Removing the iframe does not change originAgentCluster] + expected: + if flag_specific == "disable-site-isolation-trials": [PASS, FAIL]
diff --git a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-same-origin-iframe-yes.https.html.ini b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-same-origin-iframe-yes.https.html.ini index db937cb0..14cb1e6c 100644 --- a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-same-origin-iframe-yes.https.html.ini +++ b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/getter-special-cases/sandboxed-same-origin-iframe-yes.https.html.ini
@@ -1,5 +1,4 @@ [sandboxed-same-origin-iframe-yes.https.html] [originAgentCluster must equal true] expected: - if (flag_specific == "") and (os == "linux") and (product == "chrome"): FAIL - if flag_specific == "disable-site-isolation-trials": FAIL + if product == "chrome": FAIL
diff --git a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-same-2-yes-port.sub.https.html.ini b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-same-2-yes-port.sub.https.html.ini index 43e1bec..325cebf 100644 --- a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-same-2-yes-port.sub.https.html.ini +++ b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-same-2-yes-port.sub.https.html.ini
@@ -1,15 +1,15 @@ [parent-no-1-no-same-2-yes-port.sub.https.html] [before parent: originAgentCluster must equal false] expected: - if (os == "linux") and (flag_specific == "") and (product == "content_shell"): [PASS, FAIL] - if os == "win": FAIL + if (flag_specific == "") and (os == "win"): FAIL + if flag_specific == "disable-layout-ng": [PASS, FAIL] [before child: originAgentCluster must equal false] expected: - if (os == "linux") and (flag_specific == "") and (product == "content_shell"): [PASS, FAIL] - if os == "win": FAIL + if (flag_specific == "") and (os == "win"): FAIL + if flag_specific == "disable-layout-ng": [PASS, FAIL] [after parent: originAgentCluster must equal false] expected: - if (os == "linux") and (flag_specific == "") and (product == "content_shell"): [PASS, FAIL] - if os == "win": FAIL + if (flag_specific == "") and (os == "win"): FAIL + if flag_specific == "disable-layout-ng": [PASS, FAIL]
diff --git a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-same-2-yes-subdomain.sub.https.html.ini b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-same-2-yes-subdomain.sub.https.html.ini index 07e840aa..983a773 100644 --- a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-same-2-yes-subdomain.sub.https.html.ini +++ b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-same-2-yes-subdomain.sub.https.html.ini
@@ -1,15 +1,12 @@ [parent-no-1-no-same-2-yes-subdomain.sub.https.html] [before parent: originAgentCluster must equal false] expected: - if (flag_specific == "") and (product == "content_shell") and (os == "linux"): [PASS, FAIL] - if (flag_specific == "") and (product == "content_shell") and (os == "win"): [PASS, FAIL] + if (flag_specific == "") and (product == "content_shell"): FAIL [before child: originAgentCluster must equal false] expected: - if (flag_specific == "") and (product == "content_shell") and (os == "win"): [PASS, FAIL] - if (flag_specific == "") and (product == "content_shell") and (os == "linux"): [PASS, FAIL] + if (flag_specific == "") and (product == "content_shell"): FAIL [after parent: originAgentCluster must equal false] expected: - if (flag_specific == "") and (product == "content_shell") and (os == "linux"): [PASS, FAIL] - if (flag_specific == "") and (product == "content_shell") and (os == "win"): [PASS, FAIL] + if (flag_specific == "") and (product == "content_shell"): FAIL
diff --git a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-subdomain-2-yes-subdomain.sub.https.html.ini b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-subdomain-2-yes-subdomain.sub.https.html.ini index d2ecf81..ea1a234e 100644 --- a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-subdomain-2-yes-subdomain.sub.https.html.ini +++ b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-subdomain-2-yes-subdomain.sub.https.html.ini
@@ -1,34 +1,20 @@ [parent-no-1-no-subdomain-2-yes-subdomain.sub.https.html] [Before: parent to child: setting document.domain must give sync access] expected: - if (product == "content_shell") and (flag_specific == "disable-site-isolation-trials"): [PASS, FAIL] - if product == "chrome": PASS + if (flag_specific == "") and (product == "chrome"): PASS FAIL [After: parent to child: setting document.domain must give sync access] expected: - if (product == "content_shell") and (flag_specific == "disable-site-isolation-trials"): [PASS, FAIL] - if product == "chrome": PASS + if (flag_specific == "") and (product == "chrome"): PASS FAIL [before parent: originAgentCluster must equal false] expected: - if (product == "content_shell") and (flag_specific == "disable-site-isolation-trials"): [PASS, FAIL] - if (product == "content_shell") and (flag_specific == "disable-layout-ng"): [PASS, FAIL] - if product == "chrome": PASS - FAIL + if (flag_specific == "") and (os == "linux") and (product == "content_shell"): FAIL + if flag_specific == "disable-site-isolation-trials": FAIL [after parent: originAgentCluster must equal false] expected: - if (product == "content_shell") and (flag_specific == "disable-site-isolation-trials"): [PASS, FAIL] - if (product == "content_shell") and (flag_specific == "disable-layout-ng"): [PASS, FAIL] - if product == "chrome": PASS - FAIL - - [after child: originAgentCluster must equal false] - expected: - if flag_specific == "disable-site-isolation-trials": [PASS, FAIL] - - [before child: originAgentCluster must equal false] - expected: - if flag_specific == "disable-site-isolation-trials": [PASS, FAIL] + if (flag_specific == "") and (os == "linux") and (product == "content_shell"): FAIL + if flag_specific == "disable-site-isolation-trials": FAIL
diff --git a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-subdomain-2-yes-subdomain2.sub.https.html.ini b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-subdomain-2-yes-subdomain2.sub.https.html.ini index f4e8bf34..9a902da1 100644 --- a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-subdomain-2-yes-subdomain2.sub.https.html.ini +++ b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-no-subdomain-2-yes-subdomain2.sub.https.html.ini
@@ -1,14 +1,18 @@ [parent-no-1-no-subdomain-2-yes-subdomain2.sub.https.html] [Before: parent to child: setting document.domain must give sync access] expected: - if (product == "content_shell") and (flag_specific == "disable-site-isolation-trials"): [PASS, FAIL] - if product == "chrome": PASS + if (flag_specific == "") and (product == "chrome"): PASS + if flag_specific == "disable-site-isolation-trials": PASS FAIL [after parent: originAgentCluster must equal false] expected: - if (os == "linux") and (flag_specific == "disable-site-isolation-trials"): [PASS, FAIL] + if (flag_specific == "") and (os == "win"): [PASS, FAIL] [before parent: originAgentCluster must equal false] expected: - if (os == "linux") and (flag_specific == "disable-site-isolation-trials"): [PASS, FAIL] + if (flag_specific == "") and (os == "win"): [PASS, FAIL] + + [before child: originAgentCluster must equal false] + expected: + if os == "win": [PASS, FAIL]
diff --git a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-subdomain-yes-2-subdomain2-no.sub.https.html.ini b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-subdomain-yes-2-subdomain2-no.sub.https.html.ini index 35333f9b..419e0edd 100644 --- a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-subdomain-yes-2-subdomain2-no.sub.https.html.ini +++ b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-subdomain-yes-2-subdomain2-no.sub.https.html.ini
@@ -1,14 +1,13 @@ [parent-no-1-subdomain-yes-2-subdomain2-no.sub.https.html] [After: parent to child: setting document.domain must give sync access] expected: - if (product == "content_shell") and (flag_specific == "disable-site-isolation-trials"): [PASS, FAIL] - if product == "chrome": PASS + if (flag_specific == "") and (product == "chrome"): PASS FAIL [before parent: originAgentCluster must equal false] expected: - if flag_specific == "disable-site-isolation-trials": [PASS, FAIL] + if flag_specific == "disable-site-isolation-trials": FAIL [after parent: originAgentCluster must equal false] expected: - if flag_specific == "disable-site-isolation-trials": [PASS, FAIL] + if flag_specific == "disable-site-isolation-trials": FAIL
diff --git a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-yes-subdomain-2-no-subdomain.sub.https.html.ini b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-yes-subdomain-2-no-subdomain.sub.https.html.ini index 88927c4..240de0d5 100644 --- a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-yes-subdomain-2-no-subdomain.sub.https.html.ini +++ b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-no-1-yes-subdomain-2-no-subdomain.sub.https.html.ini
@@ -1,8 +1,16 @@ [parent-no-1-yes-subdomain-2-no-subdomain.sub.https.html] [before parent: originAgentCluster must equal false] expected: - if os == "win": [PASS, FAIL] + if (os == "linux") and (flag_specific == "disable-layout-ng"): [PASS, FAIL] [after parent: originAgentCluster must equal false] expected: - if os == "win": [PASS, FAIL] + if (os == "linux") and (flag_specific == "disable-layout-ng"): [PASS, FAIL] + + [before child: originAgentCluster must equal true] + expected: + if flag_specific == "disable-layout-ng": [PASS, FAIL] + + [after child: originAgentCluster must equal true] + expected: + if flag_specific == "disable-layout-ng": [PASS, FAIL]
diff --git a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-yes-1-no-same-2-no-subdomain.sub.https.html.ini b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-yes-1-no-same-2-no-subdomain.sub.https.html.ini index dae0b9e..4c693c6f 100644 --- a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-yes-1-no-same-2-no-subdomain.sub.https.html.ini +++ b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/iframe-navigation/parent-yes-1-no-same-2-no-subdomain.sub.https.html.ini
@@ -1,23 +1,21 @@ [parent-yes-1-no-same-2-no-subdomain.sub.https.html] [before parent: originAgentCluster must equal true] expected: - if (flag_specific == "") and (os == "linux") and (product == "chrome"): FAIL - if (flag_specific == "") and (os == "win"): FAIL + if product == "chrome": FAIL [before child: originAgentCluster must equal true] expected: - if (flag_specific == "") and (os == "linux") and (product == "chrome"): FAIL - if (flag_specific == "") and (os == "win"): FAIL + if product == "chrome": FAIL [after parent: originAgentCluster must equal true] expected: - if (flag_specific == "") and (os == "linux") and (product == "chrome"): FAIL - if (flag_specific == "") and (os == "win"): FAIL + if product == "chrome": FAIL [After: parent to child: setting document.domain must not give sync access] expected: - if (flag_specific == "") and (product == "chrome"): FAIL + if product == "chrome": FAIL [after child: originAgentCluster must equal false] expected: - if (flag_specific == "") and (os == "linux") and (product == "content_shell"): [PASS, FAIL] + if (flag_specific == "") and (os == "linux") and (product == "content_shell"): FAIL + if flag_specific == "disable-site-isolation-trials": [PASS, FAIL]
diff --git a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-no-openee-yes-port.sub.https.html.ini b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-no-openee-yes-port.sub.https.html.ini index b40a081d..31826e4 100644 --- a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-no-openee-yes-port.sub.https.html.ini +++ b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-no-openee-yes-port.sub.https.html.ini
@@ -1,4 +1,4 @@ [opener-no-openee-yes-port.sub.https.html] [opener: originAgentCluster must equal false] expected: - if (os == "linux") and (flag_specific == "disable-layout-ng"): [PASS, FAIL] + if flag_specific == "disable-layout-ng": FAIL
diff --git a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-no-openee-yes-same.sub.https.html.ini b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-no-openee-yes-same.sub.https.html.ini index ed54867d..f4e691e 100644 --- a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-no-openee-yes-same.sub.https.html.ini +++ b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-no-openee-yes-same.sub.https.html.ini
@@ -1,14 +1,12 @@ [opener-no-openee-yes-same.sub.https.html] [opener: originAgentCluster must equal false] expected: - if (flag_specific == "") and (product == "content_shell") and (os == "win"): [PASS, FAIL] - if (flag_specific == "") and (product == "chrome"): PASS - if flag_specific == "disable-site-isolation-trials": [PASS, FAIL] + if (flag_specific == "") and (os == "linux") and (product == "chrome"): PASS + if flag_specific == "disable-layout-ng": PASS FAIL [openee: originAgentCluster must equal false] expected: - if (flag_specific == "") and (product == "content_shell") and (os == "win"): [PASS, FAIL] - if (flag_specific == "") and (product == "chrome"): PASS - if flag_specific == "disable-site-isolation-trials": [PASS, FAIL] + if (flag_specific == "") and (os == "linux") and (product == "chrome"): PASS + if flag_specific == "disable-layout-ng": PASS FAIL
diff --git a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-no-openee-yes-subdomain.sub.https.html.ini b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-no-openee-yes-subdomain.sub.https.html.ini index 62147f9..439cca1 100644 --- a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-no-openee-yes-subdomain.sub.https.html.ini +++ b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-no-openee-yes-subdomain.sub.https.html.ini
@@ -1,6 +1,7 @@ [opener-no-openee-yes-subdomain.sub.https.html] [opener: originAgentCluster must equal false] expected: + if (os == "linux") and (flag_specific == "disable-site-isolation-trials"): [PASS, FAIL] if os == "win": FAIL [openee: originAgentCluster must equal true]
diff --git a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-same.sub.https.html.ini b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-same.sub.https.html.ini deleted file mode 100644 index 851a368..0000000 --- a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-same.sub.https.html.ini +++ /dev/null
@@ -1,10 +0,0 @@ -[opener-yes-openee-yes-same.sub.https.html] - [opener: originAgentCluster must equal true] - expected: - if (product == "content_shell") and (flag_specific == "") and (os == "linux"): FAIL - if product == "chrome": FAIL - - [openee: originAgentCluster must equal true] - expected: - if (product == "content_shell") and (flag_specific == "") and (os == "linux"): FAIL - if product == "chrome": FAIL
diff --git a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-subdomain.sub.https.html.ini b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-subdomain.sub.https.html.ini index 8901530..d6b4f05 100644 --- a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-subdomain.sub.https.html.ini +++ b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/popups/opener-yes-openee-yes-subdomain.sub.https.html.ini
@@ -1,4 +1,8 @@ [opener-yes-openee-yes-subdomain.sub.https.html] [openee: originAgentCluster must equal true] expected: - if flag_specific == "disable-layout-ng": [PASS, FAIL] + if flag_specific == "disable-layout-ng": FAIL + + [opener: originAgentCluster must equal true] + expected: + if product == "chrome": FAIL
diff --git a/third_party/blink/web_tests/external/wpt/html/browsers/the-window-object/open-close/open-features-is-popup-condition.html.ini b/third_party/blink/web_tests/external/wpt/html/browsers/the-window-object/open-close/open-features-is-popup-condition.html.ini index fff169d3..f6953e6 100644 --- a/third_party/blink/web_tests/external/wpt/html/browsers/the-window-object/open-close/open-features-is-popup-condition.html.ini +++ b/third_party/blink/web_tests/external/wpt/html/browsers/the-window-object/open-close/open-features-is-popup-condition.html.ini
@@ -3,9 +3,7 @@ [open-features-is-popup-condition.html?position] [open-features-is-popup-condition.html?single-2] - expected: - if product == "chrome": ERROR [open-features-is-popup-condition.html?single-1] expected: - if product == "chrome": [OK, ERROR] + if product == "chrome": ERROR
diff --git a/third_party/blink/web_tests/external/wpt/html/browsers/the-window-object/window-open-windowfeatures-values.html.ini b/third_party/blink/web_tests/external/wpt/html/browsers/the-window-object/window-open-windowfeatures-values.html.ini index d9e0e4f..ef909a9 100644 --- a/third_party/blink/web_tests/external/wpt/html/browsers/the-window-object/window-open-windowfeatures-values.html.ini +++ b/third_party/blink/web_tests/external/wpt/html/browsers/the-window-object/window-open-windowfeatures-values.html.ini
@@ -1,3 +1,3 @@ [window-open-windowfeatures-values.html] expected: - if product == "chrome": [ERROR, TIMEOUT] + if product == "chrome": TIMEOUT
diff --git a/third_party/blink/web_tests/external/wpt/html/browsers/windows/auxiliary-browsing-contexts/opener-noopener.html.ini b/third_party/blink/web_tests/external/wpt/html/browsers/windows/auxiliary-browsing-contexts/opener-noopener.html.ini index 08977dee..bbfffcc 100644 --- a/third_party/blink/web_tests/external/wpt/html/browsers/windows/auxiliary-browsing-contexts/opener-noopener.html.ini +++ b/third_party/blink/web_tests/external/wpt/html/browsers/windows/auxiliary-browsing-contexts/opener-noopener.html.ini
@@ -1,3 +1,3 @@ [opener-noopener.html] expected: - if product == "chrome": [OK, ERROR] + if product == "chrome": ERROR
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/manual/the-offscreen-canvas/offscreencanvas.resize.html.ini b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/manual/the-offscreen-canvas/offscreencanvas.resize.html.ini index 362466fa..378d6a6 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/manual/the-offscreen-canvas/offscreencanvas.resize.html.ini +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/manual/the-offscreen-canvas/offscreencanvas.resize.html.ini
@@ -1,16 +1,12 @@ [offscreencanvas.resize.html] [Verify that resizing an OffscreenCanvas with a webgl context propagates the new size to its placeholder canvas asynchronously.] expected: - if (product == "content_shell") and (flag_specific == "") and (os == "win"): [FAIL, PASS] - if (product == "content_shell") and (flag_specific == "disable-site-isolation-trials"): [PASS, FAIL] - if product == "chrome": FAIL + if (product == "content_shell") and (flag_specific == "") and (os == "linux"): PASS + if (product == "content_shell") and (flag_specific == "disable-layout-ng"): PASS + FAIL [Verify that drawImage uses the size of the frame as the intinsic size of a placeholder canvas.] expected: - if flag_specific == "disable-site-isolation-trials": [FAIL, PASS] + if (flag_specific == "") and (os == "linux") and (product == "content_shell"): PASS if flag_specific == "disable-layout-ng": PASS FAIL - - [Verify that resizing an OffscreenCanvas with a 2d context propagates the new size to its placeholder canvas asynchronously.] - expected: - if product == "chrome": FAIL
diff --git a/third_party/blink/web_tests/external/wpt/html/cross-origin-embedder-policy/cross-origin-isolated-permission-worker.https.window.js.ini b/third_party/blink/web_tests/external/wpt/html/cross-origin-embedder-policy/cross-origin-isolated-permission-worker.https.window.js.ini index 1cda6978..6e7bbd4c 100644 --- a/third_party/blink/web_tests/external/wpt/html/cross-origin-embedder-policy/cross-origin-isolated-permission-worker.https.window.js.ini +++ b/third_party/blink/web_tests/external/wpt/html/cross-origin-embedder-policy/cross-origin-isolated-permission-worker.https.window.js.ini
@@ -1,5 +1,3 @@ [cross-origin-isolated-permission-worker.https.window.html] - expected: - if os == "win": TIMEOUT [shared_worker (withCoopCoep: true) cross origin isolated permission test] expected: FAIL
diff --git a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/coep-with-same-site.https.html.ini b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/coep-with-same-site.https.html.ini deleted file mode 100644 index 06986c34..0000000 --- a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/coep-with-same-site.https.html.ini +++ /dev/null
@@ -1,3 +0,0 @@ -[coep-with-same-site.https.html] - expected: - if product == "chrome": ERROR
diff --git a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/header-parsing-failures.https.html.ini b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/header-parsing-failures.https.html.ini index 85c7b35..53b1c22 100644 --- a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/header-parsing-failures.https.html.ini +++ b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/header-parsing-failures.https.html.ini
@@ -1,9 +1,11 @@ [header-parsing-failures.https.html?12-last] + +[header-parsing-failures.https.html?9-12] expected: if product == "chrome": [OK, ERROR] -[header-parsing-failures.https.html?9-12] - [header-parsing-failures.https.html?1-4] + expected: + if product == "chrome": [OK, ERROR] [header-parsing-failures.https.html?5-8]
diff --git a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/header-parsing-repeated.https.html.ini b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/header-parsing-repeated.https.html.ini deleted file mode 100644 index 0ff03121..0000000 --- a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/header-parsing-repeated.https.html.ini +++ /dev/null
@@ -1,3 +0,0 @@ -[header-parsing-repeated.https.html] - expected: - if product == "chrome": ERROR
diff --git a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/header-parsing-successes.https.html.ini b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/header-parsing-successes.https.html.ini index f545d7b1..caf5a0c 100644 --- a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/header-parsing-successes.https.html.ini +++ b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/header-parsing-successes.https.html.ini
@@ -1,3 +1,3 @@ [header-parsing-successes.https.html] expected: - if product == "chrome": [OK, ERROR] + if product == "chrome": ERROR
diff --git a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/historical/popup-same-origin-unsafe-allow-outgoing-with-cross-origin.https.html.ini b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/historical/popup-same-origin-unsafe-allow-outgoing-with-cross-origin.https.html.ini deleted file mode 100644 index da1992e..0000000 --- a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/historical/popup-same-origin-unsafe-allow-outgoing-with-cross-origin.https.html.ini +++ /dev/null
@@ -1,3 +0,0 @@ -[popup-same-origin-unsafe-allow-outgoing-with-cross-origin.https.html] - expected: - if product == "chrome": [ERROR, OK]
diff --git a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/historical/popup-same-site-unsafe-allow-outgoing-with-same-origin.https.html.ini b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/historical/popup-same-site-unsafe-allow-outgoing-with-same-origin.https.html.ini new file mode 100644 index 0000000..0ece312 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/historical/popup-same-site-unsafe-allow-outgoing-with-same-origin.https.html.ini
@@ -0,0 +1,3 @@ +[popup-same-site-unsafe-allow-outgoing-with-same-origin.https.html] + expected: + if product == "chrome": [OK, ERROR]
diff --git a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/iframe-popup-same-origin-allow-popups-to-same-origin-allow-popups.https.html.ini b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/iframe-popup-same-origin-allow-popups-to-same-origin-allow-popups.https.html.ini index 9813f106..eb7663e 100644 --- a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/iframe-popup-same-origin-allow-popups-to-same-origin-allow-popups.https.html.ini +++ b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/iframe-popup-same-origin-allow-popups-to-same-origin-allow-popups.https.html.ini
@@ -1,6 +1,4 @@ [iframe-popup-same-origin-allow-popups-to-same-origin-allow-popups.https.html?1-2] - expected: - if product == "chrome": ERROR [iframe-popup-same-origin-allow-popups-to-same-origin-allow-popups.https.html?3-4] expected: @@ -15,5 +13,3 @@ if product == "chrome": ERROR [iframe-popup-same-origin-allow-popups-to-same-origin-allow-popups.https.html?9-last] - expected: - if product == "chrome": ERROR
diff --git a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/iframe-popup-same-origin-to-same-origin.https.html.ini b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/iframe-popup-same-origin-to-same-origin.https.html.ini index c6cd6b7..79b69601 100644 --- a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/iframe-popup-same-origin-to-same-origin.https.html.ini +++ b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/iframe-popup-same-origin-to-same-origin.https.html.ini
@@ -7,6 +7,8 @@ if product == "chrome": ERROR [iframe-popup-same-origin-to-same-origin.https.html?9-last] + expected: + if product == "chrome": [OK, ERROR] [iframe-popup-same-origin-to-same-origin.https.html?7-8] expected:
diff --git a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/iframe-popup-same-origin-to-unsafe-none.https.html.ini b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/iframe-popup-same-origin-to-unsafe-none.https.html.ini index 872be04..8eec163 100644 --- a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/iframe-popup-same-origin-to-unsafe-none.https.html.ini +++ b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/iframe-popup-same-origin-to-unsafe-none.https.html.ini
@@ -11,8 +11,6 @@ if product == "chrome": ERROR [iframe-popup-same-origin-to-unsafe-none.https.html?9-last] - expected: - if product == "chrome": ERROR [iframe-popup-same-origin-to-unsafe-none.https.html?3-4] expected:
diff --git a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/iframe-popup-unsafe-none-to-same-origin.https.html.ini b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/iframe-popup-unsafe-none-to-same-origin.https.html.ini index 91095c6..3e09c28 100644 --- a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/iframe-popup-unsafe-none-to-same-origin.https.html.ini +++ b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/iframe-popup-unsafe-none-to-same-origin.https.html.ini
@@ -3,6 +3,8 @@ if product == "chrome": ERROR [iframe-popup-unsafe-none-to-same-origin.https.html?9-last] + expected: + if product == "chrome": [ERROR, OK] [iframe-popup-unsafe-none-to-same-origin.https.html?7-8] expected: @@ -14,4 +16,4 @@ [iframe-popup-unsafe-none-to-same-origin.https.html?5-6] expected: - if product == "chrome": [ERROR, CRASH] + if product == "chrome": ERROR
diff --git a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/iframe-popup-unsafe-none-to-unsafe-none.https.html.ini b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/iframe-popup-unsafe-none-to-unsafe-none.https.html.ini index 3deb888f..c1f50620 100644 --- a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/iframe-popup-unsafe-none-to-unsafe-none.https.html.ini +++ b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/iframe-popup-unsafe-none-to-unsafe-none.https.html.ini
@@ -11,6 +11,8 @@ if product == "chrome": ERROR [iframe-popup-unsafe-none-to-unsafe-none.https.html?9-last] + expected: + if product == "chrome": ERROR [iframe-popup-unsafe-none-to-unsafe-none.https.html?1-2] expected:
diff --git a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/javascript-url.https.html.ini b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/javascript-url.https.html.ini index 019f715..5f8bd9ef 100644 --- a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/javascript-url.https.html.ini +++ b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/javascript-url.https.html.ini
@@ -7,12 +7,10 @@ if product == "chrome": ERROR [javascript-url.https.html?11-12] - expected: - if product == "chrome": [OK, ERROR] [javascript-url.https.html?13-14] expected: - if product == "chrome": [ERROR, OK] + if product == "chrome": ERROR [javascript-url.https.html?15-16] @@ -29,3 +27,5 @@ if product == "chrome": ERROR [javascript-url.https.html?9-10] + expected: + if product == "chrome": [OK, ERROR]
diff --git a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/navigate-top-to-aboutblank.https.html.ini b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/navigate-top-to-aboutblank.https.html.ini index 1aeca85..d5c6b762 100644 --- a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/navigate-top-to-aboutblank.https.html.ini +++ b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/navigate-top-to-aboutblank.https.html.ini
@@ -1,8 +1,12 @@ [navigate-top-to-aboutblank.https.html] expected: - if product == "chrome": ERROR + if product == "chrome": [OK, ERROR] [Navigate top to about:blank from iframe with opener COOP: |header(Cross-Origin-Opener-Policy,same-origin), iframe origin: https://www1.web-platform.test:8444] expected: FAIL [Navigate top to about:blank from iframe with opener COOP: |header(Cross-Origin-Opener-Policy,same-origin-allow-popups), iframe origin: https://www1.web-platform.test:8444] expected: FAIL + + [Navigate top to about:blank from iframe with opener COOP: |header(Cross-Origin-Opener-Policy,same-origin), iframe origin: https://web-platform.test:8444] + expected: + if product == "chrome": FAIL
diff --git a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/popup-same-origin-allow-popups-with-cross-origin.https.html.ini b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/popup-same-origin-allow-popups-with-cross-origin.https.html.ini deleted file mode 100644 index 78395f06..0000000 --- a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/popup-same-origin-allow-popups-with-cross-origin.https.html.ini +++ /dev/null
@@ -1,3 +0,0 @@ -[popup-same-origin-allow-popups-with-cross-origin.https.html] - expected: - if product == "chrome": ERROR
diff --git a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/popup-unsafe-none-with-cross-origin.https.html.ini b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/popup-unsafe-none-with-cross-origin.https.html.ini new file mode 100644 index 0000000..1693ee1 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/popup-unsafe-none-with-cross-origin.https.html.ini
@@ -0,0 +1,3 @@ +[popup-unsafe-none-with-cross-origin.https.html] + expected: + if product == "chrome": [OK, ERROR]
diff --git a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/access-from-coop-page-to-openee_coop-ro.https.html.ini b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/access-from-coop-page-to-openee_coop-ro.https.html.ini index 4ce7bb5..59258e97 100644 --- a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/access-from-coop-page-to-openee_coop-ro.https.html.ini +++ b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/access-from-coop-page-to-openee_coop-ro.https.html.ini
@@ -1,10 +1,3 @@ [access-from-coop-page-to-openee_coop-ro.https.html] expected: - if product == "chrome": [OK, ERROR] - [access-from-coop-page-to-openee, same-origin] - expected: - if product == "chrome": FAIL - - [access-from-coop-page-to-openee, same-origin + redirect] - expected: - if product == "chrome": FAIL + if product == "chrome": ERROR
diff --git a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/access-from-coop-page-to-openee_coop-ro_cross-origin.https.html.ini b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/access-from-coop-page-to-openee_coop-ro_cross-origin.https.html.ini index dea0df3..4ae0b275 100644 --- a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/access-from-coop-page-to-openee_coop-ro_cross-origin.https.html.ini +++ b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/access-from-coop-page-to-openee_coop-ro_cross-origin.https.html.ini
@@ -1,6 +1,4 @@ [access-from-coop-page-to-openee_coop-ro_cross-origin.https.html] - expected: - if product == "chrome": [ERROR, OK] [access-from-coop-page-to-openee, cross-origin] expected: if product == "chrome": FAIL
diff --git a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/access-from-coop-page-to-other_coop-ro.https.html.ini b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/access-from-coop-page-to-other_coop-ro.https.html.ini index dd923b49..ad1f304 100644 --- a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/access-from-coop-page-to-other_coop-ro.https.html.ini +++ b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/access-from-coop-page-to-other_coop-ro.https.html.ini
@@ -1,3 +1,6 @@ [access-from-coop-page-to-other_coop-ro.https.html] expected: - if product == "chrome": ERROR + if product == "chrome": [OK, ERROR] + [access-from-coop-page-to-other (COOP-RO)] + expected: + if product == "chrome": FAIL
diff --git a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/access-from-coop-page-to-other_coop-ro_cross-origin.https.html.ini b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/access-from-coop-page-to-other_coop-ro_cross-origin.https.html.ini index dd5c96b2..cf7454f 100644 --- a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/access-from-coop-page-to-other_coop-ro_cross-origin.https.html.ini +++ b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/access-from-coop-page-to-other_coop-ro_cross-origin.https.html.ini
@@ -1,3 +1,4 @@ [access-from-coop-page-to-other_coop-ro_cross-origin.https.html] - expected: - if product == "chrome": ERROR + [access-from-coop-page-to-other (COOP-RO)] + expected: + if product == "chrome": FAIL
diff --git a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/access-to-coop-page-from-openee_coop-ro.https.html.ini b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/access-to-coop-page-from-openee_coop-ro.https.html.ini index eeab671e..134b798 100644 --- a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/access-to-coop-page-from-openee_coop-ro.https.html.ini +++ b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/access-to-coop-page-from-openee_coop-ro.https.html.ini
@@ -1,10 +1,6 @@ [access-to-coop-page-from-openee_coop-ro.https.html] expected: - if product == "chrome": [OK, ERROR] + if product == "chrome": ERROR [access-to-coop-page-from-openee, same-origin] expected: - if product == "chrome": FAIL - - [access-to-coop-page-from-openee, same-origin + redirect] - expected: - if product == "chrome": FAIL + if os == "win": [PASS, FAIL]
diff --git a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/property-closed.https.html.ini b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/property-closed.https.html.ini index ad0e9b0..3ee2c657 100644 --- a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/property-closed.https.html.ini +++ b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/property-closed.https.html.ini
@@ -1,3 +1,10 @@ [property-closed.https.html] expected: - if product == "chrome": ERROR + if product == "chrome": [OK, ERROR] + [same-origin > w => w.closed] + expected: + if product == "chrome": FAIL + + [cross-origin > w => w.closed] + expected: + if product == "chrome": FAIL
diff --git a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/property-focus.https.html.ini b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/property-focus.https.html.ini index 2db32f1e..82c8de3 100644 --- a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/property-focus.https.html.ini +++ b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/property-focus.https.html.ini
@@ -1,3 +1,10 @@ [property-focus.https.html] expected: - if product == "chrome": ERROR + if product == "chrome": [OK, ERROR] + [same-origin > w => w.focus()] + expected: + if product == "chrome": FAIL + + [cross-origin > w => w.focus()] + expected: + if product == "chrome": FAIL
diff --git a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/property-location-get.https.html.ini b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/property-location-get.https.html.ini index dcfc817..e48075c 100644 --- a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/property-location-get.https.html.ini +++ b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/property-location-get.https.html.ini
@@ -1,3 +1,10 @@ [property-location-get.https.html] expected: - if product == "chrome": ERROR + if product == "chrome": [OK, ERROR] + [same-origin > w => w.location] + expected: + if product == "chrome": FAIL + + [cross-origin > w => w.location] + expected: + if product == "chrome": FAIL
diff --git a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/property-named-getter.https.html.ini b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/property-named-getter.https.html.ini deleted file mode 100644 index a713a5f..0000000 --- a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/property-named-getter.https.html.ini +++ /dev/null
@@ -1,3 +0,0 @@ -[property-named-getter.https.html] - expected: - if product == "chrome": ERROR
diff --git a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/property-opener-set.https.html.ini b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/property-opener-set.https.html.ini deleted file mode 100644 index 5c096b16..0000000 --- a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/property-opener-set.https.html.ini +++ /dev/null
@@ -1,3 +0,0 @@ -[property-opener-set.https.html] - expected: - if product == "chrome": [ERROR, OK]
diff --git a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/property-self.https.html.ini b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/property-self.https.html.ini index 189215bc..911a48f 100644 --- a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/property-self.https.html.ini +++ b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/property-self.https.html.ini
@@ -1,3 +1,10 @@ [property-self.https.html] expected: - if product == "chrome": ERROR + if product == "chrome": [OK, ERROR] + [cross-origin > w => w.self] + expected: + if product == "chrome": FAIL + + [same-origin > w => w.self] + expected: + if product == "chrome": FAIL
diff --git a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/property-window.https.html.ini b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/property-window.https.html.ini index 78ab09d..1bf848bb 100644 --- a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/property-window.https.html.ini +++ b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/property-window.https.html.ini
@@ -1,3 +1,10 @@ [property-window.https.html] expected: - if product == "chrome": ERROR + if product == "chrome": [OK, ERROR] + [cross-origin > w => w.window] + expected: + if product == "chrome": FAIL + + [same-origin > w => w.window] + expected: + if product == "chrome": FAIL
diff --git a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/report-to-both_coop-ro.https.html.ini b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/report-to-both_coop-ro.https.html.ini index bafa861..46d3e245 100644 --- a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/report-to-both_coop-ro.https.html.ini +++ b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/report-to-both_coop-ro.https.html.ini
@@ -1,10 +1,3 @@ [report-to-both_coop-ro.https.html] expected: - if product == "chrome": [OK, ERROR, CRASH] - [Access from opener] - expected: - if product == "chrome": FAIL - - [Access from openee] - expected: - if product == "chrome": FAIL + if product == "chrome": ERROR
diff --git a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/document-reporting/report-only-four-reports.https.html.ini b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/document-reporting/report-only-four-reports.https.html.ini index c7e7616..a8b9622 100644 --- a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/document-reporting/report-only-four-reports.https.html.ini +++ b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/document-reporting/report-only-four-reports.https.html.ini
@@ -1,4 +1,6 @@ [report-only-four-reports.https.html] + expected: + if product == "chrome": [OK, ERROR] [coop document reporting test A test with both COOP and COOP report only setup using Reporting-Endpoints header to CROSS_ORIGIN with same-origin-allow-popups; report-to="coop-popup-report-endpoint", require-corp, same-origin; report-to="coop-popup-report-only-endpoint", require-corp] expected: if product == "chrome": FAIL
diff --git a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-to-so.https.html.ini b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-to-so.https.html.ini index f8a499ba..da58f27 100644 --- a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-to-so.https.html.ini +++ b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/tentative/restrict-properties/iframe-popup-to-so.https.html.ini
@@ -15,3 +15,5 @@ if product == "chrome": ERROR [iframe-popup-to-so.https.html?9-last] + expected: + if product == "chrome": [OK, ERROR]
diff --git a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/tentative/restrict-properties/popup-so.https.html.ini b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/tentative/restrict-properties/popup-so.https.html.ini deleted file mode 100644 index 81084dfe..0000000 --- a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/tentative/restrict-properties/popup-so.https.html.ini +++ /dev/null
@@ -1,3 +0,0 @@ -[popup-so.https.html] - expected: - if product == "chrome": ERROR
diff --git a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/tentative/restrict-properties/popup-soap.https.html.ini b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/tentative/restrict-properties/popup-soap.https.html.ini index 75e0479..d4cfb80 100644 --- a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/tentative/restrict-properties/popup-soap.https.html.ini +++ b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/tentative/restrict-properties/popup-soap.https.html.ini
@@ -1,4 +1,6 @@ [popup-soap.https.html] + expected: + if product == "chrome": [OK, ERROR] [SAME_ORIGIN popup with coop restrict-properties] expected: FAIL
diff --git a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/tentative/restrict-properties/popup-with-same-site.https.html.ini b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/tentative/restrict-properties/popup-with-same-site.https.html.ini index 63f2627e..3a041615 100644 --- a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/tentative/restrict-properties/popup-with-same-site.https.html.ini +++ b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/tentative/restrict-properties/popup-with-same-site.https.html.ini
@@ -1,6 +1,4 @@ [popup-with-same-site.https.html] - expected: - if product == "chrome": [ERROR, OK] [Same-site popup with coop restrict-properties] expected: FAIL
diff --git a/third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-source-not-in-document.html.ini b/third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-source-not-in-document.html.ini index 41a50745..dc6d43f 100644 --- a/third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-source-not-in-document.html.ini +++ b/third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-source-not-in-document.html.ini
@@ -1,5 +1,5 @@ [resource-selection-invoke-insert-source-not-in-document.html] [invoking resource selection by inserting <source> in video not in a document] expected: - if product == "chrome": PASS + if (flag_specific == "") and (os == "linux") and (product == "content_shell"): PASS FAIL
diff --git a/third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-source.html.ini b/third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-source.html.ini index 6deb2ed..936ae2c 100644 --- a/third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-source.html.ini +++ b/third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-insert-source.html.ini
@@ -1,5 +1,5 @@ [resource-selection-invoke-insert-source.html] [invoking resource selection by inserting <source>] expected: - if (flag_specific == "") and (os == "linux") and (product == "content_shell"): PASS + if (flag_specific == "") and (os == "linux") and (product == "content_shell"): [FAIL, PASS] FAIL
diff --git a/third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-remove-from-document-networkState.html.ini b/third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-remove-from-document-networkState.html.ini index b7a9014..89c1c9a 100644 --- a/third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-remove-from-document-networkState.html.ini +++ b/third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-remove-from-document-networkState.html.ini
@@ -1,5 +1,6 @@ [resource-selection-invoke-remove-from-document-networkState.html] [NOT invoking resource selection with implicit pause() when networkState is not NETWORK_EMPTY] expected: - if flag_specific == "disable-layout-ng": PASS + if (flag_specific == "") and (os == "linux") and (product == "chrome"): PASS + if (flag_specific == "") and (os == "win"): PASS FAIL
diff --git a/third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-remove-src.html.ini b/third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-remove-src.html.ini index 6797a25..d0030362 100644 --- a/third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-remove-src.html.ini +++ b/third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-remove-src.html.ini
@@ -1,4 +1,4 @@ [resource-selection-invoke-remove-src.html] [NOT invoking media load or resource selection when removing the src attribute] expected: - if (flag_specific == "") and (os == "win"): [PASS, FAIL] + if (os == "linux") and (flag_specific == "disable-site-isolation-trials"): [PASS, FAIL]
diff --git a/third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-set-src-not-in-document.html.ini b/third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-set-src-not-in-document.html.ini index 7f054e1f..c747a67 100644 --- a/third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-set-src-not-in-document.html.ini +++ b/third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-set-src-not-in-document.html.ini
@@ -1,5 +1,5 @@ [resource-selection-invoke-set-src-not-in-document.html] [invoking load by setting src on video not in a document] expected: - if flag_specific == "disable-layout-ng": PASS + if (flag_specific == "") and (os == "linux") and (product == "content_shell"): PASS FAIL
diff --git a/third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-set-src.html.ini b/third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-set-src.html.ini index b5d4fab4..87b5d61 100644 --- a/third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-set-src.html.ini +++ b/third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/media-elements/loading-the-media-resource/resource-selection-invoke-set-src.html.ini
@@ -1,5 +1,5 @@ [resource-selection-invoke-set-src.html] [invoking load by setting src] expected: - if flag_specific == "disable-site-isolation-trials": PASS + if (flag_specific == "") and (os == "linux") and (product == "content_shell"): PASS FAIL
diff --git a/third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/media-elements/track/track-element/track-cue-rendering-after-controls-removed.html.ini b/third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/media-elements/track/track-element/track-cue-rendering-after-controls-removed.html.ini index 867decb..cd1b74e 100644 --- a/third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/media-elements/track/track-element/track-cue-rendering-after-controls-removed.html.ini +++ b/third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/media-elements/track/track-element/track-cue-rendering-after-controls-removed.html.ini
@@ -1,4 +1,4 @@ [track-cue-rendering-after-controls-removed.html] expected: - if (flag_specific == "") and (os == "linux"): PASS - FAIL + if (flag_specific == "") and (os == "win"): FAIL + if flag_specific == "disable-layout-ng": FAIL
diff --git a/third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/the-iframe-element/sandbox-top-navigation-child-special-cases.tentative.sub.window.js.ini b/third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/the-iframe-element/sandbox-top-navigation-child-special-cases.tentative.sub.window.js.ini index 53c099f..9a594bd4 100644 --- a/third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/the-iframe-element/sandbox-top-navigation-child-special-cases.tentative.sub.window.js.ini +++ b/third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/the-iframe-element/sandbox-top-navigation-child-special-cases.tentative.sub.window.js.ini
@@ -1,4 +1,5 @@ [sandbox-top-navigation-child-special-cases.tentative.sub.window.html] expected: - if (os == "linux") and (flag_specific == "") and (product == "chrome"): ERROR - if os == "win": [OK, TIMEOUT] + if (flag_specific == "") and (os == "linux") and (product == "chrome"): ERROR + if (flag_specific == "") and (os == "win"): TIMEOUT + if flag_specific == "disable-site-isolation-trials": [TIMEOUT, OK]
diff --git a/third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/the-iframe-element/sandbox-top-navigation-escalate-privileges.tentative.sub.window.js.ini b/third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/the-iframe-element/sandbox-top-navigation-escalate-privileges.tentative.sub.window.js.ini index 4d6ee23..ae3370f 100644 --- a/third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/the-iframe-element/sandbox-top-navigation-escalate-privileges.tentative.sub.window.js.ini +++ b/third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/the-iframe-element/sandbox-top-navigation-escalate-privileges.tentative.sub.window.js.ini
@@ -1,4 +1,4 @@ [sandbox-top-navigation-escalate-privileges.tentative.sub.window.html] expected: - if (product == "content_shell") and (flag_specific == "disable-site-isolation-trials"): [OK, TIMEOUT] - if product == "chrome": ERROR + if (flag_specific == "") and (product == "chrome"): ERROR + if flag_specific == "disable-site-isolation-trials": TIMEOUT
diff --git a/third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/the-iframe-element/sandbox-top-navigation-grandchild.tentative.sub.window.js.ini b/third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/the-iframe-element/sandbox-top-navigation-grandchild.tentative.sub.window.js.ini index f6d097fe..0f880d1 100644 --- a/third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/the-iframe-element/sandbox-top-navigation-grandchild.tentative.sub.window.js.ini +++ b/third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/the-iframe-element/sandbox-top-navigation-grandchild.tentative.sub.window.js.ini
@@ -1,4 +1,3 @@ [sandbox-top-navigation-grandchild.tentative.sub.window.html] expected: - if (flag_specific == "") and (product == "chrome"): ERROR - if flag_specific == "disable-site-isolation-trials": TIMEOUT + if product == "chrome": ERROR
diff --git a/third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/the-img-element/image-loading-lazy-base-url-2.html.ini b/third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/the-img-element/image-loading-lazy-base-url-2.html.ini index 7db569e5..b0363e4 100644 --- a/third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/the-img-element/image-loading-lazy-base-url-2.html.ini +++ b/third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/the-img-element/image-loading-lazy-base-url-2.html.ini
@@ -1,3 +1,5 @@ [image-loading-lazy-base-url-2.html] + expected: + if product == "chrome": [OK, ERROR] [When a loading=lazy image is loaded, it loads relative to the document's base URL computed at parse-time.] expected: FAIL
diff --git a/third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/the-img-element/image-loading-lazy-base-url.html.ini b/third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/the-img-element/image-loading-lazy-base-url.html.ini index 031fb3b..5aa4bedf 100644 --- a/third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/the-img-element/image-loading-lazy-base-url.html.ini +++ b/third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/the-img-element/image-loading-lazy-base-url.html.ini
@@ -1,5 +1,3 @@ [image-loading-lazy-base-url.html] - expected: - if product == "chrome": ERROR [When a loading=lazy image is loaded, it loads relative to the document's base URL computed at parse-time.] expected: FAIL
diff --git a/third_party/blink/web_tests/external/wpt/html/semantics/forms/form-submission-0/multipart-formdata.window.js.ini b/third_party/blink/web_tests/external/wpt/html/semantics/forms/form-submission-0/multipart-formdata.window.js.ini index 53ef1d00..ded39f6 100644 --- a/third_party/blink/web_tests/external/wpt/html/semantics/forms/form-submission-0/multipart-formdata.window.js.ini +++ b/third_party/blink/web_tests/external/wpt/html/semantics/forms/form-submission-0/multipart-formdata.window.js.ini
@@ -1,3 +1,3 @@ [multipart-formdata.window.html] expected: - if (flag_specific == "") and (os == "linux") and (product == "content_shell"): TIMEOUT + if flag_specific == "disable-layout-ng": [OK, TIMEOUT]
diff --git a/third_party/blink/web_tests/external/wpt/html/semantics/forms/the-selectmenu-element/selectmenu-form-state-restore.tentative.html.ini b/third_party/blink/web_tests/external/wpt/html/semantics/forms/the-selectmenu-element/selectmenu-form-state-restore.tentative.html.ini index 2ea1f960..bd74d07a 100644 --- a/third_party/blink/web_tests/external/wpt/html/semantics/forms/the-selectmenu-element/selectmenu-form-state-restore.tentative.html.ini +++ b/third_party/blink/web_tests/external/wpt/html/semantics/forms/the-selectmenu-element/selectmenu-form-state-restore.tentative.html.ini
@@ -1,5 +1,5 @@ [selectmenu-form-state-restore.tentative.html] expected: - if (flag_specific == "") and (product == "chrome"): OK + if (flag_specific == "") and (os == "win"): OK if flag_specific == "disable-site-isolation-trials": OK ERROR
diff --git a/third_party/blink/web_tests/external/wpt/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini b/third_party/blink/web_tests/external/wpt/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini new file mode 100644 index 0000000..caa321a --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini
@@ -0,0 +1,3 @@ +[htmlanchorelement_noopener.html] + expected: + if product == "chrome": [OK, ERROR]
diff --git a/third_party/blink/web_tests/external/wpt/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry-different-function-realm.html.ini b/third_party/blink/web_tests/external/wpt/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry-different-function-realm.html.ini index e2f5d1c..d529e47 100644 --- a/third_party/blink/web_tests/external/wpt/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry-different-function-realm.html.ini +++ b/third_party/blink/web_tests/external/wpt/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry-different-function-realm.html.ini
@@ -1,3 +1,3 @@ [promise-job-entry-different-function-realm.html] expected: - if product == "chrome": [OK, ERROR] + if product == "chrome": ERROR
diff --git a/third_party/blink/web_tests/external/wpt/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry.html.ini b/third_party/blink/web_tests/external/wpt/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry.html.ini deleted file mode 100644 index c7de4281d..0000000 --- a/third_party/blink/web_tests/external/wpt/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry.html.ini +++ /dev/null
@@ -1,3 +0,0 @@ -[promise-job-entry.html] - expected: - if product == "chrome": ERROR
diff --git a/third_party/blink/web_tests/external/wpt/import-maps/http-url-like-specifiers.sub.html.ini b/third_party/blink/web_tests/external/wpt/import-maps/http-url-like-specifiers.sub.html.ini index c6c9a75..f151d64 100644 --- a/third_party/blink/web_tests/external/wpt/import-maps/http-url-like-specifiers.sub.html.ini +++ b/third_party/blink/web_tests/external/wpt/import-maps/http-url-like-specifiers.sub.html.ini
@@ -1,3 +1,3 @@ [http-url-like-specifiers.sub.html] expected: - if flag_specific == "disable-layout-ng": [OK, TIMEOUT] + if flag_specific == "disable-layout-ng": TIMEOUT
diff --git a/third_party/blink/web_tests/external/wpt/intersection-observer/cross-origin-iframe.sub.html.ini b/third_party/blink/web_tests/external/wpt/intersection-observer/cross-origin-iframe.sub.html.ini index d48fe92..07d81d6 100644 --- a/third_party/blink/web_tests/external/wpt/intersection-observer/cross-origin-iframe.sub.html.ini +++ b/third_party/blink/web_tests/external/wpt/intersection-observer/cross-origin-iframe.sub.html.ini
@@ -1,19 +1,5 @@ [cross-origin-iframe.sub.html] [topDocument.scrollingElement.scrollTop = 200] expected: - if (flag_specific == "") and (os == "win"): [PASS, FAIL] - if flag_specific == "disable-layout-ng": PASS - FAIL - - [topDocument.scrollingElement.scrollTop = 100] - expected: - if os == "win": [PASS, FAIL] - - [iframeDocument.scrollingElement.scrollTop = 250] - expected: - if (os == "linux") and (flag_specific == "") and (product == "content_shell"): FAIL - if os == "win": [PASS, FAIL] - - [First rAF] - expected: - if os == "win": [PASS, FAIL] + if (os == "linux") and (flag_specific == "") and (product == "chrome"): FAIL + if (os == "linux") and (flag_specific == "disable-site-isolation-trials"): FAIL
diff --git a/third_party/blink/web_tests/external/wpt/largest-contentful-paint/first-paint-equals-lcp-text.html.ini b/third_party/blink/web_tests/external/wpt/largest-contentful-paint/first-paint-equals-lcp-text.html.ini index cb0c8f1..f748fb6 100644 --- a/third_party/blink/web_tests/external/wpt/largest-contentful-paint/first-paint-equals-lcp-text.html.ini +++ b/third_party/blink/web_tests/external/wpt/largest-contentful-paint/first-paint-equals-lcp-text.html.ini
@@ -1,5 +1,6 @@ [first-paint-equals-lcp-text.html] [FCP and LCP are the same when there is a single text element in the page.] expected: - if (flag_specific == "") and (os == "linux") and (product == "content_shell"): [FAIL, PASS] + if (flag_specific == "") and (os == "linux") and (product == "chrome"): PASS + if flag_specific == "disable-site-isolation-trials": PASS FAIL
diff --git a/third_party/blink/web_tests/external/wpt/layout-instability/child-shift-with-parent-overflow-x-clip.html.ini b/third_party/blink/web_tests/external/wpt/layout-instability/child-shift-with-parent-overflow-x-clip.html.ini deleted file mode 100644 index 727203c..0000000 --- a/third_party/blink/web_tests/external/wpt/layout-instability/child-shift-with-parent-overflow-x-clip.html.ini +++ /dev/null
@@ -1,3 +0,0 @@ -[child-shift-with-parent-overflow-x-clip.html] - expected: - if flag_specific == "disable-site-isolation-trials": CRASH
diff --git a/third_party/blink/web_tests/external/wpt/loading/early-hints/csp-early-hints-allowed-final-allowed.h2.window.js.ini b/third_party/blink/web_tests/external/wpt/loading/early-hints/csp-early-hints-allowed-final-allowed.h2.window.js.ini index 8774e47e6..9071ef7 100644 --- a/third_party/blink/web_tests/external/wpt/loading/early-hints/csp-early-hints-allowed-final-allowed.h2.window.js.ini +++ b/third_party/blink/web_tests/external/wpt/loading/early-hints/csp-early-hints-allowed-final-allowed.h2.window.js.ini
@@ -1,4 +1,2 @@ [csp-early-hints-allowed-final-allowed.h2.window.html] - expected: - if product == "chrome": [OK, ERROR] - ERROR + expected: ERROR
diff --git a/third_party/blink/web_tests/external/wpt/loading/early-hints/modulepreload-in-early-hints.h2.window.js.ini b/third_party/blink/web_tests/external/wpt/loading/early-hints/modulepreload-in-early-hints.h2.window.js.ini index 09b074d..5d40100 100644 --- a/third_party/blink/web_tests/external/wpt/loading/early-hints/modulepreload-in-early-hints.h2.window.js.ini +++ b/third_party/blink/web_tests/external/wpt/loading/early-hints/modulepreload-in-early-hints.h2.window.js.ini
@@ -1,4 +1,4 @@ [modulepreload-in-early-hints.h2.window.html] expected: - if product == "chrome": OK + if product == "chrome": [ERROR, OK] ERROR
diff --git a/third_party/blink/web_tests/external/wpt/loading/early-hints/preconnect-in-early-hints.h2.window.js.ini b/third_party/blink/web_tests/external/wpt/loading/early-hints/preconnect-in-early-hints.h2.window.js.ini index 44bab013..7f528f0 100644 --- a/third_party/blink/web_tests/external/wpt/loading/early-hints/preconnect-in-early-hints.h2.window.js.ini +++ b/third_party/blink/web_tests/external/wpt/loading/early-hints/preconnect-in-early-hints.h2.window.js.ini
@@ -1,4 +1,2 @@ [preconnect-in-early-hints.h2.window.html] - expected: - if product == "chrome": [OK, ERROR] - ERROR + expected: ERROR
diff --git a/third_party/blink/web_tests/external/wpt/loading/early-hints/referrer-policy-same-origin.h2.window.js.ini b/third_party/blink/web_tests/external/wpt/loading/early-hints/referrer-policy-same-origin.h2.window.js.ini index cc4aae74..c87d9d9 100644 --- a/third_party/blink/web_tests/external/wpt/loading/early-hints/referrer-policy-same-origin.h2.window.js.ini +++ b/third_party/blink/web_tests/external/wpt/loading/early-hints/referrer-policy-same-origin.h2.window.js.ini
@@ -1,2 +1,4 @@ [referrer-policy-same-origin.h2.window.html] - expected: ERROR + expected: + if product == "chrome": OK + ERROR
diff --git a/third_party/blink/web_tests/external/wpt/mathml/presentation-markup/mrow/legacy-mstyle-attributes.html.ini b/third_party/blink/web_tests/external/wpt/mathml/presentation-markup/mrow/legacy-mstyle-attributes.html.ini deleted file mode 100644 index be13767..0000000 --- a/third_party/blink/web_tests/external/wpt/mathml/presentation-markup/mrow/legacy-mstyle-attributes.html.ini +++ /dev/null
@@ -1,4 +0,0 @@ -[legacy-mstyle-attributes.html] - [Legacy mstyle attributes do not apply to mo] - expected: - if product == "chrome": FAIL
diff --git a/third_party/blink/web_tests/external/wpt/mathml/relations/css-styling/ignored-properties-001.html.ini b/third_party/blink/web_tests/external/wpt/mathml/relations/css-styling/ignored-properties-001.html.ini index 94caa7ee..c890db57 100644 --- a/third_party/blink/web_tests/external/wpt/mathml/relations/css-styling/ignored-properties-001.html.ini +++ b/third_party/blink/web_tests/external/wpt/mathml/relations/css-styling/ignored-properties-001.html.ini
@@ -1,6 +1,6 @@ [ignored-properties-001.html] expected: - if (flag_specific == "") and (os == "win"): [OK, TIMEOUT] + if (os == "linux") and (flag_specific == "disable-site-isolation-trials"): [OK, TIMEOUT] [maction layout is not affected by width: 100px !important; height: 200px !important;] expected: FAIL
diff --git a/third_party/blink/web_tests/external/wpt/media-source/dedicated-worker/mediasource-worker-play-terminate-worker.html.ini b/third_party/blink/web_tests/external/wpt/media-source/dedicated-worker/mediasource-worker-play-terminate-worker.html.ini index edc72e2..75488df 100644 --- a/third_party/blink/web_tests/external/wpt/media-source/dedicated-worker/mediasource-worker-play-terminate-worker.html.ini +++ b/third_party/blink/web_tests/external/wpt/media-source/dedicated-worker/mediasource-worker-play-terminate-worker.html.ini
@@ -1,4 +1,4 @@ [mediasource-worker-play-terminate-worker.html] [Test worker MediaSource termination after at least 6 main thread setTimeouts, starting counting before setting srcObject] expected: - if flag_specific == "disable-site-isolation-trials": [PASS, FAIL] + if flag_specific == "disable-site-isolation-trials": FAIL
diff --git a/third_party/blink/web_tests/external/wpt/media-source/mediasource-appendbuffer-quota-exceeded.html.ini b/third_party/blink/web_tests/external/wpt/media-source/mediasource-appendbuffer-quota-exceeded.html.ini index 627cac7..3763a2bc3 100644 --- a/third_party/blink/web_tests/external/wpt/media-source/mediasource-appendbuffer-quota-exceeded.html.ini +++ b/third_party/blink/web_tests/external/wpt/media-source/mediasource-appendbuffer-quota-exceeded.html.ini
@@ -1,3 +1,3 @@ [mediasource-appendbuffer-quota-exceeded.html] expected: - if flag_specific == "disable-site-isolation-trials": [OK, TIMEOUT] + if flag_specific == "disable-layout-ng": [OK, TIMEOUT]
diff --git a/third_party/blink/web_tests/external/wpt/media-source/mediasource-avtracks.html.ini b/third_party/blink/web_tests/external/wpt/media-source/mediasource-avtracks.html.ini index cf16bf5..da84148 100644 --- a/third_party/blink/web_tests/external/wpt/media-source/mediasource-avtracks.html.ini +++ b/third_party/blink/web_tests/external/wpt/media-source/mediasource-avtracks.html.ini
@@ -4,4 +4,5 @@ [Media tracks must be removed when the SourceBuffer is removed from the MediaSource] expected: + if (os == "linux") and (product == "chrome"): [PASS, FAIL] if os == "win": FAIL
diff --git a/third_party/blink/web_tests/external/wpt/media-source/mediasource-duration.html.ini b/third_party/blink/web_tests/external/wpt/media-source/mediasource-duration.html.ini index 1946fb5..1cbec73 100644 --- a/third_party/blink/web_tests/external/wpt/media-source/mediasource-duration.html.ini +++ b/third_party/blink/web_tests/external/wpt/media-source/mediasource-duration.html.ini
@@ -1,8 +1,16 @@ [mediasource-duration.html] expected: - if (flag_specific == "") and (product == "content_shell") and (os == "win"): [OK, ERROR] - if (flag_specific == "") and (product == "content_shell") and (os == "linux"): ERROR - if flag_specific == "disable-site-isolation-trials": ERROR + if (os == "linux") and (product == "chrome"): OK + if os == "win": OK + ERROR [Test endOfStream completes previous seek to truncated duration] expected: - if flag_specific == "disable-layout-ng": FAIL + if flag_specific == "disable-layout-ng": [PASS, FAIL] + + [Test appendBuffer completes previous seek to truncated duration] + expected: + if flag_specific == "disable-layout-ng": [PASS, FAIL] + + [Test setting same duration multiple times does not fire duplicate durationchange] + expected: + if product == "chrome": [PASS, FAIL]
diff --git a/third_party/blink/web_tests/external/wpt/navigation-api/navigation-methods/return-value/navigate-initial-about-blank.html.ini b/third_party/blink/web_tests/external/wpt/navigation-api/navigation-methods/return-value/navigate-initial-about-blank.html.ini new file mode 100644 index 0000000..fad0e6e --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/navigation-api/navigation-methods/return-value/navigate-initial-about-blank.html.ini
@@ -0,0 +1,4 @@ +[navigate-initial-about-blank.html] + expected: + if (flag_specific == "") and (os == "win"): [ERROR, OK] + if flag_specific == "disable-site-isolation-trials": ERROR
diff --git a/third_party/blink/web_tests/external/wpt/navigation-timing/test-performance-attributes.sub.html.ini b/third_party/blink/web_tests/external/wpt/navigation-timing/test-performance-attributes.sub.html.ini index 47d7592..2b9f61a 100644 --- a/third_party/blink/web_tests/external/wpt/navigation-timing/test-performance-attributes.sub.html.ini +++ b/third_party/blink/web_tests/external/wpt/navigation-timing/test-performance-attributes.sub.html.ini
@@ -1,4 +1,4 @@ [test-performance-attributes.sub.html] [Check that performance.timing has reasonable values for secureConnectionStart and other attributes] expected: - if flag_specific == "disable-site-isolation-trials": [PASS, FAIL] + if flag_specific == "disable-site-isolation-trials": FAIL
diff --git a/third_party/blink/web_tests/external/wpt/pending-beacon/pending_beacon-sendondiscard.tentative.https.window.js.ini b/third_party/blink/web_tests/external/wpt/pending-beacon/pending_beacon-sendondiscard.tentative.https.window.js.ini index 7c8da31..3150981 100644 --- a/third_party/blink/web_tests/external/wpt/pending-beacon/pending_beacon-sendondiscard.tentative.https.window.js.ini +++ b/third_party/blink/web_tests/external/wpt/pending-beacon/pending_beacon-sendondiscard.tentative.https.window.js.ini
@@ -3,8 +3,4 @@ if product == "chrome": ERROR [A discarded document does not send an already sent beacon.] expected: - if flag_specific == "disable-site-isolation-trials": [PASS, FAIL] - - [A discarded document sends all its beacons of which backgroundTimeouts are\n not default.] - expected: - if flag_specific == "disable-site-isolation-trials": [PASS, FAIL] + if (flag_specific == "") and (os == "win"): FAIL
diff --git a/third_party/blink/web_tests/external/wpt/performance-timeline/not-restored-reasons/performance-navigation-timing-same-origin-bfcache.tentative.window.js.ini b/third_party/blink/web_tests/external/wpt/performance-timeline/not-restored-reasons/performance-navigation-timing-same-origin-bfcache.tentative.window.js.ini index 2f32ea7..facb631 100644 --- a/third_party/blink/web_tests/external/wpt/performance-timeline/not-restored-reasons/performance-navigation-timing-same-origin-bfcache.tentative.window.js.ini +++ b/third_party/blink/web_tests/external/wpt/performance-timeline/not-restored-reasons/performance-navigation-timing-same-origin-bfcache.tentative.window.js.ini
@@ -1,6 +1,5 @@ [performance-navigation-timing-same-origin-bfcache.tentative.window.html] [RemoteContextHelper navigation using BFCache] expected: - if (flag_specific == "") and (product == "content_shell") and (os == "win"): [PASS, FAIL] - if (flag_specific == "") and (product == "content_shell") and (os == "linux"): [FAIL, PASS] - if (flag_specific == "") and (product == "chrome"): FAIL + if (flag_specific == "") and (os == "linux") and (product == "chrome"): FAIL + if (flag_specific == "") and (os == "win"): FAIL
diff --git a/third_party/blink/web_tests/external/wpt/permissions-policy/experimental-features/unload-allowed-by-default.tentative.window.js.ini b/third_party/blink/web_tests/external/wpt/permissions-policy/experimental-features/unload-allowed-by-default.tentative.window.js.ini index 041aee22..6360a03d 100644 --- a/third_party/blink/web_tests/external/wpt/permissions-policy/experimental-features/unload-allowed-by-default.tentative.window.js.ini +++ b/third_party/blink/web_tests/external/wpt/permissions-policy/experimental-features/unload-allowed-by-default.tentative.window.js.ini
@@ -1,3 +1,3 @@ [unload-allowed-by-default.tentative.window.html] expected: - if os == "win": [OK, TIMEOUT] + if os == "win": TIMEOUT
diff --git a/third_party/blink/web_tests/external/wpt/requestidlecallback/deadline-max-rAF-dynamic.html.ini b/third_party/blink/web_tests/external/wpt/requestidlecallback/deadline-max-rAF-dynamic.html.ini index e3970f54..3dbee2d 100644 --- a/third_party/blink/web_tests/external/wpt/requestidlecallback/deadline-max-rAF-dynamic.html.ini +++ b/third_party/blink/web_tests/external/wpt/requestidlecallback/deadline-max-rAF-dynamic.html.ini
@@ -1,3 +1,3 @@ [deadline-max-rAF-dynamic.html] expected: - if os == "win": [OK, TIMEOUT] + if os == "win": TIMEOUT
diff --git a/third_party/blink/web_tests/external/wpt/requestidlecallback/deadline-max-rAF.html.ini b/third_party/blink/web_tests/external/wpt/requestidlecallback/deadline-max-rAF.html.ini deleted file mode 100644 index c2a9bbc..0000000 --- a/third_party/blink/web_tests/external/wpt/requestidlecallback/deadline-max-rAF.html.ini +++ /dev/null
@@ -1,3 +0,0 @@ -[deadline-max-rAF.html] - expected: - if os == "win": TIMEOUT
diff --git a/third_party/blink/web_tests/external/wpt/resource-timing/content-type-parsing.html.ini b/third_party/blink/web_tests/external/wpt/resource-timing/content-type-parsing.html.ini index 0b6bb698..5310563 100644 --- a/third_party/blink/web_tests/external/wpt/resource-timing/content-type-parsing.html.ini +++ b/third_party/blink/web_tests/external/wpt/resource-timing/content-type-parsing.html.ini
@@ -37,8 +37,7 @@ [content-type 13 : text/plain,*/*;charset=gbk] expected: - if (flag_specific == "") and (os == "win"): PASS - if flag_specific == "disable-layout-ng": PASS + if os == "win": PASS FAIL [content-type 14 : text/html,*/*;charset=gbk]
diff --git a/third_party/blink/web_tests/external/wpt/resource-timing/no-entries-for-cross-origin-css-fetched-memory-cache.sub.html.ini b/third_party/blink/web_tests/external/wpt/resource-timing/no-entries-for-cross-origin-css-fetched-memory-cache.sub.html.ini index fd988bd..1d9ea2f 100644 --- a/third_party/blink/web_tests/external/wpt/resource-timing/no-entries-for-cross-origin-css-fetched-memory-cache.sub.html.ini +++ b/third_party/blink/web_tests/external/wpt/resource-timing/no-entries-for-cross-origin-css-fetched-memory-cache.sub.html.ini
@@ -1,5 +1,3 @@ [no-entries-for-cross-origin-css-fetched-memory-cache.sub.html] [Make sure that resources fetched by cross origin CSS are not in the timeline.] - expected: - if product == "chrome": PASS - FAIL + expected: FAIL
diff --git a/third_party/blink/web_tests/external/wpt/resource-timing/response-status-code.html.ini b/third_party/blink/web_tests/external/wpt/resource-timing/response-status-code.html.ini index 8913fe9..ed87eaff 100644 --- a/third_party/blink/web_tests/external/wpt/resource-timing/response-status-code.html.ini +++ b/third_party/blink/web_tests/external/wpt/resource-timing/response-status-code.html.ini
@@ -158,10 +158,6 @@ [This test validates the response status of resources. 251] expected: [PASS, TIMEOUT, NOTRUN] - [This test validates the response status of resources. 252] - expected: - if flag_specific == "disable-layout-ng": [PASS, FAIL] - [This test validates the response status of resources. 164] expected: [PASS, NOTRUN] @@ -492,14 +488,9 @@ [This test validates the response status of resources. 98] expected: [PASS, NOTRUN] - [This test validates the response status of resources. 88] - expected: - if (flag_specific == "") and (product == "content_shell"): [PASS, FAIL] - if flag_specific == "disable-site-isolation-trials": [PASS, FAIL] - [This test validates the response status of resources. 254] expected: - if product == "chrome": [PASS, FAIL] + if (product == "content_shell") and (flag_specific == "") and (os == "linux"): [PASS, FAIL] [This test validates the response status of resources. 160] expected: [PASS, NOTRUN] @@ -538,7 +529,8 @@ expected: [PASS, NOTRUN] [This test validates the response status of resources. 86] - expected: [PASS, NOTRUN] + expected: + if (flag_specific == "") and (os == "linux") and (product == "content_shell"): [PASS, FAIL] [This test validates the response status of resources. 96] expected: [PASS, NOTRUN] @@ -548,46 +540,29 @@ [This test validates the response status of resources. 279] expected: - if (product == "content_shell") and (flag_specific == "disable-site-isolation-trials"): [PASS, FAIL] if product == "chrome": [PASS, FAIL] - [This test validates the response status of resources. 277] - expected: - if (flag_specific == "") and (product == "content_shell"): [PASS, FAIL] - [This test validates the response status of resources. 275] expected: - if (product == "content_shell") and (flag_specific == ""): [PASS, FAIL] + if flag_specific == "disable-site-isolation-trials": [PASS, FAIL] [This test validates the response status of resources. 274] expected: - if product == "chrome": [PASS, FAIL] - - [This test validates the response status of resources. 273] - expected: - if product == "chrome": [PASS, FAIL] + if (product == "content_shell") and (flag_specific == "disable-layout-ng"): [PASS, FAIL] [This test validates the response status of resources. 272] expected: if product == "chrome": [PASS, FAIL] - [This test validates the response status of resources. 295] + [This test validates the response status of resources. 84] expected: - if product == "chrome": [PASS, FAIL] + if (flag_specific == "") and (os == "linux") and (product == "content_shell"): [PASS, FAIL] - [This test validates the response status of resources. 297] + [This test validates the response status of resources. 294] expected: - if product == "chrome": [PASS, FAIL] - - [This test validates the response status of resources. 276] - expected: - if product == "chrome": [PASS, FAIL] - - [This test validates the response status of resources. 278] - expected: - if product == "chrome": [PASS, FAIL] - - [This test validates the response status of resources. 296] - expected: - if (flag_specific == "") and (product == "chrome"): [PASS, FAIL] + if flag_specific == "disable-site-isolation-trials": [PASS, FAIL] if flag_specific == "disable-layout-ng": [PASS, FAIL] + + [This test validates the response status of resources. 244] + expected: + if product == "chrome": [PASS, FAIL]
diff --git a/third_party/blink/web_tests/external/wpt/service-workers/cache-storage/cache-add.https.any.js.ini b/third_party/blink/web_tests/external/wpt/service-workers/cache-storage/cache-add.https.any.js.ini index 260e24a8..6e81129 100644 --- a/third_party/blink/web_tests/external/wpt/service-workers/cache-storage/cache-add.https.any.js.ini +++ b/third_party/blink/web_tests/external/wpt/service-workers/cache-storage/cache-add.https.any.js.ini
@@ -7,6 +7,10 @@ [Cache.addAll called with the same Request object specified twice] expected: FAIL + [Cache.addAll should succeed when entries differ by vary header] + expected: + if product == "chrome": [PASS, FAIL] + [cache-add.https.any.serviceworker.html] [Cache.addAll called with the same Request object specified twice] @@ -14,13 +18,9 @@ [Cache.addAll should succeed when entries differ by vary header] expected: - if product == "chrome": [PASS, FAIL] + if product == "chrome": FAIL [cache-add.https.any.html] [Cache.addAll called with the same Request object specified twice] expected: FAIL - - [Cache.addAll should succeed when entries differ by vary header] - expected: - if product == "chrome": [FAIL, PASS]
diff --git a/third_party/blink/web_tests/external/wpt/service-workers/service-worker/client-navigate.https.html.ini b/third_party/blink/web_tests/external/wpt/service-workers/service-worker/client-navigate.https.html.ini index 51fc648..ed96e18b 100644 --- a/third_party/blink/web_tests/external/wpt/service-workers/service-worker/client-navigate.https.html.ini +++ b/third_party/blink/web_tests/external/wpt/service-workers/service-worker/client-navigate.https.html.ini
@@ -1,8 +1,4 @@ [client-navigate.https.html] [Frame location should not be accessible after redirect] expected: - if flag_specific == "disable-layout-ng": [PASS, FAIL] - - [Frame location should not be accessible after cross-origin navigation] - expected: - if flag_specific == "disable-layout-ng": [PASS, FAIL] + if (flag_specific == "") and (os == "linux") and (product == "content_shell"): [PASS, FAIL]
diff --git a/third_party/blink/web_tests/external/wpt/service-workers/service-worker/unregister-immediately-during-extendable-events.https.html.ini b/third_party/blink/web_tests/external/wpt/service-workers/service-worker/unregister-immediately-during-extendable-events.https.html.ini index 4507f10..17f97e1 100644 --- a/third_party/blink/web_tests/external/wpt/service-workers/service-worker/unregister-immediately-during-extendable-events.https.html.ini +++ b/third_party/blink/web_tests/external/wpt/service-workers/service-worker/unregister-immediately-during-extendable-events.https.html.ini
@@ -1,4 +1,8 @@ [unregister-immediately-during-extendable-events.https.html] - expected: TIMEOUT + expected: + if (flag_specific == "") and (os == "linux") and (product == "content_shell"): [OK, TIMEOUT] + TIMEOUT [Clear-Site-Data must fail pending subresource fetch events.] - expected: TIMEOUT + expected: + if product == "content_shell": FAIL + TIMEOUT
diff --git a/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/about-blank-iframes.html.ini b/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/about-blank-iframes.html.ini index 3d5f3771..bd9a22f 100644 --- a/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/about-blank-iframes.html.ini +++ b/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/about-blank-iframes.html.ini
@@ -5,8 +5,7 @@ disabled: if flag_specific == "force-renderer-accessibility": was skipped in 'FlagExpectations/force-renderer-accessibility' expected: - if (os == "linux") and (product == "chrome"): TIMEOUT - if os == "win": ERROR + if product == "chrome": TIMEOUT [about:blank iframes] expected: if product == "chrome": TIMEOUT
diff --git a/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/activation-start.html.ini b/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/activation-start.html.ini index 0bc0525..6292f6c 100644 --- a/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/activation-start.html.ini +++ b/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/activation-start.html.ini
@@ -3,6 +3,7 @@ disabled: if flag_specific == "force-renderer-accessibility": was skipped in 'FlagExpectations/force-renderer-accessibility' expected: + if (product == "content_shell") and (os == "win"): [OK, TIMEOUT] if product == "chrome": TIMEOUT [PerformanceNavigationTiming's activationStart in prerendered page] expected:
diff --git a/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/csp-script-src-self.html.ini b/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/csp-script-src-self.html.ini index df90d9b..a85027a5 100644 --- a/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/csp-script-src-self.html.ini +++ b/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/csp-script-src-self.html.ini
@@ -1,5 +1,3 @@ [csp-script-src-self.html] expected: - if (flag_specific == "") and (os == "linux") and (product == "content_shell"): [OK, ERROR] - if (flag_specific == "") and (os == "win"): ERROR - if flag_specific == "disable-layout-ng": ERROR + if os == "win": ERROR
diff --git a/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/iframe-added-post-activation.html.ini b/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/iframe-added-post-activation.html.ini index 639ddc1..6b9bf4fd 100644 --- a/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/iframe-added-post-activation.html.ini +++ b/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/iframe-added-post-activation.html.ini
@@ -1,7 +1,6 @@ [iframe-added-post-activation.html] expected: - if (os == "linux") and (product == "chrome"): TIMEOUT - if os == "win": ERROR + if product == "chrome": TIMEOUT [iframe added after activation has false document.prerendering] expected: if product == "chrome": TIMEOUT
diff --git a/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/indexeddb.html.ini b/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/indexeddb.html.ini index d339397..e16ee6b 100644 --- a/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/indexeddb.html.ini +++ b/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/indexeddb.html.ini
@@ -1,7 +1,6 @@ [indexeddb.html] expected: - if (os == "linux") and (product == "chrome"): TIMEOUT - if os == "win": TIMEOUT + if product == "chrome": TIMEOUT [prerendering page should be able to access Indexed DataBase] expected: if product == "chrome": TIMEOUT
diff --git a/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/navigator-plugins.tentative.html.ini b/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/navigator-plugins.tentative.html.ini index 6d40224..a9fa26cb 100644 --- a/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/navigator-plugins.tentative.html.ini +++ b/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/navigator-plugins.tentative.html.ini
@@ -1,5 +1,6 @@ [navigator-plugins.tentative.html] expected: + if (product == "content_shell") and (os == "win"): [OK, TIMEOUT] if product == "chrome": TIMEOUT [prerendering page should be able to access the navigator.plugins] expected:
diff --git a/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/response-code-non-successful.html.ini b/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/response-code-non-successful.html.ini index 8269e5d..ec248a715 100644 --- a/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/response-code-non-successful.html.ini +++ b/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/response-code-non-successful.html.ini
@@ -1,12 +1,12 @@ [response-code-non-successful.html?code=500] + expected: + if product == "chrome": [OK, ERROR] [response-code-non-successful.html?code=205] expected: - if product == "chrome": [OK, ERROR] + if product == "chrome": ERROR [response-code-non-successful.html?code=503] - expected: - if product == "chrome": [OK, ERROR] [response-code-non-successful.html?code=402]
diff --git a/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/restriction-battery-status.https.html.ini b/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/restriction-battery-status.https.html.ini index 1cc8950d..d2f7055 100644 --- a/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/restriction-battery-status.https.html.ini +++ b/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/restriction-battery-status.https.html.ini
@@ -1,7 +1,7 @@ [restriction-battery-status.https.html] expected: - if (flag_specific == "") and (product == "content_shell") and (os == "linux"): [OK, ERROR] - if (flag_specific == "") and (product == "chrome"): TIMEOUT + if (product == "content_shell") and (os == "win"): [OK, ERROR] + if product == "chrome": TIMEOUT [the access to the Battery Status API should be deferred until the\n prerendered page is activated] expected: if product == "chrome": TIMEOUT
diff --git a/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/restriction-media-auto-play-attribute.html.ini b/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/restriction-media-auto-play-attribute.html.ini index 8abf580..66ea6cb7 100644 --- a/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/restriction-media-auto-play-attribute.html.ini +++ b/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/restriction-media-auto-play-attribute.html.ini
@@ -3,8 +3,8 @@ disabled: if flag_specific == "force-renderer-accessibility": was skipped in 'FlagExpectations/force-renderer-accessibility' expected: - if (product == "content_shell") and (os == "win"): [OK, ERROR] - if product == "chrome": TIMEOUT + if (os == "linux") and (product == "chrome"): TIMEOUT + if os == "win": ERROR [autoplay of the audio media should be deferred until the prerendered page is activated] expected: if product == "chrome": TIMEOUT
diff --git a/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/restriction-media-play.html.ini b/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/restriction-media-play.html.ini index f3cd2a6..abcfbde 100644 --- a/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/restriction-media-play.html.ini +++ b/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/restriction-media-play.html.ini
@@ -3,8 +3,8 @@ disabled: if flag_specific == "force-renderer-accessibility": was skipped in 'FlagExpectations/force-renderer-accessibility' expected: - if (product == "content_shell") and (os == "win"): [OK, ERROR] - if product == "chrome": TIMEOUT + if (os == "linux") and (product == "chrome"): TIMEOUT + if os == "win": ERROR [play of the audio media should be deferred until the prerendered page is activated] expected: if product == "chrome": TIMEOUT
diff --git a/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/restriction-presentation-request.https.html.ini b/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/restriction-presentation-request.https.html.ini index 1a3d08e..ea367f5 100644 --- a/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/restriction-presentation-request.https.html.ini +++ b/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/restriction-presentation-request.https.html.ini
@@ -1,7 +1,7 @@ [restriction-presentation-request.https.html] expected: - if (product == "content_shell") and (os == "win"): [ERROR, TIMEOUT] - if product == "chrome": TIMEOUT + if (os == "linux") and (product == "chrome"): TIMEOUT + if os == "win": TIMEOUT ERROR [prerendering page cannot start presentation] expected: TIMEOUT
diff --git a/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/restriction-request-picture-in-picture.html.ini b/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/restriction-request-picture-in-picture.html.ini index 9bfa95ff..32004d9 100644 --- a/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/restriction-request-picture-in-picture.html.ini +++ b/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/restriction-request-picture-in-picture.html.ini
@@ -1,5 +1,6 @@ [restriction-request-picture-in-picture.html] expected: + if (product == "content_shell") and (os == "win"): [OK, TIMEOUT] if product == "chrome": TIMEOUT [prerendering page cannot invokeHTMLVideoElement.requestPictureInPicture] expected:
diff --git a/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/restriction-speech-synthesis.html.ini b/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/restriction-speech-synthesis.html.ini index ad1ad4c..6984300 100644 --- a/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/restriction-speech-synthesis.html.ini +++ b/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/restriction-speech-synthesis.html.ini
@@ -1,5 +1,6 @@ [restriction-speech-synthesis.html] expected: + if (product == "content_shell") and (os == "win"): [OK, ERROR] if product == "chrome": TIMEOUT [speechSynthesis.speak(utterance) should be deferred until the prerendered page is activated] expected:
diff --git a/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/restriction-web-serial.tentative.https.html.ini b/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/restriction-web-serial.tentative.https.html.ini index 94eabaf..5b44cb6 100644 --- a/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/restriction-web-serial.tentative.https.html.ini +++ b/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/restriction-web-serial.tentative.https.html.ini
@@ -1,7 +1,7 @@ [restriction-web-serial.tentative.https.html] expected: - if (product == "content_shell") and (os == "win"): [OK, ERROR] - if product == "chrome": TIMEOUT + if (os == "linux") and (product == "chrome"): TIMEOUT + if os == "win": ERROR [the access to the Web Serial API should be deferred until the prerendered\n page is activated] expected: if product == "chrome": TIMEOUT
diff --git a/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/restriction-window-move.html.ini b/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/restriction-window-move.html.ini index 241db3c..87802b2 100644 --- a/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/restriction-window-move.html.ini +++ b/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/restriction-window-move.html.ini
@@ -1,7 +1,6 @@ [restriction-window-move.html] expected: - if (os == "linux") and (product == "chrome"): TIMEOUT - if os == "win": ERROR + if product == "chrome": TIMEOUT [a prerendering page cannot move its window by executing moveTo.] expected: if product == "chrome": TIMEOUT
diff --git a/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/session-history-subframe-navigation.https.html.ini b/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/session-history-subframe-navigation.https.html.ini index 95f1641..c03d814 100644 --- a/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/session-history-subframe-navigation.https.html.ini +++ b/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/session-history-subframe-navigation.https.html.ini
@@ -1,7 +1,7 @@ [session-history-subframe-navigation.https.html] expected: - if (product == "content_shell") and (flag_specific == "") and (os == "linux"): [OK, TIMEOUT] - if product == "chrome": TIMEOUT + if (flag_specific == "") and (os == "linux") and (product == "chrome"): TIMEOUT + if (flag_specific == "") and (os == "win"): [OK, TIMEOUT] [Subframe navigation in prerender replaces the session entry] expected: if product == "chrome": TIMEOUT
diff --git a/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/windowclient-navigate-to-same-origin-url-on-iframe.https.html.ini b/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/windowclient-navigate-to-same-origin-url-on-iframe.https.html.ini index 1366d59..dd3486d 100644 --- a/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/windowclient-navigate-to-same-origin-url-on-iframe.https.html.ini +++ b/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/windowclient-navigate-to-same-origin-url-on-iframe.https.html.ini
@@ -3,8 +3,8 @@ disabled: if flag_specific == "force-renderer-accessibility": was skipped in 'FlagExpectations/force-renderer-accessibility' expected: + if (product == "content_shell") and (os == "win"): [OK, ERROR] if product == "chrome": TIMEOUT [WindowClient.navigate() to a same-origin URL on a prerendered iframe should succeed] expected: - if (product == "content_shell") and (os == "win"): [PASS, FAIL] - if product == "chrome": TIMEOUT + if (os == "linux") and (product == "chrome"): TIMEOUT
diff --git a/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/workers.html.ini b/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/workers.html.ini index 3ed7eaa..a986d42 100644 --- a/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/workers.html.ini +++ b/third_party/blink/web_tests/external/wpt/speculation-rules/prerender/workers.html.ini
@@ -1,7 +1,7 @@ [workers.html] expected: - if (product == "content_shell") and (os == "win"): [OK, TIMEOUT] - if product == "chrome": TIMEOUT + if (os == "linux") and (product == "chrome"): TIMEOUT + if os == "win": TIMEOUT [Dedicated workers should be loaded in suspended state until activated] expected: if product == "chrome": TIMEOUT
diff --git a/third_party/blink/web_tests/external/wpt/storage/partitioned-estimate-usage-details-caches.tentative.https.sub.html.ini b/third_party/blink/web_tests/external/wpt/storage/partitioned-estimate-usage-details-caches.tentative.https.sub.html.ini index a92177d6..d95804a 100644 --- a/third_party/blink/web_tests/external/wpt/storage/partitioned-estimate-usage-details-caches.tentative.https.sub.html.ini +++ b/third_party/blink/web_tests/external/wpt/storage/partitioned-estimate-usage-details-caches.tentative.https.sub.html.ini
@@ -1,3 +1,4 @@ [partitioned-estimate-usage-details-caches.tentative.https.sub.html] expected: - if flag_specific == "disable-site-isolation-trials": [OK, TIMEOUT] + if (flag_specific == "") and (os == "linux") and (product == "content_shell"): [OK, TIMEOUT] + if flag_specific == "disable-layout-ng": [OK, TIMEOUT]
diff --git a/third_party/blink/web_tests/external/wpt/url/a-element-xhtml.xhtml.ini b/third_party/blink/web_tests/external/wpt/url/a-element-xhtml.xhtml.ini index b73f309..5d13145f 100644 --- a/third_party/blink/web_tests/external/wpt/url/a-element-xhtml.xhtml.ini +++ b/third_party/blink/web_tests/external/wpt/url/a-element-xhtml.xhtml.ini
@@ -963,9 +963,7 @@ [a-element-xhtml.xhtml?include=file] expected: - if (flag_specific == "") and (os == "win"): [OK, TIMEOUT] - if flag_specific == "disable-site-isolation-trials": [OK, CRASH] - if flag_specific == "disable-layout-ng": [OK, CRASH] + if flag_specific == "disable-layout-ng": CRASH [Parsing: <file://example%/> against <about:blank>] expected: FAIL @@ -1214,8 +1212,7 @@ [a-element-xhtml.xhtml?exclude=(file|javascript|mailto)] expected: - if (flag_specific == "") and (os == "linux") and (product == "content_shell"): CRASH - if (flag_specific == "") and (os == "win"): [OK, TIMEOUT] + if os == "win": TIMEOUT [Parsing: <non-special://test:@test/x> against <about:blank>] expected: FAIL @@ -2014,26 +2011,6 @@ [Parsing: <http://💩.123/> against <about:blank>] expected: FAIL - [Parsing: <test-a-colon-slash.html> against <a:/>] - expected: - if os == "win": FAIL - - [Parsing: <\\\\x\\hello> against <http://example.org/foo/bar>] - expected: - if os == "win": FAIL - - [Parsing: <test-a-colon-slash-b.html> against <a:/b>] - expected: - if os == "win": FAIL - - [Parsing: <a:\t foo.com> against <http://example.org/foo/bar>] - expected: - if os == "win": FAIL - - [Parsing: <c:/foo> against <http://example.org/foo/bar>] - expected: - if os == "win": FAIL - [Parsing: <non-special:y> against <about:blank>] expected: FAIL @@ -2066,13 +2043,15 @@ [a-element-xhtml.xhtml?include=mailto] + expected: + if flag_specific == "disable-layout-ng": [OK, CRASH] + if flag_specific == "disable-site-isolation-trials": [OK, CRASH] [Parsing: <mailto:/../> against <about:blank>] expected: FAIL [a-element-xhtml.xhtml?include=javascript] expected: - if flag_specific == "disable-layout-ng": [OK, CRASH] - if flag_specific == "disable-site-isolation-trials": [OK, CRASH] + if flag_specific == "disable-site-isolation-trials": CRASH [Parsing: <javascript:/../> against <about:blank>] expected: FAIL
diff --git a/third_party/blink/web_tests/external/wpt/url/a-element.html.ini b/third_party/blink/web_tests/external/wpt/url/a-element.html.ini index 844cd32..fda81b92 100644 --- a/third_party/blink/web_tests/external/wpt/url/a-element.html.ini +++ b/third_party/blink/web_tests/external/wpt/url/a-element.html.ini
@@ -1073,8 +1073,10 @@ [a-element.html?include=file] expected: - if (flag_specific == "") and (os == "linux") and (product == "content_shell"): [OK, CRASH] - if flag_specific == "highdpi": [OK, CRASH] + if (flag_specific == "") and (os == "linux") and (product == "content_shell"): CRASH + if flag_specific == "highdpi": CRASH + if flag_specific == "disable-site-isolation-trials": [OK, CRASH] + if flag_specific == "disable-layout-ng": [OK, CRASH] [Parsing: <file://example%/> against <about:blank>] expected: FAIL @@ -1322,8 +1324,6 @@ [a-element.html?include=mailto] - expected: - if os == "win": [OK, TIMEOUT] [Parsing: <mailto:/../> against <about:blank>] expected: FAIL @@ -2179,7 +2179,5 @@ [a-element.html?include=javascript] - expected: - if flag_specific == "disable-site-isolation-trials": [OK, CRASH] [Parsing: <javascript:/../> against <about:blank>] expected: FAIL
diff --git a/third_party/blink/web_tests/external/wpt/url/failure.html.ini b/third_party/blink/web_tests/external/wpt/url/failure.html.ini index 97ce987..5f3314d 100644 --- a/third_party/blink/web_tests/external/wpt/url/failure.html.ini +++ b/third_party/blink/web_tests/external/wpt/url/failure.html.ini
@@ -1,7 +1,6 @@ [failure.html] expected: - if (flag_specific == "") and (product == "chrome"): TIMEOUT - if flag_specific == "disable-layout-ng": CRASH + if product == "chrome": TIMEOUT [Location's href: file://example:1/ should throw] expected: FAIL
diff --git a/third_party/blink/web_tests/external/wpt/url/percent-encoding.window.js.ini b/third_party/blink/web_tests/external/wpt/url/percent-encoding.window.js.ini new file mode 100644 index 0000000..1091bffa --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/url/percent-encoding.window.js.ini
@@ -0,0 +1,3 @@ +[percent-encoding.window.html] + expected: + if flag_specific == "disable-site-isolation-trials": [OK, CRASH]
diff --git a/third_party/blink/web_tests/external/wpt/url/url-setters-a-area.window.js.ini b/third_party/blink/web_tests/external/wpt/url/url-setters-a-area.window.js.ini index 9dea791..d812cea 100644 --- a/third_party/blink/web_tests/external/wpt/url/url-setters-a-area.window.js.ini +++ b/third_party/blink/web_tests/external/wpt/url/url-setters-a-area.window.js.ini
@@ -1161,8 +1161,6 @@ [url-setters-a-area.window.html?include=javascript] - expected: - if os == "win": [OK, TIMEOUT] [<a>: Setting <javascript://x/>.username = 'wario'] expected: FAIL @@ -1184,8 +1182,8 @@ [url-setters-a-area.window.html?include=mailto] expected: - if (flag_specific == "") and (os == "linux") and (product == "content_shell"): [OK, CRASH] - if flag_specific == "disable-layout-ng": [OK, CRASH] + if (flag_specific == "") and (os == "linux") and (product == "content_shell"): CRASH + if (flag_specific == "") and (os == "win"): [OK, TIMEOUT] [<a>: Setting <mailto:me@example.net>.protocol = 'http' Cannot-be-a-base URL doesn’t have a host, but URL in a special scheme must.] expected: FAIL
diff --git a/third_party/blink/web_tests/external/wpt/url/url-setters-stripping.any.js.ini b/third_party/blink/web_tests/external/wpt/url/url-setters-stripping.any.js.ini index d2c3ff18..ad2f860 100644 --- a/third_party/blink/web_tests/external/wpt/url/url-setters-stripping.any.js.ini +++ b/third_party/blink/web_tests/external/wpt/url/url-setters-stripping.any.js.ini
@@ -1,6 +1,4 @@ [url-setters-stripping.any.html] - expected: - if os == "win": TIMEOUT [Setting pathname with leading U+0000 (https:)] expected: FAIL @@ -318,6 +316,8 @@ [url-setters-stripping.any.worker.html] + expected: + if os == "win": [OK, TIMEOUT] [Setting pathname with leading U+0000 (https:)] expected: FAIL
diff --git a/third_party/blink/web_tests/external/wpt/url/urlsearchparams-delete.any.js.ini b/third_party/blink/web_tests/external/wpt/url/urlsearchparams-delete.any.js.ini index e35316b..8c158fa3 100644 --- a/third_party/blink/web_tests/external/wpt/url/urlsearchparams-delete.any.js.ini +++ b/third_party/blink/web_tests/external/wpt/url/urlsearchparams-delete.any.js.ini
@@ -1,6 +1,6 @@ [urlsearchparams-delete.any.html] expected: - if flag_specific == "disable-site-isolation-trials": [OK, CRASH] + if flag_specific == "disable-site-isolation-trials": CRASH [Changing the query of a URL with an opaque path can impact the path] expected: FAIL
diff --git a/third_party/blink/web_tests/external/wpt/url/urlsearchparams-stringifier.any.js.ini b/third_party/blink/web_tests/external/wpt/url/urlsearchparams-stringifier.any.js.ini deleted file mode 100644 index e43de9d..0000000 --- a/third_party/blink/web_tests/external/wpt/url/urlsearchparams-stringifier.any.js.ini +++ /dev/null
@@ -1,5 +0,0 @@ -[urlsearchparams-stringifier.any.html] - expected: - if (flag_specific == "") and (os == "linux") and (product == "content_shell"): CRASH - -[urlsearchparams-stringifier.any.worker.html]
diff --git a/third_party/blink/web_tests/external/wpt/web-animations/timing-model/timelines/sibling-iframe-timeline.html.ini b/third_party/blink/web_tests/external/wpt/web-animations/timing-model/timelines/sibling-iframe-timeline.html.ini index fda793b..1a24dbb77 100644 --- a/third_party/blink/web_tests/external/wpt/web-animations/timing-model/timelines/sibling-iframe-timeline.html.ini +++ b/third_party/blink/web_tests/external/wpt/web-animations/timing-model/timelines/sibling-iframe-timeline.html.ini
@@ -1,6 +1,4 @@ [sibling-iframe-timeline.html] [animation tied to another frame's timeline runs properly] expected: - if (flag_specific == "") and (product == "chrome"): PASS - if flag_specific == "disable-site-isolation-trials": PASS - FAIL + if (flag_specific == "") and (product == "content_shell"): FAIL
diff --git a/third_party/blink/web_tests/external/wpt/web-bundle/subresource-loading/reuse-web-bundle-resource.https.tentative.html.ini b/third_party/blink/web_tests/external/wpt/web-bundle/subresource-loading/reuse-web-bundle-resource.https.tentative.html.ini new file mode 100644 index 0000000..cdd8260da --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/web-bundle/subresource-loading/reuse-web-bundle-resource.https.tentative.html.ini
@@ -0,0 +1,4 @@ +[reuse-web-bundle-resource.https.tentative.html] + ['remove(), then append()' should reuse webbundle resources] + expected: + if product == "chrome": [PASS, FAIL]
diff --git a/third_party/blink/web_tests/external/wpt/web-locks/query-ordering.tentative.https.html.ini b/third_party/blink/web_tests/external/wpt/web-locks/query-ordering.tentative.https.html.ini index b63d722..236f81a 100644 --- a/third_party/blink/web_tests/external/wpt/web-locks/query-ordering.tentative.https.html.ini +++ b/third_party/blink/web_tests/external/wpt/web-locks/query-ordering.tentative.https.html.ini
@@ -1,3 +1,3 @@ [query-ordering.tentative.https.html] expected: - if flag_specific == "disable-site-isolation-trials": [OK, CRASH] + if flag_specific == "disable-site-isolation-trials": CRASH
diff --git a/third_party/blink/web_tests/external/wpt/webaudio/the-audio-api/the-analysernode-interface/test-analyser-output.html.ini b/third_party/blink/web_tests/external/wpt/webaudio/the-audio-api/the-analysernode-interface/test-analyser-output.html.ini index 46c0f33..553f41a 100644 --- a/third_party/blink/web_tests/external/wpt/webaudio/the-audio-api/the-analysernode-interface/test-analyser-output.html.ini +++ b/third_party/blink/web_tests/external/wpt/webaudio/the-audio-api/the-analysernode-interface/test-analyser-output.html.ini
@@ -1,4 +1,4 @@ [test-analyser-output.html] [AnalyserNode output] expected: - if (os == "linux") and (flag_specific == "disable-layout-ng"): [PASS, FAIL] + if flag_specific == "disable-site-isolation-trials": [PASS, FAIL]
diff --git a/third_party/blink/web_tests/external/wpt/webaudio/the-audio-api/the-audioworklet-interface/audioworkletnode-output-channel-count.https.html.ini b/third_party/blink/web_tests/external/wpt/webaudio/the-audio-api/the-audioworklet-interface/audioworkletnode-output-channel-count.https.html.ini new file mode 100644 index 0000000..97f1aa6 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/webaudio/the-audio-api/the-audioworklet-interface/audioworkletnode-output-channel-count.https.html.ini
@@ -0,0 +1,9 @@ +[audioworkletnode-output-channel-count.https.html] + [X The expected output channel count is not equal to 17. Got 1.] + expected: FAIL + + [< [Dynamically change the channel count to if unspecified.\] 1 out of 1 assertions were failed.] + expected: FAIL + + [# AUDIT TASK RUNNER FINISHED: 1 out of 2 tasks were failed.] + expected: FAIL
diff --git a/third_party/blink/web_tests/external/wpt/webaudio/the-audio-api/the-mediaelementaudiosourcenode-interface/mediaElementAudioSourceToScriptProcessorTest.html.ini b/third_party/blink/web_tests/external/wpt/webaudio/the-audio-api/the-mediaelementaudiosourcenode-interface/mediaElementAudioSourceToScriptProcessorTest.html.ini index c9987cad..b4bd5dd 100644 --- a/third_party/blink/web_tests/external/wpt/webaudio/the-audio-api/the-mediaelementaudiosourcenode-interface/mediaElementAudioSourceToScriptProcessorTest.html.ini +++ b/third_party/blink/web_tests/external/wpt/webaudio/the-audio-api/the-mediaelementaudiosourcenode-interface/mediaElementAudioSourceToScriptProcessorTest.html.ini
@@ -1,4 +1,4 @@ [mediaElementAudioSourceToScriptProcessorTest.html] [All data processed correctly] expected: - if (flag_specific == "") and (os == "linux") and (product == "content_shell"): [PASS, FAIL] + if flag_specific == "disable-layout-ng": [FAIL, PASS]
diff --git a/third_party/blink/web_tests/external/wpt/webaudio/the-audio-api/the-pannernode-interface/distance-exponential.html.ini b/third_party/blink/web_tests/external/wpt/webaudio/the-audio-api/the-pannernode-interface/distance-exponential.html.ini new file mode 100644 index 0000000..a3874a7 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/webaudio/the-audio-api/the-pannernode-interface/distance-exponential.html.ini
@@ -0,0 +1,3 @@ +[distance-exponential.html] + expected: + if flag_specific == "disable-layout-ng": [OK, CRASH]
diff --git a/third_party/blink/web_tests/external/wpt/webaudio/the-audio-api/the-pannernode-interface/test-pannernode-automation.html.ini b/third_party/blink/web_tests/external/wpt/webaudio/the-audio-api/the-pannernode-interface/test-pannernode-automation.html.ini index 20900aa..a0c0660 100644 --- a/third_party/blink/web_tests/external/wpt/webaudio/the-audio-api/the-pannernode-interface/test-pannernode-automation.html.ini +++ b/third_party/blink/web_tests/external/wpt/webaudio/the-audio-api/the-pannernode-interface/test-pannernode-automation.html.ini
@@ -1,3 +1,3 @@ [test-pannernode-automation.html] expected: - if os == "win": [OK, TIMEOUT] + if os == "win": TIMEOUT
diff --git a/third_party/blink/web_tests/external/wpt/webmessaging/broadcastchannel/origin.window.js.ini b/third_party/blink/web_tests/external/wpt/webmessaging/broadcastchannel/origin.window.js.ini new file mode 100644 index 0000000..cdb616cc --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/webmessaging/broadcastchannel/origin.window.js.ini
@@ -0,0 +1,3 @@ +[origin.window.html] + expected: + if flag_specific == "disable-layout-ng": [OK, TIMEOUT]
diff --git a/third_party/blink/web_tests/external/wpt/webmessaging/broadcastchannel/workers.html.ini b/third_party/blink/web_tests/external/wpt/webmessaging/broadcastchannel/workers.html.ini new file mode 100644 index 0000000..49c2787 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/webmessaging/broadcastchannel/workers.html.ini
@@ -0,0 +1,3 @@ +[workers.html] + expected: + if flag_specific == "disable-site-isolation-trials": [OK, TIMEOUT]
diff --git a/third_party/blink/web_tests/external/wpt/webmessaging/multi-globals/broadcastchannel-incumbent.sub.html.ini b/third_party/blink/web_tests/external/wpt/webmessaging/multi-globals/broadcastchannel-incumbent.sub.html.ini index 6742e102..b15baab 100644 --- a/third_party/blink/web_tests/external/wpt/webmessaging/multi-globals/broadcastchannel-incumbent.sub.html.ini +++ b/third_party/blink/web_tests/external/wpt/webmessaging/multi-globals/broadcastchannel-incumbent.sub.html.ini
@@ -1,4 +1,6 @@ [broadcastchannel-incumbent.sub.html] + expected: + if os == "win": [OK, TIMEOUT] [The incumbent page being cross-origin must not prevent the BroadcastChannel message from being seen] expected: if (flag_specific == "") and (product == "chrome"): PASS
diff --git a/third_party/blink/web_tests/external/wpt/webmessaging/without-ports/020.html.ini b/third_party/blink/web_tests/external/wpt/webmessaging/without-ports/020.html.ini index 265c7a6..71f5f91 100644 --- a/third_party/blink/web_tests/external/wpt/webmessaging/without-ports/020.html.ini +++ b/third_party/blink/web_tests/external/wpt/webmessaging/without-ports/020.html.ini
@@ -2,3 +2,4 @@ [cross-origin test] expected: if (flag_specific == "") and (os == "linux") and (product == "content_shell"): FAIL + if flag_specific == "disable-layout-ng": [PASS, FAIL]
diff --git a/third_party/blink/web_tests/external/wpt/webrtc-encoded-transform/RTCPeerConnection-insertable-streams-simulcast.https.html.ini b/third_party/blink/web_tests/external/wpt/webrtc-encoded-transform/RTCPeerConnection-insertable-streams-simulcast.https.html.ini new file mode 100644 index 0000000..efdf9fe --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/webrtc-encoded-transform/RTCPeerConnection-insertable-streams-simulcast.https.html.ini
@@ -0,0 +1,4 @@ +[RTCPeerConnection-insertable-streams-simulcast.https.html] + expected: [OK, TIMEOUT] + [Basic simulcast setup with three spatial layers] + expected: [PASS, TIMEOUT]
diff --git a/third_party/blink/web_tests/external/wpt/webrtc/RTCDTMFSender-ontonechange.https.html.ini b/third_party/blink/web_tests/external/wpt/webrtc/RTCDTMFSender-ontonechange.https.html.ini index 7f85bcb..1c21bda5 100644 --- a/third_party/blink/web_tests/external/wpt/webrtc/RTCDTMFSender-ontonechange.https.html.ini +++ b/third_party/blink/web_tests/external/wpt/webrtc/RTCDTMFSender-ontonechange.https.html.ini
@@ -1,3 +1,11 @@ [RTCDTMFSender-ontonechange.https.html] [Tone change event init optional parameters] expected: FAIL + + [Setting transceiver.currentDirection to recvonly in the middle of tonechange events should stop future tonechange events from firing] + expected: + if flag_specific == "disable-site-isolation-trials": [PASS, FAIL] + + [Calling insertDTMF('') in the middle of tonechange events should stop future tonechange events from firing] + expected: + if flag_specific == "disable-site-isolation-trials": [PASS, FAIL]
diff --git a/third_party/blink/web_tests/external/wpt/webxr/events_referenceSpace_reset_inline.https.html.ini b/third_party/blink/web_tests/external/wpt/webxr/events_referenceSpace_reset_inline.https.html.ini index 00c1d56..1e5b84d1 100644 --- a/third_party/blink/web_tests/external/wpt/webxr/events_referenceSpace_reset_inline.https.html.ini +++ b/third_party/blink/web_tests/external/wpt/webxr/events_referenceSpace_reset_inline.https.html.ini
@@ -1,7 +1,7 @@ [events_referenceSpace_reset_inline.https.html] - expected: TIMEOUT + expected: + if (flag_specific == "") and (os == "linux") and (product == "content_shell"): TIMEOUT + if flag_specific == "disable-site-isolation-trials": TIMEOUT [XRSession resetpose from a device properly fires off the right events for non-immersive sessions - webgl] - expected: FAIL - - [XRSession resetpose from a device properly fires off the right events for non-immersive sessions - webgl2] - expected: TIMEOUT + expected: + if product == "chrome": FAIL
diff --git a/third_party/blink/web_tests/external/wpt/webxr/xrSession_requestAnimationFrame_getViewerPose.https.html.ini b/third_party/blink/web_tests/external/wpt/webxr/xrSession_requestAnimationFrame_getViewerPose.https.html.ini index fd22b34a..13ee403 100644 --- a/third_party/blink/web_tests/external/wpt/webxr/xrSession_requestAnimationFrame_getViewerPose.https.html.ini +++ b/third_party/blink/web_tests/external/wpt/webxr/xrSession_requestAnimationFrame_getViewerPose.https.html.ini
@@ -2,7 +2,3 @@ [XRFrame getViewerPose updates on the next frame for non-immersive sessions - webgl] expected: if product == "chrome": FAIL - - [XRFrame getViewerPose updates on the next frame for non-immersive sessions - webgl2] - expected: - if product == "chrome": FAIL
diff --git a/third_party/blink/web_tests/external/wpt/webxr/xrSession_requestReferenceSpace_features.https.html.ini b/third_party/blink/web_tests/external/wpt/webxr/xrSession_requestReferenceSpace_features.https.html.ini index 2e02a8c..0671cad 100644 --- a/third_party/blink/web_tests/external/wpt/webxr/xrSession_requestReferenceSpace_features.https.html.ini +++ b/third_party/blink/web_tests/external/wpt/webxr/xrSession_requestReferenceSpace_features.https.html.ini
@@ -1,6 +1,14 @@ [xrSession_requestReferenceSpace_features.https.html] expected: - if (product == "content_shell") and (flag_specific == "") and (os == "linux"): [OK, TIMEOUT] + if product == "chrome": [OK, TIMEOUT] [Non-immersive session supports viewer space by default - webgl] expected: if product == "chrome": FAIL + + [Immersive session rejects local-floor space if not requested - webgl2] + expected: + if product == "chrome": [PASS, NOTRUN] + + [Immersive session rejects local-floor space if not requested - webgl] + expected: + if product == "chrome": [PASS, TIMEOUT]
diff --git a/third_party/blink/web_tests/external/wpt/webxr/xrStationaryReferenceSpace_floorlevel_updates.https.html.ini b/third_party/blink/web_tests/external/wpt/webxr/xrStationaryReferenceSpace_floorlevel_updates.https.html.ini index 01e2cc2c..66f1822a 100644 --- a/third_party/blink/web_tests/external/wpt/webxr/xrStationaryReferenceSpace_floorlevel_updates.https.html.ini +++ b/third_party/blink/web_tests/external/wpt/webxr/xrStationaryReferenceSpace_floorlevel_updates.https.html.ini
@@ -6,7 +6,3 @@ ['floor-level' XRStationaryReferenceSpace updates properly when the transform changes for non-immersive sessions - webgl] expected: if product == "chrome": FAIL - - ['floor-level' XRStationaryReferenceSpace updates properly when the transform changes for non-immersive sessions - webgl2] - expected: - if product == "chrome": [FAIL, PASS]
diff --git a/third_party/blink/web_tests/external/wpt/workers/baseurl/alpha/importScripts-in-worker.html.ini b/third_party/blink/web_tests/external/wpt/workers/baseurl/alpha/importScripts-in-worker.html.ini new file mode 100644 index 0000000..b871ad55 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/workers/baseurl/alpha/importScripts-in-worker.html.ini
@@ -0,0 +1,3 @@ +[importScripts-in-worker.html] + expected: + if flag_specific == "disable-site-isolation-trials": [OK, TIMEOUT]
diff --git a/third_party/blink/web_tests/external/wpt/workers/interfaces/WorkerGlobalScope/location/redirect.html.ini b/third_party/blink/web_tests/external/wpt/workers/interfaces/WorkerGlobalScope/location/redirect.html.ini index fd33d33..3a0f10f 100644 --- a/third_party/blink/web_tests/external/wpt/workers/interfaces/WorkerGlobalScope/location/redirect.html.ini +++ b/third_party/blink/web_tests/external/wpt/workers/interfaces/WorkerGlobalScope/location/redirect.html.ini
@@ -1,3 +1,3 @@ [redirect.html] expected: - if os == "win": [OK, TIMEOUT] + if os == "win": TIMEOUT
diff --git a/third_party/blink/web_tests/external/wpt/workers/modules/dedicated-worker-import-meta.html.ini b/third_party/blink/web_tests/external/wpt/workers/modules/dedicated-worker-import-meta.html.ini index f8185f10..1457ee30 100644 --- a/third_party/blink/web_tests/external/wpt/workers/modules/dedicated-worker-import-meta.html.ini +++ b/third_party/blink/web_tests/external/wpt/workers/modules/dedicated-worker-import-meta.html.ini
@@ -1,5 +1,3 @@ [dedicated-worker-import-meta.html] - expected: - if (flag_specific == "") and (os == "linux") and (product == "content_shell"): TIMEOUT [Test import.meta.url on the imported module script with a fragment.] expected: FAIL
diff --git a/third_party/blink/web_tests/external/wpt/workers/semantics/xhr/003.html.ini b/third_party/blink/web_tests/external/wpt/workers/semantics/run-a-worker/003.html.ini similarity index 72% rename from third_party/blink/web_tests/external/wpt/workers/semantics/xhr/003.html.ini rename to third_party/blink/web_tests/external/wpt/workers/semantics/run-a-worker/003.html.ini index d7839083..df562551 100644 --- a/third_party/blink/web_tests/external/wpt/workers/semantics/xhr/003.html.ini +++ b/third_party/blink/web_tests/external/wpt/workers/semantics/run-a-worker/003.html.ini
@@ -1,3 +1,3 @@ [003.html] expected: - if (flag_specific == "") and (os == "linux") and (product == "content_shell"): TIMEOUT + if (flag_specific == "") and (os == "linux") and (product == "content_shell"): [OK, TIMEOUT]
diff --git a/third_party/blink/web_tests/wpt_internal/cache_storage/padding.https.html.ini b/third_party/blink/web_tests/wpt_internal/cache_storage/padding.https.html.ini deleted file mode 100644 index a067ca4..0000000 --- a/third_party/blink/web_tests/wpt_internal/cache_storage/padding.https.html.ini +++ /dev/null
@@ -1,4 +0,0 @@ -[padding.https.html] - [Code cache padding should be stable.] - expected: - if product == "chrome": [FAIL, PASS]
diff --git a/third_party/blink/web_tests/wpt_internal/forms/file/file-input-webkitdirectory-click.html.ini b/third_party/blink/web_tests/wpt_internal/forms/file/file-input-webkitdirectory-click.html.ini index 10a1e2c..1aef8ac 100644 --- a/third_party/blink/web_tests/wpt_internal/forms/file/file-input-webkitdirectory-click.html.ini +++ b/third_party/blink/web_tests/wpt_internal/forms/file/file-input-webkitdirectory-click.html.ini
@@ -1,6 +1,6 @@ [file-input-webkitdirectory-click.html] expected: - if (flag_specific == "") and (os == "linux") and (product == "content_shell"): [OK, TIMEOUT] + if (flag_specific == "") and (os == "linux") and (product == "content_shell"): TIMEOUT [clicking a file input with the webkitdirectory attribute launches a file chooser] expected: if product == "chrome": FAIL
diff --git a/third_party/blink/web_tests/wpt_internal/forms/file/file-input-webkitdirectory-key-space.html.ini b/third_party/blink/web_tests/wpt_internal/forms/file/file-input-webkitdirectory-key-space.html.ini index 6e4add39..41ad029 100644 --- a/third_party/blink/web_tests/wpt_internal/forms/file/file-input-webkitdirectory-key-space.html.ini +++ b/third_party/blink/web_tests/wpt_internal/forms/file/file-input-webkitdirectory-key-space.html.ini
@@ -1,6 +1,6 @@ [file-input-webkitdirectory-key-space.html] expected: - if flag_specific == "disable-layout-ng": [OK, TIMEOUT] + if flag_specific == "disable-layout-ng": TIMEOUT [pressing Space on a focused webkitdirectory file input element launches a file chooser] expected: if product == "chrome": FAIL
diff --git a/third_party/blink/web_tests/wpt_internal/html/interaction/focus/the-autofocus-attribute/object-fallback.html.ini b/third_party/blink/web_tests/wpt_internal/html/interaction/focus/the-autofocus-attribute/object-fallback.html.ini index c9cf564..4e85ae1 100644 --- a/third_party/blink/web_tests/wpt_internal/html/interaction/focus/the-autofocus-attribute/object-fallback.html.ini +++ b/third_party/blink/web_tests/wpt_internal/html/interaction/focus/the-autofocus-attribute/object-fallback.html.ini
@@ -1,4 +1,6 @@ [object-fallback.html] + expected: + if os == "win": [OK, TIMEOUT] [An autofocus element in an OBJECT with a loaded frame should not be processed] expected: if product == "chrome": FAIL
diff --git a/third_party/blink/web_tests/wpt_internal/storage/quota/partitioned-webkitStorageInfo-temporary-quota-usage-details.tentative.sub.html.ini b/third_party/blink/web_tests/wpt_internal/storage/quota/partitioned-webkitStorageInfo-temporary-quota-usage-details.tentative.sub.html.ini index a41394f..5d05428 100644 --- a/third_party/blink/web_tests/wpt_internal/storage/quota/partitioned-webkitStorageInfo-temporary-quota-usage-details.tentative.sub.html.ini +++ b/third_party/blink/web_tests/wpt_internal/storage/quota/partitioned-webkitStorageInfo-temporary-quota-usage-details.tentative.sub.html.ini
@@ -1,4 +1,6 @@ [partitioned-webkitStorageInfo-temporary-quota-usage-details.tentative.sub.html] + expected: + if flag_specific == "disable-layout-ng": [OK, TIMEOUT] [Partitioned webkitStorageInfo temporary quota request and usage details test.] expected: - if product == "chrome": [PASS, FAIL] + if (product == "content_shell") and (flag_specific == "") and (os == "linux"): [PASS, FAIL]
diff --git a/third_party/freetype/README.chromium b/third_party/freetype/README.chromium index f307f4ba..b93b447 100644 --- a/third_party/freetype/README.chromium +++ b/third_party/freetype/README.chromium
@@ -1,7 +1,7 @@ Name: FreeType URL: http://www.freetype.org/ -Version: VER-2-12-1-152-gebe7e9128 -Revision: ebe7e9128cdf81cb0a0d27fe293ecff96f6c98a8 +Version: VER-2-12-1-154-gb1c90733e +Revision: b1c90733ee6a04882b133101d61b12e352eeb290 CPEPrefix: cpe:/a:freetype:freetype:2.12.1 License: Custom license "inspired by the BSD, Artistic, and IJG (Independent JPEG Group) licenses"
diff --git a/tools/binary_size/libsupersize/viewer/upload_html_viewer.py b/tools/binary_size/libsupersize/viewer/upload_html_viewer.py index 6e4bcd9..47a3fcd 100755 --- a/tools/binary_size/libsupersize/viewer/upload_html_viewer.py +++ b/tools/binary_size/libsupersize/viewer/upload_html_viewer.py
@@ -158,7 +158,6 @@ project_static_dir = _FirebaseInitProjectDir(project_dir) _CopyStaticFiles(project_static_dir, include_debug_wasm=options.deploy_mode == _DEV) - _FirebaseLogin() _FillInAndCopyTemplates(project_static_dir) _FirebaseDeploy(project_dir, deploy_mode=options.deploy_mode) else:
diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py index 3b2f4380..8baa4e4 100755 --- a/tools/gn/bootstrap/bootstrap.py +++ b/tools/gn/bootstrap/bootstrap.py
@@ -39,6 +39,7 @@ help='Do a debug build. Defaults to release build.') parser.add_option( '-o', '--output', help='place output in PATH', metavar='PATH') + parser.add_option('-j', '--jobs', help='Number of jobs') parser.add_option('-s', '--no-rebuild', help='ignored') parser.add_option('--no-clean', help='ignored') parser.add_option('--gn-gen-args', help='Args to pass to gn gen --args') @@ -122,8 +123,10 @@ shutil.copy2( os.path.join(BOOTSTRAP_DIR, 'last_commit_position.h'), gn_build_dir) - subprocess.check_call( - [ninja_binary, '-C', gn_build_dir, '-w', 'dupbuild=err', 'gn']) + cmd = [ninja_binary, '-C', gn_build_dir, '-w', 'dupbuild=err', 'gn'] + if options.jobs: + cmd += ['-j', str(options.jobs)] + subprocess.check_call(cmd) shutil.copy2(os.path.join(gn_build_dir, 'gn'), gn_path) if not options.skip_generate_buildfiles:
diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums.xml index 0555cc5d..ae8ac527 100644 --- a/tools/metrics/histograms/enums.xml +++ b/tools/metrics/histograms/enums.xml
@@ -99735,7 +99735,9 @@ </summary> <int value="0" label="TCSD_ORD_ERROR: tpm: TSS_SUCCESS"/> <int value="65536" label="TCSD_ORD_OPENCONTEXT: tpm: TSS_SUCCESS"/> + <int value="77841" label="TCSD_ORD_OPENCONTEXT: tsp: TSS_E_COMM_FAILURE"/> <int value="131072" label="TCSD_ORD_CLOSECONTEXT: tpm: TSS_SUCCESS"/> + <int value="143377" label="TCSD_ORD_CLOSECONTEXT: tsp: TSS_E_COMM_FAILURE"/> <int value="196608" label="TCSD_ORD_FREEMEMORY: tpm: TSS_SUCCESS"/> <int value="262144" label="TCSD_ORD_TCSGETCAPABILITY: tpm: TSS_SUCCESS"/> <int value="327680" label="TCSD_ORD_REGISTERKEY: tpm: TSS_SUCCESS"/> @@ -99746,10 +99748,16 @@ <int value="655360" label="TCSD_ORD_GETREGISTEREDKEYBYPUBLICINFO: tpm: TSS_SUCCESS"/> <int value="720896" label="TCSD_ORD_LOADKEYBYBLOB: tpm: TSS_SUCCESS"/> + <int value="720929" label="TCSD_ORD_LOADKEYBYBLOB: tpm: TPM_E_DECRYPT_ERROR"/> + <int value="725127" label="TCSD_ORD_LOADKEYBYBLOB: tddl: TDDL_E_IOERROR"/> <int value="786432" label="TCSD_ORD_LOADKEYBYUUID: tpm: TSS_SUCCESS"/> <int value="851968" label="TCSD_ORD_EVICTKEY: tpm: TSS_SUCCESS"/> <int value="917504" label="TCSD_ORD_CREATEWRAPKEY: tpm: TSS_SUCCESS"/> <int value="983040" label="TCSD_ORD_GETPUBKEY: tpm: TSS_SUCCESS"/> + <int value="983041" label="TCSD_ORD_GETPUBKEY: tpm: TPM_E_AUTHFAIL"/> + <int value="985091" + label="TCSD_ORD_GETPUBKEY: tpm: TPM_E_DEFEND_LOCK_RUNNING"/> + <int value="995345" label="TCSD_ORD_GETPUBKEY: tsp: TSS_E_COMM_FAILURE"/> <int value="1048576" label="TCSD_ORD_MAKEIDENTITY: tpm: TSS_SUCCESS"/> <int value="1114112" label="TCSD_ORD_LOGPCREVENT: tpm: TSS_SUCCESS"/> <int value="1179648" label="TCSD_ORD_GETPCREVENT: tpm: TSS_SUCCESS"/> @@ -99758,7 +99766,11 @@ <int value="1376256" label="TCSD_ORD_SETOWNERINSTALL: tpm: TSS_SUCCESS"/> <int value="1441792" label="TCSD_ORD_TAKEOWNERSHIP: tpm: TSS_SUCCESS"/> <int value="1507328" label="TCSD_ORD_OIAP: tpm: TSS_SUCCESS"/> + <int value="1507351" label="TCSD_ORD_OIAP: tpm: TPM_E_SIZE"/> + <int value="1511559" label="TCSD_ORD_OIAP: tddl: TDDL_E_IOERROR"/> + <int value="1519633" label="TCSD_ORD_OIAP: tsp: TSS_E_COMM_FAILURE"/> <int value="1572864" label="TCSD_ORD_OSAP: tpm: TSS_SUCCESS"/> + <int value="1577095" label="TCSD_ORD_OSAP: tddl: TDDL_E_IOERROR"/> <int value="1638400" label="TCSD_ORD_CHANGEAUTH: tpm: TSS_SUCCESS"/> <int value="1703936" label="TCSD_ORD_CHANGEAUTHOWNER: tpm: TSS_SUCCESS"/> <int value="1769472" label="TCSD_ORD_CHANGEAUTHASYMSTART: tpm: TSS_SUCCESS"/> @@ -99772,7 +99784,12 @@ <int value="2293760" label="TCSD_ORD_DIRREAD: tpm: TSS_SUCCESS"/> <int value="2359296" label="TCSD_ORD_SEAL: tpm: TSS_SUCCESS"/> <int value="2424832" label="TCSD_ORD_UNSEAL: tpm: TSS_SUCCESS"/> + <int value="2424833" label="TCSD_ORD_UNSEAL: tpm: TPM_E_AUTHFAIL"/> + <int value="2424856" label="TCSD_ORD_UNSEAL: tpm: TPM_E_WRONGPCRVAL"/> + <int value="2424861" label="TCSD_ORD_UNSEAL: tpm: TPM_E_AUTH2FAIL"/> <int value="2490368" label="TCSD_ORD_UNBIND: tpm: TSS_SUCCESS"/> + <int value="2490401" label="TCSD_ORD_UNBIND: tpm: TPM_E_DECRYPT_ERROR"/> + <int value="2498762" label="TCSD_ORD_UNBIND: tcs: TCS_E_KM_LOADFAILED"/> <int value="2555904" label="TCSD_ORD_CREATEMIGRATIONBLOB: tpm: TSS_SUCCESS"/> <int value="2621440" label="TCSD_ORD_CONVERTMIGRATIONBLOB: tpm: TSS_SUCCESS"/> <int value="2686976" @@ -99782,11 +99799,28 @@ <int value="2883584" label="TCSD_ORD_GETRANDOM: tpm: TSS_SUCCESS"/> <int value="2949120" label="TCSD_ORD_STIRRANDOM: tpm: TSS_SUCCESS"/> <int value="3014656" label="TCSD_ORD_GETCAPABILITY: tpm: TSS_SUCCESS"/> + <int value="3014658" label="TCSD_ORD_GETCAPABILITY: tpm: TPM_E_BADINDEX"/> + <int value="3014659" + label="TCSD_ORD_GETCAPABILITY: tpm: TPM_E_BAD_PARAMETER"/> + <int value="3014684" + label="TCSD_ORD_GETCAPABILITY: tpm: TPM_E_FAILEDSELFTEST"/> + <int value="3014700" label="TCSD_ORD_GETCAPABILITY: tpm: TPM_E_BAD_MODE"/> + <int value="3018887" label="TCSD_ORD_GETCAPABILITY: tddl: TDDL_E_IOERROR"/> + <int value="3026961" label="TCSD_ORD_GETCAPABILITY: tsp: TSS_E_COMM_FAILURE"/> <int value="3080192" label="TCSD_ORD_GETCAPABILITYSIGNED: tpm: TSS_SUCCESS"/> <int value="3145728" label="TCSD_ORD_GETCAPABILITYOWNER: tpm: TSS_SUCCESS"/> + <int value="3145729" + label="TCSD_ORD_GETCAPABILITYOWNER: tpm: TPM_E_AUTHFAIL"/> + <int value="3145734" + label="TCSD_ORD_GETCAPABILITYOWNER: tpm: TPM_E_DEACTIVATED"/> + <int value="3147779" + label="TCSD_ORD_GETCAPABILITYOWNER: tpm: TPM_E_DEFEND_LOCK_RUNNING"/> <int value="3211264" label="TCSD_ORD_CREATEENDORSEMENTKEYPAIR: tpm: TSS_SUCCESS"/> <int value="3276800" label="TCSD_ORD_READPUBEK: tpm: TSS_SUCCESS"/> + <int value="3276806" label="TCSD_ORD_READPUBEK: tpm: TPM_E_DEACTIVATED"/> + <int value="3276807" label="TCSD_ORD_READPUBEK: tpm: TPM_E_DISABLED"/> + <int value="3276835" label="TCSD_ORD_READPUBEK: tpm: TPM_E_NO_ENDORSEMENT"/> <int value="3342336" label="TCSD_ORD_DISABLEPUBEKREAD: tpm: TSS_SUCCESS"/> <int value="3407872" label="TCSD_ORD_OWNERREADPUBEK: tpm: TSS_SUCCESS"/> <int value="3473408" label="TCSD_ORD_SELFTESTFULL: tpm: TSS_SUCCESS"/> @@ -99831,10 +99865,19 @@ <int value="5636096" label="TCSD_ORD_GETCREDENTIAL: tpm: TSS_SUCCESS"/> <int value="5701632" label="TCSD_ORD_NVDEFINEORRELEASESPACE: tpm: TSS_SUCCESS"/> + <int value="5701634" + label="TCSD_ORD_NVDEFINEORRELEASESPACE: tpm: TPM_E_BADINDEX"/> <int value="5767168" label="TCSD_ORD_NVWRITEVALUE: tpm: TSS_SUCCESS"/> + <int value="5767192" label="TCSD_ORD_NVWRITEVALUE: tpm: TPM_E_WRONGPCRVAL"/> <int value="5832704" label="TCSD_ORD_NVWRITEVALUEAUTH: tpm: TSS_SUCCESS"/> + <int value="5832764" + label="TCSD_ORD_NVWRITEVALUEAUTH: tpm: TPM_E_AREA_LOCKED"/> <int value="5898240" label="TCSD_ORD_NVREADVALUE: tpm: TSS_SUCCESS"/> + <int value="5898264" label="TCSD_ORD_NVREADVALUE: tpm: TPM_E_WRONGPCRVAL"/> + <int value="5898285" label="TCSD_ORD_NVREADVALUE: tpm: TPM_E_BAD_PRESENCE"/> <int value="5963776" label="TCSD_ORD_NVREADVALUEAUTH: tpm: TSS_SUCCESS"/> + <int value="5976081" + label="TCSD_ORD_NVREADVALUEAUTH: tsp: TSS_E_COMM_FAILURE"/> <int value="6029312" label="TCSD_ORD_ESTABLISHTRANSPORT: tpm: TSS_SUCCESS"/> <int value="6094848" label="TCSD_ORD_EXECUTETRANSPORT: tpm: TSS_SUCCESS"/> <int value="6160384" @@ -99853,6 +99896,8 @@ label="TCSD_ORD_DELEGATE_CREATEKEYDELEGATION: tpm: TSS_SUCCESS"/> <int value="6881280" label="TCSD_ORD_DELEGATE_CREATEOWNERDELEGATION: tpm: TSS_SUCCESS"/> + <int value="6893585" + label="TCSD_ORD_DELEGATE_CREATEOWNERDELEGATION: tsp: TSS_E_COMM_FAILURE"/> <int value="6946816" label="TCSD_ORD_DELEGATE_LOADOWNERDELEGATION: tpm: TSS_SUCCESS"/> <int value="7012352" label="TCSD_ORD_DELEGATE_READTABLE: tpm: TSS_SUCCESS"/> @@ -99875,6 +99920,7 @@ <int value="7864320" label="TCSD_ORD_FLUSHSPECIFIC: tpm: TSS_SUCCESS"/> <int value="7929856" label="TCSD_ORD_KEYCONTROLOWNER: tpm: TSS_SUCCESS"/> <int value="7995392" label="TCSD_ORD_DSAP: tpm: TSS_SUCCESS"/> + <int value="7999623" label="TCSD_ORD_DSAP: tddl: TDDL_E_IOERROR"/> </enum> <enum name="TPM2CommandAndResponse"> @@ -99888,6 +99934,7 @@ </summary> <int value="18808832" label="TPM_CC_NV_UndefineSpaceSpecial: TPM_RC_SUCCESS"/> <int value="18874368" label="TPM_CC_EvictControl: TPM_RC_SUCCESS"/> + <int value="18874530" label="TPM_CC_EvictControl: TPM_RC_BAD_AUTH"/> <int value="18939904" label="TPM_CC_HierarchyControl: TPM_RC_SUCCESS"/> <int value="19005440" label="TPM_CC_NV_UndefineSpace: TPM_RC_SUCCESS"/> <int value="19136512" label="TPM_CC_ChangeEPS: TPM_RC_SUCCESS"/> @@ -99896,7 +99943,10 @@ <int value="19333120" label="TPM_CC_ClearControl: TPM_RC_SUCCESS"/> <int value="19398656" label="TPM_CC_ClockSet: TPM_RC_SUCCESS"/> <int value="19464192" label="TPM_CC_HierarchyChangeAuth: TPM_RC_SUCCESS"/> + <int value="19464354" label="TPM_CC_HierarchyChangeAuth: TPM_RC_BAD_AUTH"/> <int value="19529728" label="TPM_CC_NV_DefineSpace: TPM_RC_SUCCESS"/> + <int value="19529890" label="TPM_CC_NV_DefineSpace: TPM_RC_BAD_AUTH"/> + <int value="19566608" label="TPM_CC_NV_DefineSpace: SAPI_RC_NO_CONNECTION"/> <int value="19595264" label="TPM_CC_PCR_Allocate: TPM_RC_SUCCESS"/> <int value="19660800" label="TPM_CC_PCR_SetAuthPolicy: TPM_RC_SUCCESS"/> <int value="19726336" label="TPM_CC_PP_Commands: TPM_RC_SUCCESS"/> @@ -99904,6 +99954,8 @@ <int value="19857408" label="TPM_CC_FieldUpgradeStart: TPM_RC_SUCCESS"/> <int value="19922944" label="TPM_CC_ClockRateAdjust: TPM_RC_SUCCESS"/> <int value="19988480" label="TPM_CC_CreatePrimary: TPM_RC_SUCCESS"/> + <int value="19988612" label="TPM_CC_CreatePrimary: TPM_RC_VALUE"/> + <int value="19988642" label="TPM_CC_CreatePrimary: TPM_RC_BAD_AUTH"/> <int value="20054016" label="TPM_CC_NV_GlobalWriteLock: TPM_RC_SUCCESS"/> <int value="20119552" label="TPM_CC_GetCommandAuditDigest: TPM_RC_SUCCESS"/> <int value="20185088" label="TPM_CC_NV_Increment: TPM_RC_SUCCESS"/> @@ -99913,6 +99965,9 @@ <int value="20447232" label="TPM_CC_NV_WriteLock: TPM_RC_SUCCESS"/> <int value="20512768" label="TPM_CC_DictionaryAttackLockReset: TPM_RC_SUCCESS"/> + <int value="20515096" + label="TPM_CC_DictionaryAttackLockReset: TPM_RC_REFERENCE_S0"/> + <int value="20515106" label="TPM_CC_DictionaryAttackLockReset: TPM_RC_RETRY"/> <int value="20541444" label="TPM_CC_DictionaryAttackLockReset: TRUNKS_RC_WRITE_ERROR"/> <int value="20578304" @@ -99930,30 +99985,48 @@ <int value="21233664" label="TPM_CC_Startup: TPM_RC_SUCCESS"/> <int value="21299200" label="TPM_CC_Shutdown: TPM_RC_SUCCESS"/> <int value="21364736" label="TPM_CC_StirRandom: TPM_RC_SUCCESS"/> + <int value="21401616" label="TPM_CC_StirRandom: SAPI_RC_NO_CONNECTION"/> <int value="21430272" label="TPM_CC_ActivateCredential: TPM_RC_SUCCESS"/> <int value="21430431" label="TPM_CC_ActivateCredential: TPM_RC_INTEGRITY"/> + <int value="21432593" label="TPM_CC_ActivateCredential: TPM_RC_REFERENCE_H1"/> + <int value="21432601" label="TPM_CC_ActivateCredential: TPM_RC_REFERENCE_S1"/> + <int value="21432610" label="TPM_CC_ActivateCredential: TPM_RC_RETRY"/> <int value="21495808" label="TPM_CC_Certify: TPM_RC_SUCCESS"/> + <int value="21498146" label="TPM_CC_Certify: TPM_RC_RETRY"/> + <int value="21532688" label="TPM_CC_Certify: SAPI_RC_NO_CONNECTION"/> <int value="21561344" label="TPM_CC_PolicyNV: TPM_RC_SUCCESS"/> <int value="21626880" label="TPM_CC_CertifyCreation: TPM_RC_SUCCESS"/> <int value="21692416" label="TPM_CC_Duplicate: TPM_RC_SUCCESS"/> <int value="21757952" label="TPM_CC_GetTime: TPM_RC_SUCCESS"/> <int value="21823488" label="TPM_CC_GetSessionAuditDigest: TPM_RC_SUCCESS"/> <int value="21889024" label="TPM_CC_NV_Read: TPM_RC_SUCCESS"/> + <int value="21925904" label="TPM_CC_NV_Read: SAPI_RC_NO_CONNECTION"/> <int value="21954560" label="TPM_CC_NV_ReadLock: TPM_RC_SUCCESS"/> <int value="22020096" label="TPM_CC_ObjectChangeAuth: TPM_RC_SUCCESS"/> <int value="22085632" label="TPM_CC_PolicySecret: TPM_RC_SUCCESS"/> + <int value="22087960" label="TPM_CC_PolicySecret: TPM_RC_REFERENCE_S0"/> <int value="22151168" label="TPM_CC_Rewrap: TPM_RC_SUCCESS"/> <int value="22216704" label="TPM_CC_Create: TPM_RC_SUCCESS"/> <int value="22216854" label="TPM_CC_Create: TPM_RC_SYMMETRIC"/> <int value="22216866" label="TPM_CC_Create: TPM_RC_BAD_AUTH"/> <int value="22219032" label="TPM_CC_Create: TPM_RC_REFERENCE_S0"/> + <int value="22219042" label="TPM_CC_Create: TPM_RC_RETRY"/> <int value="22245380" label="TPM_CC_Create: TRUNKS_RC_WRITE_ERROR"/> <int value="22253584" label="TPM_CC_Create: SAPI_RC_NO_CONNECTION"/> <int value="22261899" label="TPM_CC_Create: Resource Manager: TPM_RC_HANDLE"/> <int value="22282240" label="TPM_CC_ECDH_ZGen: TPM_RC_SUCCESS"/> + <int value="22282402" label="TPM_CC_ECDH_ZGen: TPM_RC_BAD_AUTH"/> + <int value="22284560" label="TPM_CC_ECDH_ZGen: TPM_RC_REFERENCE_H0"/> + <int value="22284568" label="TPM_CC_ECDH_ZGen: TPM_RC_REFERENCE_S0"/> + <int value="22284578" label="TPM_CC_ECDH_ZGen: TPM_RC_RETRY"/> + <int value="22310916" label="TPM_CC_ECDH_ZGen: TRUNKS_RC_WRITE_ERROR"/> + <int value="22327435" + label="TPM_CC_ECDH_ZGen: Resource Manager: TPM_RC_HANDLE"/> <int value="22347776" label="TPM_CC_HMAC: TPM_RC_SUCCESS"/> <int value="22413312" label="TPM_CC_Import: TPM_RC_SUCCESS"/> + <int value="22450192" label="TPM_CC_Import: SAPI_RC_NO_CONNECTION"/> <int value="22478848" label="TPM_CC_Load: TPM_RC_SUCCESS"/> + <int value="22478997" label="TPM_CC_Load: TPM_RC_SIZE"/> <int value="22479007" label="TPM_CC_Load: TPM_RC_INTEGRITY"/> <int value="22479104" label="TPM_CC_Load: TPM_RC_INITIALIZE"/> <int value="22481186" label="TPM_CC_Load: TPM_RC_RETRY"/> @@ -99963,7 +100036,11 @@ <int value="22581264" label="TPM_CC_Quote: SAPI_RC_NO_CONNECTION"/> <int value="22609920" label="TPM_CC_RSA_Decrypt: TPM_RC_SUCCESS"/> <int value="22610052" label="TPM_CC_RSA_Decrypt: TPM_RC_VALUE"/> + <int value="22610069" label="TPM_CC_RSA_Decrypt: TPM_RC_SIZE"/> + <int value="22610070" label="TPM_CC_RSA_Decrypt: TPM_RC_SYMMETRIC"/> + <int value="22610079" label="TPM_CC_RSA_Decrypt: TPM_RC_INTEGRITY"/> <int value="22610082" label="TPM_CC_RSA_Decrypt: TPM_RC_BAD_AUTH"/> + <int value="22612240" label="TPM_CC_RSA_Decrypt: TPM_RC_REFERENCE_H0"/> <int value="22612248" label="TPM_CC_RSA_Decrypt: TPM_RC_REFERENCE_S0"/> <int value="22612258" label="TPM_CC_RSA_Decrypt: TPM_RC_RETRY"/> <int value="22638596" label="TPM_CC_RSA_Decrypt: TRUNKS_RC_WRITE_ERROR"/> @@ -99973,19 +100050,25 @@ <int value="22806528" label="TPM_CC_SequenceUpdate: TPM_RC_SUCCESS"/> <int value="22872064" label="TPM_CC_Sign: TPM_RC_SUCCESS"/> <int value="22872195" label="TPM_CC_Sign: TPM_RC_HASH"/> + <int value="22872196" label="TPM_CC_Sign: TPM_RC_VALUE"/> + <int value="22872214" label="TPM_CC_Sign: TPM_RC_SYMMETRIC"/> <int value="22872226" label="TPM_CC_Sign: TPM_RC_BAD_AUTH"/> <int value="22874384" label="TPM_CC_Sign: TPM_RC_REFERENCE_H0"/> <int value="22874392" label="TPM_CC_Sign: TPM_RC_REFERENCE_S0"/> <int value="22874402" label="TPM_CC_Sign: TPM_RC_RETRY"/> + <int value="22900740" label="TPM_CC_Sign: TRUNKS_RC_WRITE_ERROR"/> + <int value="22917259" label="TPM_CC_Sign: Resource Manager: TPM_RC_HANDLE"/> <int value="22937600" label="TPM_CC_Unseal: TPM_RC_SUCCESS"/> <int value="22937757" label="TPM_CC_Unseal: TPM_RC_POLICY_FAIL"/> <int value="22937762" label="TPM_CC_Unseal: TPM_RC_BAD_AUTH"/> <int value="22937903" label="TPM_CC_Unseal: TPM_RC_AUTH_UNAVAILABLE"/> <int value="22939928" label="TPM_CC_Unseal: TPM_RC_REFERENCE_S0"/> <int value="22939938" label="TPM_CC_Unseal: TPM_RC_RETRY"/> + <int value="22966276" label="TPM_CC_Unseal: TRUNKS_RC_WRITE_ERROR"/> <int value="22974480" label="TPM_CC_Unseal: SAPI_RC_NO_CONNECTION"/> <int value="22982795" label="TPM_CC_Unseal: Resource Manager: TPM_RC_HANDLE"/> <int value="23068672" label="TPM_CC_PolicySigned: TPM_RC_SUCCESS"/> + <int value="23071000" label="TPM_CC_PolicySigned: TPM_RC_REFERENCE_S0"/> <int value="23134208" label="TPM_CC_ContextLoad: TPM_RC_SUCCESS"/> <int value="23199744" label="TPM_CC_ContextSave: TPM_RC_SUCCESS"/> <int value="23265280" label="TPM_CC_ECDH_KeyGen: TPM_RC_SUCCESS"/> @@ -99994,6 +100077,8 @@ <int value="23396491" label="TPM_CC_FlushContext: TPM_RC_HANDLE"/> <int value="23396608" label="TPM_CC_FlushContext: TPM_RC_INITIALIZE"/> <int value="23425028" label="TPM_CC_FlushContext: TRUNKS_RC_WRITE_ERROR"/> + <int value="23433224" + label="TPM_CC_FlushContext: SAPI_RC_NO_RESPONSE_RECEIVED"/> <int value="23433232" label="TPM_CC_FlushContext: SAPI_RC_NO_CONNECTION"/> <int value="23441547" label="TPM_CC_FlushContext: Resource Manager: TPM_RC_HANDLE"/> @@ -100006,6 +100091,7 @@ <int value="23724032" label="TPM_CC_PolicyAuthorize: TPM_RC_SUCCESS"/> <int value="23789568" label="TPM_CC_PolicyAuthValue: TPM_RC_SUCCESS"/> <int value="23791906" label="TPM_CC_PolicyAuthValue: TPM_RC_RETRY"/> + <int value="23818244" label="TPM_CC_PolicyAuthValue: TRUNKS_RC_WRITE_ERROR"/> <int value="23855104" label="TPM_CC_PolicyCommandCode: TPM_RC_SUCCESS"/> <int value="23920640" label="TPM_CC_PolicyCounterTimer: TPM_RC_SUCCESS"/> <int value="23986176" label="TPM_CC_PolicyCpHash: TPM_RC_SUCCESS"/> @@ -100014,39 +100100,52 @@ <int value="24182784" label="TPM_CC_PolicyOR: TPM_RC_SUCCESS"/> <int value="24248320" label="TPM_CC_PolicyTicket: TPM_RC_SUCCESS"/> <int value="24313856" label="TPM_CC_ReadPublic: TPM_RC_SUCCESS"/> + <int value="24313988" label="TPM_CC_ReadPublic: TPM_RC_VALUE"/> <int value="24313995" label="TPM_CC_ReadPublic: TPM_RC_HANDLE"/> + <int value="24316176" label="TPM_CC_ReadPublic: TPM_RC_REFERENCE_H0"/> <int value="24316194" label="TPM_CC_ReadPublic: TPM_RC_RETRY"/> <int value="24342532" label="TPM_CC_ReadPublic: TRUNKS_RC_WRITE_ERROR"/> <int value="24350736" label="TPM_CC_ReadPublic: SAPI_RC_NO_CONNECTION"/> + <int value="24359051" + label="TPM_CC_ReadPublic: Resource Manager: TPM_RC_HANDLE"/> <int value="24379392" label="TPM_CC_RSA_Encrypt: TPM_RC_SUCCESS"/> <int value="24510464" label="TPM_CC_StartAuthSession: TPM_RC_SUCCESS"/> <int value="24510594" label="TPM_CC_StartAuthSession: TPM_RC_ATTRIBUTES"/> + <int value="24510596" label="TPM_CC_StartAuthSession: TPM_RC_VALUE"/> <int value="24510720" label="TPM_CC_StartAuthSession: TPM_RC_INITIALIZE"/> <int value="24512802" label="TPM_CC_StartAuthSession: TPM_RC_RETRY"/> <int value="24539140" label="TPM_CC_StartAuthSession: TRUNKS_RC_WRITE_ERROR"/> <int value="24547336" label="TPM_CC_StartAuthSession: SAPI_RC_NO_RESPONSE_RECEIVED"/> <int value="24547344" label="TPM_CC_StartAuthSession: SAPI_RC_NO_CONNECTION"/> + <int value="24555671" + label="TPM_CC_StartAuthSession: Resource Manager: TPM_RC_TAG"/> <int value="24576000" label="TPM_CC_VerifySignature: TPM_RC_SUCCESS"/> <int value="24641536" label="TPM_CC_ECC_Parameters: TPM_RC_SUCCESS"/> <int value="24707072" label="TPM_CC_FirmwareRead: TPM_RC_SUCCESS"/> <int value="24772608" label="TPM_CC_GetCapability: TPM_RC_SUCCESS"/> <int value="24772864" label="TPM_CC_GetCapability: TPM_RC_INITIALIZE"/> <int value="24801284" label="TPM_CC_GetCapability: TRUNKS_RC_WRITE_ERROR"/> + <int value="24809480" + label="TPM_CC_GetCapability: SAPI_RC_NO_RESPONSE_RECEIVED"/> <int value="24809488" label="TPM_CC_GetCapability: SAPI_RC_NO_CONNECTION"/> <int value="24838144" label="TPM_CC_GetRandom: TPM_RC_SUCCESS"/> + <int value="24866820" label="TPM_CC_GetRandom: TRUNKS_RC_WRITE_ERROR"/> <int value="24903680" label="TPM_CC_GetTestResult: TPM_RC_SUCCESS"/> <int value="24969216" label="TPM_CC_Hash: TPM_RC_SUCCESS"/> <int value="25034752" label="TPM_CC_PCR_Read: TPM_RC_SUCCESS"/> + <int value="25063428" label="TPM_CC_PCR_Read: TRUNKS_RC_WRITE_ERROR"/> <int value="25071632" label="TPM_CC_PCR_Read: SAPI_RC_NO_CONNECTION"/> <int value="25100288" label="TPM_CC_PolicyPCR: TPM_RC_SUCCESS"/> <int value="25102626" label="TPM_CC_PolicyPCR: TPM_RC_RETRY"/> + <int value="25128964" label="TPM_CC_PolicyPCR: TRUNKS_RC_WRITE_ERROR"/> <int value="25137168" label="TPM_CC_PolicyPCR: SAPI_RC_NO_CONNECTION"/> <int value="25165824" label="TPM_CC_PolicyRestart: TPM_RC_SUCCESS"/> <int value="25231360" label="TPM_CC_ReadClock: TPM_RC_SUCCESS"/> <int value="25296896" label="TPM_CC_PCR_Extend: TPM_RC_SUCCESS"/> <int value="25362432" label="TPM_CC_PCR_SetAuthValue: TPM_RC_SUCCESS"/> <int value="25427968" label="TPM_CC_NV_Certify: TPM_RC_SUCCESS"/> + <int value="25428294" label="TPM_CC_NV_Certify: TPM_RC_NV_RANGE"/> <int value="25464848" label="TPM_CC_NV_Certify: SAPI_RC_NO_CONNECTION"/> <int value="25493504" label="TPM_CC_EventSequenceComplete: TPM_RC_SUCCESS"/> <int value="25559040" label="TPM_CC_HashSequenceStart: TPM_RC_SUCCESS"/>
diff --git a/tools/metrics/histograms/metadata/browser/histograms.xml b/tools/metrics/histograms/metadata/browser/histograms.xml index 19f61962..69c78f7 100644 --- a/tools/metrics/histograms/metadata/browser/histograms.xml +++ b/tools/metrics/histograms/metadata/browser/histograms.xml
@@ -566,34 +566,6 @@ </token> </histogram> -<histogram name="Browser.Tabs.InputEventToSelectionTime{TabSwitchInputLatency}" - units="microseconds" expires_after="2019-08-31"> - <owner>ejoe@google.com</owner> - <owner>jonross@chromium.org</owner> - <summary> - The time between input event timestamp for tab switch and when the - TabStripModel begins processing the switch. {TabSwitchInputLatency} - </summary> - <token key="TabSwitchInputLatency"> - <variant name=".Keyboard" - summary="The time it takes from receiving a keyboard input event that - leads to the active tab changing to just before the TabStrip - notifies its observers of the change."/> - <variant name=".Mouse" - summary="The time it takes from receiving a mouse input event that - leads to the active tab changing to just before the TabStrip - notifies its observers of the change."/> - <variant name=".Touch" - summary="The time it takes from receiving a touch input event that - leads to the active tab changing to just before the TabStrip - notifies its observers of the change."/> - <variant name=".Wheel" - summary="The time it takes from receiving a mouse scroll event that - leads to the active tab changing to just before the TabStrip - notifies its observers of the change."/> - </token> -</histogram> - <histogram name="Browser.Tabs.SelectionToVisibilityRequestTime" units="microseconds" expires_after="2023-05-07"> <owner>jonross@chromium.org</owner>
diff --git a/tools/metrics/histograms/metadata/commerce/histograms.xml b/tools/metrics/histograms/metadata/commerce/histograms.xml index 87738fbc..6dabfef 100644 --- a/tools/metrics/histograms/metadata/commerce/histograms.xml +++ b/tools/metrics/histograms/metadata/commerce/histograms.xml
@@ -222,7 +222,7 @@ </histogram> <histogram name="Commerce.PDPStateOnNavigation" enum="ShoppingPDPState" - expires_after="2023-02-01"> + expires_after="2023-06-01"> <owner>ayman@chromium.org</owner> <owner>mdjones@chromium.org</owner> <owner>chrome-shopping@google.com</owner> @@ -264,6 +264,9 @@ <histogram name="Commerce.PowerBookmarks.ShoppingDataProvider.IsProductPage" enum="Boolean" expires_after="2023-01-01"> + <obsolete> + Deprecated 12/2022. Replaced by Commerce.PDPStateOnNavigation. + </obsolete> <owner>ayman@chromium.org</owner> <owner>mdjones@chromium.org</owner> <summary>
diff --git a/tools/metrics/histograms/metadata/extensions/histograms.xml b/tools/metrics/histograms/metadata/extensions/histograms.xml index 25e2b9e..dc85546 100644 --- a/tools/metrics/histograms/metadata/extensions/histograms.xml +++ b/tools/metrics/histograms/metadata/extensions/histograms.xml
@@ -154,15 +154,6 @@ </summary> </histogram> -<histogram name="Extensions.ApiTabUpdateJavascript" enum="Boolean" - expires_after="M78"> - <owner>dbertoni@chromium.org</owner> - <summary> - Reports whether a tab was updated to a javascript:-scheme URL from the - extensions tabs.update API. Reported once per call to tabs.update(). - </summary> -</histogram> - <histogram name="Extensions.AppLaunch" enum="AppLaunch" expires_after="2023-06-04"> <owner>benwells@chromium.org</owner>
diff --git a/ui/chromeos/translations/ui_chromeos_strings_pt-BR.xtb b/ui/chromeos/translations/ui_chromeos_strings_pt-BR.xtb index 42c5270..81129c7 100644 --- a/ui/chromeos/translations/ui_chromeos_strings_pt-BR.xtb +++ b/ui/chromeos/translations/ui_chromeos_strings_pt-BR.xtb
@@ -46,7 +46,7 @@ <translation id="1388045380422025115">Todos os tipos</translation> <translation id="1395262318152388157">Controle deslizante de busca</translation> <translation id="1399511500114202393">Nenhum certificado do usuário</translation> -<translation id="1403008701842173542">Em qualquer lugar</translation> +<translation id="1403008701842173542">Em tudo</translation> <translation id="1404323374378969387">Norueguês</translation> <translation id="1433628812591023318">Para arrastar arquivos até o Parallels Desktop, é necessário primeiro movê-los para a pasta "Arquivos" do Windows.</translation> <translation id="1435838927755162558">Compartilhar pasta com o Parallels Desktop</translation>
diff --git a/ui/strings/translations/ui_strings_el.xtb b/ui/strings/translations/ui_strings_el.xtb index 4ee9dee0..1a96788 100644 --- a/ui/strings/translations/ui_strings_el.xtb +++ b/ui/strings/translations/ui_strings_el.xtb
@@ -26,6 +26,7 @@ <translation id="1803208670097017349">{MONTHS,plural, =1{1 μήνας}other{# μήνες}}</translation> <translation id="1809410197924942083"><ph name="QUANTITY" /> MB/s</translation> <translation id="1830179671306812954">{HOURS,plural, =1{1 ώρα και }other{# ώρες και }}</translation> +<translation id="185013357618350178">&Επιλογή</translation> <translation id="1859234291848436338">Κατεύθυνση γραφής</translation> <translation id="1860796786778352021">Κλείσιμο ειδοποίησης</translation> <translation id="186476001994626254">Περιεχόμενο έξυπνης επικόλλησης ιστού</translation>
diff --git a/ui/strings/translations/ui_strings_fr-CA.xtb b/ui/strings/translations/ui_strings_fr-CA.xtb index 68c586c..321b3f56 100644 --- a/ui/strings/translations/ui_strings_fr-CA.xtb +++ b/ui/strings/translations/ui_strings_fr-CA.xtb
@@ -26,6 +26,7 @@ <translation id="1803208670097017349">{MONTHS,plural, =1{Un mois}one{# mois}other{# mois}}</translation> <translation id="1809410197924942083"><ph name="QUANTITY" /> Mo/s</translation> <translation id="1830179671306812954">{HOURS,plural, =1{1 heure et }one{# heure et }other{# heures et }}</translation> +<translation id="185013357618350178">&Sélectionner</translation> <translation id="1859234291848436338">Direction de l'écriture</translation> <translation id="1860796786778352021">Fermeture de la notification</translation> <translation id="186476001994626254">Contenu du coller intelligent Web</translation>
diff --git a/ui/strings/translations/ui_strings_hy.xtb b/ui/strings/translations/ui_strings_hy.xtb index 3166b02..27096e9 100644 --- a/ui/strings/translations/ui_strings_hy.xtb +++ b/ui/strings/translations/ui_strings_hy.xtb
@@ -26,6 +26,7 @@ <translation id="1803208670097017349">{MONTHS,plural, =1{1 ամիս}one{# ամիս}other{# ամիս}}</translation> <translation id="1809410197924942083"><ph name="QUANTITY" /> ՄԲ/վ</translation> <translation id="1830179671306812954">{HOURS,plural, =1{1 ժամ }one{# ժամ }other{# ժամ }}</translation> +<translation id="185013357618350178">&Ընտրել</translation> <translation id="1859234291848436338">Գրելու ուղղություն</translation> <translation id="1860796786778352021">Փակել ծանուցումը</translation> <translation id="186476001994626254">Web Smart Paste ձևաչափով բովանդակություն</translation>
diff --git a/ui/strings/translations/ui_strings_pt-BR.xtb b/ui/strings/translations/ui_strings_pt-BR.xtb index cce1536..a8ce97de 100644 --- a/ui/strings/translations/ui_strings_pt-BR.xtb +++ b/ui/strings/translations/ui_strings_pt-BR.xtb
@@ -26,6 +26,7 @@ <translation id="1803208670097017349">{MONTHS,plural, =1{ mês}one{# mês}other{# meses}}</translation> <translation id="1809410197924942083"><ph name="QUANTITY" /> MB/s</translation> <translation id="1830179671306812954">{HOURS,plural, =1{Uma hora e }one{# horas e }other{# horas e }}</translation> +<translation id="185013357618350178">&Selecionar</translation> <translation id="1859234291848436338">Direção da escrita</translation> <translation id="1860796786778352021">Fechar notificação</translation> <translation id="186476001994626254">Conteúdo Web Smart Paste</translation>
diff --git a/ui/strings/translations/ui_strings_sk.xtb b/ui/strings/translations/ui_strings_sk.xtb index 570d2ce..f6c94d0 100644 --- a/ui/strings/translations/ui_strings_sk.xtb +++ b/ui/strings/translations/ui_strings_sk.xtb
@@ -26,6 +26,7 @@ <translation id="1803208670097017349">{MONTHS,plural, =1{1 mesiac}few{# mesiace}many{# mesiaca}other{# mesiacov}}</translation> <translation id="1809410197924942083"><ph name="QUANTITY" /> MB/s</translation> <translation id="1830179671306812954">{HOURS,plural, =1{Pred 1 hodinou a }few{Pred # hodinami a }many{Pred # hodinou a }other{Pred # hodinami a }}</translation> +<translation id="185013357618350178">&Vybrať</translation> <translation id="1859234291848436338">Smer písania</translation> <translation id="1860796786778352021">Zavrieť upozornenie</translation> <translation id="186476001994626254">Obsah pridaný inteligentným prilepením z webov</translation>
diff --git a/ui/strings/translations/ui_strings_te.xtb b/ui/strings/translations/ui_strings_te.xtb index 21663f0f..a2bfb3f 100644 --- a/ui/strings/translations/ui_strings_te.xtb +++ b/ui/strings/translations/ui_strings_te.xtb
@@ -26,6 +26,7 @@ <translation id="1803208670097017349">{MONTHS,plural, =1{1 నెల}other{# నెలలు}}</translation> <translation id="1809410197924942083"><ph name="QUANTITY" /> MB/s</translation> <translation id="1830179671306812954">{HOURS,plural, =1{1 గంట మరియు }other{# గంటలు మరియు }}</translation> +<translation id="185013357618350178">&Select</translation> <translation id="1859234291848436338">వ్రాసే దిశ</translation> <translation id="1860796786778352021">నోటిఫికేషన్ను మూసివేయి</translation> <translation id="186476001994626254">వెబ్ స్మార్ట్ పేస్ట్ కంటెంట్</translation>