Index: remoting/host/it2me/it2me_confirmation_dialog_proxy_unittest.cc |
diff --git a/remoting/host/it2me/it2me_confirmation_dialog_proxy_unittest.cc b/remoting/host/it2me/it2me_confirmation_dialog_proxy_unittest.cc |
index 9e4ef749b1572c93be9ffada45490fc0efe478a7..a18f3126e44289dc9e623ad6a1d9eb2198fb5322 100644 |
--- a/remoting/host/it2me/it2me_confirmation_dialog_proxy_unittest.cc |
+++ b/remoting/host/it2me/it2me_confirmation_dialog_proxy_unittest.cc |
@@ -7,6 +7,7 @@ |
#include <memory> |
#include "base/bind.h" |
+#include "base/memory/ptr_util.h" |
#include "base/memory/ref_counted.h" |
#include "base/run_loop.h" |
#include "base/single_thread_task_runner.h" |
@@ -114,9 +115,8 @@ class It2MeConfirmationDialogProxyTest : public testing::Test { |
base::RunLoop run_loop_; |
base::Thread dialog_thread_; |
- // |dialog_| is owned by |dialog_proxy_| but we keep an alias for test |
- // purposes. |
- StubIt2MeConfirmationDialog* dialog_; |
+ // |dialog_| is owned by |dialog_proxy_| but we keep an alias for testing. |
+ StubIt2MeConfirmationDialog* dialog_ = nullptr; |
std::unique_ptr<It2MeConfirmationDialogProxy> dialog_proxy_; |
}; |
@@ -124,9 +124,11 @@ It2MeConfirmationDialogProxyTest::It2MeConfirmationDialogProxyTest() |
: dialog_thread_("test dialog thread") { |
dialog_thread_.Start(); |
- dialog_ = new StubIt2MeConfirmationDialog(dialog_task_runner()); |
- dialog_proxy_.reset(new It2MeConfirmationDialogProxy( |
- dialog_task_runner(), std::unique_ptr<It2MeConfirmationDialog>(dialog_))); |
+ auto dialog = |
+ base::MakeUnique<StubIt2MeConfirmationDialog>(dialog_task_runner()); |
+ dialog_ = dialog.get(); |
+ dialog_proxy_.reset(new It2MeConfirmationDialogProxy(dialog_task_runner(), |
+ std::move(dialog))); |
} |
It2MeConfirmationDialogProxyTest::~It2MeConfirmationDialogProxyTest() {} |