Pass SessionConfig by reference instead of pointer.

remoting/host/chromoting_host_unittest.cc

 // Copyright (c) 2011 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 "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop_proxy.h"
 #include "base/task.h"
 #include "remoting/host/capturer_fake.h"
 #include "remoting/host/chromoting_host.h"
@@ skipping 94 matching lines @@
                                    access_verifier, false);
     credentials_.set_type(protocol::PASSWORD);
     credentials_.set_username("user");
     credentials_.set_credential("password");
     connection_ = new MockConnectionToClient(
         &handler_, &host_stub_, event_executor_);
     connection2_ = new MockConnectionToClient(
         &handler_, &host_stub2_, &event_executor2_);
     session_.reset(new MockSession());
     session2_.reset(new MockSession());
-    session_config_.reset(SessionConfig::CreateDefault());
-    session_config2_.reset(SessionConfig::CreateDefault());
+    session_config_ = SessionConfig::GetDefault();
+    session_jid_ = "user@domain/rest-of-jid";
+    session_config2_ = SessionConfig::GetDefault();
 
     ON_CALL(video_stub_, ProcessVideoPacket(_, _))
         .WillByDefault(
             DoAll(DeleteArg<0>(), DeleteArg<1>()));
     ON_CALL(video_stub2_, ProcessVideoPacket(_, _))
         .WillByDefault(
             DoAll(DeleteArg<0>(), DeleteArg<1>()));
     ON_CALL(*connection_.get(), video_stub())
         .WillByDefault(Return(&video_stub_));
     ON_CALL(*connection_.get(), client_stub())
         .WillByDefault(Return(&client_stub_));
     ON_CALL(*connection_.get(), session())
         .WillByDefault(Return(session_.get()));
     ON_CALL(*connection2_.get(), video_stub())
         .WillByDefault(Return(&video_stub2_));
     ON_CALL(*connection2_.get(), client_stub())
         .WillByDefault(Return(&client_stub2_));
     ON_CALL(*connection2_.get(), session())
         .WillByDefault(Return(session2_.get()));
     ON_CALL(*session_.get(), config())
-        .WillByDefault(Return(session_config_.get()));
+        .WillByDefault(ReturnRef(session_config_));
+    ON_CALL(*session_, jid())
+        .WillByDefault(ReturnRef(session_jid_));
     ON_CALL(*session2_.get(), config())
-        .WillByDefault(Return(session_config2_.get()));
+        .WillByDefault(ReturnRef(session_config2_));
     EXPECT_CALL(*connection_.get(), video_stub())
         .Times(AnyNumber());
     EXPECT_CALL(*connection_.get(), client_stub())
         .Times(AnyNumber());
     EXPECT_CALL(*connection_.get(), session())
         .Times(AnyNumber());
     EXPECT_CALL(*connection2_.get(), video_stub())
         .Times(AnyNumber());
     EXPECT_CALL(*connection2_.get(), client_stub())
         .Times(AnyNumber());
@@ skipping 59 matching lines @@
  protected:
   MessageLoop message_loop_;
   scoped_refptr<base::MessageLoopProxy> message_loop_proxy_;
   MockConnectionToClientEventHandler handler_;
   scoped_ptr<DesktopEnvironment> desktop_environment_;
   scoped_refptr<ChromotingHost> host_;
   scoped_refptr<InMemoryHostConfig> config_;
   MockChromotingHostContext context_;
   protocol::LocalLoginCredentials credentials_;
   scoped_refptr<MockConnectionToClient> connection_;
+  std::string session_jid_;
   scoped_ptr<MockSession> session_;
-  scoped_ptr<SessionConfig> session_config_;
+  SessionConfig session_config_;
   MockVideoStub video_stub_;
   MockClientStub client_stub_;
   MockHostStub host_stub_;
   scoped_refptr<MockConnectionToClient> connection2_;
   scoped_ptr<MockSession> session2_;
-  scoped_ptr<SessionConfig> session_config2_;
+  SessionConfig session_config2_;
   MockVideoStub video_stub2_;
   MockClientStub client_stub2_;
   MockHostStub host_stub2_;
   MockEventExecutor event_executor2_;
 
   // Owned by |host_|.
   MockEventExecutor* event_executor_;
   MockCurtain* curtain_;
   MockDisconnectWindow* disconnect_window_;
   MockContinueWindow* continue_window_;
@@ skipping 217 matching lines @@
 TEST_F(ChromotingHostTest, CurtainModeIT2Me) {
   host_->Start();
   host_->set_it2me(true);
 
   EXPECT_CALL(client_stub_, BeginSessionResponse(_, _))
       .WillOnce(RunDoneTask());
 
   // When the video packet is received we first shutdown ChromotingHost
   // then execute the done task.
   bool curtain_activated = false;
-  std::string mockJid("user@domain/rest-of-jid");
   {
     Sequence s1, s2;
     // Can't just expect Times(0) because if it fails then the host will
     // not be shut down and the message loop will never exit.
     EXPECT_CALL(*curtain_, EnableCurtainMode(_))
         .Times(AnyNumber())
         .WillRepeatedly(SetBool(&curtain_activated));
-    EXPECT_CALL(*session_, jid())
-        .Times(1)
-        .InSequence(s1)
-        .WillOnce(ReturnRef(mockJid));
     EXPECT_CALL(*disconnect_window_, Show(_, "user@domain"))
         .Times(1)
         .InSequence(s1);
     EXPECT_CALL(*local_input_monitor_, Start(_))
         .Times(1)
         .InSequence(s2);
     EXPECT_CALL(video_stub_, ProcessVideoPacket(_, _))
         .InSequence(s1, s2)
         .WillOnce(DoAll(
             InvokeWithoutArgs(this, &ChromotingHostTest::ShutdownHost),
             RunDoneTask()))
         .RetiresOnSaturation();
     EXPECT_CALL(video_stub_, ProcessVideoPacket(_, _))
         .Times(AnyNumber())
         .InSequence(s1, s2);
     EXPECT_CALL(*connection_.get(), Disconnect())
         .InSequence(s1, s2)
         .RetiresOnSaturation();
   }
   SimulateClientConnection(0, true);
   message_loop_.Run();
   host_->set_it2me(false);
   EXPECT_THAT(curtain_activated, false);
 }
 }  // namespace remoting