Fixes the interactive default browser UX for policy setting

chrome/browser/ui/startup/default_browser_prompt.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/startup/default_browser_prompt.h"
 
 #include <string>
 
 #include "base/location.h"
 #include "base/macros.h"
@@ skipping 158 matching lines @@
   return shell_integration::IsElevationNeededForSettingDefaultProtocolClient();
 }
 
 bool DefaultBrowserInfoBarDelegate::Accept() {
   action_taken_ = true;
   content::RecordAction(
       base::UserMetricsAction("DefaultBrowserInfoBar_Accept"));
   UMA_HISTOGRAM_ENUMERATION("DefaultBrowser.InfoBar.UserInteraction",
                             InfoBarUserInteraction::START_SET_AS_DEFAULT,
                             NUM_INFO_BAR_USER_INTERACTION_TYPES);
+  // The worker pointer is reference counted. While it is running, the
+  // message loops of the FILE and UI thread will hold references to it
+  // and it will be automatically freed once all its tasks have finished.
   scoped_refptr<shell_integration::DefaultBrowserWorker>(
-      new shell_integration::DefaultBrowserWorker(nullptr))
+      new shell_integration::DefaultBrowserWorker(nullptr,
+                                                  /*delete_observer=*/false))
       ->StartSetAsDefault();
   return true;
 }
 
 bool DefaultBrowserInfoBarDelegate::Cancel() {
   action_taken_ = true;
   content::RecordAction(
       base::UserMetricsAction("DefaultBrowserInfoBar_DontAskAgain"));
   UMA_HISTOGRAM_ENUMERATION("DefaultBrowser.InfoBar.UserInteraction",
                             InfoBarUserInteraction::DONT_ASK_AGAIN,
@@ skipping 10 matching lines @@
 class CheckDefaultBrowserObserver
     : public shell_integration::DefaultWebClientObserver {
  public:
   CheckDefaultBrowserObserver(const base::FilePath& profile_path,
                               bool show_prompt);
   ~CheckDefaultBrowserObserver() override;
 
  private:
   void SetDefaultWebClientUIState(
       shell_integration::DefaultWebClientUIState state) override;
-  bool IsOwnedByWorker() override;
 
   void ResetCheckDefaultBrowserPref();
   void ShowPrompt();
 
   // The path to the profile for which the prompt is to be shown.
   base::FilePath profile_path_;
 
   // True if the prompt is to be shown if Chrome is not the default browser.
   bool show_prompt_;
 
@@ skipping 13 matching lines @@
     // Notify the user in the future if Chrome ceases to be the user's chosen
     // default browser.
     ResetCheckDefaultBrowserPref();
   } else if (show_prompt_ && state == shell_integration::STATE_NOT_DEFAULT &&
              shell_integration::CanSetAsDefaultBrowser() !=
                  shell_integration::SET_DEFAULT_NOT_ALLOWED) {
     ShowPrompt();
   }
 }
 
-bool CheckDefaultBrowserObserver::IsOwnedByWorker() {
-  // Instruct the DefaultBrowserWorker to delete this instance when it is done.
-  return true;
-}
-
 void CheckDefaultBrowserObserver::ResetCheckDefaultBrowserPref() {
   Profile* profile =
       g_browser_process->profile_manager()->GetProfileByPath(profile_path_);
   if (profile)
     profile->GetPrefs()->SetBoolean(prefs::kCheckDefaultBrowser, true);
 }
 
 void CheckDefaultBrowserObserver::ShowPrompt() {
   Browser* browser = chrome::FindLastActive();
   if (!browser)
@@ skipping 50 matching lines @@
     const Version disable_version(disable_version_string);
     DCHECK(disable_version_string.empty() || disable_version.IsValid());
     if (disable_version.IsValid() &&
         disable_version == Version(version_info::GetVersionNumber())) {
       show_prompt = false;
     }
   }
 
   scoped_refptr<shell_integration::DefaultBrowserWorker>(
       new shell_integration::DefaultBrowserWorker(
-          new CheckDefaultBrowserObserver(profile->GetPath(), show_prompt)))
+          new CheckDefaultBrowserObserver(profile->GetPath(), show_prompt),
+          /*delete_observer=*/true))
       ->StartCheckIsDefault();
 }
 
 #if !defined(OS_WIN)
 bool ShowFirstRunDefaultBrowserPrompt(Profile* profile) {
   return false;
 }
 #endif
 
 }  // namespace chrome