Revert of Removing TODO for It2Me Confirmation Dialog

remoting/host/it2me/it2me_host_unittest.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 "remoting/host/it2me/it2me_host.h"
 
 #include <memory>
 #include <string>
 #include <utility>
 
@@ skipping 109 matching lines @@
                             ValidationResult validation_result);
 
  protected:
   void SetClientDomainPolicy(const std::string& policy_value);
 
   void RunValidationCallback(const std::string& remote_jid);
 
   ValidationResult validation_result_ = ValidationResult::SUCCESS;
 
   // Used to set ConfirmationDialog behavior.
-  FakeIt2MeConfirmationDialog* dialog_ = nullptr;
+  FakeIt2MeConfirmationDialogFactory* fake_dialog_factory_ = nullptr;
 
  private:
   std::unique_ptr<base::MessageLoop> message_loop_;
   std::unique_ptr<base::RunLoop> run_loop_;
 
   scoped_refptr<It2MeHost> it2me_host_;
 
   std::string directory_bot_jid_;
   XmppSignalStrategy::XmppServerConfig xmpp_server_config_;
 
   DISALLOW_COPY_AND_ASSIGN(It2MeHostTest);
 };
 
 void It2MeHostTest::SetUp() {
   message_loop_.reset(new base::MessageLoop());
   run_loop_.reset(new base::RunLoop());
 
-  std::unique_ptr<FakeIt2MeConfirmationDialogFactory> fake_dialog_factory(
-      new FakeIt2MeConfirmationDialogFactory());
-  dialog_ = new FakeIt2MeConfirmationDialog();
-  fake_dialog_factory->set_confirmation_dialog(base::WrapUnique(dialog_));
-
+  fake_dialog_factory_ = new FakeIt2MeConfirmationDialogFactory();
   scoped_refptr<AutoThreadTaskRunner> auto_thread_task_runner =
       new AutoThreadTaskRunner(base::ThreadTaskRunnerHandle::Get(),
                                run_loop_->QuitClosure());
-
   it2me_host_ = new It2MeHost(
       ChromotingHostContext::Create(auto_thread_task_runner),
-      /*policy_watcher=*/nullptr, std::move(fake_dialog_factory),
+      /*policy_watcher=*/nullptr, base::WrapUnique(fake_dialog_factory_),
       /*observer=*/nullptr, xmpp_server_config_, directory_bot_jid_);
 }
 
 void It2MeHostTest::TearDown() {
   it2me_host_ = nullptr;
   run_loop_->Run();
 }
 
 void It2MeHostTest::OnValidationComplete(const base::Closure& resume_callback,
                                          ValidationResult validation_result) {
@@ skipping 70 matching lines @@
   RunValidationCallback(kTestClientJid);
   ASSERT_EQ(ValidationResult::ERROR_INVALID_ACCOUNT, validation_result_);
 }
 
 TEST_F(It2MeHostTest, ConnectionValidation_WrongClientDomain_MatchEnd) {
   SetClientDomainPolicy(kMismatchedDomain1);
   RunValidationCallback(kTestClientJid);
   ASSERT_EQ(ValidationResult::ERROR_INVALID_ACCOUNT, validation_result_);
 }
 
-TEST_F(It2MeHostTest, ConnectionValidation_ConfirmationDialog_Accept) {
+TEST_F(It2MeHostTest, ConnectionValidation_ConfirmationDialog_NoDialog) {
   RunValidationCallback(kTestClientJid);
   ASSERT_EQ(ValidationResult::SUCCESS, validation_result_);
-  ASSERT_STREQ(kTestClientUserName, dialog_->get_remote_user_email().c_str());
+}
+
+TEST_F(It2MeHostTest, ConnectionValidation_ConfirmationDialog_Accept) {
+  FakeIt2MeConfirmationDialog* dialog = new FakeIt2MeConfirmationDialog();
+  fake_dialog_factory_->set_confirmation_dialog(base::WrapUnique(dialog));
+
+  RunValidationCallback(kTestClientJid);
+  ASSERT_EQ(ValidationResult::SUCCESS, validation_result_);
+  ASSERT_STREQ(kTestClientUserName, dialog->get_remote_user_email().c_str());
 }
 
 TEST_F(It2MeHostTest, ConnectionValidation_ConfirmationDialog_Reject) {
-  dialog_->set_dialog_result(DialogResult::CANCEL);
+  FakeIt2MeConfirmationDialog* dialog = new FakeIt2MeConfirmationDialog();
+  dialog->set_dialog_result(DialogResult::CANCEL);
+  fake_dialog_factory_->set_confirmation_dialog(base::WrapUnique(dialog));
+
   RunValidationCallback(kTestClientJid);
   ASSERT_EQ(ValidationResult::ERROR_REJECTED_BY_USER, validation_result_);
-  ASSERT_STREQ(kTestClientUserName, dialog_->get_remote_user_email().c_str());
+  ASSERT_STREQ(kTestClientUserName, dialog->get_remote_user_email().c_str());
 }
 
 }  // namespace remoting