Revert of Remote assistance on Chrome OS Part IV - It2MeHost

remoting/host/it2me/it2me_native_messaging_host_unittest.cc

 // Copyright 2013 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_native_messaging_host.h"
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/stl_util.h"
 #include "base/strings/stringize_macros.h"
 #include "base/values.h"
 #include "net/base/file_stream.h"
 #include "net/base/net_util.h"
 #include "remoting/base/auto_thread_task_runner.h"
 #include "remoting/host/chromoting_host_context.h"
 #include "remoting/host/native_messaging/native_messaging_pipe.h"
 #include "remoting/host/native_messaging/pipe_messaging_channel.h"
-#include "remoting/host/policy_hack/policy_watcher.h"
 #include "remoting/host/setup/test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace remoting {
 
 namespace {
 
 const char kTestAccessCode[] = "888888";
 const int kTestAccessCodeLifetimeInSeconds = 666;
 const char kTestClientUsername[] = "some_user@gmail.com";
@@ skipping 28 matching lines @@
 
   int int_value;
   EXPECT_TRUE(response->GetInteger("id", &int_value));
   EXPECT_EQ(id, int_value);
 }
 
 }  // namespace
 
 class MockIt2MeHost : public It2MeHost {
  public:
-  MockIt2MeHost(scoped_ptr<ChromotingHostContext> context,
-                scoped_ptr<policy_hack::PolicyWatcher> policy_watcher,
+  MockIt2MeHost(ChromotingHostContext* context,
+                scoped_refptr<base::SingleThreadTaskRunner> task_runner,
                 base::WeakPtr<It2MeHost::Observer> observer,
                 const XmppSignalStrategy::XmppServerConfig& xmpp_server_config,
                 const std::string& directory_bot_jid)
-      : It2MeHost(context.Pass(),
-                  policy_watcher.Pass(),
+      : It2MeHost(context,
+                  task_runner,
                   observer,
                   xmpp_server_config,
                   directory_bot_jid) {}
 
   // It2MeHost overrides
   void Connect() override;
   void Disconnect() override;
   void RequestNatPolicy() override;
 
  private:
@@ skipping 54 matching lines @@
   if (!host_context()->network_task_runner()->BelongsToCurrentThread()) {
     host_context()->network_task_runner()->PostTask(
         FROM_HERE, base::Bind(&It2MeHost::SetStateForTesting, this, state));
   } else {
     SetStateForTesting(state);
   }
 }
 
 class MockIt2MeHostFactory : public It2MeHostFactory {
  public:
-  MockIt2MeHostFactory() : It2MeHostFactory() {}
+  MockIt2MeHostFactory() {}
   scoped_refptr<It2MeHost> CreateIt2MeHost(
-      scoped_ptr<ChromotingHostContext> context,
+      ChromotingHostContext* context,
+      scoped_refptr<base::SingleThreadTaskRunner> task_runner,
       base::WeakPtr<It2MeHost::Observer> observer,
       const XmppSignalStrategy::XmppServerConfig& xmpp_server_config,
       const std::string& directory_bot_jid) override {
-    return new MockIt2MeHost(context.Pass(), nullptr, observer,
-                             xmpp_server_config, directory_bot_jid);
+    return new MockIt2MeHost(
+        context, task_runner, observer, xmpp_server_config, directory_bot_jid);
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockIt2MeHostFactory);
 };  // MockIt2MeHostFactory
 
 class It2MeNativeMessagingHostTest : public testing::Test {
  public:
   It2MeNativeMessagingHostTest() {}
   ~It2MeNativeMessagingHostTest() override {}
@@ skipping 252 matching lines @@
 
 void It2MeNativeMessagingHostTest::StartHost() {
   DCHECK(host_task_runner_->RunsTasksOnCurrentThread());
 
   base::File input_read_file;
   base::File output_write_file;
 
   ASSERT_TRUE(MakePipe(&input_read_file, &input_write_file_));
   ASSERT_TRUE(MakePipe(&output_read_file_, &output_write_file));
 
+  // Creating a native messaging host with a mock It2MeHostFactory.
+  scoped_ptr<It2MeHostFactory> factory(new MockIt2MeHostFactory());
+
   pipe_.reset(new NativeMessagingPipe());
 
   scoped_ptr<extensions::NativeMessagingChannel> channel(
       new PipeMessagingChannel(input_read_file.Pass(),
                                output_write_file.Pass()));
 
-  // Creating a native messaging host with a mock It2MeHostFactory.
   scoped_ptr<extensions::NativeMessageHost> it2me_host(
       new It2MeNativeMessagingHost(
-          ChromotingHostContext::Create(host_task_runner_),
-          make_scoped_ptr(new MockIt2MeHostFactory())));
+          host_task_runner_,
+          factory.Pass()));
   it2me_host->Start(pipe_.get());
 
   pipe_->Start(it2me_host.Pass(),
                channel.Pass(),
                base::Bind(&It2MeNativeMessagingHostTest::StopHost,
                           base::Unretained(this)));
 
   // Notify the test that the host has finished starting up.
   test_message_loop_->message_loop_proxy()->PostTask(
       FROM_HERE, test_run_loop_->QuitClosure());
@@ skipping 99 matching lines @@
 
 // Verify rejection if type is unrecognized.
 TEST_F(It2MeNativeMessagingHostTest, InvalidType) {
   base::DictionaryValue message;
   message.SetString("type", "xxx");
   TestBadRequest(message, true);
 }
 
 }  // namespace remoting