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

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

Issue 1673723002: Use IpcVideoFrameCapturer on network thread instead of capturer thread. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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
« no previous file with comments | « remoting/host/ipc_desktop_environment.cc ('k') | remoting/host/it2me/it2me_host.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 <stdint.h> 5 #include <stdint.h>
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
(...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after
287 .Times(AnyNumber()) 287 .Times(AnyNumber())
288 .WillRepeatedly(InvokeWithoutArgs( 288 .WillRepeatedly(InvokeWithoutArgs(
289 this, &IpcDesktopEnvironmentTest::DeleteDesktopEnvironment)); 289 this, &IpcDesktopEnvironmentTest::DeleteDesktopEnvironment));
290 EXPECT_CALL(client_session_control_, OnLocalMouseMoved(_)) 290 EXPECT_CALL(client_session_control_, OnLocalMouseMoved(_))
291 .Times(0); 291 .Times(0);
292 EXPECT_CALL(client_session_control_, SetDisableInputs(_)) 292 EXPECT_CALL(client_session_control_, SetDisableInputs(_))
293 .Times(0); 293 .Times(0);
294 294
295 // Create a desktop environment instance. 295 // Create a desktop environment instance.
296 desktop_environment_factory_.reset(new IpcDesktopEnvironmentFactory( 296 desktop_environment_factory_.reset(new IpcDesktopEnvironmentFactory(
297 task_runner_, 297 task_runner_, task_runner_, io_task_runner_, &daemon_channel_));
298 task_runner_,
299 task_runner_,
300 io_task_runner_,
301 &daemon_channel_));
302 desktop_environment_ = desktop_environment_factory_->Create( 298 desktop_environment_ = desktop_environment_factory_->Create(
303 client_session_control_factory_.GetWeakPtr()); 299 client_session_control_factory_.GetWeakPtr());
304 300
305 screen_controls_ = desktop_environment_->CreateScreenControls(); 301 screen_controls_ = desktop_environment_->CreateScreenControls();
306 302
307 // Create the input injector. 303 // Create the input injector.
308 input_injector_ = desktop_environment_->CreateInputInjector(); 304 input_injector_ = desktop_environment_->CreateInputInjector();
309 305
310 // Create the screen capturer. 306 // Create the screen capturer.
311 video_capturer_ = 307 video_capturer_ =
(...skipping 430 matching lines...) Expand 10 before | Expand all | Expand 10 after
742 .WillOnce(InvokeWithoutArgs( 738 .WillOnce(InvokeWithoutArgs(
743 this, &IpcDesktopEnvironmentTest::DeleteDesktopEnvironment)); 739 this, &IpcDesktopEnvironmentTest::DeleteDesktopEnvironment));
744 740
745 // Change the desktop resolution. 741 // Change the desktop resolution.
746 screen_controls_->SetScreenResolution(ScreenResolution( 742 screen_controls_->SetScreenResolution(ScreenResolution(
747 webrtc::DesktopSize(100, 100), 743 webrtc::DesktopSize(100, 100),
748 webrtc::DesktopVector(96, 96))); 744 webrtc::DesktopVector(96, 96)));
749 } 745 }
750 746
751 } // namespace remoting 747 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/host/ipc_desktop_environment.cc ('k') | remoting/host/it2me/it2me_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698