Migrate uses of WebContentsObserver to WeakPtr

Now that WebContents has weak pointer support, migrate uses of
WebContentsObserver to use it.

BUG=952390

Change-Id: I9858b51409a29310b84d714c053fd37b820db788
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3145550
Reviewed-by: Rouslan Solomakhin <[email protected]>
Commit-Queue: Dave Tapuska <[email protected]>
Cr-Commit-Position: refs/heads/main@{#918852}

Author: dtapuska

components/payments/content/payment_handler_host.cc

@@ -56,9 +56,10 @@ void RunCallbackWithError(const std::string& error,
 
 PaymentHandlerHost::PaymentHandlerHost(content::WebContents* web_contents,
                                        base::WeakPtr<Delegate> delegate)
-    : WebContentsObserver(web_contents), delegate_(delegate) {
+    : delegate_(delegate) {
   DCHECK(web_contents);
   DCHECK(delegate_);
+  web_contents_ = web_contents->GetWeakPtr();
 }
 
 PaymentHandlerHost::~PaymentHandlerHost() {}
@@ -80,7 +81,7 @@ void PaymentHandlerHost::UpdateWith(
   if (!change_payment_request_details_callback_)
     return;
 
-  auto* dev_tools = GetDevTools(web_contents(), sw_origin_for_logs_);
+  auto* dev_tools = GetDevTools(web_contents_.get(), sw_origin_for_logs_);
   if (dev_tools) {
     std::map<std::string, std::string> data = {{"Error", response->error}};
 
@@ -198,7 +199,7 @@ void PaymentHandlerHost::ChangePaymentMethod(
     return;
   }
 
-  auto* dev_tools = GetDevTools(web_contents(), sw_origin_for_logs_);
+  auto* dev_tools = GetDevTools(web_contents_.get(), sw_origin_for_logs_);
   if (dev_tools) {
     dev_tools->LogBackgroundServiceEvent(
         registration_id_for_logs_, sw_origin_for_logs_,
@@ -228,7 +229,7 @@ void PaymentHandlerHost::ChangeShippingOption(
     return;
   }
 
-  auto* dev_tools = GetDevTools(web_contents(), sw_origin_for_logs_);
+  auto* dev_tools = GetDevTools(web_contents_.get(), sw_origin_for_logs_);
   if (dev_tools) {
     dev_tools->LogBackgroundServiceEvent(
         registration_id_for_logs_, sw_origin_for_logs_,
@@ -257,7 +258,7 @@ void PaymentHandlerHost::ChangeShippingAddress(
     return;
   }
 
-  auto* dev_tools = GetDevTools(web_contents(), sw_origin_for_logs_);
+  auto* dev_tools = GetDevTools(web_contents_.get(), sw_origin_for_logs_);
   if (dev_tools) {
     std::map<std::string, std::string> shipping_address_map;
     shipping_address_map.emplace("Country", shipping_address->country);

components/payments/content/payment_handler_host.h

@@ -11,7 +11,6 @@
 #include "base/callback_forward.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
-#include "content/public/browser/web_contents_observer.h"
 #include "mojo/public/cpp/bindings/pending_remote.h"
 #include "mojo/public/cpp/bindings/receiver.h"
 #include "third_party/blink/public/mojom/payments/payment_handler_host.mojom.h"
@@ -28,8 +27,7 @@ using ChangePaymentRequestDetailsCallback =
 
 // Handles the communication from the payment handler renderer process to the
 // merchant renderer process.
-class PaymentHandlerHost : public mojom::PaymentHandlerHost,
-                           public content::WebContentsObserver {
+class PaymentHandlerHost : public mojom::PaymentHandlerHost {
  public:
   // The interface to be implemented by the object that can communicate to the
   // merchant's renderer process.
@@ -148,6 +146,8 @@ class PaymentHandlerHost : public mojom::PaymentHandlerHost,
   // logging.
   std::string payment_request_id_for_logs_;
 
+  base::WeakPtr<content::WebContents> web_contents_;
+
   base::WeakPtrFactory<PaymentHandlerHost> weak_ptr_factory_{this};
 
   DISALLOW_COPY_AND_ASSIGN(PaymentHandlerHost);