Update some ScopedObserver declarations

This completes ScopedObserver updates for Windows, Mac and Android.
iOS is the final holdout.

Bug: 998625
Change-Id: I415fe2f6799fcd1631385c4a825027424d8bfc0e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1854520Reviewed-by: Scott Violet <sky@chromium.org>
Commit-Queue: Evan Stade <estade@chromium.org>
Cr-Commit-Position: refs/heads/master@{#705735}

chrome/browser/android/provider/chrome_browser_provider.cc

@@ -39,7 +39,6 @@
 #include "components/bookmarks/managed/managed_bookmark_service.h"
 #include "components/favicon/core/favicon_service.h"
 #include "components/history/core/browser/android/android_history_types.h"
-#include "components/history/core/browser/history_service.h"
 #include "components/history/core/browser/top_sites.h"
 #include "components/search_engines/template_url.h"
 #include "components/search_engines/template_url_service.h"
@@ -793,9 +792,7 @@ static jlong JNI_ChromeBrowserProvider_Init(JNIEnv* env,
 }
 
 ChromeBrowserProvider::ChromeBrowserProvider(JNIEnv* env, jobject obj)
-    : weak_java_provider_(env, obj),
-      history_service_observer_(this),
-      handling_extensive_changes_(false) {
+    : weak_java_provider_(env, obj), handling_extensive_changes_(false) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   profile_ = g_browser_process->profile_manager()->GetLastUsedProfile();
   bookmark_model_ = BookmarkModelFactory::GetForBrowserContext(profile_);

chrome/browser/android/provider/chrome_browser_provider.h

@@ -15,6 +15,7 @@
 #include "base/task/cancelable_task_tracker.h"
 #include "components/bookmarks/browser/base_bookmark_model_observer.h"
 #include "components/history/core/browser/android/android_history_types.h"
+#include "components/history/core/browser/history_service.h"
 #include "components/history/core/browser/history_service_observer.h"
 
 class AndroidHistoryProviderService;
@@ -229,7 +230,7 @@ class ChromeBrowserProvider : public bookmarks::BaseBookmarkModelObserver,
   base::CancelableTaskTracker cancelable_task_tracker_;
 
   ScopedObserver<history::HistoryService, history::HistoryServiceObserver>
-      history_service_observer_;
+      history_service_observer_{this};
 
   bool handling_extensive_changes_;
 

chrome/browser/chromeos/login/reset_browsertest.cc

@@ -98,8 +98,8 @@ class LoginPromptVisibleObserver : public SessionManagerClient::Observer {
  private:
   bool signal_emitted_ = false;
 
-  ScopedObserver<SessionManagerClient, LoginPromptVisibleObserver> observer_{
-      this};
+  ScopedObserver<SessionManagerClient, SessionManagerClient::Observer>
+      observer_{this};
 
   DISALLOW_COPY_AND_ASSIGN(LoginPromptVisibleObserver);
 };

chrome/browser/task_manager/providers/service_worker_task_provider.cc

@@ -13,7 +13,6 @@
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/render_process_host.h"
-#include "content/public/browser/service_worker_context.h"
 #include "content/public/browser/service_worker_running_info.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/common/child_process_host.h"
@@ -23,9 +22,7 @@ using content::BrowserThread;
 
 namespace task_manager {
 
-ServiceWorkerTaskProvider::ServiceWorkerTaskProvider()
-    : scoped_context_observer_(this) {}
-
+ServiceWorkerTaskProvider::ServiceWorkerTaskProvider() = default;
 ServiceWorkerTaskProvider::~ServiceWorkerTaskProvider() = default;
 
 Task* ServiceWorkerTaskProvider::GetTaskOfUrlRequest(int child_id,

chrome/browser/task_manager/providers/service_worker_task_provider.h

@@ -14,12 +14,9 @@
 #include "chrome/browser/task_manager/providers/task_provider.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
+#include "content/public/browser/service_worker_context.h"
 #include "content/public/browser/service_worker_context_observer.h"
 
-namespace content {
-class ServiceWorkerContext;
-}
-
 namespace task_manager {
 
 // This provides tasks that describe running service workers
@@ -82,7 +79,7 @@ class ServiceWorkerTaskProvider : public TaskProvider,
 
   ScopedObserver<content::ServiceWorkerContext,
                  content::ServiceWorkerContextObserver>
-      scoped_context_observer_;
+      scoped_context_observer_{this};
 
   DISALLOW_COPY_AND_ASSIGN(ServiceWorkerTaskProvider);
 };

chrome/browser/ui/views/frame/browser_desktop_window_tree_host_win.cc

@@ -46,8 +46,7 @@ BrowserDesktopWindowTreeHostWin::BrowserDesktopWindowTreeHostWin(
     : DesktopWindowTreeHostWin(native_widget_delegate,
                                desktop_native_widget_aura),
       browser_view_(browser_view),
-      browser_frame_(browser_frame),
-      profile_observer_(this) {
+      browser_frame_(browser_frame) {
   profile_observer_.Add(
       &g_browser_process->profile_manager()->GetProfileAttributesStorage());
 }

chrome/browser/ui/views/frame/browser_desktop_window_tree_host_win.h

@@ -98,8 +98,8 @@ class BrowserDesktopWindowTreeHostWin
 
   // This is used to monitor when the window icon needs to be updated because
   // the icon badge has changed (e.g., avatar icon changed).
-  ScopedObserver<ProfileAttributesStorage, BrowserDesktopWindowTreeHostWin>
-      profile_observer_;
+  ScopedObserver<ProfileAttributesStorage, ProfileAttributesStorage::Observer>
+      profile_observer_{this};
 
   base::win::ScopedHICON icon_handle_;
 

content/browser/frame_host/popup_menu_helper_mac.h

@@ -13,6 +13,7 @@
 #include "base/memory/weak_ptr.h"
 #include "base/scoped_observer.h"
 #include "content/common/content_export.h"
+#include "content/public/browser/render_widget_host.h"
 #include "content/public/browser/render_widget_host_observer.h"
 #include "ui/gfx/geometry/rect.h"
 
@@ -71,15 +72,15 @@ class PopupMenuHelper : public RenderWidgetHostObserver {
 
   Delegate* delegate_;  // Weak. Owns |this|.
 
-  ScopedObserver<RenderWidgetHost, RenderWidgetHostObserver> observer_;
+  ScopedObserver<RenderWidgetHost, RenderWidgetHostObserver> observer_{this};
   base::WeakPtr<RenderFrameHostImpl> render_frame_host_;
-  WebMenuRunner* menu_runner_;
-  bool popup_was_hidden_;
+  WebMenuRunner* menu_runner_ = nil;
+  bool popup_was_hidden_ = false;
 
   // Controls whether messages can be pumped during the menu fade.
   std::unique_ptr<base::ScopedPumpMessagesInPrivateModes> pump_in_fade_;
 
-  base::WeakPtrFactory<PopupMenuHelper> weak_ptr_factory_;
+  base::WeakPtrFactory<PopupMenuHelper> weak_ptr_factory_{this};
 
   DISALLOW_COPY_AND_ASSIGN(PopupMenuHelper);
 };

content/browser/frame_host/popup_menu_helper_mac.mm

@@ -28,12 +28,8 @@ bool g_allow_showing_popup_menus = true;
 PopupMenuHelper::PopupMenuHelper(Delegate* delegate,
                                  RenderFrameHost* render_frame_host)
     : delegate_(delegate),
-      observer_(this),
       render_frame_host_(
-          static_cast<RenderFrameHostImpl*>(render_frame_host)->GetWeakPtr()),
-      menu_runner_(nil),
-      popup_was_hidden_(false),
-      weak_ptr_factory_(this) {
+          static_cast<RenderFrameHostImpl*>(render_frame_host)->GetWeakPtr()) {
   RenderWidgetHost* widget_host =
       render_frame_host->GetRenderViewHost()->GetWidget();
   observer_.Add(widget_host);