Deprecate the StickyDefaultBrowserPrompt experiment

chrome/browser/ui/startup/default_browser_infobar_delegate.cc

 // Copyright 2016 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_infobar_delegate.h"
 
 #include <memory>
 
 #include "base/metrics/histogram_macros.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "chrome/app/vector_icons/vector_icons.h"
 #include "chrome/browser/ui/startup/default_browser_prompt.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/infobars/core/infobar.h"
 #include "content/public/browser/user_metrics.h"
 #include "ui/base/l10n/l10n_util.h"
 
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"

[Peter Kasting, 2017/03/20 20:13:03]

I bet this #include can go away.

[Patrick Monette, 2017/03/20 20:25:52]

Done.

 #endif
 
 namespace chrome {
 
-bool IsStickyDefaultBrowserPromptEnabled() {
-#if defined(OS_WIN)
-  // The flow to set the default browser is only asynchronous on Windows 10+.
-  return base::win::GetVersion() >= base::win::VERSION_WIN10 &&
-         base::FeatureList::IsEnabled(kStickyDefaultBrowserPrompt);
-#else
-  return false;
-#endif
-}
-
 // static
 void DefaultBrowserInfoBarDelegate::Create(InfoBarService* infobar_service,
                                            Profile* profile) {
   infobar_service->AddInfoBar(infobar_service->CreateConfirmInfoBar(
       std::unique_ptr<ConfirmInfoBarDelegate>(
           new DefaultBrowserInfoBarDelegate(profile))));
 }
 
 DefaultBrowserInfoBarDelegate::DefaultBrowserInfoBarDelegate(Profile* profile)
     : ConfirmInfoBarDelegate(),
@@ skipping 76 matching lines @@
 }
 
 bool DefaultBrowserInfoBarDelegate::Accept() {
   action_taken_ = true;
   content::RecordAction(
       base::UserMetricsAction("DefaultBrowserInfoBar_Accept"));
   UMA_HISTOGRAM_ENUMERATION("DefaultBrowser.InfoBar.UserInteraction",
                             ACCEPT_INFO_BAR,
                             NUM_INFO_BAR_USER_INTERACTION_TYPES);
 
-  bool close_infobar = true;
-  shell_integration::DefaultWebClientWorkerCallback set_as_default_callback;
-
-  if (IsStickyDefaultBrowserPromptEnabled()) {
-    // When the experiment is enabled, the infobar is only closed when the
-    // DefaultBrowserWorker is finished.
-    set_as_default_callback =
-        base::Bind(&DefaultBrowserInfoBarDelegate::OnSetAsDefaultFinished,
-                   weak_factory_.GetWeakPtr());
-    close_infobar = false;
-  }
-
   // 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.
-  CreateDefaultBrowserWorker(set_as_default_callback)->StartSetAsDefault();
-  return close_infobar;
-}
-
-scoped_refptr<shell_integration::DefaultBrowserWorker>
-DefaultBrowserInfoBarDelegate::CreateDefaultBrowserWorker(
-    const shell_integration::DefaultWebClientWorkerCallback& callback) {
-  return new shell_integration::DefaultBrowserWorker(callback);
-}
-
-void DefaultBrowserInfoBarDelegate::OnSetAsDefaultFinished(
-    shell_integration::DefaultWebClientState state) {
-  infobar()->owner()->RemoveInfoBar(infobar());
+  make_scoped_refptr(new shell_integration::DefaultBrowserWorker(
+                         shell_integration::DefaultWebClientWorkerCallback()))
+      ->StartSetAsDefault();
+  return true;
 }
 
 }  // namespace chrome