Rename "base::raw_ptr" into "raw_ptr".

The shorter form is the one to be used.
Pointers in ChromeOS ash used not to be rewritten and it is not enforced
yet. Folks started to use them, and the `base::raw_ptr` pattern emerged.

This is a fully automated patch to fix it. Script:

```
git grep -lz "base::raw_ptr<" | xargs -0 sed -i 's/base::raw_ptr</raw_ptr</g'
git grep -lz "base::raw_ref<" | xargs -0 sed -i 's/base::raw_ref</raw_ref</g'
git checkout HEAD~ base/
git checkout HEAD~ tools/
git cl format
```

Bug: None
Change-Id: I0814bafe9f47b93be0b73d84ee52b058d1ad368f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4476651
Reviewed-by: Bartek Nowierski <bartekn@chromium.org>
Owners-Override: Bartek Nowierski <bartekn@chromium.org>
Commit-Queue: Arthur Sonzogni <arthursonzogni@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1135823}

diff --git a/android_webview/js_sandbox/service/js_sandbox_isolate.cc b/android_webview/js_sandbox/service/js_sandbox_isolate.cc
index ecfacdb2..535b132 100644
--- a/android_webview/js_sandbox/service/js_sandbox_isolate.cc
+++ b/android_webview/js_sandbox/service/js_sandbox_isolate.cc

@@ -244,7 +244,7 @@
   }
 
  private:
-  const base::raw_ref<JsSandboxIsolate> isolate_;
+  const raw_ref<JsSandboxIsolate> isolate_;
 };
 
 JsSandboxIsolate::JsSandboxIsolate(

diff --git a/ash/ambient/ambient_managed_slideshow_ui_launcher.h b/ash/ambient/ambient_managed_slideshow_ui_launcher.h
index cf94d2e..d5f128a 100644
--- a/ash/ambient/ambient_managed_slideshow_ui_launcher.h
+++ b/ash/ambient/ambient_managed_slideshow_ui_launcher.h

@@ -52,7 +52,7 @@
   void UpdateImageFilePaths(const std::vector<base::FilePath>& path_to_images);
 
   AmbientManagedPhotoController photo_controller_;
-  base::raw_ptr<AmbientViewDelegateImpl> delegate_;
+  raw_ptr<AmbientViewDelegateImpl> delegate_;
   InitializationCallback initialization_callback_;
   base::ScopedObservation<AmbientBackendModel, AmbientBackendModelObserver>
       ambient_backend_model_observer_{this};

diff --git a/ash/ambient/ambient_photo_controller.h b/ash/ambient/ambient_photo_controller.h
index af50cdd..a3ff624 100644
--- a/ash/ambient/ambient_photo_controller.h
+++ b/ash/ambient/ambient_photo_controller.h

@@ -229,8 +229,8 @@
   // Backoff to resume fetch images.
   net::BackoffEntry resume_fetch_image_backoff_;
 
-  const base::raw_ptr<AmbientPhotoCache> photo_cache_;
-  const base::raw_ptr<AmbientPhotoCache> backup_photo_cache_;
+  const raw_ptr<AmbientPhotoCache> photo_cache_;
+  const raw_ptr<AmbientPhotoCache> backup_photo_cache_;
 
   scoped_refptr<base::SequencedTaskRunner> task_runner_;
 

diff --git a/ash/ambient/ambient_video_ui_launcher.h b/ash/ambient/ambient_video_ui_launcher.h
index 8d39ece..21726d6 100644
--- a/ash/ambient/ambient_video_ui_launcher.h
+++ b/ash/ambient/ambient_video_ui_launcher.h

@@ -39,8 +39,8 @@
  private:
   bool is_active_ = false;
   AmbientVideo current_video_;
-  const base::raw_ptr<PrefService> pref_service_;
-  const base::raw_ptr<AmbientViewDelegate> view_delegate_;
+  const raw_ptr<PrefService> pref_service_;
+  const raw_ptr<AmbientViewDelegate> view_delegate_;
   std::unique_ptr<AmbientWeatherController::ScopedRefresher> weather_refresher_;
 };
 

diff --git a/ash/ambient/ambient_weather_controller.h b/ash/ambient/ambient_weather_controller.h
index 6fb138d..f4fc984 100644
--- a/ash/ambient/ambient_weather_controller.h
+++ b/ash/ambient/ambient_weather_controller.h

@@ -42,7 +42,7 @@
 
     explicit ScopedRefresher(AmbientWeatherController* controller);
 
-    const base::raw_ptr<AmbientWeatherController> controller_;
+    const raw_ptr<AmbientWeatherController> controller_;
   };
 
   AmbientWeatherController();

diff --git a/ash/ambient/metrics/ambient_session_metrics_recorder.h b/ash/ambient/metrics/ambient_session_metrics_recorder.h
index eb08c03..095a74e 100644
--- a/ash/ambient/metrics/ambient_session_metrics_recorder.h
+++ b/ash/ambient/metrics/ambient_session_metrics_recorder.h

@@ -62,7 +62,7 @@
       const lottie::Animation& animation_r) const;
 
   const AmbientTheme theme_;
-  const base::raw_ptr<const base::TickClock> clock_;
+  const raw_ptr<const base::TickClock> clock_;
   const base::TimeTicks session_start_time_;
 
   int num_registered_screens_ = 0;

diff --git a/ash/ambient/model/ambient_animation_attribution_provider.h b/ash/ambient/model/ambient_animation_attribution_provider.h
index 8deded9c..04732b3f 100644
--- a/ash/ambient/model/ambient_animation_attribution_provider.h
+++ b/ash/ambient/model/ambient_animation_attribution_provider.h

@@ -43,7 +43,7 @@
           new_topics) override;
 
  private:
-  const base::raw_ptr<lottie::Animation> animation_;
+  const raw_ptr<lottie::Animation> animation_;
   // Set of text nodes in the animation that should hold attribution for a
   // photo. It is expected that the size of this vector matches the number of
   // dynamic image assets in the animation (1 for each photo).

diff --git a/ash/ambient/model/ambient_topic_queue.h b/ash/ambient/model/ambient_topic_queue.h
index 77765d1d..a93b643f 100644
--- a/ash/ambient/model/ambient_topic_queue.h
+++ b/ash/ambient/model/ambient_topic_queue.h

@@ -123,7 +123,7 @@
   const base::TimeDelta topic_fetch_interval_;
   const bool should_split_topics_;
   const std::unique_ptr<Delegate> delegate_;
-  const base::raw_ptr<AmbientBackendController> backend_controller_;
+  const raw_ptr<AmbientBackendController> backend_controller_;
 
   std::queue<AmbientModeTopic> available_topics_;
   int total_topics_fetched_ = 0;

diff --git a/ash/ambient/ui/ambient_animation_frame_rate_controller.h b/ash/ambient/ui/ambient_animation_frame_rate_controller.h
index 167b0ab..501338c2 100644
--- a/ash/ambient/ui/ambient_animation_frame_rate_controller.h
+++ b/ash/ambient/ui/ambient_animation_frame_rate_controller.h

@@ -71,7 +71,7 @@
   void RemoveWindowToThrottle(aura::Window* window);
   void TrySetNewTrackingAnimation();
 
-  const base::raw_ptr<FrameThrottlingController> frame_throttling_controller_;
+  const raw_ptr<FrameThrottlingController> frame_throttling_controller_;
 
   // Matches one of the lottie::Animations in |windows_to_throttle_|. Even
   // though the caller may add multiple lottie::Animations in
@@ -81,7 +81,7 @@
   // synchronized; this is ensured within AmbientAnimationPlayer. If the
   // |tracking_animation_| is destroyed while this class is active, a new one
   // is picked from the |windows_to_throttle_|.
-  base::raw_ptr<lottie::Animation> tracking_animation_ = nullptr;
+  raw_ptr<lottie::Animation> tracking_animation_ = nullptr;
   AmbientAnimationFrameRateSchedule schedule_;
 
   // Points to the current section in the |schedule_| that's being played.

diff --git a/ash/ambient/ui/ambient_animation_player.h b/ash/ambient/ui/ambient_animation_player.h
index 2dd302a7..661bb19 100644
--- a/ash/ambient/ui/ambient_animation_player.h
+++ b/ash/ambient/ui/ambient_animation_player.h

@@ -51,8 +51,8 @@
   ~AmbientAnimationPlayer();
 
  private:
-  const base::raw_ptr<views::AnimatedImageView> animated_image_view_;
-  const base::raw_ptr<AmbientAnimationProgressTracker> progress_tracker_;
+  const raw_ptr<views::AnimatedImageView> animated_image_view_;
+  const raw_ptr<AmbientAnimationProgressTracker> progress_tracker_;
   base::TimeDelta cycle_restart_timestamp_;
 };
 

diff --git a/ash/ambient/ui/ambient_animation_shield_controller.h b/ash/ambient/ui/ambient_animation_shield_controller.h
index 7dffb79..fe5cf7bf 100644
--- a/ash/ambient/ui/ambient_animation_shield_controller.h
+++ b/ash/ambient/ui/ambient_animation_shield_controller.h

@@ -40,7 +40,7 @@
   void OnColorModeChanged(bool dark_mode_enabled) override;
 
   const std::unique_ptr<views::View> shield_view_;
-  const base::raw_ptr<views::View> parent_view_;
+  const raw_ptr<views::View> parent_view_;
   base::ScopedObservation<DarkLightModeControllerImpl, ColorModeObserver>
       color_provider_observer_{this};
 };

diff --git a/ash/ambient/ui/ambient_animation_view.h b/ash/ambient/ui/ambient_animation_view.h
index 7b1b8455..09749b9 100644
--- a/ash/ambient/ui/ambient_animation_view.h
+++ b/ash/ambient/ui/ambient_animation_view.h

@@ -79,12 +79,11 @@
   void RestartThroughputTracking();
   void ApplyJitter();
 
-  const base::raw_ptr<AmbientViewDelegateImpl> view_delegate_;
-  const base::raw_ptr<AmbientAnimationProgressTracker> progress_tracker_;
+  const raw_ptr<AmbientViewDelegateImpl> view_delegate_;
+  const raw_ptr<AmbientAnimationProgressTracker> progress_tracker_;
   const std::unique_ptr<const AmbientAnimationStaticResources>
       static_resources_;
-  const base::raw_ptr<AmbientAnimationFrameRateController>
-      frame_rate_controller_;
+  const raw_ptr<AmbientAnimationFrameRateController> frame_rate_controller_;
   AmbientAnimationPhotoProvider animation_photo_provider_;
   std::unique_ptr<AmbientAnimationAttributionProvider>
       animation_attribution_provider_;

diff --git a/ash/ambient/ui/ambient_background_image_view.h b/ash/ambient/ui/ambient_background_image_view.h
index 32c9e16..8d9bb5f 100644
--- a/ash/ambient/ui/ambient_background_image_view.h
+++ b/ash/ambient/ui/ambient_background_image_view.h

@@ -83,7 +83,7 @@
   // Owned by |AmbientController| and should always outlive |this|.
   raw_ptr<AmbientViewDelegate, ExperimentalAsh> delegate_ = nullptr;
 
-  const base::raw_ptr<JitterCalculator> glanceable_info_jitter_calculator_;
+  const raw_ptr<JitterCalculator> glanceable_info_jitter_calculator_;
 
   // View to display current image(s) on ambient. Owned by the view hierarchy.
   raw_ptr<views::View, ExperimentalAsh> image_container_ = nullptr;

diff --git a/ash/ambient/ui/ambient_slideshow_peripheral_ui.h b/ash/ambient/ui/ambient_slideshow_peripheral_ui.h
index 3cf9b66..cafed42d 100644
--- a/ash/ambient/ui/ambient_slideshow_peripheral_ui.h
+++ b/ash/ambient/ui/ambient_slideshow_peripheral_ui.h

@@ -58,7 +58,7 @@
   // constructor.
   const std::unique_ptr<JitterCalculator> owned_jitter_calculator_;
   // Never null. Always points to the `JitterCalculator` to use.
-  const base::raw_ptr<JitterCalculator> jitter_calculator_;
+  const raw_ptr<JitterCalculator> jitter_calculator_;
 
   raw_ptr<AmbientInfoView, ExperimentalAsh> ambient_info_view_ = nullptr;
 

diff --git a/ash/ambient/ui/glanceable_info_view.h b/ash/ambient/ui/glanceable_info_view.h
index e6d0251..3e7ffe1 100644
--- a/ash/ambient/ui/glanceable_info_view.h
+++ b/ash/ambient/ui/glanceable_info_view.h

@@ -69,8 +69,8 @@
   const raw_ptr<AmbientViewDelegate, ExperimentalAsh> delegate_ = nullptr;
 
   // Unowned. Must out live |GlancealeInfoView|.
-  base::raw_ptr<GlanceableInfoView::Delegate> const
-      glanceable_info_view_delegate_ = nullptr;
+  raw_ptr<GlanceableInfoView::Delegate> const glanceable_info_view_delegate_ =
+      nullptr;
 
   const int time_font_size_dip_;
 

diff --git a/ash/ambient/ui/media_string_view.h b/ash/ambient/ui/media_string_view.h
index e231081..97599a7 100644
--- a/ash/ambient/ui/media_string_view.h
+++ b/ash/ambient/ui/media_string_view.h

@@ -100,7 +100,7 @@
   views::Label* media_text_label_for_testing() { return media_text_; }
 
   // Unowned. Must out live |MediaStringView|.
-  base::raw_ptr<MediaStringView::Delegate> delegate_ = nullptr;
+  raw_ptr<MediaStringView::Delegate> delegate_ = nullptr;
 
   // Music eighth note.
   raw_ptr<views::ImageView, ExperimentalAsh> icon_ = nullptr;

diff --git a/ash/app_list/views/search_result_image_list_view.h b/ash/app_list/views/search_result_image_list_view.h
index 4c136d9e..6f4548d 100644
--- a/ash/app_list/views/search_result_image_list_view.h
+++ b/ash/app_list/views/search_result_image_list_view.h

@@ -56,8 +56,8 @@
   SearchResultImageViewDelegate delegate_;
 
   // Owned by views hierarchy.
-  base::raw_ptr<views::Label> title_label_ = nullptr;
-  base::raw_ptr<views::BoxLayoutView> image_view_container_ = nullptr;
+  raw_ptr<views::Label> title_label_ = nullptr;
+  raw_ptr<views::BoxLayoutView> image_view_container_ = nullptr;
   std::vector<SearchResultImageView*> image_views_;
 };
 

diff --git a/ash/app_list/views/search_result_image_view.h b/ash/app_list/views/search_result_image_view.h
index 809c7ae4..e135039 100644
--- a/ash/app_list/views/search_result_image_view.h
+++ b/ash/app_list/views/search_result_image_view.h

@@ -42,7 +42,7 @@
   // SearchResultObserver overrides:
   void OnMetadataChanged() override;
 
-  base::raw_ptr<views::ImageButton> result_image_ =
+  raw_ptr<views::ImageButton> result_image_ =
       nullptr;  // Owned by views hierarchy.
 
   // TODO(crbug.com/1352636) remove once backend service is available.

diff --git a/ash/assistant/ui/main_stage/assistant_zero_state_view.h b/ash/assistant/ui/main_stage/assistant_zero_state_view.h
index 626c63e..3c1c041 100644
--- a/ash/assistant/ui/main_stage/assistant_zero_state_view.h
+++ b/ash/assistant/ui/main_stage/assistant_zero_state_view.h

@@ -60,8 +60,8 @@
   // Owned by view hierarchy;
   raw_ptr<AssistantOnboardingView, ExperimentalAsh> onboarding_view_ = nullptr;
   raw_ptr<views::Label, ExperimentalAsh> greeting_label_ = nullptr;
-  base::raw_ptr<views::View> spacer_ = nullptr;
-  base::raw_ptr<AppListToastView> learn_more_toast_ = nullptr;
+  raw_ptr<views::View> spacer_ = nullptr;
+  raw_ptr<AppListToastView> learn_more_toast_ = nullptr;
 
   base::ScopedObservation<AssistantController, AssistantControllerObserver>
       assistant_controller_observation_{this};

diff --git a/ash/clipboard/clipboard_history_controller_impl.h b/ash/clipboard/clipboard_history_controller_impl.h
index c434729..3998940 100644
--- a/ash/clipboard/clipboard_history_controller_impl.h
+++ b/ash/clipboard/clipboard_history_controller_impl.h

@@ -249,7 +249,7 @@
   std::unique_ptr<MenuDelegate> menu_delegate_;
   // Bubble view displayed by `ShowMenu()` when the clipboard history refresh
   // feature is enabled. Null when `MenuIsShowing()` is false.
-  base::raw_ptr<ClipboardManagerBubbleView> clipboard_manager_ = nullptr;
+  raw_ptr<ClipboardManagerBubbleView> clipboard_manager_ = nullptr;
 
   // The timestamp when the clipboard history menu was last shown.
   base::TimeTicks last_menu_show_time_;

diff --git a/ash/clipboard/views/clipboard_history_item_view.h b/ash/clipboard/views/clipboard_history_item_view.h
index e540345..85f4312 100644
--- a/ash/clipboard/views/clipboard_history_item_view.h
+++ b/ash/clipboard/views/clipboard_history_item_view.h

@@ -162,7 +162,7 @@
   const base::UnguessableToken item_id_;
 
   // Owned by `ClipboardHistoryControllerImpl`.
-  const base::raw_ptr<const ClipboardHistory> clipboard_history_;
+  const raw_ptr<const ClipboardHistory> clipboard_history_;
 
   const raw_ptr<views::MenuItemView, ExperimentalAsh> container_;
 

diff --git a/ash/fast_ink/fast_ink_host_frame_utils_unittest.cc b/ash/fast_ink/fast_ink_host_frame_utils_unittest.cc
index 8d68fd7..2181f62 100644
--- a/ash/fast_ink/fast_ink_host_frame_utils_unittest.cc
+++ b/ash/fast_ink/fast_ink_host_frame_utils_unittest.cc

@@ -96,7 +96,7 @@
   }
 
   UiResourceManager resource_manager_;
-  base::raw_ptr<aura::Window> host_window_;
+  raw_ptr<aura::Window> host_window_;
   std::unique_ptr<gfx::GpuMemoryBuffer> gpu_memory_buffer_;
 };
 

diff --git a/ash/fast_ink/fast_ink_host_unittest.cc b/ash/fast_ink/fast_ink_host_unittest.cc
index 4238ae79..cd93848 100644
--- a/ash/fast_ink/fast_ink_host_unittest.cc
+++ b/ash/fast_ink/fast_ink_host_unittest.cc

@@ -96,9 +96,9 @@
   gfx::Rect expected_quad_rect_;
   gfx::Rect expected_quad_layer_rect_;
 
-  base::raw_ptr<aura::Window> host_window_;
+  raw_ptr<aura::Window> host_window_;
   std::unique_ptr<FastInkHost> fast_ink_host_;
-  base::raw_ptr<TestLayerTreeFrameSink> layer_tree_frame_sink_;
+  raw_ptr<TestLayerTreeFrameSink> layer_tree_frame_sink_;
   std::unique_ptr<TestBeginFrameSource> begin_frame_source_;
 };
 

diff --git a/ash/fast_ink/view_tree_host_root_view_frame_factory.h b/ash/fast_ink/view_tree_host_root_view_frame_factory.h
index 4f83a86..b8e8269 100644
--- a/ash/fast_ink/view_tree_host_root_view_frame_factory.h
+++ b/ash/fast_ink/view_tree_host_root_view_frame_factory.h

@@ -90,7 +90,7 @@
       bool is_overlay_candidate,
       UiResourceManager& resource_manager) const;
 
-  base::raw_ptr<views::Widget> widget_;
+  raw_ptr<views::Widget> widget_;
 };
 
 }  // namespace ash

diff --git a/ash/frame_sink/frame_sink_holder.h b/ash/frame_sink/frame_sink_holder.h
index ff0ab35e..0982d96f 100644
--- a/ash/frame_sink/frame_sink_holder.h
+++ b/ash/frame_sink/frame_sink_holder.h

@@ -162,7 +162,7 @@
   // The root window to which `this` holder becomes an observer to extend its
   // lifespan till all the in-flight resource to display compositor are
   // reclaimed.
-  base::raw_ptr<aura::Window> root_window_for_deletion_ = nullptr;
+  raw_ptr<aura::Window> root_window_for_deletion_ = nullptr;
 
   // Keeps track of resources that are currently available to be reused in a
   // compositor frame and the resources that are in-use by the display

diff --git a/ash/frame_sink/frame_sink_holder_test_api.h b/ash/frame_sink/frame_sink_holder_test_api.h
index 449b6ba8..56efc27 100644
--- a/ash/frame_sink/frame_sink_holder_test_api.h
+++ b/ash/frame_sink/frame_sink_holder_test_api.h

@@ -30,7 +30,7 @@
   bool IsFirstFrameRequested() const;
 
  private:
-  base::raw_ptr<FrameSinkHolder> frame_sink_holder_;
+  raw_ptr<FrameSinkHolder> frame_sink_holder_;
 };
 
 }  // namespace ash

diff --git a/ash/frame_sink/frame_sink_holder_unittest.cc b/ash/frame_sink/frame_sink_holder_unittest.cc
index 38adda02..0b3861d 100644
--- a/ash/frame_sink/frame_sink_holder_unittest.cc
+++ b/ash/frame_sink/frame_sink_holder_unittest.cc

@@ -125,7 +125,7 @@
   // holder did not schedule a delete task, it will get destroyed once we
   // delete the root_window of `host_window_`.
   std::unique_ptr<FrameSinkHolder> frame_sink_holder_;
-  base::raw_ptr<aura::Window, DanglingUntriaged | ExperimentalAsh> host_window_;
+  raw_ptr<aura::Window, DanglingUntriaged | ExperimentalAsh> host_window_;
 
   // Will be used to access the frame_sink_holder once we pass the
   // ownership of `frame_sink_holder_` to
@@ -136,7 +136,7 @@
   std::unique_ptr<TestFrameFactory> frame_factory_;
 
   // Keeping a reference to be used in tests.
-  base::raw_ptr<TestLayerTreeFrameSink, DanglingUntriaged | ExperimentalAsh>
+  raw_ptr<TestLayerTreeFrameSink, DanglingUntriaged | ExperimentalAsh>
       layer_tree_frame_sink_;  // no owned
 };
 

diff --git a/ash/frame_sink/frame_sink_host.h b/ash/frame_sink/frame_sink_host.h
index bcfe0a7..d21914d 100644
--- a/ash/frame_sink/frame_sink_host.h
+++ b/ash/frame_sink/frame_sink_host.h

@@ -118,7 +118,7 @@
       std::unique_ptr<cc::LayerTreeFrameSink> layer_tree_frame_sink);
 
   // The window on which LayerTreeFrameSink is created on.
-  base::raw_ptr<aura::Window> host_window_ = nullptr;
+  raw_ptr<aura::Window> host_window_ = nullptr;
 
   // The bounds of the content to be displayed in host window coordinates.
   gfx::Rect content_rect_;

diff --git a/ash/frame_sink/test/test_begin_frame_source.h b/ash/frame_sink/test/test_begin_frame_source.h
index 8672adc..c6455e9 100644
--- a/ash/frame_sink/test/test_begin_frame_source.h
+++ b/ash/frame_sink/test/test_begin_frame_source.h

@@ -46,7 +46,7 @@
   viz::BeginFrameObserver* GetBeginFrameObserver() const;
 
  private:
-  base::raw_ptr<viz::BeginFrameObserver> observer_;
+  raw_ptr<viz::BeginFrameObserver> observer_;
 };
 
 viz::BeginFrameArgs CreateValidBeginFrameArgsForTesting();

diff --git a/ash/in_session_auth/authentication_dialog.h b/ash/in_session_auth/authentication_dialog.h
index e474b0d1..18eb366 100644
--- a/ash/in_session_auth/authentication_dialog.h
+++ b/ash/in_session_auth/authentication_dialog.h

@@ -41,7 +41,7 @@
     }
 
    private:
-    base::raw_ptr<AuthenticationDialog> const dialog_;
+    raw_ptr<AuthenticationDialog> const dialog_;
   };
 
   // |on_auth_complete| is called when the user has been authenticated
@@ -112,8 +112,8 @@
                             std::unique_ptr<UserContext> user_context,
                             absl::optional<AuthenticationError> auth_error);
 
-  base::raw_ptr<views::Textfield> password_field_;
-  base::raw_ptr<views::Label> invalid_password_label_;
+  raw_ptr<views::Textfield> password_field_;
+  raw_ptr<views::Label> invalid_password_label_;
 
   // See implementation of `CancelAuthAttempt` for details.
   bool is_closing_ = false;
@@ -128,7 +128,7 @@
   // `auth_token_provider_` will outlive this dialog since it will
   // be destroyed after `AshShellInit`, which owns the aura
   // window hierarchy.
-  base::raw_ptr<InSessionAuthTokenProvider> auth_token_provider_;
+  raw_ptr<InSessionAuthTokenProvider> auth_token_provider_;
 
   std::unique_ptr<UserContext> user_context_;
 

diff --git a/ash/in_session_auth/authentication_dialog_unittest.cc b/ash/in_session_auth/authentication_dialog_unittest.cc
index 28e792b..dab3f16 100644
--- a/ash/in_session_auth/authentication_dialog_unittest.cc
+++ b/ash/in_session_auth/authentication_dialog_unittest.cc

@@ -117,9 +117,9 @@
 
   absl::optional<bool> success_;
   base::UnguessableToken token_;
-  base::raw_ptr<AuthenticationDialog> dialog_;
+  raw_ptr<AuthenticationDialog> dialog_;
   std::unique_ptr<MockInSessionAuthTokenProvider> auth_token_provider_;
-  base::raw_ptr<MockAuthPerformer> auth_performer_;
+  raw_ptr<MockAuthPerformer> auth_performer_;
   std::unique_ptr<AuthenticationDialog::TestApi> test_api_;
 };
 

diff --git a/ash/in_session_auth/in_session_auth_dialog_controller_impl.h b/ash/in_session_auth/in_session_auth_dialog_controller_impl.h
index 33174fa2d..b275a5f 100644
--- a/ash/in_session_auth/in_session_auth_dialog_controller_impl.h
+++ b/ash/in_session_auth/in_session_auth_dialog_controller_impl.h

@@ -32,7 +32,7 @@
   // `auth_token_provider_` will outlive this controller since the controller
   // is part of `ash::Shell` and will be destroyed as part of `AshShellInit`
   // before `auth_token_provider`.
-  base::raw_ptr<InSessionAuthTokenProvider> auth_token_provider_;
+  raw_ptr<InSessionAuthTokenProvider> auth_token_provider_;
 };
 
 }  // namespace ash

diff --git a/ash/login/ui/lock_contents_view.h b/ash/login/ui/lock_contents_view.h
index 943f23b..5738007 100644
--- a/ash/login/ui/lock_contents_view.h
+++ b/ash/login/ui/lock_contents_view.h

@@ -482,7 +482,7 @@
   raw_ptr<LoginErrorBubble, ExperimentalAsh> warning_banner_bubble_;
 
   // View that is shown on login timeout with camera usage.
-  base::raw_ptr<LoginCameraTimeoutView, DanglingUntriaged>
+  raw_ptr<LoginCameraTimeoutView, DanglingUntriaged>
       login_camera_timeout_view_ = nullptr;
 
   // Bottom status indicator displaying entreprise domain or ADB enabled alert

diff --git a/ash/login/ui/login_camera_timeout_view.h b/ash/login/ui/login_camera_timeout_view.h
index 521e568..1f0af78c 100644
--- a/ash/login/ui/login_camera_timeout_view.h
+++ b/ash/login/ui/login_camera_timeout_view.h

@@ -47,9 +47,9 @@
   void RequestFocus() override;
 
  private:
-  base::raw_ptr<views::Label> title_;
-  base::raw_ptr<views::Label> subtitle_;
-  base::raw_ptr<ArrowButtonView> arrow_button_;
+  raw_ptr<views::Label> title_;
+  raw_ptr<views::Label> subtitle_;
+  raw_ptr<ArrowButtonView> arrow_button_;
 };
 
 }  // namespace ash

diff --git a/ash/metrics/feature_discovery_duration_reporter_impl.h b/ash/metrics/feature_discovery_duration_reporter_impl.h
index 0f50381..a199a03c 100644
--- a/ash/metrics/feature_discovery_duration_reporter_impl.h
+++ b/ash/metrics/feature_discovery_duration_reporter_impl.h

@@ -76,7 +76,7 @@
   // is set when the active user pref service changes.
   // NOTE: `active_pref_service_` is not reset when signing out. Because the
   // reporter instance should be destroyed in this scenario.
-  base::raw_ptr<PrefService> active_pref_service_ = nullptr;
+  raw_ptr<PrefService> active_pref_service_ = nullptr;
 
   // If true, starting observations on feature discovery is allowed.
   bool is_active_ = false;

diff --git a/ash/metrics/login_unlock_throughput_recorder.cc b/ash/metrics/login_unlock_throughput_recorder.cc
index aced9ce..51f7c1a3 100644
--- a/ash/metrics/login_unlock_throughput_recorder.cc
+++ b/ash/metrics/login_unlock_throughput_recorder.cc

@@ -78,7 +78,7 @@
     delete this;
   }
 
-  base::raw_ptr<ShelfView> shelf_view_;
+  raw_ptr<ShelfView> shelf_view_;
   base::OnceClosure on_animation_end_;
 };
 

diff --git a/ash/metrics/login_unlock_throughput_recorder_unittest.cc b/ash/metrics/login_unlock_throughput_recorder_unittest.cc
index e7565da..0d0d83807 100644
--- a/ash/metrics/login_unlock_throughput_recorder_unittest.cc
+++ b/ash/metrics/login_unlock_throughput_recorder_unittest.cc

@@ -115,7 +115,7 @@
 
  private:
   int count_ = 0;
-  const base::raw_ptr<ui::Compositor> compositor_;
+  const raw_ptr<ui::Compositor> compositor_;
 };
 
 class BeginMainFrameWaiter : public ui::CompositorObserver {
@@ -146,7 +146,7 @@
   }
 
  private:
-  const base::raw_ptr<ui::Compositor> compositor_;
+  const raw_ptr<ui::Compositor> compositor_;
   bool done_ = false;
   std::unique_ptr<base::RunLoop> run_loop_;
 };
@@ -224,7 +224,7 @@
   }
 
  private:
-  base::raw_ptr<base::HistogramTester> histogram_tester_;
+  raw_ptr<base::HistogramTester> histogram_tester_;
   const std::string metrics_name_;
 };
 

diff --git a/ash/public/cpp/accelerator_keycode_lookup_cache_unittest.cc b/ash/public/cpp/accelerator_keycode_lookup_cache_unittest.cc
index e47a068..cd915ba6 100644
--- a/ash/public/cpp/accelerator_keycode_lookup_cache_unittest.cc
+++ b/ash/public/cpp/accelerator_keycode_lookup_cache_unittest.cc

@@ -64,7 +64,7 @@
   std::unique_ptr<AcceleratorKeycodeLookupCache> lookup_cache_;
   std::unique_ptr<ui::StubKeyboardLayoutEngine> layout_engine_;
   // Test global singleton. Delete is handled by InputMethodManager::Shutdown().
-  base::raw_ptr<TestInputMethodManager> input_method_manager_;
+  raw_ptr<TestInputMethodManager> input_method_manager_;
 };
 
 TEST_F(AcceleratorKeycodeLookupCacheTest, ImeChanged) {

diff --git a/ash/public/cpp/file_preview/file_preview_controller.h b/ash/public/cpp/file_preview/file_preview_controller.h
index 1e1fe08..8d8b3dd 100644
--- a/ash/public/cpp/file_preview/file_preview_controller.h
+++ b/ash/public/cpp/file_preview/file_preview_controller.h

@@ -75,7 +75,7 @@
  private:
   // The `FilePreviewImageSkiaSource` this controller controls. Owned by the
   // `gfx::ImageSkia`.
-  const base::raw_ptr<FilePreviewImageSkiaSource> source_ = nullptr;
+  const raw_ptr<FilePreviewImageSkiaSource> source_ = nullptr;
 
   // The `gfx::ImageSkia` that contains the `FilePreviewImageSkiaSource`. This
   // is the same one in the `ui::ImageModel` that `FilePreviewFactory` creates.

diff --git a/ash/public/cpp/file_preview/file_preview_image_skia_source.h b/ash/public/cpp/file_preview/file_preview_image_skia_source.h
index b87f92c..dcb6dca 100644
--- a/ash/public/cpp/file_preview/file_preview_image_skia_source.h
+++ b/ash/public/cpp/file_preview/file_preview_image_skia_source.h

@@ -71,7 +71,7 @@
   // triggers invalidation.
   void Update();
 
-  base::raw_ptr<FilePreviewController> controller_;
+  raw_ptr<FilePreviewController> controller_;
   const base::FilePath file_path_;
   std::vector<image_util::AnimationFrame> frames_;
   size_t frame_index_ = 0;

diff --git a/ash/public/cpp/file_preview/file_preview_unittest.cc b/ash/public/cpp/file_preview/file_preview_unittest.cc
index 11e9e0a..f3c9c6d 100644
--- a/ash/public/cpp/file_preview/file_preview_unittest.cc
+++ b/ash/public/cpp/file_preview/file_preview_unittest.cc

@@ -104,7 +104,7 @@
   TestImageDecoder decoder_;
   SkColor last_pixel_color_ = SK_ColorTRANSPARENT;
   base::CallbackListSubscription invalidation_subscription_;
-  base::raw_ptr<FilePreviewController> controller_ = nullptr;
+  raw_ptr<FilePreviewController> controller_ = nullptr;
   ui::ImageModel model_;
 };
 

diff --git a/ash/rounded_display/rounded_display_host_unittest.cc b/ash/rounded_display/rounded_display_host_unittest.cc
index f7fc3e6..a615b17 100644
--- a/ash/rounded_display/rounded_display_host_unittest.cc
+++ b/ash/rounded_display/rounded_display_host_unittest.cc

@@ -75,7 +75,7 @@
   }
 
  protected:
-  base::raw_ptr<aura::Window> host_window_;
+  raw_ptr<aura::Window> host_window_;
   std::unique_ptr<TestRoundedDisplayHost> host_;
 };
 

diff --git a/ash/rounded_display/rounded_display_provider.h b/ash/rounded_display/rounded_display_provider.h
index 30ec1740..6c24f6af 100644
--- a/ash/rounded_display/rounded_display_provider.h
+++ b/ash/rounded_display/rounded_display_provider.h

@@ -110,7 +110,7 @@
   // Represents the surface on which the `host_` render the mask textures of the
   // rounded-display corners. It gets destroyed when its window_tree_host
   // is destroyed.
-  base::raw_ptr<aura::Window> host_window_ = nullptr;
+  raw_ptr<aura::Window> host_window_ = nullptr;
 
   // Responsible to render the mask textures by submitting compositor frames.
   std::unique_ptr<RoundedDisplayHost> host_;

diff --git a/ash/shelf/login_shelf_widget.cc b/ash/shelf/login_shelf_widget.cc
index e083fcd..bcbd0d37 100644
--- a/ash/shelf/login_shelf_widget.cc
+++ b/ash/shelf/login_shelf_widget.cc

@@ -75,7 +75,7 @@
   }
 
  private:
-  const base::raw_ptr<Shelf> shelf_ = nullptr;
+  const raw_ptr<Shelf> shelf_ = nullptr;
 
   // When true, the default focus of the shelf is the last focusable child.
   bool default_last_focusable_child_ = false;

diff --git a/ash/shelf/login_shelf_widget.h b/ash/shelf/login_shelf_widget.h
index 53b55ff..d6c6e1a 100644
--- a/ash/shelf/login_shelf_widget.h
+++ b/ash/shelf/login_shelf_widget.h

@@ -51,14 +51,14 @@
   void OnSessionStateChanged(session_manager::SessionState state) override;
   void OnUserSessionAdded(const AccountId& account_id) override;
 
-  const base::raw_ptr<Shelf> shelf_;
+  const raw_ptr<Shelf> shelf_;
 
   class LoginShelfWidgetDelegate;
-  base::raw_ptr<LoginShelfWidgetDelegate> delegate_;
+  raw_ptr<LoginShelfWidgetDelegate> delegate_;
 
   ScopedSessionObserver scoped_session_observer_;
 
-  base::raw_ptr<LoginShelfView> login_shelf_view_ = nullptr;
+  raw_ptr<LoginShelfView> login_shelf_view_ = nullptr;
 
   // The target widget bounds in screen coordinates.
   gfx::Rect target_bounds_;

diff --git a/ash/style/color_palette_controller.cc b/ash/style/color_palette_controller.cc
index 98f96fd3..f19e632 100644
--- a/ash/style/color_palette_controller.cc
+++ b/ash/style/color_palette_controller.cc

@@ -366,10 +366,9 @@
   base::ScopedObservation<WallpaperController, WallpaperControllerObserver>
       wallpaper_observation_{this};
 
-  base::raw_ptr<WallpaperControllerImpl> wallpaper_controller_;  // unowned
+  raw_ptr<WallpaperControllerImpl> wallpaper_controller_;  // unowned
 
-  base::raw_ptr<DarkLightModeController>
-      dark_light_mode_controller_;  // unowned
+  raw_ptr<DarkLightModeController> dark_light_mode_controller_;  // unowned
 
   base::ObserverList<ColorPaletteController::Observer> observers_;
 };

diff --git a/ash/style/color_palette_controller_unittest.cc b/ash/style/color_palette_controller_unittest.cc
index d921d950..da0bd9e 100644
--- a/ash/style/color_palette_controller_unittest.cc
+++ b/ash/style/color_palette_controller_unittest.cc

@@ -101,11 +101,10 @@
   }
 
  private:
-  base::raw_ptr<DarkLightModeControllerImpl>
-      dark_light_mode_controller_;                               // unowned
-  base::raw_ptr<WallpaperControllerImpl> wallpaper_controller_;  // unowned
+  raw_ptr<DarkLightModeControllerImpl> dark_light_mode_controller_;  // unowned
+  raw_ptr<WallpaperControllerImpl> wallpaper_controller_;            // unowned
 
-  base::raw_ptr<ColorPaletteController> color_palette_controller_;
+  raw_ptr<ColorPaletteController> color_palette_controller_;
 };
 
 TEST_F(ColorPaletteControllerTest, ExpectedEmptyValues) {

diff --git a/ash/style/pagination_view.cc b/ash/style/pagination_view.cc
index 373fb7c..f65aff880 100644
--- a/ash/style/pagination_view.cc
+++ b/ash/style/pagination_view.cc

@@ -294,7 +294,7 @@
     }
   }
 
-  std::vector<base::raw_ptr<IndicatorButton>> buttons_;
+  std::vector<raw_ptr<IndicatorButton>> buttons_;
   absl::optional<InterpolationInterval<int>> scroll_interval_;
 };
 

diff --git a/ash/style/pagination_view.h b/ash/style/pagination_view.h
index ea9f19d..97f9871 100644
--- a/ash/style/pagination_view.h
+++ b/ash/style/pagination_view.h

@@ -90,20 +90,20 @@
   void SelectedPageChanged(int old_selected, int new_selected) override;
   void TransitionChanged() override;
 
-  base::raw_ptr<PaginationModel> const model_;
+  raw_ptr<PaginationModel> const model_;
   const Orientation orientation_;
 
   // The scroll view with an indicator container as its contents. The scroll
   // view is owned by this and the container is owned by the scroll view.
-  base::raw_ptr<views::ScrollView> indicator_scroll_view_ = nullptr;
-  base::raw_ptr<IndicatorContainer> indicator_container_ = nullptr;
+  raw_ptr<views::ScrollView> indicator_scroll_view_ = nullptr;
+  raw_ptr<IndicatorContainer> indicator_container_ = nullptr;
 
   // The selector dot view which is owned by this.
-  base::raw_ptr<SelectorDotView> selector_dot_ = nullptr;
+  raw_ptr<SelectorDotView> selector_dot_ = nullptr;
 
   // The arrow buttons owned by this.
-  base::raw_ptr<views::ImageButton> backward_arrow_button_ = nullptr;
-  base::raw_ptr<views::ImageButton> forward_arrow_button_ = nullptr;
+  raw_ptr<views::ImageButton> backward_arrow_button_ = nullptr;
+  raw_ptr<views::ImageButton> forward_arrow_button_ = nullptr;
 
   base::ScopedObservation<PaginationModel, PaginationModelObserver>
       model_observation_{this};

diff --git a/ash/style/style_viewer/pagination_instances_grid_view_factory.cc b/ash/style/style_viewer/pagination_instances_grid_view_factory.cc
index 7de0239c..5aabc66d 100644
--- a/ash/style/style_viewer/pagination_instances_grid_view_factory.cc
+++ b/ash/style/style_viewer/pagination_instances_grid_view_factory.cc

@@ -80,7 +80,7 @@
   gfx::PointF dragging_origin_;
   // True if the content is being dragged.
   bool is_dragging_ = false;
-  base::raw_ptr<PaginationController> const pagination_controller_;
+  raw_ptr<PaginationController> const pagination_controller_;
 };
 
 //------------------------------------------------------------------------------
@@ -181,10 +181,10 @@
   }
 
  private:
-  base::raw_ptr<PaginationModel> const model_;
+  raw_ptr<PaginationModel> const model_;
   PaginationView::Orientation orientation_;
   std::unique_ptr<PaginationController> pagination_controller_;
-  base::raw_ptr<PaginationTestContents> page_container_;
+  raw_ptr<PaginationTestContents> page_container_;
   base::ScopedObservation<PaginationModel, PaginationModelObserver>
       model_observer_{this};
 };

diff --git a/ash/style/system_textfield_controller.h b/ash/style/system_textfield_controller.h
index f3987b9..6295ee9 100644
--- a/ash/style/system_textfield_controller.h
+++ b/ash/style/system_textfield_controller.h

@@ -43,7 +43,7 @@
 
  private:
   // The textfield that the controller binds with.
-  base::raw_ptr<SystemTextfield> const textfield_;
+  raw_ptr<SystemTextfield> const textfield_;
   // Indicates if selecting all text should be deferred.
   bool defer_select_all_ = false;
 };

diff --git a/ash/system/geolocation/geolocation_controller.h b/ash/system/geolocation/geolocation_controller.h
index ff91a34..687fe927 100644
--- a/ash/system/geolocation/geolocation_controller.h
+++ b/ash/system/geolocation/geolocation_controller.h

@@ -164,7 +164,7 @@
   const raw_ptr<network::SharedURLLoaderFactory, ExperimentalAsh> factory_;
 
   // May be null if a user has not logged in yet.
-  base::raw_ptr<PrefService> active_user_pref_service_ = nullptr;
+  raw_ptr<PrefService> active_user_pref_service_ = nullptr;
 
   // The IP-based geolocation provider.
   SimpleGeolocationProvider provider_;

diff --git a/ash/system/input_device_settings/input_device_notifier.h b/ash/system/input_device_settings/input_device_notifier.h
index d0bb480..0f9a418 100644
--- a/ash/system/input_device_settings/input_device_notifier.h
+++ b/ash/system/input_device_settings/input_device_notifier.h

@@ -50,7 +50,7 @@
   // `connected_devices_` is owned by `InputDeviceSettingsControllerImpl` which
   // instantiates the `InputDeviceNotifier` as a member. `connected_devices_`
   // will always outlive `InputDeviceNotifier`.
-  base::raw_ptr<base::flat_map<DeviceId, MojomDevicePtr>> connected_devices_;
+  raw_ptr<base::flat_map<DeviceId, MojomDevicePtr>> connected_devices_;
   InputDeviceListsUpdatedCallback device_lists_updated_callback_;
 };
 

diff --git a/ash/system/input_device_settings/input_device_tracker_unittest.cc b/ash/system/input_device_settings/input_device_tracker_unittest.cc
index 457118e..4375aa5 100644
--- a/ash/system/input_device_settings/input_device_tracker_unittest.cc
+++ b/ash/system/input_device_settings/input_device_tracker_unittest.cc

@@ -95,7 +95,7 @@
 
  protected:
   std::unique_ptr<InputDeviceTracker> tracker_;
-  base::raw_ptr<PrefService, DanglingUntriaged | ExperimentalAsh> pref_service_;
+  raw_ptr<PrefService, DanglingUntriaged | ExperimentalAsh> pref_service_;
 
   InputDeviceCategory category_;
   base::StringPiece pref_path_;

diff --git a/ash/system/media/quick_settings_media_view.cc b/ash/system/media/quick_settings_media_view.cc
index ca9b84b..a771e4f 100644
--- a/ash/system/media/quick_settings_media_view.cc
+++ b/ash/system/media/quick_settings_media_view.cc

@@ -78,7 +78,7 @@
   }
 
  private:
-  base::raw_ptr<PaginationModel> model_ = nullptr;
+  raw_ptr<PaginationModel> model_ = nullptr;
   base::ScopedObservation<PaginationModel, PaginationModelObserver> observer_{
       this};
 };

diff --git a/ash/system/privacy_hub/privacy_hub_notification_controller_unittest.cc b/ash/system/privacy_hub/privacy_hub_notification_controller_unittest.cc
index 8759d39b..a93f296 100644
--- a/ash/system/privacy_hub/privacy_hub_notification_controller_unittest.cc
+++ b/ash/system/privacy_hub/privacy_hub_notification_controller_unittest.cc

@@ -141,11 +141,11 @@
   MockNewWindowDelegate* new_window_delegate() { return new_window_delegate_; }
 
  private:
-  base::raw_ptr<PrivacyHubNotificationController> controller_;
+  raw_ptr<PrivacyHubNotificationController> controller_;
   const FakeSensorDisabledNotificationDelegate delegate_;
   const base::HistogramTester histogram_tester_;
   base::test::ScopedFeatureList scoped_feature_list_;
-  base::raw_ptr<MockNewWindowDelegate> new_window_delegate_ = nullptr;
+  raw_ptr<MockNewWindowDelegate> new_window_delegate_ = nullptr;
   std::unique_ptr<ash::TestNewWindowDelegateProvider> window_delegate_provider_;
 };
 

diff --git a/ash/system/scheduled_feature/scheduled_feature_unittest.cc b/ash/system/scheduled_feature/scheduled_feature_unittest.cc
index e125c1a..51c6002 100644
--- a/ash/system/scheduled_feature/scheduled_feature_unittest.cc
+++ b/ash/system/scheduled_feature/scheduled_feature_unittest.cc

@@ -147,7 +147,7 @@
   base::ScopedObservation<ScheduledFeature,
                           ScheduledFeature::CheckpointObserver>
       observation_{this};
-  const base::raw_ptr<const base::Clock> clock_;
+  const raw_ptr<const base::Clock> clock_;
   std::vector<std::pair<TimeOfDay, ScheduleCheckpoint>> changes_;
 };
 

diff --git a/ash/system/video_conference/video_conference_tray_controller.h b/ash/system/video_conference/video_conference_tray_controller.h
index 5e46687..ab0d0df 100644
--- a/ash/system/video_conference/video_conference_tray_controller.h
+++ b/ash/system/video_conference/video_conference_tray_controller.h

@@ -207,7 +207,7 @@
   // ChromeBrowserMainParts::PostMainMessageLoopRun() as a chrome_extra_part;
   // VideoConferenceManagerAsh is destroyed inside crosapi_manager_.reset()
   // which is after VideoConferenceTrayController.
-  base::raw_ptr<VideoConferenceManagerBase> video_conference_manager_ = nullptr;
+  raw_ptr<VideoConferenceManagerBase> video_conference_manager_ = nullptr;
   bool initialized_ = false;
 
   base::WeakPtrFactory<VideoConferenceTrayController> weak_ptr_factory_{this};

diff --git a/ash/user_education/views/help_bubble_factory_views_ash.h b/ash/user_education/views/help_bubble_factory_views_ash.h
index 88b2d1a..894461e 100644
--- a/ash/user_education/views/help_bubble_factory_views_ash.h
+++ b/ash/user_education/views/help_bubble_factory_views_ash.h

@@ -88,7 +88,7 @@
       scoped_observation_{this};
 
   // Track the anchor element to determine if/when it goes away.
-  base::raw_ptr<const ui::TrackedElement, DanglingUntriaged> anchor_element_;
+  raw_ptr<const ui::TrackedElement, DanglingUntriaged> anchor_element_;
 
   // Listens so that the bubble can be closed if the anchor element disappears.
   // The specific anchor view is not tracked because in a few cases (e.g. Mac
@@ -128,7 +128,7 @@
       user_education::HelpBubbleParams params);
 
  private:
-  base::raw_ptr<const user_education::HelpBubbleDelegate> delegate_;
+  raw_ptr<const user_education::HelpBubbleDelegate> delegate_;
 };
 
 }  // namespace ash

diff --git a/ash/user_education/views/help_bubble_view_ash.h b/ash/user_education/views/help_bubble_view_ash.h
index 4d8a25b..723d10b2 100644
--- a/ash/user_education/views/help_bubble_view_ash.h
+++ b/ash/user_education/views/help_bubble_view_ash.h

@@ -101,13 +101,13 @@
   // If set, overrides the anchor bounds within the anchor view.
   absl::optional<gfx::Rect> local_anchor_bounds_;
 
-  base::raw_ptr<views::ImageView> icon_view_ = nullptr;
+  raw_ptr<views::ImageView> icon_view_ = nullptr;
   std::vector<views::Label*> labels_;
 
   // If the bubble has buttons, it must be focusable.
   std::vector<views::MdTextButton*> non_default_buttons_;
-  base::raw_ptr<views::MdTextButton> default_button_ = nullptr;
-  base::raw_ptr<views::Button> close_button_ = nullptr;
+  raw_ptr<views::MdTextButton> default_button_ = nullptr;
+  raw_ptr<views::Button> close_button_ = nullptr;
 
   // This is the base accessible name of the window.
   std::u16string accessible_name_;

diff --git a/ash/wallpaper/wallpaper_pref_manager.cc b/ash/wallpaper/wallpaper_pref_manager.cc
index 7d4544b..4c03221 100644
--- a/ash/wallpaper/wallpaper_pref_manager.cc
+++ b/ash/wallpaper/wallpaper_pref_manager.cc

@@ -274,7 +274,7 @@
   }
 
  private:
-  base::raw_ptr<WallpaperControllerClient> wallpaper_controller_client_ =
+  raw_ptr<WallpaperControllerClient> wallpaper_controller_client_ =
       nullptr;  // not owned
 };
 

diff --git a/ash/webui/camera_app_ui/camera_app_helper_impl.h b/ash/webui/camera_app_ui/camera_app_helper_impl.h
index f23811c..f89cf1e5 100644
--- a/ash/webui/camera_app_ui/camera_app_helper_impl.h
+++ b/ash/webui/camera_app_ui/camera_app_helper_impl.h

@@ -163,7 +163,7 @@
   // Client to connect to document detection service.
   std::unique_ptr<DocumentScannerServiceClient> document_scanner_service_;
 
-  base::raw_ptr<HoldingSpaceClient> const holding_space_client_;
+  raw_ptr<HoldingSpaceClient> const holding_space_client_;
 
   base::WeakPtrFactory<CameraAppHelperImpl> weak_factory_{this};
 };

diff --git a/ash/webui/diagnostics_ui/backend/connectivity/network_health_provider.h b/ash/webui/diagnostics_ui/backend/connectivity/network_health_provider.h
index b977a6e..a37cafa 100644
--- a/ash/webui/diagnostics_ui/backend/connectivity/network_health_provider.h
+++ b/ash/webui/diagnostics_ui/backend/connectivity/network_health_provider.h

@@ -131,7 +131,7 @@
 
   mojom::NetworkState GetNetworkStateForGuid(const std::string& guid);
 
-  base::raw_ptr<NetworkingLog> networking_log_ptr_ = nullptr;  // Not owned.
+  raw_ptr<NetworkingLog> networking_log_ptr_ = nullptr;  // Not owned.
 
   // Guid for the currently active network (if one exists). This guid will
   // be present in |networks_|.

diff --git a/ash/webui/diagnostics_ui/backend/input/input_data_provider.h b/ash/webui/diagnostics_ui/backend/input/input_data_provider.h
index b1193a3..c463f478 100644
--- a/ash/webui/diagnostics_ui/backend/input/input_data_provider.h
+++ b/ash/webui/diagnostics_ui/backend/input/input_data_provider.h

@@ -174,8 +174,7 @@
 
   bool IsLoggingEnabled() const;
 
-  base::raw_ptr<KeyboardInputLog> keyboard_input_log_ptr_ =
-      nullptr;  // Not Owned.
+  raw_ptr<KeyboardInputLog> keyboard_input_log_ptr_ = nullptr;  // Not Owned.
 
   // Denotes whether DiagnosticsDialog should be closed when escape is pressed.
   // Currently, this is only false when the keyboard tester is actively in use.

diff --git a/ash/webui/diagnostics_ui/backend/system/system_data_provider.h b/ash/webui/diagnostics_ui/backend/system/system_data_provider.h
index eda3ba2..5e9755f 100644
--- a/ash/webui/diagnostics_ui/backend/system/system_data_provider.h
+++ b/ash/webui/diagnostics_ui/backend/system/system_data_provider.h

@@ -116,7 +116,7 @@
 
   bool IsLoggingEnabled() const;
 
-  base::raw_ptr<TelemetryLog> telemetry_log_ptr_ = nullptr;  // Not owned.
+  raw_ptr<TelemetryLog> telemetry_log_ptr_ = nullptr;  // Not owned.
 
   CpuUsageData previous_cpu_usage_data_;
 

diff --git a/ash/webui/face_ml_app_ui/face_ml_page_handler.h b/ash/webui/face_ml_app_ui/face_ml_page_handler.h
index 429e188..eb1c8196 100644
--- a/ash/webui/face_ml_app_ui/face_ml_page_handler.h
+++ b/ash/webui/face_ml_app_ui/face_ml_page_handler.h

@@ -37,7 +37,7 @@
 
   mojo::Receiver<mojom::face_ml_app::PageHandler> receiver_{this};
   mojo::Remote<mojom::face_ml_app::Page> page_;
-  base::raw_ref<FaceMLAppUI> face_ml_app_ui_;  // Owns |this|.
+  raw_ref<FaceMLAppUI> face_ml_app_ui_;  // Owns |this|.
 };
 
 }  // namespace ash

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 5092f40..213fa0e5 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

@@ -418,7 +418,7 @@
   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_;
+  raw_ptr<TestInputMethodManager> input_method_manager_;
   std::unique_ptr<FakeDeviceManager> fake_keyboard_manager_;
   FakeAcceleratorsUpdatedObserver observer_;
 };

diff --git a/chrome/browser/apps/almanac_api_client/device_info_manager.h b/chrome/browser/apps/almanac_api_client/device_info_manager.h
index b737547..f58971f 100644
--- a/chrome/browser/apps/almanac_api_client/device_info_manager.h
+++ b/chrome/browser/apps/almanac_api_client/device_info_manager.h

@@ -98,7 +98,7 @@
                    DeviceInfo device_info,
                    base::SysInfo::HardwareInfo hardware_info);
 
-  base::raw_ptr<Profile> profile_;
+  raw_ptr<Profile> profile_;
 
   // |weak_ptr_factory_| must be the last member of this class.
   base::WeakPtrFactory<DeviceInfoManager> weak_ptr_factory_{this};

diff --git a/chrome/browser/apps/app_preload_service/web_app_preload_installer.h b/chrome/browser/apps/app_preload_service/web_app_preload_installer.h
index aff1d68..b5ba3f2 100644
--- a/chrome/browser/apps/app_preload_service/web_app_preload_installer.h
+++ b/chrome/browser/apps/app_preload_service/web_app_preload_installer.h

@@ -77,7 +77,7 @@
                       const web_app::AppId& app_id,
                       webapps::InstallResultCode code);
 
-  base::raw_ptr<Profile> profile_;
+  raw_ptr<Profile> profile_;
 
   base::WeakPtrFactory<WebAppPreloadInstaller> weak_ptr_factory_{this};
 };

diff --git a/chrome/browser/apps/app_service/app_icon/guest_os_apps_icon_unittest.cc b/chrome/browser/apps/app_service/app_icon/guest_os_apps_icon_unittest.cc
index 264c2174..9aca3d7 100644
--- a/chrome/browser/apps/app_service/app_icon/guest_os_apps_icon_unittest.cc
+++ b/chrome/browser/apps/app_service/app_icon/guest_os_apps_icon_unittest.cc

@@ -123,10 +123,10 @@
  private:
   content::BrowserTaskEnvironment task_environment_;
   base::test::ScopedFeatureList scoped_feature_list_;
-  base::raw_ptr<ash::FakeCiceroneClient> fake_cicerone_client_;
+  raw_ptr<ash::FakeCiceroneClient> fake_cicerone_client_;
   std::unique_ptr<TestingProfile> profile_;
   data_decoder::test::InProcessDataDecoder in_process_data_decoder_;
-  base::raw_ptr<AppServiceProxy> proxy_;
+  raw_ptr<AppServiceProxy> proxy_;
   std::unique_ptr<crostini::CrostiniTestHelper> crostini_test_helper_;
 };
 

diff --git a/chrome/browser/apps/app_service/publishers/bruschetta_apps_unittest.cc b/chrome/browser/apps/app_service/publishers/bruschetta_apps_unittest.cc
index 6c90e04..d731f60 100644
--- a/chrome/browser/apps/app_service/publishers/bruschetta_apps_unittest.cc
+++ b/chrome/browser/apps/app_service/publishers/bruschetta_apps_unittest.cc

@@ -59,8 +59,8 @@
  private:
   content::BrowserTaskEnvironment task_environment_;
   std::unique_ptr<TestingProfile> profile_;
-  base::raw_ptr<AppServiceProxy> app_service_proxy_ = nullptr;
-  base::raw_ptr<guest_os::GuestOsRegistryService> registry_ = nullptr;
+  raw_ptr<AppServiceProxy> app_service_proxy_ = nullptr;
+  raw_ptr<guest_os::GuestOsRegistryService> registry_ = nullptr;
   base::test::ScopedFeatureList scoped_feature_list_;
 };
 

diff --git a/chrome/browser/apps/app_service/publishers/guest_os_apps_unittest.cc b/chrome/browser/apps/app_service/publishers/guest_os_apps_unittest.cc
index 9081f71..125e0d3f 100644
--- a/chrome/browser/apps/app_service/publishers/guest_os_apps_unittest.cc
+++ b/chrome/browser/apps/app_service/publishers/guest_os_apps_unittest.cc

@@ -131,8 +131,8 @@
  private:
   content::BrowserTaskEnvironment task_environment_;
   std::unique_ptr<TestingProfile> profile_;
-  base::raw_ptr<AppServiceProxy> app_service_proxy_ = nullptr;
-  base::raw_ptr<guest_os::GuestOsRegistryService> registry_ = nullptr;
+  raw_ptr<AppServiceProxy> app_service_proxy_ = nullptr;
+  raw_ptr<guest_os::GuestOsRegistryService> registry_ = nullptr;
   std::unique_ptr<TestPublisher> publisher_;
 };
 

diff --git a/chrome/browser/ash/accessibility/live_caption/system_live_caption_service.h b/chrome/browser/ash/accessibility/live_caption/system_live_caption_service.h
index 1956668c..72c04a3 100644
--- a/chrome/browser/ash/accessibility/live_caption/system_live_caption_service.h
+++ b/chrome/browser/ash/accessibility/live_caption/system_live_caption_service.h

@@ -103,8 +103,8 @@
   void CreateClient();
   void StopTimeoutFinished();
 
-  const base::raw_ptr<Profile> profile_;
-  base::raw_ptr<::captions::LiveCaptionController> controller_;
+  const raw_ptr<Profile> profile_;
+  raw_ptr<::captions::LiveCaptionController> controller_;
 
   ash::captions::CaptionBubbleContextAsh context_;
 

diff --git a/chrome/browser/ash/app_list/search/files/zero_state_drive_provider.h b/chrome/browser/ash/app_list/search/files/zero_state_drive_provider.h
index 0670f638..289bd6e 100644
--- a/chrome/browser/ash/app_list/search/files/zero_state_drive_provider.h
+++ b/chrome/browser/ash/app_list/search/files/zero_state_drive_provider.h

@@ -95,7 +95,7 @@
   const raw_ptr<session_manager::SessionManager, ExperimentalAsh>
       session_manager_;
 
-  const base::raw_ptr<ash::FileSuggestKeyedService> file_suggest_service_;
+  const raw_ptr<ash::FileSuggestKeyedService> file_suggest_service_;
 
   const base::Time construction_time_;
   base::TimeTicks query_start_time_;

diff --git a/chrome/browser/ash/app_list/search/files/zero_state_file_provider.h b/chrome/browser/ash/app_list/search/files/zero_state_file_provider.h
index 35483b1..385b600 100644
--- a/chrome/browser/ash/app_list/search/files/zero_state_file_provider.h
+++ b/chrome/browser/ash/app_list/search/files/zero_state_file_provider.h

@@ -65,7 +65,7 @@
 
   ash::ThumbnailLoader thumbnail_loader_;
 
-  const base::raw_ptr<ash::FileSuggestKeyedService> file_suggest_service_;
+  const raw_ptr<ash::FileSuggestKeyedService> file_suggest_service_;
 
   base::TimeTicks query_start_time_;
 

diff --git a/chrome/browser/ash/app_mode/kiosk_app_launcher.h b/chrome/browser/ash/app_mode/kiosk_app_launcher.h
index 6e54093..7b6cbbc 100644
--- a/chrome/browser/ash/app_mode/kiosk_app_launcher.h
+++ b/chrome/browser/ash/app_mode/kiosk_app_launcher.h

@@ -98,7 +98,7 @@
   virtual void LaunchApp() = 0;
 
  protected:
-  base::raw_ptr<NetworkDelegate> delegate_ = nullptr;  // Not owned, owns us.
+  raw_ptr<NetworkDelegate> delegate_ = nullptr;  // Not owned, owns us.
 };
 
 }  // namespace ash

diff --git a/chrome/browser/ash/bruschetta/bruschetta_download_client.h b/chrome/browser/ash/bruschetta/bruschetta_download_client.h
index cdf05cd..b0c22790 100644
--- a/chrome/browser/ash/bruschetta/bruschetta_download_client.h
+++ b/chrome/browser/ash/bruschetta/bruschetta_download_client.h

@@ -47,7 +47,7 @@
 
   bool MaybeCancelDownload(const std::string& guid);
 
-  const base::raw_ptr<Profile> profile_;
+  const raw_ptr<Profile> profile_;
 };
 
 }  // namespace bruschetta

diff --git a/chrome/browser/ash/bruschetta/bruschetta_installer_impl.h b/chrome/browser/ash/bruschetta/bruschetta_installer_impl.h
index db80f94..3947f361 100644
--- a/chrome/browser/ash/bruschetta/bruschetta_installer_impl.h
+++ b/chrome/browser/ash/bruschetta/bruschetta_installer_impl.h

@@ -97,11 +97,11 @@
 
   std::unique_ptr<guest_os::GuestOsDlcInstallation> in_progress_dlc_;
 
-  const base::raw_ptr<Profile> profile_;
+  const raw_ptr<Profile> profile_;
 
   base::OnceClosure close_closure_;
 
-  base::raw_ptr<Observer> observer_ = nullptr;
+  raw_ptr<Observer> observer_ = nullptr;
 
   base::WeakPtrFactory<BruschettaInstallerImpl> weak_ptr_factory_{this};
 };

diff --git a/chrome/browser/ash/crosapi/multi_capture_service_ash.h b/chrome/browser/ash/crosapi/multi_capture_service_ash.h
index c2d35b9..b6cf1aa 100644
--- a/chrome/browser/ash/crosapi/multi_capture_service_ash.h
+++ b/chrome/browser/ash/crosapi/multi_capture_service_ash.h

@@ -33,7 +33,7 @@
  private:
   mojo::ReceiverSet<mojom::MultiCaptureService>
       multi_capture_service_receiver_set_;
-  base::raw_ptr<ash::MultiCaptureServiceClient, DanglingUntriaged>
+  raw_ptr<ash::MultiCaptureServiceClient, DanglingUntriaged>
       multi_capture_client_ = nullptr;
 };
 

diff --git a/chrome/browser/ash/file_suggest/drive_file_suggestion_provider.h b/chrome/browser/ash/file_suggest/drive_file_suggestion_provider.h
index 6b8c81b..62c7eff 100644
--- a/chrome/browser/ash/file_suggest/drive_file_suggestion_provider.h
+++ b/chrome/browser/ash/file_suggest/drive_file_suggestion_provider.h

@@ -62,9 +62,9 @@
       DriveSuggestValidationStatus validation_status,
       const absl::optional<std::vector<FileSuggestData>>& suggest_results);
 
-  const base::raw_ptr<Profile> profile_;
+  const raw_ptr<Profile> profile_;
 
-  const base::raw_ptr<drive::DriveIntegrationService> drive_service_;
+  const raw_ptr<drive::DriveIntegrationService> drive_service_;
 
   // The drive client from which the raw suggest data (i.e. the data before
   // validation) is fetched.

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 fe09b49d..a9d96bb 100644
--- a/chrome/browser/ash/login/enrollment/auto_enrollment_check_screen.h
+++ b/chrome/browser/ash/login/enrollment/auto_enrollment_check_screen.h

@@ -122,7 +122,7 @@
   base::WeakPtr<AutoEnrollmentCheckScreenView> view_;
   raw_ptr<ErrorScreen, ExperimentalAsh> error_screen_;
   base::RepeatingCallback<void(Result result)> exit_callback_;
-  base::raw_ptr<policy::AutoEnrollmentController> auto_enrollment_controller_ =
+  raw_ptr<policy::AutoEnrollmentController> auto_enrollment_controller_ =
       nullptr;
 
   base::CallbackListSubscription auto_enrollment_progress_subscription_;

diff --git a/chrome/browser/ash/login/existing_user_controller.cc b/chrome/browser/ash/login/existing_user_controller.cc
index 25c4fdf..af32345 100644
--- a/chrome/browser/ash/login/existing_user_controller.cc
+++ b/chrome/browser/ash/login/existing_user_controller.cc

@@ -364,8 +364,7 @@
   void OnDeviceLocalAccountsChanged() override {}
 
  private:
-  base::raw_ptr<policy::DeviceLocalAccountPolicyService> policy_service_ =
-      nullptr;
+  raw_ptr<policy::DeviceLocalAccountPolicyService> policy_service_ = nullptr;
   base::OnceClosure callback_;
   std::string user_id_;
   base::ScopedObservation<policy::DeviceLocalAccountPolicyService,

diff --git a/chrome/browser/ash/login/saml/lockscreen_reauth_dialog_test_helper.h b/chrome/browser/ash/login/saml/lockscreen_reauth_dialog_test_helper.h
index 2516a439..0bd831c 100644
--- a/chrome/browser/ash/login/saml/lockscreen_reauth_dialog_test_helper.h
+++ b/chrome/browser/ash/login/saml/lockscreen_reauth_dialog_test_helper.h

@@ -149,23 +149,21 @@
   void WaitForNetworkDialogToLoad();
 
   // Main Dialog
-  base::raw_ptr<LockScreenStartReauthDialog, DanglingUntriaged> reauth_dialog_ =
+  raw_ptr<LockScreenStartReauthDialog, DanglingUntriaged> reauth_dialog_ =
       nullptr;
-  base::raw_ptr<LockScreenStartReauthUI, DanglingUntriaged>
-      reauth_webui_controller_ = nullptr;
-  base::raw_ptr<LockScreenReauthHandler, DanglingUntriaged> main_handler_ =
+  raw_ptr<LockScreenStartReauthUI, DanglingUntriaged> reauth_webui_controller_ =
       nullptr;
+  raw_ptr<LockScreenReauthHandler, DanglingUntriaged> main_handler_ = nullptr;
 
   // Network dialog which is owned by the main dialog.
-  base::raw_ptr<LockScreenNetworkDialog, DanglingUntriaged> network_dialog_ =
+  raw_ptr<LockScreenNetworkDialog, DanglingUntriaged> network_dialog_ = nullptr;
+  raw_ptr<LockScreenNetworkUI, DanglingUntriaged> network_webui_controller_ =
       nullptr;
-  base::raw_ptr<LockScreenNetworkUI, DanglingUntriaged>
-      network_webui_controller_ = nullptr;
-  base::raw_ptr<NetworkConfigMessageHandler, DanglingUntriaged>
-      network_handler_ = nullptr;
+  raw_ptr<NetworkConfigMessageHandler, DanglingUntriaged> network_handler_ =
+      nullptr;
 
   // Captive portal dialog which is owned by the main dialog.
-  base::raw_ptr<LockScreenCaptivePortalDialog, DanglingUntriaged>
+  raw_ptr<LockScreenCaptivePortalDialog, DanglingUntriaged>
       captive_portal_dialog_ = nullptr;
 };
 

diff --git a/chrome/browser/ash/login/screens/recommend_apps_screen.h b/chrome/browser/ash/login/screens/recommend_apps_screen.h
index 93d281b..15d0ebc 100644
--- a/chrome/browser/ash/login/screens/recommend_apps_screen.h
+++ b/chrome/browser/ash/login/screens/recommend_apps_screen.h

@@ -75,14 +75,14 @@
   base::WeakPtr<RecommendAppsScreenView> view_;
   ScreenExitCallback exit_callback_;
 
-  base::raw_ptr<apps::AppDiscoveryService> app_discovery_service_ = nullptr;
+  raw_ptr<apps::AppDiscoveryService> app_discovery_service_ = nullptr;
 
   // Skip the screen for testing if set to true.
   bool skip_for_testing_ = false;
 
   size_t recommended_app_count_ = 0;
 
-  base::raw_ptr<PrefService> pref_service_;
+  raw_ptr<PrefService> pref_service_;
 
   base::WeakPtrFactory<RecommendAppsScreen> weak_factory_{this};
 };

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 1089bf7..d47f5c8 100644
--- a/chrome/browser/ash/login/screens/recommend_apps_screen_browsertest.cc
+++ b/chrome/browser/ash/login/screens/recommend_apps_screen_browsertest.cc

@@ -202,11 +202,11 @@
     test::OobeJS().ExpectHiddenPath({kRecommendAppsId, "loadingDialog"});
   }
 
-  base::raw_ptr<RecommendAppsScreen, DanglingUntriaged> recommend_apps_screen_ =
+  raw_ptr<RecommendAppsScreen, DanglingUntriaged> recommend_apps_screen_ =
       nullptr;
   absl::optional<RecommendAppsScreen::Result> screen_result_;
-  base::raw_ptr<StubRecommendAppsFetcher, DanglingUntriaged>
-      recommend_apps_fetcher_ = nullptr;
+  raw_ptr<StubRecommendAppsFetcher, DanglingUntriaged> recommend_apps_fetcher_ =
+      nullptr;
 
   LoginManagerMixin login_manager_{&mixin_host_};
 

diff --git a/chrome/browser/ash/login/signin/oauth2_browsertest.cc b/chrome/browser/ash/login/signin/oauth2_browsertest.cc
index 8808c31..3d008df 100644
--- a/chrome/browser/ash/login/signin/oauth2_browsertest.cc
+++ b/chrome/browser/ash/login/signin/oauth2_browsertest.cc

@@ -170,7 +170,7 @@
     signal_->SetValue();
   }
 
-  const base::raw_ptr<Profile> profile_;
+  const raw_ptr<Profile> profile_;
   std::set<OAuth2LoginManager::SessionRestoreState> states_;
   bool waiting_for_state_ = false;
   OAuth2LoginManager::SessionRestoreState final_state_ =

diff --git a/chrome/browser/ash/login/signin/offline_signin_limiter_unittest.cc b/chrome/browser/ash/login/signin/offline_signin_limiter_unittest.cc
index 62b4982..4bbd85d1 100644
--- a/chrome/browser/ash/login/signin/offline_signin_limiter_unittest.cc
+++ b/chrome/browser/ash/login/signin/offline_signin_limiter_unittest.cc

@@ -81,7 +81,7 @@
 
   std::unique_ptr<MockLockHandler> lock_handler_;
 
-  base::raw_ptr<base::WallClockTimer> timer_ = nullptr;
+  raw_ptr<base::WallClockTimer> timer_ = nullptr;
 
   std::unique_ptr<OfflineSigninLimiter> limiter_;
   base::test::ScopedPowerMonitorTestSource test_power_monitor_source_;

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 39fd077..6c27f48a 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

@@ -237,7 +237,7 @@
   scoped_refptr<base::SequencedTaskRunner> task_runner_;
 
   // PrefService instance to read the policy refresh rate from.
-  base::raw_ptr<PrefService, DanglingUntriaged | ExperimentalAsh> local_state_;
+  raw_ptr<PrefService, DanglingUntriaged | ExperimentalAsh> local_state_;
 
   base::CallbackListSubscription state_keys_update_subscription_;
 

diff --git a/chrome/browser/ash/policy/core/reporting_user_tracker.h b/chrome/browser/ash/policy/core/reporting_user_tracker.h
index e776a2b..88fada24e 100644
--- a/chrome/browser/ash/policy/core/reporting_user_tracker.h
+++ b/chrome/browser/ash/policy/core/reporting_user_tracker.h

@@ -50,7 +50,7 @@
   // Removes user from the list of the users who should be reported.
   void RemoveReportingUser(const AccountId& account_id);
 
-  const base::raw_ptr<PrefService> local_state_;
+  const raw_ptr<PrefService> local_state_;
   base::ScopedObservation<user_manager::UserManager,
                           user_manager::UserManager::Observer>
       observation_{this};

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 f1f6a9c..581bd9f 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

@@ -288,7 +288,7 @@
   base::OneShotTimer policy_refresh_timeout_;
 
   // The pref service to pass to the refresh scheduler on initialization.
-  base::raw_ptr<PrefService> local_state_ = nullptr;
+  raw_ptr<PrefService> local_state_ = nullptr;
 
   // Used to fetch the policy OAuth token, when necessary. This object holds
   // a callback with an unretained reference to the manager, when it exists.

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 1396c68..89c68e9 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

@@ -413,8 +413,8 @@
       DeviceManagementService::JobConfiguration::TYPE_INVALID;
 
   // Sets the final result of PSM protocol for testing.
-  base::raw_ptr<psm::FakeRlweDmserverClient>
-      fake_psm_rlwe_dmserver_client_ptr_ = nullptr;
+  raw_ptr<psm::FakeRlweDmserverClient> fake_psm_rlwe_dmserver_client_ptr_ =
+      nullptr;
 
  private:
   const AutoEnrollmentProtocol protocol_;

diff --git a/chrome/browser/ash/policy/enrollment/auto_enrollment_controller.h b/chrome/browser/ash/policy/enrollment/auto_enrollment_controller.h
index 29a7fa2..cd9aa2c 100644
--- a/chrome/browser/ash/policy/enrollment/auto_enrollment_controller.h
+++ b/chrome/browser/ash/policy/enrollment/auto_enrollment_controller.h

@@ -58,7 +58,7 @@
       absl::optional<user_data_auth::GetFirmwareManagementParametersReply>
           reply);
 
-  base::raw_ptr<ash::InstallAttributesClient> install_attributes_client_;
+  raw_ptr<ash::InstallAttributesClient> install_attributes_client_;
   base::WeakPtrFactory<EnrollmentFwmpHelper> weak_ptr_factory_{this};
 };
 

diff --git a/chrome/browser/ash/policy/handlers/screensaver_images_policy_handler.h b/chrome/browser/ash/policy/handlers/screensaver_images_policy_handler.h
index 4092090..13fc0e2d73 100644
--- a/chrome/browser/ash/policy/handlers/screensaver_images_policy_handler.h
+++ b/chrome/browser/ash/policy/handlers/screensaver_images_policy_handler.h

@@ -54,7 +54,7 @@
 
   base::flat_set<base::FilePath> downloaded_images_;
 
-  base::raw_ptr<PrefService> user_pref_service_ = nullptr;
+  raw_ptr<PrefService> user_pref_service_ = nullptr;
 
   std::unique_ptr<PrefChangeRegistrar> pref_change_registrar_;
 

diff --git a/chrome/browser/ash/policy/remote_commands/device_command_reboot_job.h b/chrome/browser/ash/policy/remote_commands/device_command_reboot_job.h
index d884c04..90aefbfba 100644
--- a/chrome/browser/ash/policy/remote_commands/device_command_reboot_job.h
+++ b/chrome/browser/ash/policy/remote_commands/device_command_reboot_job.h

@@ -107,27 +107,26 @@
   void ResetTriggeringEvents();
 
   // Sends the reboot request to power manager service. Unowned.
-  const base::raw_ptr<chromeos::PowerManagerClient> power_manager_client_;
+  const raw_ptr<chromeos::PowerManagerClient> power_manager_client_;
   // Checks the availability of `power_manager_client_`.
   base::ScopedObservation<chromeos::PowerManagerClient, DeviceCommandRebootJob>
       power_manager_availability_observation_{this};
 
   // Provides information about current logins status and device mode to
   // determine how to proceed with the reboot.
-  const base::raw_ptr<ash::LoginState> login_state_;
+  const raw_ptr<ash::LoginState> login_state_;
 
   // Handles reboot on signout.
-  base::raw_ptr<ash::SessionTerminationManager> session_termination_manager_;
+  raw_ptr<ash::SessionTerminationManager> session_termination_manager_;
 
   // Scheduler for reboot notification and dialog. Unowned.
-  base::raw_ptr<RebootNotificationsScheduler>
-      in_session_notifications_scheduler_;
+  raw_ptr<RebootNotificationsScheduler> in_session_notifications_scheduler_;
   // Timer tracking the delayed reboot event.
   base::WallClockTimer in_session_reboot_timer_;
 
   // Clock to schedule in-user-session reboot delay. Can be mocked for testing.
   // Unowned.
-  base::raw_ptr<const base::Clock> clock_;
+  raw_ptr<const base::Clock> clock_;
 
   // Returns device's boot timestamp. The boot time is not constant and may
   // change at runtime, e.g. because of time sync.

diff --git a/chrome/browser/ash/policy/scheduled_task_handler/device_scheduled_reboot_handler.h b/chrome/browser/ash/policy/scheduled_task_handler/device_scheduled_reboot_handler.h
index 9cea6c8..8ed6ec8 100644
--- a/chrome/browser/ash/policy/scheduled_task_handler/device_scheduled_reboot_handler.h
+++ b/chrome/browser/ash/policy/scheduled_task_handler/device_scheduled_reboot_handler.h

@@ -102,7 +102,7 @@
   void RebootDevice(const std::string& reboot_description) const;
 
   // Used to retrieve Chrome OS settings. Not owned.
-  const base::raw_ptr<ash::CrosSettings> cros_settings_;
+  const raw_ptr<ash::CrosSettings> cros_settings_;
 
   // Subscription for callback when settings change.
   base::CallbackListSubscription cros_settings_subscription_;
@@ -118,7 +118,7 @@
   absl::optional<base::TimeDelta> reboot_delay_for_testing_;
 
   // Scheduler for reboot notification and dialog. Unowned.
-  base::raw_ptr<RebootNotificationsScheduler> notifications_scheduler_;
+  raw_ptr<RebootNotificationsScheduler> notifications_scheduler_;
 
   // Indicating if the reboot should be skipped.
   bool skip_reboot_ = false;

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 326fa13d..8ff804c 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

@@ -148,7 +148,7 @@
                           session_manager::SessionManagerObserver>
       observation_{this};
 
-  base::raw_ptr<const base::Clock> clock_;
+  raw_ptr<const base::Clock> clock_;
 
   base::WeakPtrFactory<RebootNotificationsScheduler> weak_ptr_factory_{this};
 };

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 93442236..20fde34 100644
--- a/chrome/browser/ash/policy/status_collector/device_status_collector.h
+++ b/chrome/browser/ash/policy/status_collector/device_status_collector.h

@@ -340,9 +340,9 @@
   bool IncludeEmailsInActivityReports() const;
 
   // Pref service that is mainly used to store activity periods for reporting.
-  const base::raw_ptr<PrefService, ExperimentalAsh> pref_service_;
+  const raw_ptr<PrefService, ExperimentalAsh> pref_service_;
 
-  const base::raw_ptr<ReportingUserTracker> reporting_user_tracker_;
+  const raw_ptr<ReportingUserTracker> reporting_user_tracker_;
 
   // The last time an idle state check was performed.
   base::Time last_idle_check_;

diff --git a/chrome/browser/ash/printing/oauth2/client_ids_database.cc b/chrome/browser/ash/printing/oauth2/client_ids_database.cc
index c4f5d1f..36dec766 100644
--- a/chrome/browser/ash/printing/oauth2/client_ids_database.cc
+++ b/chrome/browser/ash/printing/oauth2/client_ids_database.cc

@@ -43,7 +43,7 @@
   }
 
  private:
-  base::raw_ptr<PrefService> pref_;
+  raw_ptr<PrefService> pref_;
   base::Value::Dict data_;
 };
 

diff --git a/chrome/browser/ash/sync/sync_appsync_optin_client.h b/chrome/browser/ash/sync/sync_appsync_optin_client.h
index 43392ef..7ed157f 100644
--- a/chrome/browser/ash/sync/sync_appsync_optin_client.h
+++ b/chrome/browser/ash/sync/sync_appsync_optin_client.h

@@ -78,8 +78,8 @@
   // if no profile can be found.
   std::string GetActiveProfileHash(const syncer::SyncService* sync_service);
 
-  const base::raw_ptr<syncer::SyncService> sync_service_;
-  const base::raw_ptr<user_manager::UserManager> user_manager_;
+  const raw_ptr<syncer::SyncService> sync_service_;
+  const raw_ptr<user_manager::UserManager> user_manager_;
 
   bool is_apps_sync_enabled_;
 

diff --git a/chrome/browser/ash/sync/sync_explicit_passphrase_client_ash.h b/chrome/browser/ash/sync/sync_explicit_passphrase_client_ash.h
index 5da7b21..40806ad 100644
--- a/chrome/browser/ash/sync/sync_explicit_passphrase_client_ash.h
+++ b/chrome/browser/ash/sync/sync_explicit_passphrase_client_ash.h

@@ -52,7 +52,7 @@
   bool ValidateAccountKey(
       const crosapi::mojom::AccountKeyPtr& mojo_account_key) const;
 
-  const base::raw_ptr<syncer::SyncService> sync_service_;
+  const raw_ptr<syncer::SyncService> sync_service_;
 
   bool is_passphrase_required_;
   bool is_passphrase_available_;

diff --git a/chrome/browser/ash/sync/sync_user_settings_client_ash.h b/chrome/browser/ash/sync/sync_user_settings_client_ash.h
index dc6376b..d469215 100644
--- a/chrome/browser/ash/sync/sync_user_settings_client_ash.h
+++ b/chrome/browser/ash/sync/sync_user_settings_client_ash.h

@@ -43,7 +43,7 @@
   void FlushMojoForTesting();
 
  private:
-  const base::raw_ptr<syncer::SyncService> sync_service_;
+  const raw_ptr<syncer::SyncService> sync_service_;
 
   bool is_apps_sync_enabled_;
 

diff --git a/chrome/browser/ash/video_conference/video_conference_app_service_client.h b/chrome/browser/ash/video_conference/video_conference_app_service_client.h
index 3a3ba62..73a3a142 100644
--- a/chrome/browser/ash/video_conference/video_conference_app_service_client.h
+++ b/chrome/browser/ash/video_conference/video_conference_app_service_client.h

@@ -109,9 +109,9 @@
   void HandleMediaUsageUpdate();
 
   // These registries are used for observing app behaviors.
-  base::raw_ptr<apps::InstanceRegistry> instance_registry_;
-  base::raw_ptr<apps::AppRegistryCache> app_registry_;
-  base::raw_ptr<apps::AppCapabilityAccessCache> capability_cache_;
+  raw_ptr<apps::InstanceRegistry> instance_registry_;
+  raw_ptr<apps::AppRegistryCache> app_registry_;
+  raw_ptr<apps::AppCapabilityAccessCache> capability_cache_;
 
   // Unique id associated with this client. It is used by the VcManager to
   // identify clients.

diff --git a/chrome/browser/ash/video_conference/video_conference_app_service_client_browsertest.cc b/chrome/browser/ash/video_conference/video_conference_app_service_client_browsertest.cc
index e83a97d..33406a4 100644
--- a/chrome/browser/ash/video_conference/video_conference_app_service_client_browsertest.cc
+++ b/chrome/browser/ash/video_conference/video_conference_app_service_client_browsertest.cc

@@ -129,7 +129,7 @@
  private:
   std::unique_ptr<aura::Window> window_;
   std::unique_ptr<apps::Instance> instance_;
-  base::raw_ptr<apps::InstanceRegistry> instance_registry_;
+  raw_ptr<apps::InstanceRegistry> instance_registry_;
 };
 
 }  // namespace

diff --git a/chrome/browser/ash/web_applications/face_ml/chrome_face_ml_user_provider.h b/chrome/browser/ash/web_applications/face_ml/chrome_face_ml_user_provider.h
index 25091db..5e1fef8 100644
--- a/chrome/browser/ash/web_applications/face_ml/chrome_face_ml_user_provider.h
+++ b/chrome/browser/ash/web_applications/face_ml/chrome_face_ml_user_provider.h

@@ -29,7 +29,7 @@
   mojom::face_ml_app::UserInformation GetCurrentUserInformation() override;
 
  private:
-  const base::raw_ref<content::WebUI> web_ui_;  // Owns |this|.
+  const raw_ref<content::WebUI> web_ui_;  // Owns |this|.
 };
 }  // namespace ash
 

diff --git a/chrome/browser/ash/web_applications/personalization_app/personalization_app_theme_provider_impl.h b/chrome/browser/ash/web_applications/personalization_app/personalization_app_theme_provider_impl.h
index 67571fa8..5a1f9c4 100644
--- a/chrome/browser/ash/web_applications/personalization_app/personalization_app_theme_provider_impl.h
+++ b/chrome/browser/ash/web_applications/personalization_app/personalization_app_theme_provider_impl.h

@@ -96,7 +96,7 @@
 
   PrefChangeRegistrar pref_change_registrar_;
 
-  base::raw_ptr<ColorPaletteController> color_palette_controller_ =
+  raw_ptr<ColorPaletteController> color_palette_controller_ =
       nullptr;  // owned by Shell
 
   base::ScopedObservation<ash::DarkLightModeControllerImpl,

diff --git a/chrome/browser/autocomplete/tab_matcher_desktop.h b/chrome/browser/autocomplete/tab_matcher_desktop.h
index 5669da1..408dcbe 100644
--- a/chrome/browser/autocomplete/tab_matcher_desktop.h
+++ b/chrome/browser/autocomplete/tab_matcher_desktop.h

@@ -30,7 +30,7 @@
       const bool keep_search_intent_params,
       const bool normalize_search_terms) const;
 
-  base::raw_ptr<const TemplateURLService> template_url_service_;
+  raw_ptr<const TemplateURLService> template_url_service_;
   raw_ptr<Profile> profile_{};
 };
 

diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
index fb5d772..9a42c66fe 100644
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc

@@ -542,7 +542,7 @@
   base::ScopedObservation<ProfileManager, ProfileManagerObserver>
       profile_manager_observer_{this};
   // Raw pointer. This is safe because `ChromeBrowserMainParts` owns `this`.
-  const base::raw_ptr<ChromeBrowserMainParts> browser_main_;
+  const raw_ptr<ChromeBrowserMainParts> browser_main_;
 };
 
 ChromeBrowserMainParts::ProfileInitManager::ProfileInitManager(

diff --git a/chrome/browser/chromeos/extensions/smart_card_provider_private/smart_card_provider_private_apitest.cc b/chrome/browser/chromeos/extensions/smart_card_provider_private/smart_card_provider_private_apitest.cc
index daf9e6f..f24a18e 100644
--- a/chrome/browser/chromeos/extensions/smart_card_provider_private/smart_card_provider_private_apitest.cc
+++ b/chrome/browser/chromeos/extensions/smart_card_provider_private/smart_card_provider_private_apitest.cc

@@ -151,7 +151,7 @@
   }
 
  private:
-  base::raw_ptr<const Extension, DanglingUntriaged> extension_;
+  raw_ptr<const Extension, DanglingUntriaged> extension_;
 };
 
 IN_PROC_BROWSER_TEST_F(SmartCardProviderPrivateApiTest,

diff --git a/chrome/browser/chromeos/video_conference/video_conference_manager_client_browsertest.cc b/chrome/browser/chromeos/video_conference/video_conference_manager_client_browsertest.cc
index 6af6766..a1086af 100644
--- a/chrome/browser/chromeos/video_conference/video_conference_manager_client_browsertest.cc
+++ b/chrome/browser/chromeos/video_conference/video_conference_manager_client_browsertest.cc

@@ -57,7 +57,7 @@
 
   ~FakeVideoConferenceManagerClient() override = default;
 
-  std::map<base::UnguessableToken, base::raw_ptr<content::WebContents>>
+  std::map<base::UnguessableToken, raw_ptr<content::WebContents>>
   id_to_webcontents() {
     return id_to_webcontents_;
   }

diff --git a/chrome/browser/enterprise/connectors/analysis/request_handler_base.h b/chrome/browser/enterprise/connectors/analysis/request_handler_base.h
index 47bc824b..ab11ba0 100644
--- a/chrome/browser/enterprise/connectors/analysis/request_handler_base.h
+++ b/chrome/browser/enterprise/connectors/analysis/request_handler_base.h

@@ -85,7 +85,7 @@
   safe_browsing::BinaryUploadService* GetBinaryUploadService();
 
   base::WeakPtr<safe_browsing::BinaryUploadService> upload_service_ = nullptr;
-  base::raw_ptr<Profile> profile_ = nullptr;
+  raw_ptr<Profile> profile_ = nullptr;
   const raw_ref<const enterprise_connectors::AnalysisSettings>
       analysis_settings_;
   GURL url_;

diff --git a/chrome/browser/enterprise/signals/user_delegate_impl.h b/chrome/browser/enterprise/signals/user_delegate_impl.h
index 6599ed7..ed623ac 100644
--- a/chrome/browser/enterprise/signals/user_delegate_impl.h
+++ b/chrome/browser/enterprise/signals/user_delegate_impl.h

@@ -30,8 +30,8 @@
   bool IsSameUser(const std::string& gaia_id) const override;
 
  private:
-  const base::raw_ptr<Profile> profile_;
-  const base::raw_ptr<signin::IdentityManager> identity_manager_;
+  const raw_ptr<Profile> profile_;
+  const raw_ptr<signin::IdentityManager> identity_manager_;
 };
 
 }  // namespace enterprise_signals

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 5c32def..feb76927 100644
--- a/chrome/browser/extensions/api/file_system/consent_provider_impl.h
+++ b/chrome/browser/extensions/api/file_system/consent_provider_impl.h

@@ -129,7 +129,7 @@
   bool IsAllowlistedComponent(const Extension& extension) override;
 
   // |profile_| can be a raw pointer since its destruction is observed.
-  base::raw_ptr<Profile> profile_;
+  raw_ptr<Profile> profile_;
   base::ScopedObservation<Profile, ProfileObserver> profile_observation_{this};
 };
 

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 bab9e39..8c0f3be 100644
--- a/chrome/browser/extensions/api/file_system/consent_provider_unittest.cc
+++ b/chrome/browser/extensions/api/file_system/consent_provider_unittest.cc

@@ -95,7 +95,7 @@
   }
 
   // Use raw_ptr since |state| is owned by owner.
-  base::raw_ptr<TestDelegateState> state_;
+  raw_ptr<TestDelegateState> state_;
 };
 
 // Rewrites result of a consent request from |result| to |log|.

diff --git a/chrome/browser/extensions/api/file_system/request_file_system_notification.cc b/chrome/browser/extensions/api/file_system/request_file_system_notification.cc
index c8c043a..65c70c7 100644
--- a/chrome/browser/extensions/api/file_system/request_file_system_notification.cc
+++ b/chrome/browser/extensions/api/file_system/request_file_system_notification.cc

@@ -79,7 +79,7 @@
  private:
   ~AppNotificationLauncher() override = default;
 
-  base::raw_ptr<Profile> profile_;
+  raw_ptr<Profile> profile_;
   std::unique_ptr<AppIconLoader> icon_loader_;
   std::unique_ptr<message_center::Notification> pending_notification_;
 };

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 00a1a84..297938f 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

@@ -36,7 +36,7 @@
       std::vector<crosapi::mojom::VolumePtr> volume_list) override;
 
   // Pointer to owner, so okay to keep as raw pointer.
-  base::raw_ptr<Profile> profile_;
+  raw_ptr<Profile> profile_;
 
   // Receives mojo messages from ash-chrome.
   mojo::Receiver<crosapi::mojom::VolumeListObserver> receiver_{this};

diff --git a/chrome/browser/extensions/install_signer.cc b/chrome/browser/extensions/install_signer.cc
index d33560b..15f54ff4 100644
--- a/chrome/browser/extensions/install_signer.cc
+++ b/chrome/browser/extensions/install_signer.cc

@@ -174,11 +174,9 @@
   if (dict.FindInt(kSignatureFormatVersionKey) != kSignatureFormatVersion)
     return nullptr;
 
-  base::raw_ptr<const std::string> expire_date =
-      dict.FindString(kExpireDateKey);
-  base::raw_ptr<const std::string> salt_base64 = dict.FindString(kSaltKey);
-  base::raw_ptr<const std::string> signature_base64 =
-      dict.FindString(kSignatureKey);
+  raw_ptr<const std::string> expire_date = dict.FindString(kExpireDateKey);
+  raw_ptr<const std::string> salt_base64 = dict.FindString(kSaltKey);
+  raw_ptr<const std::string> signature_base64 = dict.FindString(kSignatureKey);
   if (!expire_date || !salt_base64 || !signature_base64 ||
       !base::Base64Decode(*salt_base64, &result->salt) ||
       !base::Base64Decode(*signature_base64, &result->signature))
@@ -191,8 +189,8 @@
   result->timestamp =
       base::ValueToTime(dict.Find(kTimestampKey)).value_or(base::Time());
 
-  base::raw_ptr<const base::Value::List> ids_list = dict.FindList(kIdsKey);
-  base::raw_ptr<const base::Value::List> invalid_ids_list =
+  raw_ptr<const base::Value::List> ids_list = dict.FindList(kIdsKey);
+  raw_ptr<const base::Value::List> invalid_ids_list =
       dict.FindList(kInvalidIdsKey);
   if (!ids_list || !invalid_ids_list)
     return nullptr;

diff --git a/chrome/browser/fuchsia/chrome_browser_main_parts_fuchsia.cc b/chrome/browser/fuchsia/chrome_browser_main_parts_fuchsia.cc
index 35bb060..5954454 100644
--- a/chrome/browser/fuchsia/chrome_browser_main_parts_fuchsia.cc
+++ b/chrome/browser/fuchsia/chrome_browser_main_parts_fuchsia.cc

@@ -136,7 +136,7 @@
     return view_controller;
   }
 
-  base::raw_ptr<ElementManagerImpl> element_manager_;
+  raw_ptr<ElementManagerImpl> element_manager_;
   fuchsia::element::GraphicalPresenterPtr graphical_presenter_;
 };
 

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 a988aa9..3d11d0b 100644
--- a/chrome/browser/k_anonymity_service/k_anonymity_service_client.h
+++ b/chrome/browser/k_anonymity_service/k_anonymity_service_client.h

@@ -197,7 +197,7 @@
   url::Origin join_origin_;
   url::Origin query_origin_;
 
-  base::raw_ptr<Profile> profile_;
+  raw_ptr<Profile> profile_;
   base::WeakPtrFactory<KAnonymityServiceClient> weak_ptr_factory_{this};
 };
 

diff --git a/chrome/browser/k_anonymity_service/remote_trust_token_query_answerer.h b/chrome/browser/k_anonymity_service/remote_trust_token_query_answerer.h
index 2f1e3f54..53bb9c78 100644
--- a/chrome/browser/k_anonymity_service/remote_trust_token_query_answerer.h
+++ b/chrome/browser/k_anonymity_service/remote_trust_token_query_answerer.h

@@ -57,7 +57,7 @@
       pending_has_redemption_record_request_;
 
   const url::Origin top_frame_origin_;
-  const base::raw_ptr<Profile> profile_;
+  const raw_ptr<Profile> profile_;
   mojo::Remote<network::mojom::TrustTokenQueryAnswerer> cached_answerer_;
   base::WeakPtrFactory<RemoteTrustTokenQueryAnswerer> weak_ptr_factory_{this};
 };

diff --git a/chrome/browser/lacros/sync/crosapi_session_sync_favicon_delegate.h b/chrome/browser/lacros/sync/crosapi_session_sync_favicon_delegate.h
index 62b9d62..68f5b37 100644
--- a/chrome/browser/lacros/sync/crosapi_session_sync_favicon_delegate.h
+++ b/chrome/browser/lacros/sync/crosapi_session_sync_favicon_delegate.h

@@ -47,8 +47,7 @@
       GetFaviconImageForPageURLCallback callback,
       const favicon_base::FaviconImageResult& favicon_image_result);
 
-  base::raw_ptr<favicon::HistoryUiFaviconRequestHandler>
-      favicon_request_handler_;
+  raw_ptr<favicon::HistoryUiFaviconRequestHandler> favicon_request_handler_;
   mojo::Receiver<crosapi::mojom::SyncedSessionClientFaviconDelegate> receiver_{
       this};
 

diff --git a/chrome/browser/lacros/sync/crosapi_session_sync_notifier.h b/chrome/browser/lacros/sync/crosapi_session_sync_notifier.h
index 74b9af74..9e79b13 100644
--- a/chrome/browser/lacros/sync/crosapi_session_sync_notifier.h
+++ b/chrome/browser/lacros/sync/crosapi_session_sync_notifier.h

@@ -49,7 +49,7 @@
   void OnForeignSyncedSessionsUpdated();
 
   bool is_tab_sync_enabled_ = false;
-  base::raw_ptr<sync_sessions::SessionSyncService> session_sync_service_;
+  raw_ptr<sync_sessions::SessionSyncService> session_sync_service_;
   mojo::Remote<crosapi::mojom::SyncedSessionClient> synced_session_client_;
   base::CallbackListSubscription session_updated_subscription_;
   base::ScopedObservation<syncer::SyncService, syncer::SyncServiceObserver>

diff --git a/chrome/browser/lacros/sync/sync_crosapi_manager_lacros.h b/chrome/browser/lacros/sync/sync_crosapi_manager_lacros.h
index 06a30ae7..8092ba7f 100644
--- a/chrome/browser/lacros/sync/sync_crosapi_manager_lacros.h
+++ b/chrome/browser/lacros/sync/sync_crosapi_manager_lacros.h

@@ -51,7 +51,7 @@
   void OnCreateSyncedSessionClient(
       mojo::PendingRemote<crosapi::mojom::SyncedSessionClient> pending_remote);
 
-  base::raw_ptr<Profile, DanglingUntriaged> profile_ = nullptr;
+  raw_ptr<Profile, DanglingUntriaged> profile_ = nullptr;
 
   // The objects below are created for main profile PostProfileInit() and
   // destroyed upon main profile SyncService shutdown.

diff --git a/chrome/browser/lacros/sync/sync_explicit_passphrase_client_lacros.h b/chrome/browser/lacros/sync/sync_explicit_passphrase_client_lacros.h
index 3706129..8b42e26 100644
--- a/chrome/browser/lacros/sync/sync_explicit_passphrase_client_lacros.h
+++ b/chrome/browser/lacros/sync/sync_explicit_passphrase_client_lacros.h

@@ -53,9 +53,8 @@
     bool is_passphrase_available() const { return is_passphrase_available_; }
 
    private:
-    base::raw_ptr<syncer::SyncService> sync_service_;
-    base::raw_ptr<SyncExplicitPassphraseClientLacros>
-        explicit_passphrase_client_;
+    raw_ptr<syncer::SyncService> sync_service_;
+    raw_ptr<SyncExplicitPassphraseClientLacros> explicit_passphrase_client_;
 
     bool is_passphrase_required_;
     bool is_passphrase_available_;
@@ -82,8 +81,7 @@
     bool is_passphrase_available() const { return is_passphrase_available_; }
 
    private:
-    base::raw_ptr<SyncExplicitPassphraseClientLacros>
-        explicit_passphrase_client_;
+    raw_ptr<SyncExplicitPassphraseClientLacros> explicit_passphrase_client_;
     mojo::Receiver<crosapi::mojom::SyncExplicitPassphraseClientObserver>
         receiver_{this};
 
@@ -102,7 +100,7 @@
   void OnQueryDecryptionKeyFromAshCompleted(
       crosapi::mojom::NigoriKeyPtr mojo_nigori_key);
 
-  base::raw_ptr<syncer::SyncService> sync_service_;
+  raw_ptr<syncer::SyncService> sync_service_;
   LacrosSyncServiceObserver sync_service_observer_;
   std::unique_ptr<AshSyncExplicitPassphraseClientObserver>
       ash_explicit_passphrase_client_observer_;

diff --git a/chrome/browser/lacros/sync/sync_user_settings_client_lacros.h b/chrome/browser/lacros/sync/sync_user_settings_client_lacros.h
index 968dfb5..0fedaa217 100644
--- a/chrome/browser/lacros/sync/sync_user_settings_client_lacros.h
+++ b/chrome/browser/lacros/sync/sync_user_settings_client_lacros.h

@@ -36,7 +36,7 @@
  private:
   void OnIsAppsSyncEnabledFetched(bool is_apps_sync_enabled);
 
-  base::raw_ptr<syncer::SyncUserSettings> sync_user_settings_;
+  raw_ptr<syncer::SyncUserSettings> sync_user_settings_;
   mojo::Receiver<crosapi::mojom::SyncUserSettingsClientObserver>
       observer_receiver_{this};
   mojo::Remote<crosapi::mojom::SyncUserSettingsClient> remote_;

diff --git a/chrome/browser/metrics/chromeos_metrics_provider.h b/chrome/browser/metrics/chromeos_metrics_provider.h
index aeaa351..0de8377 100644
--- a/chrome/browser/metrics/chromeos_metrics_provider.h
+++ b/chrome/browser/metrics/chromeos_metrics_provider.h

@@ -70,7 +70,7 @@
   std::unique_ptr<metrics::ProfileProvider> profile_provider_;
 
   // Interface for providing the SystemProfile to metrics.
-  base::raw_ptr<ChromeOSSystemProfileProvider> cros_system_profile_provider_;
+  raw_ptr<ChromeOSSystemProfileProvider> cros_system_profile_provider_;
 
   base::WeakPtrFactory<ChromeOSMetricsProvider> weak_ptr_factory_{this};
 };

diff --git a/chrome/browser/password_manager/web_app_profile_switcher.h b/chrome/browser/password_manager/web_app_profile_switcher.h
index b4cf640..780847a 100644
--- a/chrome/browser/password_manager/web_app_profile_switcher.h
+++ b/chrome/browser/password_manager/web_app_profile_switcher.h

@@ -61,7 +61,7 @@
   web_app::AppId app_id_;
 
   // The profile for which the app is already open.
-  base::raw_ref<Profile> active_profile_;
+  raw_ref<Profile> active_profile_;
 
   // The callback that needs to be invoked when the profile is switched,
   // or when switching is aborted.

diff --git a/chrome/browser/policy/status_provider/updater_status_and_value_provider.h b/chrome/browser/policy/status_provider/updater_status_and_value_provider.h
index db9d506..b6d4b34 100644
--- a/chrome/browser/policy/status_provider/updater_status_and_value_provider.h
+++ b/chrome/browser/policy/status_provider/updater_status_and_value_provider.h

@@ -54,7 +54,7 @@
   std::unique_ptr<GoogleUpdateState> updater_status_;
   std::unique_ptr<policy::PolicyMap> updater_policies_;
   std::string domain_;
-  base::raw_ptr<Profile> profile_;
+  raw_ptr<Profile> profile_;
   base::WeakPtrFactory<UpdaterStatusAndValueProvider> weak_factory_{this};
 };
 

diff --git a/chrome/browser/policy/value_provider/chrome_policies_value_provider.h b/chrome/browser/policy/value_provider/chrome_policies_value_provider.h
index 305e955b..1d4fe08 100644
--- a/chrome/browser/policy/value_provider/chrome_policies_value_provider.h
+++ b/chrome/browser/policy/value_provider/chrome_policies_value_provider.h

@@ -43,7 +43,7 @@
  private:
   void OnRefreshPoliciesDone();
 
-  base::raw_ptr<Profile> profile_;
+  raw_ptr<Profile> profile_;
   base::WeakPtrFactory<ChromePoliciesValueProvider> weak_ptr_factory_{this};
 };
 

diff --git a/chrome/browser/policy/value_provider/extension_policies_value_provider.h b/chrome/browser/policy/value_provider/extension_policies_value_provider.h
index 20c8864..c76a407 100644
--- a/chrome/browser/policy/value_provider/extension_policies_value_provider.h
+++ b/chrome/browser/policy/value_provider/extension_policies_value_provider.h

@@ -55,7 +55,7 @@
   base::ScopedObservation<extensions::ExtensionRegistry,
                           extensions::ExtensionRegistryObserver>
       extension_registry_observation_{this};
-  base::raw_ptr<Profile> profile_;
+  raw_ptr<Profile> profile_;
 };
 
 #endif  // CHROME_BROWSER_POLICY_VALUE_PROVIDER_EXTENSION_POLICIES_VALUE_PROVIDER_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 ec5c2b52..6f34530e 100644
--- a/chrome/browser/preloading/prefetch/search_prefetch/search_prefetch_request.h
+++ b/chrome/browser/preloading/prefetch/search_prefetch/search_prefetch_request.h

@@ -251,7 +251,7 @@
   // before we receive a prefetch response or the prerender is not created.
   base::WeakPtr<content::PreloadingAttempt> prerender_preloading_attempt_;
 
-  base::raw_ptr<Profile> profile_;
+  raw_ptr<Profile> profile_;
 };
 
 // Used when DCHECK_STATE_TRANSITION triggers.

diff --git a/chrome/browser/signin/bound_session_credentials/registration_token_helper.h b/chrome/browser/signin/bound_session_credentials/registration_token_helper.h
index a827825..083b145 100644
--- a/chrome/browser/signin/bound_session_credentials/registration_token_helper.h
+++ b/chrome/browser/signin/bound_session_credentials/registration_token_helper.h

@@ -65,7 +65,7 @@
   void OnDataSigned(
       unexportable_keys::ServiceErrorOr<std::vector<uint8_t>> result);
 
-  const base::raw_ref<unexportable_keys::UnexportableKeyService>
+  const raw_ref<unexportable_keys::UnexportableKeyService>
       unexportable_key_service_;
   const std::string client_id_;
   const std::string auth_code_;

diff --git a/chrome/browser/sync/test/integration/contact_info_helper.h b/chrome/browser/sync/test/integration/contact_info_helper.h
index 9a92f76..67da2d2 100644
--- a/chrome/browser/sync/test/integration/contact_info_helper.h
+++ b/chrome/browser/sync/test/integration/contact_info_helper.h

@@ -36,7 +36,7 @@
   void OnPersonalDataChanged() override;
 
  private:
-  const base::raw_ptr<autofill::PersonalDataManager> pdm_;
+  const raw_ptr<autofill::PersonalDataManager> pdm_;
   const testing::Matcher<std::vector<autofill::AutofillProfile>> matcher_;
 };
 

diff --git a/chrome/browser/sync/test/integration/invalidations/fake_server_sync_invalidation_sender.h b/chrome/browser/sync/test/integration/invalidations/fake_server_sync_invalidation_sender.h
index c9acf91..bfd9248 100644
--- a/chrome/browser/sync/test/integration/invalidations/fake_server_sync_invalidation_sender.h
+++ b/chrome/browser/sync/test/integration/invalidations/fake_server_sync_invalidation_sender.h

@@ -77,7 +77,7 @@
   // invalidations to a corresponding client.
   std::map<std::string, syncer::ModelTypeSet> token_to_interested_data_types_;
 
-  std::vector<base::raw_ptr<instance_id::FakeGCMDriverForInstanceID>>
+  std::vector<raw_ptr<instance_id::FakeGCMDriverForInstanceID>>
       fake_gcm_drivers_;
 };
 

diff --git a/chrome/browser/sync/test/integration/preferences_helper.h b/chrome/browser/sync/test/integration/preferences_helper.h
index d4e54ac..280bab4b 100644
--- a/chrome/browser/sync/test/integration/preferences_helper.h
+++ b/chrome/browser/sync/test/integration/preferences_helper.h

@@ -103,7 +103,7 @@
   const char* path_;
   const bool expected_value_;
 
-  const base::raw_ptr<PrefService> pref_service_;
+  const raw_ptr<PrefService> pref_service_;
   PrefChangeRegistrar pref_change_registrar_;
 };
 

diff --git a/chrome/browser/sync/test/integration/single_client_arc_package_sync_test.cc b/chrome/browser/sync/test/integration/single_client_arc_package_sync_test.cc
index 960ba3d5..af8ced0 100644
--- a/chrome/browser/sync/test/integration/single_client_arc_package_sync_test.cc
+++ b/chrome/browser/sync/test/integration/single_client_arc_package_sync_test.cc

@@ -45,7 +45,7 @@
   }
 
  private:
-  const base::raw_ptr<Profile> profile_;
+  const raw_ptr<Profile> profile_;
   const size_t expected_count_;
 };
 

diff --git a/chrome/browser/ui/ash/auth/cryptohome_pin_engine.h b/chrome/browser/ui/ash/auth/cryptohome_pin_engine.h
index 6a915c0..b1fbe83e 100644
--- a/chrome/browser/ui/ash/auth/cryptohome_pin_engine.h
+++ b/chrome/browser/ui/ash/auth/cryptohome_pin_engine.h

@@ -64,7 +64,7 @@
                                      absl::optional<AuthenticationError> error);
 
   // Non owning pointer
-  const base::raw_ptr<ash::AuthPerformer> auth_performer_;
+  const raw_ptr<ash::AuthPerformer> auth_performer_;
 
   ash::AuthFactorEditor auth_factor_editor_;
 

diff --git a/chrome/browser/ui/ash/auth/legacy_fingerprint_engine.h b/chrome/browser/ui/ash/auth/legacy_fingerprint_engine.h
index 4ee1014a..33ffc7f 100644
--- a/chrome/browser/ui/ash/auth/legacy_fingerprint_engine.h
+++ b/chrome/browser/ui/ash/auth/legacy_fingerprint_engine.h

@@ -64,7 +64,7 @@
 
  private:
   // Non owning pointer
-  const base::raw_ptr<AuthPerformer> auth_performer_;
+  const raw_ptr<AuthPerformer> auth_performer_;
 
   base::WeakPtrFactory<LegacyFingerprintEngine> weak_factory_{this};
 };

diff --git a/chrome/browser/ui/ash/media_client_impl_unittest.cc b/chrome/browser/ui/ash/media_client_impl_unittest.cc
index 8a08d21..ce2d0f0 100644
--- a/chrome/browser/ui/ash/media_client_impl_unittest.cc
+++ b/chrome/browser/ui/ash/media_client_impl_unittest.cc

@@ -382,7 +382,7 @@
   MediaClientImpl media_client_;
   SystemNotificationHelper system_notification_helper_;
   user_manager::FakeUserManager user_manager_;
-  base::raw_ptr<MockNewWindowDelegate> new_window_delegate_ = nullptr;
+  raw_ptr<MockNewWindowDelegate> new_window_delegate_ = nullptr;
   std::unique_ptr<ash::TestNewWindowDelegateProvider> window_delegate_provider_;
   std::vector<media::VideoCaptureDeviceInfo> video_capture_devices_;
 };

diff --git a/chrome/browser/ui/ash/sharesheet/sharesheet_target_button.h b/chrome/browser/ui/ash/sharesheet/sharesheet_target_button.h
index 39895ff5..267f1821 100644
--- a/chrome/browser/ui/ash/sharesheet/sharesheet_target_button.h
+++ b/chrome/browser/ui/ash/sharesheet/sharesheet_target_button.h

@@ -46,7 +46,7 @@
  private:
   void SetLabelProperties(views::Label* label);
 
-  base::raw_ptr<views::ImageView> image_;
+  raw_ptr<views::ImageView> image_;
   raw_ptr<const gfx::VectorIcon, ExperimentalAsh> vector_icon_;
 };
 

diff --git a/chrome/browser/ui/ash/system_web_apps/system_web_app_icon_checker_impl.h b/chrome/browser/ui/ash/system_web_apps/system_web_app_icon_checker_impl.h
index 38ad527f..44576dc 100644
--- a/chrome/browser/ui/ash/system_web_apps/system_web_app_icon_checker_impl.h
+++ b/chrome/browser/ui/ash/system_web_apps/system_web_app_icon_checker_impl.h

@@ -31,7 +31,7 @@
       std::vector<absl::optional<web_app::WebAppIconDiagnostic::Result>>
           results);
 
-  base::raw_ptr<Profile> profile_;
+  raw_ptr<Profile> profile_;
   std::vector<std::unique_ptr<web_app::WebAppIconDiagnostic>> checkers_;
   base::WeakPtrFactory<SystemWebAppIconCheckerImpl> weak_ptr_factory_{this};
 };

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 42bf2f1..8e97a9d6 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

@@ -43,7 +43,7 @@
   }
 
  protected:
-  base::raw_ptr<content::WebContents> web_contents() const {
+  raw_ptr<content::WebContents> web_contents() const {
     return browser()->tab_strip_model()->GetActiveWebContents();
   }
 

diff --git a/chrome/browser/ui/commerce/price_tracking/shopping_list_ui_tab_helper_unittest.cc b/chrome/browser/ui/commerce/price_tracking/shopping_list_ui_tab_helper_unittest.cc
index a83f6fb..21ca2dfb 100644
--- a/chrome/browser/ui/commerce/price_tracking/shopping_list_ui_tab_helper_unittest.cc
+++ b/chrome/browser/ui/commerce/price_tracking/shopping_list_ui_tab_helper_unittest.cc

@@ -135,7 +135,7 @@
   }
 
  protected:
-  base::raw_ptr<ShoppingListUiTabHelper> tab_helper_;
+  raw_ptr<ShoppingListUiTabHelper> tab_helper_;
   std::unique_ptr<MockShoppingService> shopping_service_;
   std::unique_ptr<bookmarks::BookmarkModel> bookmark_model_;
   std::unique_ptr<image_fetcher::MockImageFetcher> image_fetcher_;
@@ -148,7 +148,7 @@
   content::TestWebContentsFactory test_web_contents_factory_;
 
  protected:
-  base::raw_ptr<content::WebContents> web_contents_;
+  raw_ptr<content::WebContents> web_contents_;
 };
 
 TEST_F(ShoppingListUiTabHelperTest, TestSubscriptionEventsUpdateState) {

diff --git a/chrome/browser/ui/exclusive_access/exclusive_access_controller_base.h b/chrome/browser/ui/exclusive_access/exclusive_access_controller_base.h
index 93f81bc..1b06b5c 100644
--- a/chrome/browser/ui/exclusive_access/exclusive_access_controller_base.h
+++ b/chrome/browser/ui/exclusive_access/exclusive_access_controller_base.h

@@ -75,7 +75,7 @@
     using content::WebContentsObserver::Observe;
 
    private:
-    const base::raw_ref<ExclusiveAccessControllerBase> controller_;
+    const raw_ref<ExclusiveAccessControllerBase> controller_;
   } web_contents_observer_{*this};
 };
 

diff --git a/chrome/browser/ui/views/autofill/address_editor_view_unittest.cc b/chrome/browser/ui/views/autofill/address_editor_view_unittest.cc
index 8d6a257..753b89bc 100644
--- a/chrome/browser/ui/views/autofill/address_editor_view_unittest.cc
+++ b/chrome/browser/ui/views/autofill/address_editor_view_unittest.cc

@@ -50,7 +50,7 @@
   autofill::AutofillProfile profile_to_edit_;
   TestingProfile profile_;
   std::unique_ptr<content::WebContents> test_web_contents_;
-  base::raw_ptr<AddressEditorController> controller_;
+  raw_ptr<AddressEditorController> controller_;
   std::unique_ptr<AddressEditorView> view_;
 };
 

diff --git a/chrome/browser/ui/views/borealis/borealis_splash_screen_view.h b/chrome/browser/ui/views/borealis/borealis_splash_screen_view.h
index 6491eb0..a17755c 100644
--- a/chrome/browser/ui/views/borealis/borealis_splash_screen_view.h
+++ b/chrome/browser/ui/views/borealis/borealis_splash_screen_view.h

@@ -41,7 +41,7 @@
 
  private:
   raw_ptr<Profile, ExperimentalAsh> profile_ = nullptr;
-  base::raw_ptr<views::Label> starting_label_;
+  raw_ptr<views::Label> starting_label_;
   base::WeakPtrFactory<BorealisSplashScreenView> weak_factory_;
 };
 

diff --git a/chrome/browser/ui/views/webid/account_selection_bubble_view.cc b/chrome/browser/ui/views/webid/account_selection_bubble_view.cc
index 0ce0f9ae..e6279c0 100644
--- a/chrome/browser/ui/views/webid/account_selection_bubble_view.cc
+++ b/chrome/browser/ui/views/webid/account_selection_bubble_view.cc

@@ -233,7 +233,7 @@
   }
 
  private:
-  base::raw_ptr<AccountSelectionBubbleView> bubble_view_;
+  raw_ptr<AccountSelectionBubbleView> bubble_view_;
   absl::optional<SkColor> brand_background_color_;
   absl::optional<SkColor> brand_text_color_;
 };
@@ -327,7 +327,7 @@
 
   // The AccountSelectionBubbleView outlives IdpImageView so it is safe to store
   // a raw pointer to it.
-  base::raw_ptr<AccountSelectionBubbleView> bubble_view_;
+  raw_ptr<AccountSelectionBubbleView> bubble_view_;
 
   base::WeakPtrFactory<IdpImageView> weak_ptr_factory_{this};
 };

diff --git a/chrome/browser/ui/views/webid/fedcm_account_selection_view_desktop_unittest.cc b/chrome/browser/ui/views/webid/fedcm_account_selection_view_desktop_unittest.cc
index c6c3d93a..4fb12d9 100644
--- a/chrome/browser/ui/views/webid/fedcm_account_selection_view_desktop_unittest.cc
+++ b/chrome/browser/ui/views/webid/fedcm_account_selection_view_desktop_unittest.cc

@@ -130,8 +130,8 @@
   }
 
  private:
-  base::raw_ptr<views::Widget> widget_;
-  base::raw_ptr<TestBubbleView> bubble_view_;
+  raw_ptr<views::Widget> widget_;
+  raw_ptr<TestBubbleView> bubble_view_;
 };
 
 // Stub AccountSelectionView::Delegate.
@@ -155,7 +155,7 @@
   content::WebContents* GetWebContents() override { return web_contents_; }
 
  private:
-  base::raw_ptr<content::WebContents> web_contents_;
+  raw_ptr<content::WebContents> web_contents_;
 };
 
 }  // namespace

diff --git a/chrome/browser/ui/webui/ash/drive_internals_ui.cc b/chrome/browser/ui/webui/ash/drive_internals_ui.cc
index 12e92d68..b5b3730 100644
--- a/chrome/browser/ui/webui/ash/drive_internals_ui.cc
+++ b/chrome/browser/ui/webui/ash/drive_internals_ui.cc

@@ -997,7 +997,7 @@
   }
 
   // DriveFS bulk-pinning manager.
-  base::raw_ptr<PinManager> pin_manager_ = nullptr;
+  raw_ptr<PinManager> pin_manager_ = nullptr;
 
   // The last event sent to the JavaScript side.
   int last_sent_event_id_ = -1;

diff --git a/chrome/browser/ui/webui/ash/login/gaia_screen_handler.h b/chrome/browser/ui/webui/ash/login/gaia_screen_handler.h
index 0f369f8..a499da5 100644
--- a/chrome/browser/ui/webui/ash/login/gaia_screen_handler.h
+++ b/chrome/browser/ui/webui/ash/login/gaia_screen_handler.h

@@ -441,7 +441,7 @@
   // Network state informer used to keep signin screen up.
   scoped_refptr<NetworkStateInformer> network_state_informer_;
 
-  const base::raw_ptr<ErrorScreen, DanglingUntriaged> error_screen_;
+  const raw_ptr<ErrorScreen, DanglingUntriaged> error_screen_;
 
   NetworkStateInformer::State last_network_state_ =
       NetworkStateInformer::UNKNOWN;

diff --git a/chrome/browser/ui/webui/ash/login/locale_switch_screen_handler.h b/chrome/browser/ui/webui/ash/login/locale_switch_screen_handler.h
index d6a0803..d86dcde 100644
--- a/chrome/browser/ui/webui/ash/login/locale_switch_screen_handler.h
+++ b/chrome/browser/ui/webui/ash/login/locale_switch_screen_handler.h

@@ -42,7 +42,7 @@
       ::login::LocalizedValuesBuilder* builder) override;
 
  private:
-  base::raw_ptr<CoreOobeView> core_oobe_view_;
+  raw_ptr<CoreOobeView> core_oobe_view_;
 };
 
 }  // namespace ash

diff --git a/chrome/browser/ui/webui/ash/login/welcome_screen_handler.h b/chrome/browser/ui/webui/ash/login/welcome_screen_handler.h
index 6a49087..d0ab99d 100644
--- a/chrome/browser/ui/webui/ash/login/welcome_screen_handler.h
+++ b/chrome/browser/ui/webui/ash/login/welcome_screen_handler.h

@@ -98,7 +98,7 @@
   // Returns available timezones.
   static base::Value::List GetTimezoneList();
 
-  const base::raw_ptr<CoreOobeView> core_oobe_view_;
+  const raw_ptr<CoreOobeView> core_oobe_view_;
 };
 
 }  // namespace ash

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 d6e4d66..bb2d2b8 100644
--- a/chrome/browser/ui/webui/history_clusters/history_clusters_handler.h
+++ b/chrome/browser/ui/webui/history_clusters/history_clusters_handler.h

@@ -129,7 +129,7 @@
 
   // Used only for hiding History visits. It's not used for querying History,
   // because we do our querying with HistoryClustersService.
-  base::raw_ptr<history::HistoryService> history_service_;
+  raw_ptr<history::HistoryService> history_service_;
 
   // Used only for deleting History properly, and observing deletions that occur
   // from other tabs. It's not used for querying History, because we do our

diff --git a/chrome/browser/ui/webui/settings/ash/crostini_section_unittest.cc b/chrome/browser/ui/webui/settings/ash/crostini_section_unittest.cc
index 0739cdbf8..a6bf1d3 100644
--- a/chrome/browser/ui/webui/settings/ash/crostini_section_unittest.cc
+++ b/chrome/browser/ui/webui/settings/ash/crostini_section_unittest.cc

@@ -70,7 +70,7 @@
  private:
   content::BrowserTaskEnvironment task_environment_;
   std::unique_ptr<TestingProfileManager> profile_manager_;
-  base::raw_ptr<TestingProfile> profile_;
+  raw_ptr<TestingProfile> profile_;
 };
 
 // Test that Bruschetta doesn't show up when it's disabled by flags.

diff --git a/chrome/browser/web_applications/commands/install_from_sync_command.h b/chrome/browser/web_applications/commands/install_from_sync_command.h
index e364c8c..e3447706 100644
--- a/chrome/browser/web_applications/commands/install_from_sync_command.h
+++ b/chrome/browser/web_applications/commands/install_from_sync_command.h

@@ -111,8 +111,8 @@
   std::unique_ptr<SharedWebContentsWithAppLockDescription> lock_description_;
   std::unique_ptr<SharedWebContentsWithAppLock> lock_;
 
-  const base::raw_ptr<WebAppUrlLoader> url_loader_;
-  const base::raw_ptr<Profile> profile_;
+  const raw_ptr<WebAppUrlLoader> url_loader_;
+  const raw_ptr<Profile> profile_;
   const std::unique_ptr<WebAppDataRetriever> data_retriever_;
   const Params params_;
   OnceInstallCallback install_callback_;

diff --git a/chrome/browser/web_applications/commands/install_from_sync_command_unittest.cc b/chrome/browser/web_applications/commands/install_from_sync_command_unittest.cc
index 3b7223e..c9a93eb7 100644
--- a/chrome/browser/web_applications/commands/install_from_sync_command_unittest.cc
+++ b/chrome/browser/web_applications/commands/install_from_sync_command_unittest.cc

@@ -234,7 +234,7 @@
     return base::UTF8ToUTF16(registrar().GetAppShortName(app_id));
   }
 
-  base::raw_ptr<TestWebAppUrlLoader> command_manager_url_loader_;
+  raw_ptr<TestWebAppUrlLoader> command_manager_url_loader_;
   std::unique_ptr<TestWebAppUrlLoader> url_loader_;
 };
 

diff --git a/chrome/browser/web_applications/commands/sub_app_install_command_unittest.cc b/chrome/browser/web_applications/commands/sub_app_install_command_unittest.cc
index c93e67b..6788d3d 100644
--- a/chrome/browser/web_applications/commands/sub_app_install_command_unittest.cc
+++ b/chrome/browser/web_applications/commands/sub_app_install_command_unittest.cc

@@ -131,7 +131,7 @@
   const GURL parent_url_{"http://www.foo.bar/web_apps/basic.html"};
   const GURL sub_app_url_{"http://www.foo.bar/web_apps/standalone/basic.html"};
 
-  base::raw_ptr<TestWebAppUrlLoader> command_manager_url_loader_;
+  raw_ptr<TestWebAppUrlLoader> command_manager_url_loader_;
 };
 
 TEST_F(SubAppInstallCommandTest, InstallSingleAppSuccess) {

diff --git a/chrome/browser/web_applications/isolated_web_apps/get_isolated_web_app_browsing_data_command.h b/chrome/browser/web_applications/isolated_web_apps/get_isolated_web_app_browsing_data_command.h
index 2b104c1..e8d82e94 100644
--- a/chrome/browser/web_applications/isolated_web_apps/get_isolated_web_app_browsing_data_command.h
+++ b/chrome/browser/web_applications/isolated_web_apps/get_isolated_web_app_browsing_data_command.h

@@ -50,7 +50,7 @@
   void StoragePartitionSizeFetched(const url::Origin& iwa_origin, int64_t size);
   void MaybeCompleteCommand();
 
-  base::raw_ptr<Profile> profile_;
+  raw_ptr<Profile> profile_;
   BrowsingDataCallback callback_;
 
   std::unique_ptr<AllAppsLockDescription> lock_description_;

diff --git a/chrome/browser/web_applications/isolated_web_apps/isolated_web_app_trust_checker.h b/chrome/browser/web_applications/isolated_web_apps/isolated_web_app_trust_checker.h
index dbddc8dc..21cfc51 100644
--- a/chrome/browser/web_applications/isolated_web_apps/isolated_web_app_trust_checker.h
+++ b/chrome/browser/web_applications/isolated_web_apps/isolated_web_app_trust_checker.h

@@ -93,7 +93,7 @@
   [[nodiscard]] bool IsTrustedViaDevMode(
       const web_package::SignedWebBundleId& web_bundle_id) const;
 
-  base::raw_ref<const PrefService> pref_service_;
+  raw_ref<const PrefService> pref_service_;
 
   base::WeakPtrFactory<IsolatedWebAppTrustChecker> weak_ptr_factory_{this};
 };

diff --git a/chrome/browser/web_applications/isolated_web_apps/pending_install_info_unittest.cc b/chrome/browser/web_applications/isolated_web_apps/pending_install_info_unittest.cc
index 3df9130..3ffb203 100644
--- a/chrome/browser/web_applications/isolated_web_apps/pending_install_info_unittest.cc
+++ b/chrome/browser/web_applications/isolated_web_apps/pending_install_info_unittest.cc

@@ -43,7 +43,7 @@
   content::WebContents& web_contents() { return *web_contents_; }
 
  private:
-  base::raw_ref<content::BrowserContext> context_;
+  raw_ref<content::BrowserContext> context_;
 
   std::unique_ptr<content::WebContents> web_contents_ =
       content::WebContents::Create(

diff --git a/chrome/browser/web_applications/locks/with_shared_web_contents_resources.h b/chrome/browser/web_applications/locks/with_shared_web_contents_resources.h
index d7f4d34..40efaed 100644
--- a/chrome/browser/web_applications/locks/with_shared_web_contents_resources.h
+++ b/chrome/browser/web_applications/locks/with_shared_web_contents_resources.h

@@ -34,7 +34,7 @@
 
  private:
   base::WeakPtr<WebAppLockManager> lock_manager_;
-  base::raw_ref<content::WebContents> shared_web_contents_;
+  raw_ref<content::WebContents> shared_web_contents_;
 };
 
 }  // namespace web_app

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 cc6a13a1..d8276a8 100644
--- a/chrome/browser/web_applications/web_app_command_manager_unittest.cc
+++ b/chrome/browser/web_applications/web_app_command_manager_unittest.cc

@@ -188,7 +188,7 @@
   TestWebAppUrlLoader* url_loader() const { return url_loader_.get(); }
 
  private:
-  base::raw_ptr<TestWebAppUrlLoader> url_loader_;
+  raw_ptr<TestWebAppUrlLoader> url_loader_;
 };
 
 TEST_F(WebAppCommandManagerTest, SimpleCommand) {

diff --git a/chrome/browser/webid/federated_identity_api_permission_context_unittest.cc b/chrome/browser/webid/federated_identity_api_permission_context_unittest.cc
index 91e2495..6c086fd 100644
--- a/chrome/browser/webid/federated_identity_api_permission_context_unittest.cc
+++ b/chrome/browser/webid/federated_identity_api_permission_context_unittest.cc

@@ -42,8 +42,8 @@
   Profile* profile() { return &profile_; }
 
  protected:
-  base::raw_ptr<FederatedIdentityApiPermissionContext> context_;
-  base::raw_ptr<HostContentSettingsMap> host_content_settings_map_;
+  raw_ptr<FederatedIdentityApiPermissionContext> context_;
+  raw_ptr<HostContentSettingsMap> host_content_settings_map_;
 
   ContentSetting GetContentSetting(const GURL& rp_url) {
     return host_content_settings_map_->GetContentSetting(

diff --git a/chrome/browser/webid/federated_identity_auto_reauthn_permission_context_unittest.cc b/chrome/browser/webid/federated_identity_auto_reauthn_permission_context_unittest.cc
index a053280..36693f4 100644
--- a/chrome/browser/webid/federated_identity_auto_reauthn_permission_context_unittest.cc
+++ b/chrome/browser/webid/federated_identity_auto_reauthn_permission_context_unittest.cc

@@ -34,8 +34,8 @@
   Profile* profile() { return &profile_; }
 
  protected:
-  base::raw_ptr<FederatedIdentityAutoReauthnPermissionContext> context_;
-  base::raw_ptr<HostContentSettingsMap> host_content_settings_map_;
+  raw_ptr<FederatedIdentityAutoReauthnPermissionContext> context_;
+  raw_ptr<HostContentSettingsMap> host_content_settings_map_;
 
   ContentSetting GetContentSetting(const GURL& rp_url) {
     return host_content_settings_map_->GetContentSetting(

diff --git a/chrome/renderer/accessibility/ax_tree_distiller.cc b/chrome/renderer/accessibility/ax_tree_distiller.cc
index b210906..1c5035d 100644
--- a/chrome/renderer/accessibility/ax_tree_distiller.cc
+++ b/chrome/renderer/accessibility/ax_tree_distiller.cc

@@ -129,10 +129,10 @@
   DCHECK(main_content_extractor_.is_bound());
   main_content_extractor_->ExtractMainContent(
       snapshot, ukm_source_id,
-      base::BindOnce(&AXTreeDistiller::ProcessScreen2xResult,
-                     weak_ptr_factory_.GetWeakPtr(),
-                     base::UnsafeDanglingUntriaged(
-                         base::raw_ref<const ui::AXTree>(tree))));
+      base::BindOnce(
+          &AXTreeDistiller::ProcessScreen2xResult,
+          weak_ptr_factory_.GetWeakPtr(),
+          base::UnsafeDanglingUntriaged(raw_ref<const ui::AXTree>(tree))));
 }
 
 void AXTreeDistiller::ProcessScreen2xResult(

diff --git a/chrome/test/chromedriver/chrome/stub_devtools_client.h b/chrome/test/chromedriver/chrome/stub_devtools_client.h
index 9b199ac9..a0d32f4 100644
--- a/chrome/test/chromedriver/chrome/stub_devtools_client.h
+++ b/chrome/test/chromedriver/chrome/stub_devtools_client.h

@@ -66,7 +66,7 @@
   std::string session_id_;
   std::string tunnel_session_id_;
   std::list<DevToolsEventListener*> listeners_;
-  base::raw_ptr<WebViewImpl> owner_ = nullptr;
+  raw_ptr<WebViewImpl> owner_ = nullptr;
   bool is_connected_ = false;
 };
 

diff --git a/chrome/test/chromedriver/chrome/web_view_impl_unittest.cc b/chrome/test/chromedriver/chrome/web_view_impl_unittest.cc
index f0d0e84..836234f 100644
--- a/chrome/test/chromedriver/chrome/web_view_impl_unittest.cc
+++ b/chrome/test/chromedriver/chrome/web_view_impl_unittest.cc

@@ -796,7 +796,7 @@
 
   BrowserInfo browser_info;
   std::unique_ptr<WebViewImpl> view;
-  base::raw_ptr<FakeDevToolsClient> client_ptr;
+  raw_ptr<FakeDevToolsClient> client_ptr;
 };
 
 TEST_P(CallUserSyncScriptArgs, Root) {

diff --git a/chrome/test/interaction/interaction_test_util_browser.cc b/chrome/test/interaction/interaction_test_util_browser.cc
index 5766a83..4c80292 100644
--- a/chrome/test/interaction/interaction_test_util_browser.cc
+++ b/chrome/test/interaction/interaction_test_util_browser.cc

@@ -73,7 +73,7 @@
   }
 
  private:
-  base::raw_ptr<views::View> view_ = nullptr;
+  raw_ptr<views::View> view_ = nullptr;
   std::string screenshot_name_;
   std::string baseline_;
 };

diff --git a/chrome/test/interaction/interaction_test_util_browser_unittest.cc b/chrome/test/interaction/interaction_test_util_browser_unittest.cc
index 7390001e..1cae98d 100644
--- a/chrome/test/interaction/interaction_test_util_browser_unittest.cc
+++ b/chrome/test/interaction/interaction_test_util_browser_unittest.cc

@@ -77,7 +77,7 @@
 };
 
 TEST_F(InteractionTestUtilBrowserTest, PressHoverButton) {
-  base::raw_ptr<HoverButton> hover_button;
+  raw_ptr<HoverButton> hover_button;
   auto pressed = base::BindLambdaForTesting([&]() {
     hover_button->parent()->RemoveChildViewT(hover_button);
     hover_button = nullptr;

diff --git a/chrome/test/interaction/tracked_element_webcontents.h b/chrome/test/interaction/tracked_element_webcontents.h
index d024c9a..79de17b2 100644
--- a/chrome/test/interaction/tracked_element_webcontents.h
+++ b/chrome/test/interaction/tracked_element_webcontents.h

@@ -36,7 +36,7 @@
 
   void Init();
 
-  const base::raw_ptr<WebContentsInteractionTestUtil> owner_;
+  const raw_ptr<WebContentsInteractionTestUtil> owner_;
 };
 
 #endif  // CHROME_TEST_INTERACTION_TRACKED_ELEMENT_WEBCONTENTS_H_

diff --git a/chrome/test/interaction/webcontents_interaction_test_util.cc b/chrome/test/interaction/webcontents_interaction_test_util.cc
index c093d5f..a07a79b 100644
--- a/chrome/test/interaction/webcontents_interaction_test_util.cc
+++ b/chrome/test/interaction/webcontents_interaction_test_util.cc

@@ -279,8 +279,8 @@
     owner_->StartWatchingWebContents(web_contents);
   }
 
-  const base::raw_ptr<WebContentsInteractionTestUtil> owner_;
-  const base::raw_ptr<Browser> browser_;
+  const raw_ptr<WebContentsInteractionTestUtil> owner_;
+  const raw_ptr<Browser> browser_;
 };
 
 class WebContentsInteractionTestUtil::Poller {
@@ -342,7 +342,7 @@
   const DeepQuery where_;
   const base::TimeDelta interval_;
   const absl::optional<base::TimeDelta> timeout_;
-  const base::raw_ptr<WebContentsInteractionTestUtil> owner_;
+  const raw_ptr<WebContentsInteractionTestUtil> owner_;
   base::RepeatingTimer timer_;
   bool is_polling_ = false;
   base::WeakPtrFactory<Poller> weak_factory_{this};
@@ -494,7 +494,7 @@
   }
 
   const raw_ptr<WebContentsInteractionTestUtil> owner_;
-  base::raw_ptr<views::WebView> web_view_;
+  raw_ptr<views::WebView> web_view_;
   bool visible_ = false;
   ui::ElementContext context_;
   ui::ElementTracker::Subscription shown_subscription_;

diff --git a/chrome/test/interaction/webcontents_interaction_test_util_interactive_uitest.cc b/chrome/test/interaction/webcontents_interaction_test_util_interactive_uitest.cc
index 3289a292..fa00bee 100644
--- a/chrome/test/interaction/webcontents_interaction_test_util_interactive_uitest.cc
+++ b/chrome/test/interaction/webcontents_interaction_test_util_interactive_uitest.cc

@@ -251,7 +251,7 @@
 
   std::unique_ptr<WebContentsInteractionTestUtil> tab_search_page;
   const ui::ElementContext context = browser()->window()->GetElementContext();
-  base::raw_ptr<WebUIBubbleDialogView> bubble_view = nullptr;
+  raw_ptr<WebUIBubbleDialogView> bubble_view = nullptr;
 
   auto sequence =
       ui::InteractionSequence::Builder()

diff --git a/chrome/updater/app/server/posix/update_service_stub.cc b/chrome/updater/app/server/posix/update_service_stub.cc
index 0ca2c02..c15a3f7d 100644
--- a/chrome/updater/app/server/posix/update_service_stub.cc
+++ b/chrome/updater/app/server/posix/update_service_stub.cc

@@ -208,7 +208,7 @@
  private:
   void OnClientDisconnected();
 
-  base::raw_ptr<mojom::UpdateService> impl_;
+  raw_ptr<mojom::UpdateService> impl_;
   SEQUENCE_CHECKER(sequence_checker_);
 };
 

diff --git a/chrome/updater/lock_linux.cc b/chrome/updater/lock_linux.cc
index c8f6c4d..5e5ec358 100644
--- a/chrome/updater/lock_linux.cc
+++ b/chrome/updater/lock_linux.cc

@@ -42,10 +42,10 @@
                                                    base::TimeDelta timeout);
 
  private:
-  ScopedLockImpl(base::raw_ptr<pthread_mutex_t> mutex, int shm_fd)
+  ScopedLockImpl(raw_ptr<pthread_mutex_t> mutex, int shm_fd)
       : mutex_(mutex), shm_fd_(shm_fd) {}
 
-  base::raw_ptr<pthread_mutex_t> mutex_;
+  raw_ptr<pthread_mutex_t> mutex_;
   int shm_fd_;
 };
 

diff --git a/chrome/updater/net/network_fetcher_linux.cc b/chrome/updater/net/network_fetcher_linux.cc
index b81e015..295f828 100644
--- a/chrome/updater/net/network_fetcher_linux.cc
+++ b/chrome/updater/net/network_fetcher_linux.cc

@@ -107,7 +107,7 @@
     return response_headers.contains(lower) ? response_headers.at(lower) : "";
   }
 
-  base::raw_ptr<CURL> curl_;
+  raw_ptr<CURL> curl_;
   std::array<char, CURL_ERROR_SIZE> curl_error_buf_;
 
   // Sequence to post callbacks to.

diff --git a/chromecast/cast_core/runtime/browser/cast_runtime_content_browser_client.cc b/chromecast/cast_core/runtime/browser/cast_runtime_content_browser_client.cc
index a002732..05184b35 100644
--- a/chromecast/cast_core/runtime/browser/cast_runtime_content_browser_client.cc
+++ b/chromecast/cast_core/runtime/browser/cast_runtime_content_browser_client.cc

@@ -42,7 +42,7 @@
   void StopInternal() override { runtime_service_->Stop(); }
 
  private:
-  base::raw_ref<RuntimeServiceImpl> runtime_service_;
+  raw_ref<RuntimeServiceImpl> runtime_service_;
 };
 
 }  // namespace

diff --git a/chromecast/cast_core/runtime/browser/cast_runtime_content_browser_client.h b/chromecast/cast_core/runtime/browser/cast_runtime_content_browser_client.h
index 960a3a3..de919ca7 100644
--- a/chromecast/cast_core/runtime/browser/cast_runtime_content_browser_client.h
+++ b/chromecast/cast_core/runtime/browser/cast_runtime_content_browser_client.h

@@ -85,8 +85,7 @@
 
     // Responsible for modifying the resolution of the screen for the embedded
     // device. Set during the first (and only) call to CreateCastService().
-    base::raw_ptr<media::VideoPlaneController> video_plane_controller_ =
-        nullptr;
+    raw_ptr<media::VideoPlaneController> video_plane_controller_ = nullptr;
 
     std::atomic_bool is_buffering_enabled_{false};
   };

diff --git a/chromecast/cast_core/runtime/browser/runtime_application_service_impl.cc b/chromecast/cast_core/runtime/browser/runtime_application_service_impl.cc
index 05934a4..1622d8a 100644
--- a/chromecast/cast_core/runtime/browser/runtime_application_service_impl.cc
+++ b/chromecast/cast_core/runtime/browser/runtime_application_service_impl.cc

@@ -83,7 +83,7 @@
 
   bool was_window_created_ = false;
 
-  base::raw_ref<CastContentWindow> content_window_;
+  raw_ref<CastContentWindow> content_window_;
 };
 
 cast::common::StopReason::Type ToProtoType(

diff --git a/chromecast/cast_core/runtime/browser/runtime_application_service_impl.h b/chromecast/cast_core/runtime/browser/runtime_application_service_impl.h
index 10355a4..fd1d2ba 100644
--- a/chromecast/cast_core/runtime/browser/runtime_application_service_impl.h
+++ b/chromecast/cast_core/runtime/browser/runtime_application_service_impl.h

@@ -143,7 +143,7 @@
   const cast::common::ApplicationConfig config_;
   scoped_refptr<base::SequencedTaskRunner> task_runner_;
 
-  base::raw_ref<CastWebService> web_service_;
+  raw_ref<CastWebService> web_service_;
 
   // The WebView associated with the window in which the Cast application is
   // displayed.

diff --git a/chromecast/cast_core/runtime/browser/runtime_service_impl.h b/chromecast/cast_core/runtime/browser/runtime_service_impl.h
index ee5a9de..1a0b918 100644
--- a/chromecast/cast_core/runtime/browser/runtime_service_impl.h
+++ b/chromecast/cast_core/runtime/browser/runtime_service_impl.h

@@ -113,7 +113,7 @@
 
   scoped_refptr<base::SequencedTaskRunner> task_runner_;
 
-  base::raw_ref<CastWebService> const web_service_;
+  raw_ref<CastWebService> const web_service_;
 
   // Allows metrics, histogram, action recording, which can be reported by
   // CastRuntimeMetricsRecorderService if Cast Core starts it.

diff --git a/chromeos/ash/components/login/auth/auth_performer.h b/chromeos/ash/components/login/auth/auth_performer.h
index aab85c5..fb699158 100644
--- a/chromeos/ash/components/login/auth/auth_performer.h
+++ b/chromeos/ash/components/login/auth/auth_performer.h

@@ -176,7 +176,7 @@
       AuthSessionStatusCallback callback,
       absl::optional<user_data_auth::GetAuthSessionStatusReply> reply);
 
-  const base::raw_ptr<UserDataAuthClient, DanglingUntriaged> client_;
+  const raw_ptr<UserDataAuthClient, DanglingUntriaged> client_;
   base::WeakPtrFactory<AuthPerformer> weak_factory_{this};
 };
 

diff --git a/chromeos/ash/components/login/auth/auth_session_authenticator.h b/chromeos/ash/components/login/auth/auth_session_authenticator.h
index 25742b2..436678a 100644
--- a/chromeos/ash/components/login/auth/auth_session_authenticator.h
+++ b/chromeos/ash/components/login/auth/auth_session_authenticator.h

@@ -240,7 +240,7 @@
   std::unique_ptr<HibernateManager> hibernate_manager_;
   std::unique_ptr<MountPerformer> mount_performer_;
 
-  const base::raw_ptr<PrefService, DanglingUntriaged> local_state_;
+  const raw_ptr<PrefService, DanglingUntriaged> local_state_;
 
   base::WeakPtrFactory<AuthSessionAuthenticator> weak_factory_{this};
 };

diff --git a/chromeos/ash/components/login/auth/recovery/cryptohome_recovery_performer.h b/chromeos/ash/components/login/auth/recovery/cryptohome_recovery_performer.h
index 10b94fc..4798ff9 100644
--- a/chromeos/ash/components/login/auth/recovery/cryptohome_recovery_performer.h
+++ b/chromeos/ash/components/login/auth/recovery/cryptohome_recovery_performer.h

@@ -80,7 +80,7 @@
   std::string access_token_;
   std::unique_ptr<OAuth2AccessTokenFetcher> access_token_fetcher_;
 
-  const base::raw_ptr<UserDataAuthClient> user_data_auth_client_;
+  const raw_ptr<UserDataAuthClient> user_data_auth_client_;
   CryptohomeRecoveryServiceClient service_client_;
   scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory_;
 

diff --git a/chromeos/ash/components/login/integrity/misconfigured_user_cleaner.h b/chromeos/ash/components/login/integrity/misconfigured_user_cleaner.h
index db306157..5566eea 100644
--- a/chromeos/ash/components/login/integrity/misconfigured_user_cleaner.h
+++ b/chromeos/ash/components/login/integrity/misconfigured_user_cleaner.h

@@ -61,7 +61,7 @@
   // by `ash::Shell` and destroyed in
   // `ChromeBrowserMainPartsAsh::PostMainMessageLoopRun`, before
   // `ChromeBrowserMainPartsAsh`, the owner of this class.
-  const base::raw_ptr<SessionController, DanglingUntriaged> session_controller_;
+  const raw_ptr<SessionController, DanglingUntriaged> session_controller_;
 
   std::unique_ptr<MountPerformer> mount_performer_;
 

diff --git a/chromeos/ash/components/osauth/public/auth_attempt_consumer.h b/chromeos/ash/components/osauth/public/auth_attempt_consumer.h
index a96e0c2..4a8f42b 100644
--- a/chromeos/ash/components/osauth/public/auth_attempt_consumer.h
+++ b/chromeos/ash/components/osauth/public/auth_attempt_consumer.h

@@ -48,7 +48,7 @@
   //   * `OnUserAuthSuccess`
   virtual void OnUserAuthAttemptConfirmed(
       AuthHubConnector* connector,
-      base::raw_ptr<AuthFactorStatusConsumer>& out_consumer) = 0;
+      raw_ptr<AuthFactorStatusConsumer>& out_consumer) = 0;
 
   // AuthHub would call this method in edge-case scenario when authentication
   // was requested for account that is not present on the device.

diff --git a/chromeos/ash/services/assistant/assistant_host.h b/chromeos/ash/services/assistant/assistant_host.h
index beb9522..9ca5ab8 100644
--- a/chromeos/ash/services/assistant/assistant_host.h
+++ b/chromeos/ash/services/assistant/assistant_host.h

@@ -112,10 +112,10 @@
   void ResetRemote();
 
   // Owned by |Service|.
-  base::raw_ptr<AssistantManagerServiceImpl> service_;
+  raw_ptr<AssistantManagerServiceImpl> service_;
 
   // Owned by |AssistantManagerServiceImpl|.
-  base::raw_ptr<LibassistantServiceHost> libassistant_service_host_;
+  raw_ptr<LibassistantServiceHost> libassistant_service_host_;
 
   mojo::Remote<libassistant::mojom::LibassistantService> libassistant_service_;
 

diff --git a/chromeos/ash/services/libassistant/grpc/grpc_http_connection_client.h b/chromeos/ash/services/libassistant/grpc/grpc_http_connection_client.h
index 2c8e824..5079d8e0 100644
--- a/chromeos/ash/services/libassistant/grpc/grpc_http_connection_client.h
+++ b/chromeos/ash/services/libassistant/grpc/grpc_http_connection_client.h

@@ -58,8 +58,7 @@
   void OnRpcExited(grpc::ClientContext* context, const grpc::Status& status);
 
   // `http_connection_factory_` must outlive this class.
-  base::raw_ptr<assistant_client::HttpConnectionFactory>
-      http_connection_factory_;
+  raw_ptr<assistant_client::HttpConnectionFactory> http_connection_factory_;
 
   // The following section is only accessed by the constructor thread.
   // Thread running the completion queue.  CQ has to be shutdown before we

diff --git a/chromeos/ash/services/libassistant/grpc/grpc_http_connection_client_unittests.cc b/chromeos/ash/services/libassistant/grpc/grpc_http_connection_client_unittests.cc
index 78a3fdd..2897f43 100644
--- a/chromeos/ash/services/libassistant/grpc/grpc_http_connection_client_unittests.cc
+++ b/chromeos/ash/services/libassistant/grpc/grpc_http_connection_client_unittests.cc

@@ -85,7 +85,7 @@
   void SendOnConnectionDestroyed() { delegate_->OnConnectionDestroyed(); }
 
  private:
-  base::raw_ptr<HttpConnection::Delegate> delegate_;
+  raw_ptr<HttpConnection::Delegate> delegate_;
 };
 
 class TestHttpConnectionFactory
@@ -210,7 +210,7 @@
     client_->OnRpcReadAvailable(nullptr, response);
   }
 
-  base::raw_ptr<GrpcHttpConnectionClient> client_;
+  raw_ptr<GrpcHttpConnectionClient> client_;
   std::unique_ptr<MockStreamingWriter> writer_;
 };
 

diff --git a/chromeos/ui/frame/highlight_border_overlay.h b/chromeos/ui/frame/highlight_border_overlay.h
index 9e304dc..777cef5 100644
--- a/chromeos/ui/frame/highlight_border_overlay.h
+++ b/chromeos/ui/frame/highlight_border_overlay.h

@@ -62,8 +62,8 @@
   void UpdateNinePatchLayer();
 
   ui::Layer layer_;
-  base::raw_ptr<views::Widget> widget_;
-  base::raw_ptr<aura::Window> window_;
+  raw_ptr<views::Widget> widget_;
+  raw_ptr<aura::Window> window_;
   int rounded_corner_radius_ = 0;
 
   display::ScopedDisplayObserver display_observer_{this};

diff --git a/components/autofill/content/browser/risk/fingerprint.cc b/components/autofill/content/browser/risk/fingerprint.cc
index 24f149e..6064e159 100644
--- a/components/autofill/content/browser/risk/fingerprint.cc
+++ b/components/autofill/content/browser/risk/fingerprint.cc

@@ -476,7 +476,7 @@
   // |screen_info| using display::DisplayUtil::GetDefaultScreenInfo().
   if (web_contents) {
     content_bounds = web_contents->GetContainerBounds();
-    base::raw_ptr<content::RenderWidgetHostView> host_view =
+    raw_ptr<content::RenderWidgetHostView> host_view =
         web_contents->GetRenderWidgetHostView();
     if (host_view)
       screen_info = host_view->GetRenderWidgetHost()->GetScreenInfo();

diff --git a/components/cast_receiver/browser/application_client.cc b/components/cast_receiver/browser/application_client.cc
index b36e9c3..18ee889 100644
--- a/components/cast_receiver/browser/application_client.cc
+++ b/components/cast_receiver/browser/application_client.cc

@@ -55,7 +55,7 @@
   }
 
  private:
-  const base::raw_ref<content::WebContents> web_contents_;
+  const raw_ref<content::WebContents> web_contents_;
   media_control::MediaBlocker media_blocker_;
   url_rewrite::UrlRequestRewriteRulesManager url_request_rewrite_rules_manager_;
 };

diff --git a/components/cast_receiver/browser/bindings_manager.h b/components/cast_receiver/browser/bindings_manager.h
index d59afc0..c6368919 100644
--- a/components/cast_receiver/browser/bindings_manager.h
+++ b/components/cast_receiver/browser/bindings_manager.h

@@ -73,9 +73,9 @@
   // Used to open a MessageChannel for connecting API bindings.
   std::unique_ptr<BindingsMessagePortConnector> message_port_connector_;
 
-  base::raw_ref<MessagePortService> message_port_service_;
+  raw_ref<MessagePortService> message_port_service_;
 
-  base::raw_ref<Client> client_;
+  raw_ref<Client> client_;
 };
 
 }  // namespace cast_receiver

diff --git a/components/cast_receiver/browser/bindings_message_port_connector.h b/components/cast_receiver/browser/bindings_message_port_connector.h
index 794b143..701cbf7 100644
--- a/components/cast_receiver/browser/bindings_message_port_connector.h
+++ b/components/cast_receiver/browser/bindings_message_port_connector.h

@@ -91,11 +91,11 @@
   void ReadyToCommitNavigation(
       content::NavigationHandle* navigation_handle) override;
 
-  base::raw_ref<Client> const client_;
+  raw_ref<Client> const client_;
 
   on_load_script_injector::OnLoadScriptInjectorHost<uint64_t> script_injector_;
 
-  base::raw_ptr<content::NavigationHandle> active_navigation_ = nullptr;
+  raw_ptr<content::NavigationHandle> active_navigation_ = nullptr;
 
   base::WeakPtrFactory<BindingsMessagePortConnector> weak_factory_;
 };

diff --git a/components/cast_receiver/browser/page_state_observer.cc b/components/cast_receiver/browser/page_state_observer.cc
index 6f5869e8..bf19d6ef 100644
--- a/components/cast_receiver/browser/page_state_observer.cc
+++ b/components/cast_receiver/browser/page_state_observer.cc

@@ -153,7 +153,7 @@
   }
 
   content::NavigationHandle* navigation_handle_ = nullptr;
-  base::raw_ref<PageStateObserver> wrapped_;
+  raw_ref<PageStateObserver> wrapped_;
 };
 
 PageStateObserver::PageStateObserver()

diff --git a/components/cast_receiver/browser/runtime_application_base.h b/components/cast_receiver/browser/runtime_application_base.h
index 2b716090..902a152 100644
--- a/components/cast_receiver/browser/runtime_application_base.h
+++ b/components/cast_receiver/browser/runtime_application_base.h

@@ -116,9 +116,9 @@
 
   scoped_refptr<base::SequencedTaskRunner> task_runner_;
 
-  base::raw_ref<ApplicationClient> application_client_;
+  raw_ref<ApplicationClient> application_client_;
 
-  base::raw_ptr<EmbedderApplication> embedder_application_{nullptr};
+  raw_ptr<EmbedderApplication> embedder_application_{nullptr};
 
   // Cached mojom rules that are set iff |cast_web_view_| is not created before
   // SetUrlRewriteRules is called.

diff --git a/components/cast_receiver/browser/runtime_application_dispatcher_impl.h b/components/cast_receiver/browser/runtime_application_dispatcher_impl.h
index cd57bb8..0020e3f9 100644
--- a/components/cast_receiver/browser/runtime_application_dispatcher_impl.h
+++ b/components/cast_receiver/browser/runtime_application_dispatcher_impl.h

@@ -51,7 +51,7 @@
       const std::string& session_id) override;
 
   SEQUENCE_CHECKER(sequence_checker_);
-  base::raw_ref<ApplicationClient> const application_client_;
+  raw_ref<ApplicationClient> const application_client_;
 
   base::flat_map<std::string, std::unique_ptr<TEmbedderApplication>>
       loaded_apps_;

diff --git a/components/cast_receiver/renderer/wrapping_url_loader_throttle_provider.h b/components/cast_receiver/renderer/wrapping_url_loader_throttle_provider.h
index 33889c7..8ff1459 100644
--- a/components/cast_receiver/renderer/wrapping_url_loader_throttle_provider.h
+++ b/components/cast_receiver/renderer/wrapping_url_loader_throttle_provider.h

@@ -58,7 +58,7 @@
   void SetOnline(bool is_online) override;
 
  private:
-  base::raw_ref<Client> client_;
+  raw_ref<Client> client_;
   std::unique_ptr<blink::URLLoaderThrottleProvider> wrapped_provider_;
 
   SEQUENCE_CHECKER(sequence_checker_);

diff --git a/components/commerce/content/browser/web_contents_wrapper.h b/components/commerce/content/browser/web_contents_wrapper.h
index 0283f99..07d4f8c 100644
--- a/components/commerce/content/browser/web_contents_wrapper.h
+++ b/components/commerce/content/browser/web_contents_wrapper.h

@@ -40,7 +40,7 @@
   void ClearWebContentsPointer();
 
  private:
-  base::raw_ptr<content::WebContents> web_contents_;
+  raw_ptr<content::WebContents> web_contents_;
 
   // The ID of the isolated world to run javascript in.
   int32_t js_world_id_;

diff --git a/components/commerce/core/shopping_bookmark_model_observer.h b/components/commerce/core/shopping_bookmark_model_observer.h
index 0c32d3e..c90097e 100644
--- a/components/commerce/core/shopping_bookmark_model_observer.h
+++ b/components/commerce/core/shopping_bookmark_model_observer.h

@@ -61,9 +61,9 @@
                                const bookmarks::BookmarkNode* node) override;
 
  private:
-  base::raw_ptr<ShoppingService> shopping_service_;
+  raw_ptr<ShoppingService> shopping_service_;
 
-  base::raw_ptr<SubscriptionsManager> subscriptions_manager_;
+  raw_ptr<SubscriptionsManager> subscriptions_manager_;
 
   // A map of bookmark ID to its current URL. This is used to detect incoming
   // changes to the URL since there isn't an explicit event for it.

diff --git a/components/commerce/ios/browser/web_state_wrapper.h b/components/commerce/ios/browser/web_state_wrapper.h
index 466e2180..ccdbd43 100644
--- a/components/commerce/ios/browser/web_state_wrapper.h
+++ b/components/commerce/ios/browser/web_state_wrapper.h

@@ -39,7 +39,7 @@
   void ClearWebStatePointer();
 
  private:
-  base::raw_ptr<web::WebState> web_state_;
+  raw_ptr<web::WebState> web_state_;
 };
 
 }  // namespace commerce

diff --git a/components/device_signals/core/browser/file_system_signals_collector.h b/components/device_signals/core/browser/file_system_signals_collector.h
index b17df171..5e54ab6 100644
--- a/components/device_signals/core/browser/file_system_signals_collector.h
+++ b/components/device_signals/core/browser/file_system_signals_collector.h

@@ -49,7 +49,7 @@
       const std::vector<FileSystemItem>& file_system_items);
 
   // Instance used to retrieve a pointer to a SystemSignalsService instance.
-  base::raw_ptr<SystemSignalsServiceHost> system_service_host_;
+  raw_ptr<SystemSignalsServiceHost> system_service_host_;
 
   SEQUENCE_CHECKER(sequence_checker_);
   base::WeakPtrFactory<FileSystemSignalsCollector> weak_factory_{this};

diff --git a/components/device_signals/core/browser/signals_aggregator_impl.h b/components/device_signals/core/browser/signals_aggregator_impl.h
index a526643..ad9afc1 100644
--- a/components/device_signals/core/browser/signals_aggregator_impl.h
+++ b/components/device_signals/core/browser/signals_aggregator_impl.h

@@ -40,7 +40,7 @@
                                GetSignalsCallback callback,
                                const UserPermission user_permission);
 
-  base::raw_ptr<UserPermissionService> permission_service_;
+  raw_ptr<UserPermissionService> permission_service_;
   std::vector<std::unique_ptr<SignalsCollector>> collectors_;
 
   base::WeakPtrFactory<SignalsAggregatorImpl> weak_factory_{this};

diff --git a/components/device_signals/core/browser/user_permission_service_impl.h b/components/device_signals/core/browser/user_permission_service_impl.h
index 8e49afdd..0a980454 100644
--- a/components/device_signals/core/browser/user_permission_service_impl.h
+++ b/components/device_signals/core/browser/user_permission_service_impl.h

@@ -36,7 +36,7 @@
   void CanCollectSignals(CanCollectCallback callback) override;
 
  private:
-  base::raw_ptr<policy::ManagementService> management_service_;
+  raw_ptr<policy::ManagementService> management_service_;
   std::unique_ptr<UserDelegate> user_delegate_;
 
   base::WeakPtrFactory<UserPermissionServiceImpl> weak_factory_{this};

diff --git a/components/device_signals/core/browser/win/win_signals_collector.h b/components/device_signals/core/browser/win/win_signals_collector.h
index 282740c..8be1ec5 100644
--- a/components/device_signals/core/browser/win/win_signals_collector.h
+++ b/components/device_signals/core/browser/win/win_signals_collector.h

@@ -62,7 +62,7 @@
                                const std::vector<InstalledHotfix>& hotfixes);
 
   // Instance used to retrieve a pointer to a SystemSignalsService instance.
-  base::raw_ptr<SystemSignalsServiceHost> system_service_host_;
+  raw_ptr<SystemSignalsServiceHost> system_service_host_;
 
   SEQUENCE_CHECKER(sequence_checker_);
   base::WeakPtrFactory<WinSignalsCollector> weak_factory_{this};

diff --git a/components/devtools/simple_devtools_protocol_client/simple_devtools_protocol_client.h b/components/devtools/simple_devtools_protocol_client/simple_devtools_protocol_client.h
index d958d45..fd94493 100644
--- a/components/devtools/simple_devtools_protocol_client/simple_devtools_protocol_client.h
+++ b/components/devtools/simple_devtools_protocol_client/simple_devtools_protocol_client.h

@@ -78,7 +78,7 @@
   base::WeakPtr<SimpleDevToolsProtocolClient> GetWeakPtr();
 
   const std::string session_id_;
-  base::raw_ptr<SimpleDevToolsProtocolClient> parent_client_ = nullptr;
+  raw_ptr<SimpleDevToolsProtocolClient> parent_client_ = nullptr;
   base::flat_map<std::string, SimpleDevToolsProtocolClient*> sessions_;
 
   scoped_refptr<content::DevToolsAgentHost> agent_host_;

diff --git a/components/exo/ui_lock_controller.h b/components/exo/ui_lock_controller.h
index 539e942..fe3d4960 100644
--- a/components/exo/ui_lock_controller.h
+++ b/components/exo/ui_lock_controller.h

@@ -105,7 +105,7 @@
   raw_ptr<Surface, ExperimentalAsh> focused_surface_to_unlock_ = nullptr;
 
   // Pointers currently being captured.
-  base::flat_set<base::raw_ptr<Pointer>> captured_pointers_;
+  base::flat_set<raw_ptr<Pointer>> captured_pointers_;
 
   base::ObserverList<Notifier> notifiers_;
 

diff --git a/components/metrics/structured/structured_metrics_provider.h b/components/metrics/structured/structured_metrics_provider.h
index f58935b..0ab30e8 100644
--- a/components/metrics/structured/structured_metrics_provider.h
+++ b/components/metrics/structured/structured_metrics_provider.h

@@ -230,7 +230,7 @@
 
   // Interface for providing the SystemProfile to metrics.
   // See chrome/browser/metrics/chrome_metrics_service_client.h
-  base::raw_ptr<metrics::MetricsProvider> system_profile_provider_;
+  raw_ptr<metrics::MetricsProvider> system_profile_provider_;
 
   // A set of projects that are not allowed to be recorded. This is a cache of
   // GetDisabledProjects().

diff --git a/components/origin_trials/browser/leveldb_persistence_provider_unittest.cc b/components/origin_trials/browser/leveldb_persistence_provider_unittest.cc
index 132bb6e..e2219cd 100644
--- a/components/origin_trials/browser/leveldb_persistence_provider_unittest.cc
+++ b/components/origin_trials/browser/leveldb_persistence_provider_unittest.cc

@@ -85,8 +85,7 @@
   content::BrowserTaskEnvironment task_environment_;
   std::map<std::string, origin_trials_pb::TrialTokenDbEntries> db_entries_;
 
-  base::raw_ptr<FakeDB<origin_trials_pb::TrialTokenDbEntries>>
-      fake_db_unretained_;
+  raw_ptr<FakeDB<origin_trials_pb::TrialTokenDbEntries>> fake_db_unretained_;
   std::unique_ptr<LevelDbPersistenceProvider> persistence_provider_;
 };
 

diff --git a/components/page_load_metrics/browser/page_load_tracker.h b/components/page_load_metrics/browser/page_load_tracker.h
index 45f3a7ad..5763d87b 100644
--- a/components/page_load_metrics/browser/page_load_tracker.h
+++ b/components/page_load_metrics/browser/page_load_tracker.h

@@ -537,7 +537,7 @@
 
   // Observer's name pointer to instance map. Can be raw_ptr as the instance is
   // owned `observers` above, and is removed from the map on destruction.
-  base::flat_map<const char*, base::raw_ptr<PageLoadMetricsObserverInterface>>
+  base::flat_map<const char*, raw_ptr<PageLoadMetricsObserverInterface>>
       observers_map_;
 
   PageLoadMetricsUpdateDispatcher metrics_update_dispatcher_;

diff --git a/components/reading_list/core/dual_reading_list_model_unittest.cc b/components/reading_list/core/dual_reading_list_model_unittest.cc
index b3998a2..cf79c65 100644
--- a/components/reading_list/core/dual_reading_list_model_unittest.cc
+++ b/components/reading_list/core/dual_reading_list_model_unittest.cc

@@ -250,8 +250,8 @@
       local_or_syncable_model_storage_ptr_;
   base::WeakPtr<FakeReadingListModelStorage> account_model_storage_ptr_;
   // Owned by `dual_model_` and guaranteed to exist while `dual_model_` exists.
-  base::raw_ptr<ReadingListModelImpl> local_or_syncable_model_ptr_;
-  base::raw_ptr<ReadingListModelImpl> account_model_ptr_;
+  raw_ptr<ReadingListModelImpl> local_or_syncable_model_ptr_;
+  raw_ptr<ReadingListModelImpl> account_model_ptr_;
   std::unique_ptr<reading_list::DualReadingListModel> dual_model_;
 };
 

diff --git a/components/reporting/storage/storage_queue_stress_test.cc b/components/reporting/storage/storage_queue_stress_test.cc
index 8dde253..bf481461 100644
--- a/components/reporting/storage/storage_queue_stress_test.cc
+++ b/components/reporting/storage/storage_queue_stress_test.cc

@@ -126,7 +126,7 @@
 
   absl::optional<int64_t> generation_id_
       GUARDED_BY_CONTEXT(test_uploader_checker_);
-  const base::raw_ptr<LastRecordDigestMap> last_record_digest_map_
+  const raw_ptr<LastRecordDigestMap> last_record_digest_map_
       GUARDED_BY_CONTEXT(test_uploader_checker_);
 };
 

diff --git a/components/segmentation_platform/internal/signals/ukm_observer_unittest.cc b/components/segmentation_platform/internal/signals/ukm_observer_unittest.cc
index 61102f0..187f983 100644
--- a/components/segmentation_platform/internal/signals/ukm_observer_unittest.cc
+++ b/components/segmentation_platform/internal/signals/ukm_observer_unittest.cc

@@ -113,7 +113,7 @@
       base::test::TaskEnvironment::TimeSource::MOCK_TIME};
   std::unique_ptr<ukm::TestUkmRecorder> ukm_recorder_;
   std::unique_ptr<UkmObserver> ukm_observer_;
-  base::raw_ptr<MockUkmDatabase> ukm_database_;
+  raw_ptr<MockUkmDatabase> ukm_database_;
   std::unique_ptr<UkmDataManagerImpl> ukm_data_manager_;
   TestingPrefServiceSimple prefs_;
 };

diff --git a/components/translate/content/browser/content_translate_driver.h b/components/translate/content/browser/content_translate_driver.h
index e3670320..e4ac2a0 100644
--- a/components/translate/content/browser/content_translate_driver.h
+++ b/components/translate/content/browser/content_translate_driver.h

@@ -151,7 +151,7 @@
       GetLanguageDetectionModelCallback callback,
       bool is_available);
 
-  base::raw_ptr<TranslateManager, DanglingUntriaged> translate_manager_;
+  raw_ptr<TranslateManager, DanglingUntriaged> translate_manager_;
 
   base::ObserverList<TranslationObserver, true> translation_observers_;
 

diff --git a/components/user_education/test/test_help_bubble.h b/components/user_education/test/test_help_bubble.h
index b73f7f2..9502ba3 100644
--- a/components/user_education/test/test_help_bubble.h
+++ b/components/user_education/test/test_help_bubble.h

@@ -58,7 +58,7 @@
  private:
   void OnElementHidden(ui::TrackedElement* element);
 
-  base::raw_ptr<ui::TrackedElement> element_;
+  raw_ptr<ui::TrackedElement> element_;
   base::CallbackListSubscription element_hidden_subscription_;
   HelpBubbleParams params_;
   int focus_count_ = 0;

diff --git a/components/user_education/views/help_bubble_factory_mac.h b/components/user_education/views/help_bubble_factory_mac.h
index d66a7d5..dddff7d 100644
--- a/components/user_education/views/help_bubble_factory_mac.h
+++ b/components/user_education/views/help_bubble_factory_mac.h

@@ -27,7 +27,7 @@
       const ui::TrackedElement* element) const override;
 
  private:
-  base::raw_ptr<const HelpBubbleDelegate> delegate_;
+  raw_ptr<const HelpBubbleDelegate> delegate_;
 };
 
 }  // namespace user_education

diff --git a/components/user_education/views/help_bubble_factory_views.h b/components/user_education/views/help_bubble_factory_views.h
index c77bfd2..44fd5890 100644
--- a/components/user_education/views/help_bubble_factory_views.h
+++ b/components/user_education/views/help_bubble_factory_views.h

@@ -84,7 +84,7 @@
       scoped_observation_{this};
 
   // Track the anchor element to determine if/when it goes away.
-  base::raw_ptr<const ui::TrackedElement, DanglingUntriaged> anchor_element_;
+  raw_ptr<const ui::TrackedElement, DanglingUntriaged> anchor_element_;
 
   // Listens so that the bubble can be closed if the anchor element disappears.
   // The specific anchor view is not tracked because in a few cases (e.g. Mac
@@ -121,7 +121,7 @@
       HelpBubbleParams params);
 
  private:
-  base::raw_ptr<const HelpBubbleDelegate> delegate_;
+  raw_ptr<const HelpBubbleDelegate> delegate_;
 };
 
 }  // namespace user_education

diff --git a/components/user_education/views/help_bubble_factory_views_unittest.cc b/components/user_education/views/help_bubble_factory_views_unittest.cc
index d211c1fa..b74c0e6 100644
--- a/components/user_education/views/help_bubble_factory_views_unittest.cc
+++ b/components/user_education/views/help_bubble_factory_views_unittest.cc

@@ -76,8 +76,8 @@
 
   test::TestHelpBubbleDelegate test_delegate_;
   HelpBubbleFactoryViews factory_{&test_delegate_};
-  base::raw_ptr<views::View> contents_view_;
-  base::raw_ptr<views::View> anchor_view_;
+  raw_ptr<views::View> contents_view_;
+  raw_ptr<views::View> anchor_view_;
   std::unique_ptr<views::Widget> widget_;
 };
 

diff --git a/components/user_education/views/help_bubble_view.cc b/components/user_education/views/help_bubble_view.cc
index 0a19417..4af925be 100644
--- a/components/user_education/views/help_bubble_view.cc
+++ b/components/user_education/views/help_bubble_view.cc

@@ -172,7 +172,7 @@
   }
 
  private:
-  const base::raw_ptr<const HelpBubbleDelegate> delegate_;
+  const raw_ptr<const HelpBubbleDelegate> delegate_;
   bool is_default_button_;
 };
 
@@ -218,7 +218,7 @@
   }
 
  private:
-  const base::raw_ptr<const HelpBubbleDelegate> delegate_;
+  const raw_ptr<const HelpBubbleDelegate> delegate_;
 };
 
 BEGIN_METADATA(ClosePromoButton, views::ImageButton)
@@ -271,7 +271,7 @@
  private:
   static constexpr int kStrokeWidth = 1;
 
-  base::raw_ptr<const HelpBubbleDelegate> delegate_;
+  raw_ptr<const HelpBubbleDelegate> delegate_;
   const gfx::Size size_;
   const bool should_fill_;
 };

diff --git a/components/user_education/views/help_bubble_view.h b/components/user_education/views/help_bubble_view.h
index 5b6be2b..63638914 100644
--- a/components/user_education/views/help_bubble_view.h
+++ b/components/user_education/views/help_bubble_view.h

@@ -100,18 +100,18 @@
 
   void OnTimeout();
 
-  const base::raw_ptr<const HelpBubbleDelegate> delegate_;
+  const raw_ptr<const HelpBubbleDelegate> delegate_;
 
   // If set, overrides the anchor bounds within the anchor view.
   absl::optional<gfx::Rect> local_anchor_bounds_;
 
-  base::raw_ptr<views::ImageView> icon_view_ = nullptr;
+  raw_ptr<views::ImageView> icon_view_ = nullptr;
   std::vector<views::Label*> labels_;
 
   // If the bubble has buttons, it must be focusable.
   std::vector<views::MdTextButton*> non_default_buttons_;
-  base::raw_ptr<views::MdTextButton> default_button_ = nullptr;
-  base::raw_ptr<views::Button> close_button_ = nullptr;
+  raw_ptr<views::MdTextButton> default_button_ = nullptr;
+  raw_ptr<views::Button> close_button_ = nullptr;
 
   // This is the base accessible name of the window.
   std::u16string accessible_name_;

diff --git a/components/user_education/views/help_bubble_view_unittest.cc b/components/user_education/views/help_bubble_view_unittest.cc
index 44d18ae3..5f6728b 100644
--- a/components/user_education/views/help_bubble_view_unittest.cc
+++ b/components/user_education/views/help_bubble_view_unittest.cc

@@ -103,7 +103,7 @@
   }
 
   test::TestHelpBubbleDelegate test_delegate_;
-  base::raw_ptr<views::View> view_;
+  raw_ptr<views::View> view_;
   std::unique_ptr<views::Widget> widget_;
 };
 

diff --git a/components/user_education/webui/help_bubble_handler.cc b/components/user_education/webui/help_bubble_handler.cc
index b55840e..be7a73f 100644
--- a/components/user_education/webui/help_bubble_handler.cc
+++ b/components/user_education/webui/help_bubble_handler.cc

@@ -119,7 +119,7 @@
 
   std::unique_ptr<TrackedElementWebUI> element;
   std::unique_ptr<HelpBubbleParams> params;
-  base::raw_ptr<HelpBubbleWebUI> help_bubble = nullptr;
+  raw_ptr<HelpBubbleWebUI> help_bubble = nullptr;
   base::CallbackListSubscription external_bubble_subscription;
 
   // This is set to true if we are closing the help bubble as the result of a

diff --git a/components/user_education/webui/help_bubble_handler.h b/components/user_education/webui/help_bubble_handler.h
index b0e2575e..e2235096b 100644
--- a/components/user_education/webui/help_bubble_handler.h
+++ b/components/user_education/webui/help_bubble_handler.h

@@ -105,7 +105,7 @@
     void SetLastKnownVisibility(absl::optional<bool> visible);
 
    private:
-    base::raw_ptr<HelpBubbleHandlerBase> handler_;
+    raw_ptr<HelpBubbleHandlerBase> handler_;
   };
 
   HelpBubbleHandlerBase(std::unique_ptr<ClientProvider> client_provider,
@@ -220,7 +220,7 @@
   void ReportBadMessage(base::StringPiece error) override;
 
   mojo::Receiver<help_bubble::mojom::HelpBubbleHandler> receiver_;
-  const base::raw_ptr<content::WebUIController> controller_;
+  const raw_ptr<content::WebUIController> controller_;
 };
 
 }  // namespace user_education

diff --git a/components/user_education/webui/help_bubble_handler_unittest.cc b/components/user_education/webui/help_bubble_handler_unittest.cc
index 7b52c3f..88d44d3 100644
--- a/components/user_education/webui/help_bubble_handler_unittest.cc
+++ b/components/user_education/webui/help_bubble_handler_unittest.cc

@@ -173,8 +173,8 @@
     return test_handler_.get();
   }
 
-  base::raw_ptr<TestHelpBubbleHandler::MockVisibilityProvider>
-      visibility_provider_ = nullptr;
+  raw_ptr<TestHelpBubbleHandler::MockVisibilityProvider> visibility_provider_ =
+      nullptr;
   std::unique_ptr<TestHelpBubbleHandler> test_handler_;
   HelpBubbleFactoryRegistry help_bubble_factory_registry_;
 };

diff --git a/components/user_education/webui/help_bubble_webui.h b/components/user_education/webui/help_bubble_webui.h
index 3850c272..13c6b31 100644
--- a/components/user_education/webui/help_bubble_webui.h
+++ b/components/user_education/webui/help_bubble_webui.h

@@ -40,7 +40,7 @@
   // HelpBubble:
   void CloseBubbleImpl() override;
 
-  const base::raw_ptr<HelpBubbleHandlerBase, DanglingUntriaged> handler_;
+  const raw_ptr<HelpBubbleHandlerBase, DanglingUntriaged> handler_;
   const ui::ElementIdentifier anchor_id_;
 };
 

diff --git a/components/user_education/webui/tracked_element_webui.h b/components/user_education/webui/tracked_element_webui.h
index c95ded7a..3ceefa7 100644
--- a/components/user_education/webui/tracked_element_webui.h
+++ b/components/user_education/webui/tracked_element_webui.h

@@ -37,7 +37,7 @@
   void CustomEvent(ui::CustomElementEventType event_type);
   bool visible() const { return visible_; }
 
-  const base::raw_ptr<HelpBubbleHandlerBase> handler_;
+  const raw_ptr<HelpBubbleHandlerBase> handler_;
   bool visible_ = false;
   gfx::RectF last_known_bounds_;
 };

diff --git a/components/user_manager/known_user.h b/components/user_manager/known_user.h
index fa807937..eeac158c 100644
--- a/components/user_manager/known_user.h
+++ b/components/user_manager/known_user.h

@@ -290,7 +290,7 @@
   // Removes all obsolete prefs from all users.
   void CleanObsoletePrefs();
 
-  const base::raw_ptr<PrefService> local_state_;
+  const raw_ptr<PrefService> local_state_;
 };
 
 }  // namespace user_manager

diff --git a/components/user_manager/user_manager_base.h b/components/user_manager/user_manager_base.h
index 0321f65cd..f85f9e1 100644
--- a/components/user_manager/user_manager_base.h
+++ b/components/user_manager/user_manager_base.h

@@ -417,7 +417,7 @@
   // TaskRunner for UI thread.
   scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
 
-  const base::raw_ptr<PrefService> local_state_;
+  const raw_ptr<PrefService> local_state_;
 
   base::WeakPtrFactory<UserManagerBase> weak_factory_{this};
 };

diff --git a/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc b/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc
index 33a2a73..0c438db 100644
--- a/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc
+++ b/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc

@@ -70,7 +70,7 @@
   }
 
   mojo::Remote<mojom::BeginFrameObserver> remote_observer_;
-  base::raw_ptr<BeginFrameSource> begin_frame_source_;
+  raw_ptr<BeginFrameSource> begin_frame_source_;
 };
 
 // static

diff --git a/content/browser/attribution_reporting/attribution_interop_runner.cc b/content/browser/attribution_reporting/attribution_interop_runner.cc
index fcebb86..817d692 100644
--- a/content/browser/attribution_reporting/attribution_interop_runner.cc
+++ b/content/browser/attribution_reporting/attribution_interop_runner.cc

@@ -352,7 +352,7 @@
   }
 
   const std::unique_ptr<AttributionManagerImpl> manager_;
-  const base::raw_ptr<FakeCookieChecker> fake_cookie_checker_;
+  const raw_ptr<FakeCookieChecker> fake_cookie_checker_;
 
   const AttributionReportJsonConverter json_converter_;
 

diff --git a/content/browser/fenced_frame/redacted_fenced_frame_config_mojom_traits_unittest.cc b/content/browser/fenced_frame/redacted_fenced_frame_config_mojom_traits_unittest.cc
index dfb82fa..b0502e0 100644
--- a/content/browser/fenced_frame/redacted_fenced_frame_config_mojom_traits_unittest.cc
+++ b/content/browser/fenced_frame/redacted_fenced_frame_config_mojom_traits_unittest.cc

@@ -488,7 +488,7 @@
     TestProperty(
         &FencedFrameProperties::shared_storage_budget_metadata_,
         &RedactedFencedFrameProperties::shared_storage_budget_metadata_,
-        static_cast<base::raw_ptr<const SharedStorageBudgetMetadata>>(
+        static_cast<raw_ptr<const SharedStorageBudgetMetadata>>(
             &test_shared_storage_budget_metadata),
         pointer_value_eq_fn, eq_fn);
   }

diff --git a/content/browser/interest_group/interest_group_auction_reporter.h b/content/browser/interest_group/interest_group_auction_reporter.h
index 1886963c..8af57a4 100644
--- a/content/browser/interest_group/interest_group_auction_reporter.h
+++ b/content/browser/interest_group/interest_group_auction_reporter.h

@@ -109,7 +109,7 @@
     //
     // TODO(mmenke):  Figure out how to make this survive the auction (perhaps
     // pass ownership to the constructor).
-    base::raw_ptr<const blink::AuctionConfig, DanglingUntriaged> auction_config;
+    raw_ptr<const blink::AuctionConfig, DanglingUntriaged> auction_config;
 
     std::unique_ptr<SubresourceUrlBuilder> subresource_url_builder;
 

diff --git a/content/browser/webid/federated_auth_user_info_request_unittest.cc b/content/browser/webid/federated_auth_user_info_request_unittest.cc
index 8cbbfb1..85b6897 100644
--- a/content/browser/webid/federated_auth_user_info_request_unittest.cc
+++ b/content/browser/webid/federated_auth_user_info_request_unittest.cc

@@ -300,7 +300,7 @@
   }
 
  protected:
-  base::raw_ptr<RenderFrameHost> iframe_render_frame_host_;
+  raw_ptr<RenderFrameHost> iframe_render_frame_host_;
   std::unique_ptr<TestIdpNetworkRequestManager> network_manager_;
   std::unique_ptr<TestApiPermissionDelegate> api_permission_delegate_;
   std::unique_ptr<TestPermissionDelegate> permission_delegate_;

diff --git a/content/browser/webid/federated_provider_fetcher.h b/content/browser/webid/federated_provider_fetcher.h
index ca0ae942..a25ea51e 100644
--- a/content/browser/webid/federated_provider_fetcher.h
+++ b/content/browser/webid/federated_provider_fetcher.h

@@ -91,7 +91,7 @@
   std::vector<FetchResult> fetch_results_;
 
   // Fetches the config and well-known files.
-  base::raw_ptr<IdpNetworkRequestManager, DanglingUntriaged> network_manager_;
+  raw_ptr<IdpNetworkRequestManager, DanglingUntriaged> network_manager_;
 
   base::WeakPtrFactory<FederatedProviderFetcher> weak_ptr_factory_{this};
 };

diff --git a/content/public/test/mock_devtools_agent_host.h b/content/public/test/mock_devtools_agent_host.h
index ee01a60..8e784e5 100644
--- a/content/public/test/mock_devtools_agent_host.h
+++ b/content/public/test/mock_devtools_agent_host.h

@@ -50,7 +50,7 @@
  protected:
   ~MockDevToolsAgentHost() override = default;
 
-  base::raw_ptr<content::DevToolsAgentHostClient> client_ = nullptr;
+  raw_ptr<content::DevToolsAgentHostClient> client_ = nullptr;
 };
 
 }  // namespace content

diff --git a/content/public/test/test_browser_context.h b/content/public/test/test_browser_context.h
index 26ea46e..8b04ead 100644
--- a/content/public/test/test_browser_context.h
+++ b/content/public/test/test_browser_context.h

@@ -87,8 +87,8 @@
   std::unique_ptr<PlatformNotificationService> platform_notification_service_;
   std::unique_ptr<MockReduceAcceptLanguageControllerDelegate>
       reduce_accept_language_controller_delegate_;
-  base::raw_ptr<OriginTrialsControllerDelegate>
-      origin_trials_controller_delegate_ = nullptr;
+  raw_ptr<OriginTrialsControllerDelegate> origin_trials_controller_delegate_ =
+      nullptr;
   bool is_off_the_record_ = false;
 };
 

diff --git a/content/web_test/browser/web_test_attribution_manager.h b/content/web_test/browser/web_test_attribution_manager.h
index 1801fb5..6e8d1fc6 100644
--- a/content/web_test/browser/web_test_attribution_manager.h
+++ b/content/web_test/browser/web_test_attribution_manager.h

@@ -31,7 +31,7 @@
   void Reset(ResetCallback) override;
 
  private:
-  const base::raw_ptr<StoragePartition> storage_partition_;
+  const raw_ptr<StoragePartition> storage_partition_;
 };
 
 }  // namespace content

diff --git a/content/web_test/browser/web_test_origin_trial_throttle.h b/content/web_test/browser/web_test_origin_trial_throttle.h
index 936aa8db..d9821164 100644
--- a/content/web_test/browser/web_test_origin_trial_throttle.h
+++ b/content/web_test/browser/web_test_origin_trial_throttle.h

@@ -31,8 +31,7 @@
   // Helper function that set the X-Web-Test-Enabled-Origin-Trials header
   void SetHeaderForRequest();
 
-  base::raw_ptr<OriginTrialsControllerDelegate>
-      origin_trials_controller_delegate_;
+  raw_ptr<OriginTrialsControllerDelegate> origin_trials_controller_delegate_;
 };
 
 }  // namespace content

diff --git a/device/bluetooth/floss/floss_advertiser_client.h b/device/bluetooth/floss/floss_advertiser_client.h
index 0c36da2..b63dd2e 100644
--- a/device/bluetooth/floss/floss_advertiser_client.h
+++ b/device/bluetooth/floss/floss_advertiser_client.h

@@ -256,7 +256,7 @@
       AdvertisingStatus status);
 
   // Managed by FlossDBusManager - we keep local pointer to access object proxy.
-  base::raw_ptr<dbus::Bus> bus_ = nullptr;
+  raw_ptr<dbus::Bus> bus_ = nullptr;
 
   // Path used for gatt api calls by this class.
   dbus::ObjectPath gatt_adapter_path_;

diff --git a/device/bluetooth/floss/floss_battery_manager_client.h b/device/bluetooth/floss/floss_battery_manager_client.h
index faa2603..5a13c79 100644
--- a/device/bluetooth/floss/floss_battery_manager_client.h
+++ b/device/bluetooth/floss/floss_battery_manager_client.h

@@ -98,7 +98,7 @@
   void BatteryCallbackRegistered(DBusResult<uint32_t> result);
 
   // Managed by FlossDBusManager - we keep local pointer to access object proxy.
-  base::raw_ptr<dbus::Bus> bus_ = nullptr;
+  raw_ptr<dbus::Bus> bus_ = nullptr;
 
   // Path used for battery api calls by this class.
   dbus::ObjectPath battery_manager_adapter_path_;

diff --git a/device/bluetooth/floss/floss_gatt_manager_client.h b/device/bluetooth/floss/floss_gatt_manager_client.h
index 9e2291d..bfeb631 100644
--- a/device/bluetooth/floss/floss_gatt_manager_client.h
+++ b/device/bluetooth/floss/floss_gatt_manager_client.h

@@ -650,7 +650,7 @@
                                GattStatus status) override;
 
   // Managed by FlossDBusManager - we keep local pointer to access object proxy.
-  base::raw_ptr<dbus::Bus> bus_ = nullptr;
+  raw_ptr<dbus::Bus> bus_ = nullptr;
 
   // Path used for gatt api calls by this class.
   dbus::ObjectPath gatt_adapter_path_;

diff --git a/device/vr/android/cardboard/cardboard_render_loop.h b/device/vr/android/cardboard/cardboard_render_loop.h
index 954b66c9..77d80cb 100644
--- a/device/vr/android/cardboard/cardboard_render_loop.h
+++ b/device/vr/android/cardboard/cardboard_render_loop.h

@@ -135,7 +135,7 @@
   gfx::RectF right_bounds_;
 
   // Owned by our parent (cardboard_device)
-  base::raw_ptr<CardboardSdk> cardboard_sdk_;
+  raw_ptr<CardboardSdk> cardboard_sdk_;
 
   // Session Controllers
   mojo::Receiver<mojom::XRFrameDataProvider> frame_data_receiver_{this};

diff --git a/google_apis/gaia/gaia_urls_overrider_for_testing.h b/google_apis/gaia/gaia_urls_overrider_for_testing.h
index 7c7324b..fc2bd63e 100644
--- a/google_apis/gaia/gaia_urls_overrider_for_testing.h
+++ b/google_apis/gaia/gaia_urls_overrider_for_testing.h

@@ -32,7 +32,7 @@
 
  private:
   // To make sure tests and this class modify the same command line instance.
-  const base::raw_ptr<base::CommandLine> command_line_;
+  const raw_ptr<base::CommandLine> command_line_;
 
   // Scoped version of `GaiaUrls` that used instead of the original
   // singleton.

diff --git a/ios/chrome/browser/sync/ios_trusted_vault_client.h b/ios/chrome/browser/sync/ios_trusted_vault_client.h
index 8db89e1..21f1bdf 100644
--- a/ios/chrome/browser/sync/ios_trusted_vault_client.h
+++ b/ios/chrome/browser/sync/ios_trusted_vault_client.h

@@ -70,8 +70,8 @@
       const std::string& gaia_id,
       const std::vector<uint8_t>& public_key);
 
-  const base::raw_ptr<ChromeAccountManagerService> account_manager_service_;
-  const base::raw_ptr<TrustedVaultClientBackend> backend_;
+  const raw_ptr<ChromeAccountManagerService> account_manager_service_;
+  const raw_ptr<TrustedVaultClientBackend> backend_;
   trusted_vault::TrustedVaultRegistrationVerifier registration_verifier_;
   base::WeakPtrFactory<IOSTrustedVaultClient> weak_ptr_factory_{this};
 };

diff --git a/media/filters/manifest_demuxer.h b/media/filters/manifest_demuxer.h
index a5c1055..0341435 100644
--- a/media/filters/manifest_demuxer.h
+++ b/media/filters/manifest_demuxer.h

@@ -157,7 +157,7 @@
 
    private:
     WrapperReadCb read_cb_;
-    base::raw_ptr<DemuxerStream> stream_;
+    raw_ptr<DemuxerStream> stream_;
   };
 
   void OnChunkDemuxerInitialized(PipelineStatus init_status);
@@ -200,7 +200,7 @@
   // Wrapped chunk demuxer that actually does the parsing and demuxing of the
   // raw data we feed it.
   std::unique_ptr<ChunkDemuxer> chunk_demuxer_;
-  base::raw_ptr<DemuxerHost> host_;
+  raw_ptr<DemuxerHost> host_;
 
   // Updated by seek, and by updates from outgoing frames.
   base::TimeDelta media_time_ = base::Seconds(0);

diff --git a/media/filters/manifest_demuxer_unittest.cc b/media/filters/manifest_demuxer_unittest.cc
index 91ddb46..932f4e1 100644
--- a/media/filters/manifest_demuxer_unittest.cc
+++ b/media/filters/manifest_demuxer_unittest.cc

@@ -110,7 +110,7 @@
   base::test::TaskEnvironment task_environment_;
   std::unique_ptr<MediaLog> media_log_;
   std::unique_ptr<MockDemuxerHost> mock_host_;
-  base::raw_ptr<MockEngine> mock_engine_;
+  raw_ptr<MockEngine> mock_engine_;
   std::unique_ptr<ManifestDemuxer> manifest_demuxer_;
 };
 

diff --git a/remoting/host/linux/ei_event_watcher_glib.h b/remoting/host/linux/ei_event_watcher_glib.h
index 6c52c99..65db867 100644
--- a/remoting/host/linux/ei_event_watcher_glib.h
+++ b/remoting/host/linux/ei_event_watcher_glib.h

@@ -67,8 +67,8 @@
   // FD to watch for events.
   int fd_ = -1;
 
-  base::raw_ptr<ei> ei_ = nullptr;
-  base::raw_ptr<EiEventHandler> handler_ = nullptr;
+  raw_ptr<ei> ei_ = nullptr;
+  raw_ptr<EiEventHandler> handler_ = nullptr;
 };
 
 }  // namespace remoting

diff --git a/remoting/host/linux/keyboard_layout_monitor_wayland.h b/remoting/host/linux/keyboard_layout_monitor_wayland.h
index 0143681..b34c9796 100644
--- a/remoting/host/linux/keyboard_layout_monitor_wayland.h
+++ b/remoting/host/linux/keyboard_layout_monitor_wayland.h

@@ -43,7 +43,7 @@
   void UpdateState();
 
   XkbKeyMapUniquePtr keymap_;
-  base::raw_ptr<struct xkb_state> xkb_state_ = nullptr;
+  raw_ptr<struct xkb_state> xkb_state_ = nullptr;
   xkb_layout_index_t current_group_ = XKB_LAYOUT_INVALID;
   base::RepeatingCallback<void(const protocol::KeyboardLayout&)>
       layout_changed_callback_;

diff --git a/remoting/host/linux/wayland_connection.h b/remoting/host/linux/wayland_connection.h
index d808f1e..7b0eba8 100644
--- a/remoting/host/linux/wayland_connection.h
+++ b/remoting/host/linux/wayland_connection.h

@@ -49,10 +49,10 @@
   SEQUENCE_CHECKER(sequence_checker_);
 
   std::string wl_socket_;
-  base::raw_ptr<struct wl_display> display_ = nullptr;
-  base::raw_ptr<struct wl_proxy> wrapped_display_ = nullptr;
-  base::raw_ptr<struct wl_event_queue> event_queue_ = nullptr;
-  base::raw_ptr<struct wl_registry> registry_ = nullptr;
+  raw_ptr<struct wl_display> display_ = nullptr;
+  raw_ptr<struct wl_proxy> wrapped_display_ = nullptr;
+  raw_ptr<struct wl_event_queue> event_queue_ = nullptr;
+  raw_ptr<struct wl_registry> registry_ = nullptr;
   const struct wl_registry_listener wl_registry_listener_ = {
       .global = OnGlobalEvent,
       .global_remove = OnGlobalRemoveEvent,

diff --git a/remoting/host/linux/wayland_display.h b/remoting/host/linux/wayland_display.h
index 9da02e73..3eed0b4d 100644
--- a/remoting/host/linux/wayland_display.h
+++ b/remoting/host/linux/wayland_display.h

@@ -90,7 +90,7 @@
 
   const struct wl_output_listener wl_output_listener_;
   const struct zxdg_output_v1_listener xdg_output_listener_;
-  base::raw_ptr<struct zxdg_output_manager_v1> xdg_output_manager_ = nullptr;
+  raw_ptr<struct zxdg_output_manager_v1> xdg_output_manager_ = nullptr;
   std::vector<DisplayInfo> display_info_;
 };
 

diff --git a/remoting/host/linux/wayland_keyboard.h b/remoting/host/linux/wayland_keyboard.h
index 4ded2c89..ca54ba1 100644
--- a/remoting/host/linux/wayland_keyboard.h
+++ b/remoting/host/linux/wayland_keyboard.h

@@ -67,9 +67,9 @@
 
   SEQUENCE_CHECKER(sequence_checker_);
 
-  base::raw_ptr<struct wl_seat> wl_seat_ = nullptr;
-  base::raw_ptr<struct wl_keyboard> wl_keyboard_ = nullptr;
-  base::raw_ptr<struct xkb_context> xkb_context_ =
+  raw_ptr<struct wl_seat> wl_seat_ = nullptr;
+  raw_ptr<struct wl_keyboard> wl_keyboard_ = nullptr;
+  raw_ptr<struct xkb_context> xkb_context_ =
       xkb_context_new(XKB_CONTEXT_NO_FLAGS);
 };
 

diff --git a/remoting/host/linux/wayland_seat.h b/remoting/host/linux/wayland_seat.h
index 2938f84..1f0776a 100644
--- a/remoting/host/linux/wayland_seat.h
+++ b/remoting/host/linux/wayland_seat.h

@@ -50,7 +50,7 @@
   const struct wl_seat_listener wl_seat_listener_ {
     .capabilities = OnSeatCapabilitiesEvent, .name = OnSeatNameEvent
   };
-  base::raw_ptr<struct wl_seat> wl_seat_ = nullptr;
+  raw_ptr<struct wl_seat> wl_seat_ = nullptr;
   uint32_t seat_id_ = 0;
   std::unique_ptr<WaylandKeyboard> wayland_keyboard_;
   OnSeatPresentCallback seat_present_callback_;

diff --git a/remoting/protocol/no_op_webrtc_frame_scheduler.h b/remoting/protocol/no_op_webrtc_frame_scheduler.h
index 9af2442..1e6ba5e 100644
--- a/remoting/protocol/no_op_webrtc_frame_scheduler.h
+++ b/remoting/protocol/no_op_webrtc_frame_scheduler.h

@@ -30,8 +30,7 @@
                         base::TimeDelta duration) override;
 
  private:
-  base::raw_ptr<DesktopCapturer> capturer_
-      GUARDED_BY_CONTEXT(sequence_checker_);
+  raw_ptr<DesktopCapturer> capturer_ GUARDED_BY_CONTEXT(sequence_checker_);
   uint32_t last_frame_rate_ GUARDED_BY_CONTEXT(sequence_checker_) = 60;
 
   SEQUENCE_CHECKER(sequence_checker_);

diff --git a/services/audio/output_device_mixer_manager.h b/services/audio/output_device_mixer_manager.h
index 26658b0..b55304c 100644
--- a/services/audio/output_device_mixer_manager.h
+++ b/services/audio/output_device_mixer_manager.h

@@ -58,7 +58,7 @@
 
   using OutputDeviceMixers = std::vector<std::unique_ptr<OutputDeviceMixer>>;
   using ListenerToDeviceMap =
-      base::flat_map<base::raw_ptr<ReferenceOutput::Listener>, std::string>;
+      base::flat_map<raw_ptr<ReferenceOutput::Listener>, std::string>;
 
   // Forwards device change notifications to OutputDeviceMixers.
   void OnDeviceChange();

diff --git a/services/network/attribution/attribution_attestation_mediator_unittest.cc b/services/network/attribution/attribution_attestation_mediator_unittest.cc
index a9684dd5..cd3f4f93 100644
--- a/services/network/attribution/attribution_attestation_mediator_unittest.cc
+++ b/services/network/attribution/attribution_attestation_mediator_unittest.cc

@@ -96,7 +96,7 @@
 
   // We hold onto a raw ptr to configure the call expectations, the helper owns
   // the unique_ptr.
-  base::raw_ptr<FakeCryptographer> fake_cryptographer_;
+  raw_ptr<FakeCryptographer> fake_cryptographer_;
   std::unique_ptr<AttributionAttestationMediator> mediator_;
 
   base::HistogramTester histograms_;

diff --git a/ui/accessibility/platform/inspect/ax_call_statement_invoker_auralinux.h b/ui/accessibility/platform/inspect/ax_call_statement_invoker_auralinux.h
index e48f0384..e648a80 100644
--- a/ui/accessibility/platform/inspect/ax_call_statement_invoker_auralinux.h
+++ b/ui/accessibility/platform/inspect/ax_call_statement_invoker_auralinux.h

@@ -72,10 +72,10 @@
 
   // Map between AXUIElement objects and their DOMIds/accessible tree
   // line numbers. Owned by the caller and outlives this object.
-  const base::raw_ptr<const AXTreeIndexerAuraLinux> indexer_;
+  const raw_ptr<const AXTreeIndexerAuraLinux> indexer_;
 
   // Variables storage. Owned by the caller and outlives this object.
-  const base::raw_ptr<std::map<std::string, Target>> storage_;
+  const raw_ptr<std::map<std::string, Target>> storage_;
 };
 
 }  // namespace ui

diff --git a/ui/accessibility/platform/inspect/ax_call_statement_invoker_mac.h b/ui/accessibility/platform/inspect/ax_call_statement_invoker_mac.h
index 5fb3860a..2f3ec4f5 100644
--- a/ui/accessibility/platform/inspect/ax_call_statement_invoker_mac.h
+++ b/ui/accessibility/platform/inspect/ax_call_statement_invoker_mac.h

@@ -111,10 +111,10 @@
 
   // Map between AXUIElement objects and their DOMIds/accessible tree
   // line numbers. Owned by the caller and outlives this object.
-  const base::raw_ptr<const AXTreeIndexerMac> indexer_;
+  const raw_ptr<const AXTreeIndexerMac> indexer_;
 
   // Variables storage. Owned by the caller and outlives this object.
-  const base::raw_ptr<std::map<std::string, id>> storage_;
+  const raw_ptr<std::map<std::string, id>> storage_;
 };
 
 }  // namespace ui

diff --git a/ui/accessibility/platform/inspect/ax_call_statement_invoker_win.h b/ui/accessibility/platform/inspect/ax_call_statement_invoker_win.h
index bf64d5b8..97f83788a 100644
--- a/ui/accessibility/platform/inspect/ax_call_statement_invoker_win.h
+++ b/ui/accessibility/platform/inspect/ax_call_statement_invoker_win.h

@@ -116,10 +116,10 @@
 
   // Map between IAccessible objects and their DOMIds/accessible tree
   // line numbers. Owned by the caller and outlives this object.
-  const base::raw_ptr<const AXTreeIndexerWin> indexer_;
+  const raw_ptr<const AXTreeIndexerWin> indexer_;
 
   // Variables storage. Owned by the caller and outlives this object.
-  const base::raw_ptr<std::map<std::string, Target>> storage_;
+  const raw_ptr<std::map<std::string, Target>> storage_;
 };
 
 }  // namespace ui

diff --git a/ui/base/interaction/interactive_test_unittest.cc b/ui/base/interaction/interactive_test_unittest.cc
index 67452fd..db5afb5d 100644
--- a/ui/base/interaction/interactive_test_unittest.cc
+++ b/ui/base/interaction/interactive_test_unittest.cc

@@ -182,7 +182,7 @@
         FROM_HERE, std::move(actions));
   }
 
-  base::raw_ptr<TestSimulator> simulator_ = nullptr;
+  raw_ptr<TestSimulator> simulator_ = nullptr;
 
  private:
   base::test::SingleThreadTaskEnvironment task_environment_{

diff --git a/ui/compositor/total_animation_throughput_reporter_unittest.cc b/ui/compositor/total_animation_throughput_reporter_unittest.cc
index a33ddd6c..e33c6ed 100644
--- a/ui/compositor/total_animation_throughput_reporter_unittest.cc
+++ b/ui/compositor/total_animation_throughput_reporter_unittest.cc

@@ -94,7 +94,7 @@
   }
 
  private:
-  const base::raw_ptr<ui::Compositor> compositor_;
+  const raw_ptr<ui::Compositor> compositor_;
   bool animations_running_ = false;
   bool waiting_for_did_present_compositor_frame_ = false;
   std::unique_ptr<base::RunLoop> run_loop_;

diff --git a/ui/lottie/animation_unittest.cc b/ui/lottie/animation_unittest.cc
index b9f311e..77c0869 100644
--- a/ui/lottie/animation_unittest.cc
+++ b/ui/lottie/animation_unittest.cc

@@ -1476,7 +1476,7 @@
   }
 
  private:
-  const base::raw_ptr<Animation> animation_;
+  const raw_ptr<Animation> animation_;
   base::ScopedObservation<Animation, AnimationObserver> observation_{this};
 };
 

diff --git a/ui/views/interaction/element_tracker_views.cc b/ui/views/interaction/element_tracker_views.cc
index 7b75281..3fab870 100644
--- a/ui/views/interaction/element_tracker_views.cc
+++ b/ui/views/interaction/element_tracker_views.cc

@@ -278,8 +278,8 @@
     tracker_->widget_trackers_.erase(widget_);
   }
 
-  const base::raw_ptr<ElementTrackerViews> tracker_;
-  const base::raw_ptr<Widget> widget_;
+  const raw_ptr<ElementTrackerViews> tracker_;
+  const raw_ptr<Widget> widget_;
   bool visible_ = false;
   base::ScopedObservation<Widget, WidgetObserver> observation_{this};
 };

diff --git a/ui/views/interaction/interaction_test_util_mouse.cc b/ui/views/interaction/interaction_test_util_mouse.cc
index bf5ab21..2533ae0 100644
--- a/ui/views/interaction/interaction_test_util_mouse.cc
+++ b/ui/views/interaction/interaction_test_util_mouse.cc

@@ -42,7 +42,7 @@
 namespace views::test {
 
 namespace {
-base::raw_ptr<InteractionTestUtilMouse> g_current_mouse_util = nullptr;
+raw_ptr<InteractionTestUtilMouse> g_current_mouse_util = nullptr;
 
 void PostTask(base::OnceClosure task) {
   base::SingleThreadTaskRunner::GetCurrentDefault()->PostTask(FROM_HERE,
@@ -169,7 +169,7 @@
   // a proxy for the existence of the DragDropClient, and unregister listeners
   // when the window goes away. If this is not done, UAFs may happen when the
   // scoped observation of the drag client goes away.
-  base::raw_ptr<aura::Window> window_;
+  raw_ptr<aura::Window> window_;
   base::ScopedObservation<aura::Window, aura::WindowObserver>
       window_observation_{this};
   base::ScopedObservation<aura::client::DragDropClient,

diff --git a/ui/views/interaction/interaction_test_util_views.cc b/ui/views/interaction/interaction_test_util_views.cc
index fcf1393..4369fc0 100644
--- a/ui/views/interaction/interaction_test_util_views.cc
+++ b/ui/views/interaction/interaction_test_util_views.cc

@@ -250,13 +250,13 @@
     return nullptr;
   }
 
-  const base::raw_ptr<InteractionTestUtilSimulatorViews> simulator_;
+  const raw_ptr<InteractionTestUtilSimulatorViews> simulator_;
   const ui::test::InteractionTestUtil::InputType input_type_;
   const size_t item_index_;
   base::RunLoop run_loop_{base::RunLoop::Type::kNestableTasksAllowed};
   AnyWidgetObserver observer_{views::test::AnyWidgetTestPasskey()};  // IN-TEST
   absl::optional<ui::test::ActionResult> result_;
-  base::raw_ptr<Widget> widget_ = nullptr;
+  raw_ptr<Widget> widget_ = nullptr;
   base::WeakPtrFactory<DropdownItemSelector> weak_ptr_factory_{this};
 };
 

diff --git a/ui/views/interaction/interactive_views_test.h b/ui/views/interaction/interactive_views_test.h
index 2f199a9..44bc435 100644
--- a/ui/views/interaction/interactive_views_test.h
+++ b/ui/views/interaction/interactive_views_test.h

@@ -349,7 +349,7 @@
   // Creates the follow-up step for a mouse action.
   StepBuilder CreateMouseFollowUpStep(const base::StringPiece& description);
 
-  base::raw_ptr<Widget, DanglingUntriaged> context_widget_ = nullptr;
+  raw_ptr<Widget, DanglingUntriaged> context_widget_ = nullptr;
 };
 
 // Template that adds InteractiveViewsTestApi to any test fixture. Prefer to use

diff --git a/ui/views/interaction/interactive_views_test_unittest.cc b/ui/views/interaction/interactive_views_test_unittest.cc
index e22c795..01820b5 100644
--- a/ui/views/interaction/interactive_views_test_unittest.cc
+++ b/ui/views/interaction/interactive_views_test_unittest.cc

@@ -128,12 +128,12 @@
       base::MockCallback<Button::PressedCallback::Callback>>;
 
   std::unique_ptr<Widget> widget_;
-  base::raw_ptr<FlexLayoutView> contents_;
-  base::raw_ptr<TabbedPane> tabs_;
-  base::raw_ptr<FlexLayoutView> buttons_;
-  base::raw_ptr<LabelButton> button1_;
-  base::raw_ptr<LabelButton> button2_;
-  base::raw_ptr<ScrollView> scroll_;
+  raw_ptr<FlexLayoutView> contents_;
+  raw_ptr<TabbedPane> tabs_;
+  raw_ptr<FlexLayoutView> buttons_;
+  raw_ptr<LabelButton> button1_;
+  raw_ptr<LabelButton> button2_;
+  raw_ptr<ScrollView> scroll_;
   ButtonCallbackMock button1_callback_;
   ButtonCallbackMock button2_callback_;
 };

diff --git a/ui/views/widget/tooltip_manager_aura.h b/ui/views/widget/tooltip_manager_aura.h
index 5b73520..b4fe56d 100644
--- a/ui/views/widget/tooltip_manager_aura.h
+++ b/ui/views/widget/tooltip_manager_aura.h

@@ -59,7 +59,7 @@
   // Returns the Window the tooltip text is installed on.
   aura::Window* GetWindow();
 
-  base::raw_ptr<internal::NativeWidgetPrivate> native_widget_;
+  raw_ptr<internal::NativeWidgetPrivate> native_widget_;
   std::u16string tooltip_text_;
 };
 

diff --git a/ui/webui/examples/browser/ui/aura/aura_context.h b/ui/webui/examples/browser/ui/aura/aura_context.h
index b1c2bed..e5d5e87 100644
--- a/ui/webui/examples/browser/ui/aura/aura_context.h
+++ b/ui/webui/examples/browser/ui/aura/aura_context.h

@@ -42,7 +42,7 @@
     aura::WindowTreeHost* window_tree_host() { return window_tree_host_.get(); }
 
    private:
-    base::raw_ptr<AuraContext> const context_;
+    raw_ptr<AuraContext> const context_;
     std::unique_ptr<aura::WindowTreeHost> const window_tree_host_;
   };
 
@@ -62,7 +62,7 @@
   std::unique_ptr<display::Screen> screen_;
   std::unique_ptr<wm::FocusController> focus_controller_;
   std::unique_ptr<wm::CursorManager> cursor_manager_;
-  base::raw_ptr<NativeCursorManager> native_cursor_manager_;
+  raw_ptr<NativeCursorManager> native_cursor_manager_;
 };
 
 }  // namespace webui_examples