Simplify ConnectionToHost interface.

remoting/test/test_chromoting_client_unittest.cc

 // Copyright 2015 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 <string>
 
 #include "base/message_loop/message_loop.h"
 #include "remoting/protocol/fake_connection_to_host.h"
+#include "remoting/signaling/fake_signal_strategy.h"
 #include "remoting/test/connection_setup_info.h"
 #include "remoting/test/test_chromoting_client.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-namespace {
-const char kTestUserName[] = "test_user@faux_address.com";
-const char kAccessToken[] = "faux_access_token";
-}
-
 namespace remoting {
 namespace test {
 
 using testing::_;
 
 // Provides base functionality for the TestChromotingClient Tests below.  This
 // fixture also creates an IO MessageLoop for use by the TestChromotingClient.
 // Overrides a subset of the RemoteConnectionObserver interface to track
 // connection status changes for result verification.
 class TestChromotingClientTest : public ::testing::Test,
                                  public RemoteConnectionObserver {
  public:
   TestChromotingClientTest();
   ~TestChromotingClientTest() override;
 
  protected:
   // testing::Test interface.
   void SetUp() override;
   void TearDown() override;
 
   // Used for result verification.
-  bool is_connected_to_host_;
-  protocol::ConnectionToHost::State connection_state_;
-  protocol::ErrorCode error_code_;
+  bool is_connected_to_host_ =false;

[joedow, 2015/12/17 16:59:45]

add space -> "= false;"

[Sergey Ulanov, 2015/12/17 17:32:32]

Done.

+  protocol::ConnectionToHost::State connection_state_ =
+      protocol::ConnectionToHost::INITIALIZING;
+  protocol::ErrorCode error_code_ = protocol::OK;
 
   // Used for simulating different conditions for the TestChromotingClient.
   ConnectionSetupInfo connection_setup_info_;
-  FakeConnectionToHost* fake_connection_to_host_;
+  FakeConnectionToHost* fake_connection_to_host_ = nullptr;
 
   scoped_ptr<TestChromotingClient> test_chromoting_client_;
 
  private:
   // RemoteConnectionObserver interface.
   void ConnectionStateChanged(protocol::ConnectionToHost::State state,
                               protocol::ErrorCode error_code) override;
   void ConnectionReady(bool ready) override;
 
   base::MessageLoopForIO message_loop_;
 
   DISALLOW_COPY_AND_ASSIGN(TestChromotingClientTest);
 };
 
-TestChromotingClientTest::TestChromotingClientTest()
-    : is_connected_to_host_(false),
-      connection_state_(protocol::ConnectionToHost::INITIALIZING),
-      error_code_(protocol::OK),
-      fake_connection_to_host_(nullptr) {
-}
-
-TestChromotingClientTest::~TestChromotingClientTest() {
-}
+TestChromotingClientTest::TestChromotingClientTest() {}
+TestChromotingClientTest::~TestChromotingClientTest() {}
 
 void TestChromotingClientTest::SetUp() {
   test_chromoting_client_.reset(new TestChromotingClient());
   test_chromoting_client_->AddRemoteConnectionObserver(this);
 
   // Pass ownership of the FakeConnectionToHost to the chromoting instance but
   // keep the ptr around so we can use it to simulate state changes.  It will
   // remain valid until |test_chromoting_client_| is destroyed.
   fake_connection_to_host_ = new FakeConnectionToHost();
+  test_chromoting_client_->SetSignalStrategyForTests(make_scoped_ptr(
+      new FakeSignalStrategy("test_user@faux_address.com/123")));
   test_chromoting_client_->SetConnectionToHostForTests(
       make_scoped_ptr(fake_connection_to_host_));
 
-  connection_setup_info_.access_token = kAccessToken;
-  connection_setup_info_.user_name = kTestUserName;
+  connection_setup_info_.host_jid = "test_host@faux_address.com/321";
   connection_setup_info_.auth_methods.push_back(
       protocol::AuthenticationMethod::ThirdParty());
 }
 
 void TestChromotingClientTest::TearDown() {
   test_chromoting_client_->RemoveRemoteConnectionObserver(this);
   fake_connection_to_host_ = nullptr;
 
   // The chromoting instance must be destroyed before the message loop.
   test_chromoting_client_.reset();
@@ skipping 110 matching lines @@
   // Close the connection via the TestChromotingClient and verify the error
   // state is persisted.
   test_chromoting_client_->EndConnection();
   EXPECT_EQ(protocol::ConnectionToHost::State::FAILED, connection_state_);
   EXPECT_EQ(protocol::ErrorCode::UNKNOWN_ERROR, error_code_);
   EXPECT_FALSE(is_connected_to_host_);
 }
 
 }  // namespace test
 }  // namespace remoting