[go: nahoru, domu]

MiraclePtr: Rewrite chromeos-ash [5/N]

This was automated.
It rewrites chromeos-ash and annotate the dangling pointers.

This part was split out of the root CL:
https://chromium-review.googlesource.com/c/chromium/src/+/4459392

number file        selected
------ ----------- --------
  1700 chrome/
  1407 ash/        x
   626 chromeos/
   147 components/
    53 ui/
    16 extensions/
    14 media/
     9 remoting/
     8 services/
     5 content/
     3 cc/
     1 gpu/
     1 crypto/

Steps:

1. Execute the rewriter:
./tools/clang/rewrite_raw_ptr_fields/rewrite-multiple-platforms.sh chromeos-ash

2. Execute all the tests. Print the dangling pointers using
   https://godbolt.org/z/o8adYnc7a idea. Then apply the edits using:
   https://github.com/ArthurSonzogni/chrome-dangling-ptr-apply-edit

3. Apply `git cl format`

4. Add `ExperimentalAsh`. This happened using a vim macro on the root
   patch. Overall there are exactly 7461 new pointers, and 183 dangling
   pointers.

5. Apply `git cl format`

Cq-Include-Trybots:luci.chromium.try:android-pie-arm64-dbg,android-x64-Cq-Include-Trybots: luci.chromium.try:android-pie-arm64-dbg,android-x64-cast,android_compile_dbg,android_compile_x64_dbg,android_compile_x86_dbg,android_cronet,chromeos-amd64-generic-dbg,chromeos-arm-generic-rel,dawn-android-arm-deps-rel,dawn-mac-x64-deps-rel,fuchsia-arm64-rel,fuchsia-x64-cast-receiver-rel,ios-simulator,lacros-amd64-generic-rel,lacros-arm-generic-rel,linux-chromeos-compile-dbg,linux-libfuzzer-asan-rel,linux_chromium_asan_rel_ng,linux_chromium_compile_dbg_ng,linux_chromium_tsan_rel_ng,linux_vr,mac_chromium_compile_dbg_ng,win-libfuzzer-asan-rel,win_chromium_compile_dbg_ng,android-arm64-rel,android-nougat-x86-rel,android_optional_gpu_tests_rel,chromeos-amd64-generic-rel,dawn-linux-x64-deps-rel,dawn-win10-x64-deps-rel,dawn-win10-x86-deps-rel,linux-chromeos-rel,linux-lacros-rel,linux-rel,linux-wayland-rel,linux-x64-castos,linux_optional_gpu_tests_rel,mac_optional_gpu_tests_rel,win_optional_gpu_tests_rel
Include-Ci-Only-Tests: true
Bug:1430482

Change-Id: Ie1e24f40a0688c1148b27455d05aae73803c10da
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4456581
Commit-Queue: Arthur Sonzogni <arthursonzogni@chromium.org>
Reviewed-by: Bartek Nowierski <bartekn@chromium.org>
Owners-Override: Bartek Nowierski <bartekn@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1134206}
diff --git a/ash/shelf/shelf_window_watcher_item_delegate.h b/ash/shelf/shelf_window_watcher_item_delegate.h
index 7ede9f4..1e45a32 100644
--- a/ash/shelf/shelf_window_watcher_item_delegate.h
+++ b/ash/shelf/shelf_window_watcher_item_delegate.h
@@ -6,6 +6,7 @@
 #define ASH_SHELF_SHELF_WINDOW_WATCHER_ITEM_DELEGATE_H_
 
 #include "ash/public/cpp/shelf_item_delegate.h"
+#include "base/memory/raw_ptr.h"
 
 namespace aura {
 class Window;
@@ -42,7 +43,7 @@
   void Close() override;
 
   // The window associated with this item. Not owned.
-  aura::Window* window_;
+  raw_ptr<aura::Window, ExperimentalAsh> window_;
 };
 
 }  // namespace ash