Update presentation receiver window controller's OTR profile usage.

Independent OffTheRecord profile manager is getting deprecated.
PresentationReciverWindowController class is updated to use the newer
profile APIs instead of that.

Bug: 1033903
Change-Id: If2f664e01227a39be78c79c71eb2f5b02ea6b678
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2151448Reviewed-by: Brandon Tolsch <btolsch@chromium.org>
Commit-Queue: Ramin Halavati <rhalavati@chromium.org>
Cr-Commit-Position: refs/heads/master@{#759939}

chrome/browser/ui/media_router/presentation_receiver_window_controller.cc

@@ -12,6 +12,7 @@
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/media/router/presentation/receiver_presentation_service_delegate_impl.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/profiles/profile_destroyer.h"
 #include "chrome/browser/ui/media_router/presentation_receiver_window.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
@@ -49,6 +50,11 @@ PresentationReceiverWindowController::CreateFromOriginalProfile(
 PresentationReceiverWindowController::~PresentationReceiverWindowController() {
   DCHECK(!web_contents_);
   DCHECK(!window_);
+
+  if (otr_profile_) {
+    otr_profile_->RemoveObserver(this);
+    ProfileDestroyer::DestroyProfileWhenAppropriate(otr_profile_);
+  }
 }
 
 void PresentationReceiverWindowController::Start(
@@ -107,20 +113,16 @@ PresentationReceiverWindowController::PresentationReceiverWindowController(
     const gfx::Rect& bounds,
     base::OnceClosure termination_callback,
     TitleChangeCallback title_change_callback)
-    : otr_profile_registration_(
-          IndependentOTRProfileManager::GetInstance()
-              ->CreateFromOriginalProfile(
-                  profile,
-                  base::BindOnce(&PresentationReceiverWindowController::
-                                     OriginalProfileDestroyed,
-                                 base::Unretained(this)))),
-      web_contents_(WebContents::Create(
-          CreateWebContentsParams(otr_profile_registration_->profile()))),
+    : otr_profile_(
+          profile->GetOffTheRecordProfile(Profile::OTRProfileID::CreateUnique(
+              "MediaRouter::PresentationReciever"))),
+      web_contents_(WebContents::Create(CreateWebContentsParams(otr_profile_))),
       window_(PresentationReceiverWindow::Create(this, bounds)),
       termination_callback_(std::move(termination_callback)),
       title_change_callback_(std::move(title_change_callback)) {
-  DCHECK(otr_profile_registration_->profile());
-  DCHECK(otr_profile_registration_->profile()->IsOffTheRecord());
+  DCHECK(otr_profile_);
+  DCHECK(otr_profile_->IsOffTheRecord());
+  otr_profile_->AddObserver(this);
   content::WebContentsObserver::Observe(web_contents_.get());
   web_contents_->SetDelegate(this);
 }
@@ -130,11 +132,11 @@ void PresentationReceiverWindowController::WindowClosed() {
   Terminate();
 }
 
-void PresentationReceiverWindowController::OriginalProfileDestroyed(
+void PresentationReceiverWindowController::OnProfileWillBeDestroyed(
     Profile* profile) {
-  DCHECK(profile == otr_profile_registration_->profile());
+  DCHECK(profile == otr_profile_);
   web_contents_.reset();
-  otr_profile_registration_.reset();
+  otr_profile_ = nullptr;
   Terminate();
 }
 

chrome/browser/ui/media_router/presentation_receiver_window_controller.h

@@ -12,7 +12,7 @@
 #include "base/macros.h"
 #include "chrome/browser/media/router/presentation/presentation_navigation_policy.h"
 #include "chrome/browser/media/router/providers/wired_display/wired_display_presentation_receiver.h"
-#include "chrome/browser/profiles/independent_otr_profile_manager.h"
+#include "chrome/browser/profiles/profile_observer.h"
 #include "chrome/browser/ui/media_router/presentation_receiver_window_delegate.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/browser/web_contents_observer.h"
@@ -38,7 +38,8 @@ class PresentationReceiverWindowController final
     : public PresentationReceiverWindowDelegate,
       public content::WebContentsObserver,
       public content::WebContentsDelegate,
-      public media_router::WiredDisplayPresentationReceiver {
+      public media_router::WiredDisplayPresentationReceiver,
+      public ProfileObserver {
  public:
   using TitleChangeCallback = base::RepeatingCallback<void(const std::string&)>;
 
@@ -68,7 +69,8 @@ class PresentationReceiverWindowController final
       base::OnceClosure termination_callback,
       TitleChangeCallback title_change_callback);
 
-  void OriginalProfileDestroyed(Profile* profile);
+  // ProfileObserver:
+  void OnProfileWillBeDestroyed(Profile* profile) override;
 
   // These methods are intended to be used by tests.
   void CloseWindowForTest();
@@ -101,8 +103,7 @@ class PresentationReceiverWindowController final
       const GURL& target_url) override;
 
   // The profile used for the presentation.
-  std::unique_ptr<IndependentOTRProfileManager::OTRProfileRegistration>
-      otr_profile_registration_;
+  Profile* otr_profile_;
 
   // WebContents for rendering the receiver page.
   std::unique_ptr<content::WebContents> web_contents_;