Commit 59930b74 authored by Honglin Yu's avatar Honglin Yu Committed by Commit Bot

Use NoDestructor in PendingDialog::GetInstance()

NoDestructor should be preferred over Singleton according to the
comments in singleton.h and
https://bugs.chromium.org/p/chromium/issues/detail?id=925323.

And this *may* also relate to
https://bugs.chromium.org/p/chromium/issues/detail?id=922327

BUG=chromium:925323, chromium:922327
TEST=cq

Change-Id: Icb014d0eae9e0032a2a5ca56dcec59cf72300315
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2526643Reviewed-by: default avatarAlexey Baskakov <loyso@chromium.org>
Reviewed-by: default avatarLuciano Pacheco <lucmult@chromium.org>
Commit-Queue: Honglin Yu <honglinyu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#825757}
parent c8762335
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
#include "base/location.h" #include "base/location.h"
#include "base/logging.h" #include "base/logging.h"
#include "base/memory/ref_counted.h" #include "base/memory/ref_counted.h"
#include "base/memory/singleton.h" #include "base/no_destructor.h"
#include "base/single_thread_task_runner.h" #include "base/single_thread_task_runner.h"
#include "base/strings/stringprintf.h" #include "base/strings/stringprintf.h"
#include "base/threading/thread_task_runner_handle.h" #include "base/threading/thread_task_runner_handle.h"
...@@ -84,7 +84,8 @@ class PendingDialog { ...@@ -84,7 +84,8 @@ class PendingDialog {
// static // static
PendingDialog* PendingDialog::GetInstance() { PendingDialog* PendingDialog::GetInstance() {
return base::Singleton<PendingDialog>::get(); static base::NoDestructor<PendingDialog> instance;
return instance.get();
} }
void PendingDialog::Add(SelectFileDialogExtension::RoutingID id, void PendingDialog::Add(SelectFileDialogExtension::RoutingID id,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment