Make AvatarMenu use a weak pointer for ProfileAttributesStorage

The profile_storage_ member of AvatarMenu is commented as "weak", but
the lifetime relationship is not discussed. Use an actual weak
pointer (ProfileAttributesStorage supports it already), and avoid
dereferencing profile_storage_ if it is gone.

Bug: 1008947, 1001215
Change-Id: I0e8a2fbb55465f1680c064c7cdb6193c93eb3e79
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1853647Reviewed-by: Avi Drissman <avi@chromium.org>
Commit-Queue: ccameron <ccameron@chromium.org>
Cr-Commit-Position: refs/heads/master@{#704908}

chrome/browser/apps/app_shim/extension_app_shim_handler_mac.cc

@@ -262,8 +262,9 @@ bool ExtensionAppShimHandler::AppState::IsMultiProfile() const {
 
 std::unique_ptr<AvatarMenu> ExtensionAppShimHandler::Delegate::CreateAvatarMenu(
     AvatarMenuObserver* observer) {
-  // TODO(https://crbug.com/1008947): Fix use-after-free caused by AvatarMenu.
-  return nullptr;
+  ProfileManager* profile_manager = g_browser_process->profile_manager();
+  return std::make_unique<AvatarMenu>(
+      &profile_manager->GetProfileAttributesStorage(), observer, nullptr);
 }
 
 Profile* ExtensionAppShimHandler::Delegate::ProfileForPath(

chrome/browser/profiles/avatar_menu.cc

@@ -42,7 +42,7 @@ AvatarMenu::AvatarMenu(ProfileAttributesStorage* profile_storage,
                        Browser* browser)
     : profile_list_(ProfileList::Create(profile_storage)),
       menu_actions_(AvatarMenuActions::Create()),
-      profile_storage_(profile_storage),
+      profile_storage_(profile_storage->AsWeakPtr()),
       observer_(observer),
       browser_(browser) {
   DCHECK(profile_storage_);
@@ -64,6 +64,9 @@ AvatarMenu::AvatarMenu(ProfileAttributesStorage* profile_storage,
 }
 
 AvatarMenu::~AvatarMenu() {
+  // Note that |profile_storage_| may be destroyed before |this|.
+  // https://crbug.com/1008947
+  if (profile_storage_)
     profile_storage_->RemoveObserver(this);
 }
 

chrome/browser/profiles/avatar_menu.h

@@ -200,8 +200,8 @@ class AvatarMenu :
       supervised_user_observer_{this};
 #endif
 
-  // The storage that provides the profile attributes. Weak.
-  ProfileAttributesStorage* profile_storage_;
+  // The storage that provides the profile attributes.
+  base::WeakPtr<ProfileAttributesStorage> profile_storage_;
 
   // The observer of this model, which is notified of changes. Weak.
   AvatarMenuObserver* observer_;