[Suggested files] Guard search_controller_ usage by weak pointer

Fixed: 1067461
Change-Id: I5b9709f24bde696fb43be85d7a82b166132d0e64
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2134232Reviewed-by: Jia Meng <jiameng@chromium.org>
Reviewed-by: Tony Yeoman <tby@chromium.org>
Commit-Queue: Roman Sorokin [CET] <rsorokin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#756585}

chrome/browser/chromeos/login/ui/user_adding_screen_browsertest.cc

@@ -166,14 +166,7 @@ IN_PROC_BROWSER_TEST_F(UserAddingScreenTest, PRE_AddingSeveralUsers) {
   StartupUtils::MarkOobeCompleted();
 }
 
-// TODO(crbug.com/1067461): Flakes on ASAN and linux-chromeos-dbg
-#if defined(OS_CHROMEOS) && (defined(ADDRESS_SANITIZER) || \
-                             defined(MEMORY_SANITIZER) || !defined(NDEBUG))
-#define MAYBE_AddingSeveralUsers DISABLED_AddingSeveralUsers
-#else
-#define MAYBE_AddingSeveralUsers AddingSeveralUsers
-#endif
-IN_PROC_BROWSER_TEST_F(UserAddingScreenTest, MAYBE_AddingSeveralUsers) {
+IN_PROC_BROWSER_TEST_F(UserAddingScreenTest, AddingSeveralUsers) {
   EXPECT_EQ(session_manager::SessionState::LOGIN_PRIMARY,
             session_manager::SessionManager::Get()->session_state());
 

chrome/browser/ui/app_list/search/drive_quick_access_provider.cc

@@ -111,16 +111,23 @@ DriveQuickAccessProvider::DriveQuickAccessProvider(
     drive_service_->AddObserver(this);
 }
 
-DriveQuickAccessProvider::~DriveQuickAccessProvider() = default;
+DriveQuickAccessProvider::~DriveQuickAccessProvider() {
+  if (drive_service_)
+    drive_service_->RemoveObserver(this);
+}
 
 void DriveQuickAccessProvider::OnFileSystemMounted() {
   // Warm up the result cache by fetching results from the Drive QuickAccess API
   // as soon as DriveFS is mounted. This ensures the first use of the launcher
   // displays Drive results. This is called on login, and when resuming from
   // sleep.
-  GetQuickAccessItems(base::BindOnce(&SearchController::Start,
-                                     base::Unretained(search_controller_),
-                                     base::string16()));
+  GetQuickAccessItems(
+      base::BindOnce(&DriveQuickAccessProvider::StartSearchController,
+                     weak_factory_.GetWeakPtr()));
+}
+
+void DriveQuickAccessProvider::StartSearchController() {
+  search_controller_->Start(base::string16());
 }
 
 void DriveQuickAccessProvider::Start(const base::string16& query) {

chrome/browser/ui/app_list/search/drive_quick_access_provider.h

@@ -47,6 +47,8 @@ class DriveQuickAccessProvider : public SearchProvider,
       base::OnceCallback<void()> on_done,
       const std::vector<drive::QuickAccessItem>& drive_results);
 
+  void StartSearchController();
+
   Profile* const profile_;
   drive::DriveIntegrationService* const drive_service_;
   SearchController* const search_controller_;