Replace BrowserProces::AddRefModule/RemoveModule by ScopedKeepAlive

chrome/browser/ui/views/uninstall_view.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/views/uninstall_view.h"
 
 #include "base/message_loop/message_loop.h"
 #include "base/process/launch.h"
 #include "base/run_loop.h"
-#include "chrome/browser/browser_process.h"
+#include "chrome/browser/lifetime/keep_alive_types.h"
+#include "chrome/browser/lifetime/scoped_keep_alive.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/browser/ui/uninstall_browser_prompt.h"
 #include "chrome/common/chrome_result_codes.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/installer/util/browser_distribution.h"
 #include "chrome/installer/util/shell_util.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/views/controls/button/checkbox.h"
 #include "ui/views/controls/combobox/combobox.h"
 #include "ui/views/controls/label.h"
@@ skipping 138 matching lines @@
   std::advance(i, index);
   return i->first;
 }
 
 namespace chrome {
 
 int ShowUninstallBrowserPrompt() {
   DCHECK(base::MessageLoopForUI::IsCurrent());
   int result = content::RESULT_CODE_NORMAL_EXIT;
 
-  // Take a reference on g_browser_process while showing the dialog. This is
-  // done because the dialog uses the views framework which may increment
-  // and decrement the module ref count during the course of displaying UI and
-  // this code can be called while the module refcount is still at 0.
+  // Register a KeepAlive while showing the dialog. This is done because the
+  // dialog uses the views framework which may take and release a KeepAlive
+  // during the course of displaying UI and this code can be called while
+  // there is no registered KeepAlive.
   // Note that this reference is never released, as this code is shown on a path
   // that immediately exits Chrome anyway.
   // See http://crbug.com/241366 for details.
-  g_browser_process->AddRefModule();
+  new ScopedKeepAlive(KeepAliveOrigin::LEAKED_UNINSTALL_VIEW,
+                      KeepAliveRestartOption::DISABLED);
 
   base::RunLoop run_loop;
   UninstallView* view = new UninstallView(&result,
                                           run_loop.QuitClosure());
   views::DialogDelegate::CreateDialogWidget(view, NULL, NULL)->Show();
   run_loop.Run();
   return result;
 }
 
 }  // namespace chrome