Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(41)

Side by Side Diff: remoting/host/client_session_unittest.cc

Issue 609923004: Cleanup usage of scoped_ptr<> in remoting for C++11 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <algorithm> 5 #include <algorithm>
6 #include <string> 6 #include <string>
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/message_loop/message_loop.h" 9 #include "base/message_loop/message_loop.h"
10 #include "base/run_loop.h" 10 #include "base/run_loop.h"
(...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after
247 connection_ = connection.get(); 247 connection_ = connection.get();
248 248
249 client_session_.reset(new ClientSession( 249 client_session_.reset(new ClientSession(
250 &session_event_handler_, 250 &session_event_handler_,
251 task_runner_, // Audio thread. 251 task_runner_, // Audio thread.
252 task_runner_, // Input thread. 252 task_runner_, // Input thread.
253 task_runner_, // Capture thread. 253 task_runner_, // Capture thread.
254 task_runner_, // Encode thread. 254 task_runner_, // Encode thread.
255 task_runner_, // Network thread. 255 task_runner_, // Network thread.
256 task_runner_, // UI thread. 256 task_runner_, // UI thread.
257 connection.PassAs<protocol::ConnectionToClient>(), 257 connection.Pass(),
258 desktop_environment_factory_.get(), 258 desktop_environment_factory_.get(),
259 base::TimeDelta(), 259 base::TimeDelta(),
260 NULL, 260 NULL,
261 extensions_)); 261 extensions_));
262 } 262 }
263 263
264 void ClientSessionTest::DisconnectClientSession() { 264 void ClientSessionTest::DisconnectClientSession() {
265 client_session_->DisconnectSession(); 265 client_session_->DisconnectSession();
266 // MockSession won't trigger OnConnectionClosed, so fake it. 266 // MockSession won't trigger OnConnectionClosed, so fake it.
267 client_session_->OnConnectionClosed(client_session_->connection(), 267 client_session_->OnConnectionClosed(client_session_->connection(),
(...skipping 540 matching lines...) Expand 10 before | Expand all | Expand 10 after
808 808
809 DisconnectClientSession(); 809 DisconnectClientSession();
810 StopClientSession(); 810 StopClientSession();
811 811
812 // ext1 was instantiated and wrapped the video capturer. 812 // ext1 was instantiated and wrapped the video capturer.
813 EXPECT_TRUE(extension.was_instantiated()); 813 EXPECT_TRUE(extension.was_instantiated());
814 EXPECT_TRUE(extension.has_wrapped_video_capturer()); 814 EXPECT_TRUE(extension.has_wrapped_video_capturer());
815 } 815 }
816 816
817 } // namespace remoting 817 } // namespace remoting
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698