| OLD | NEW |
| 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 "base/bind.h" | 5 #include "base/bind.h" |
| 6 #include "base/memory/scoped_ptr.h" | 6 #include "base/memory/scoped_ptr.h" |
| 7 #include "base/message_loop/message_loop.h" | 7 #include "base/message_loop/message_loop.h" |
| 8 #include "base/run_loop.h" | 8 #include "base/run_loop.h" |
| 9 #include "remoting/base/auto_thread_task_runner.h" | 9 #include "remoting/base/auto_thread_task_runner.h" |
| 10 #include "remoting/host/client_session_control.h" | 10 #include "remoting/host/client_session_control.h" |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 73 .Times(AnyNumber()); | 73 .Times(AnyNumber()); |
| 74 EXPECT_CALL(client_session_control_, SetDisableInputs(_)) | 74 EXPECT_CALL(client_session_control_, SetDisableInputs(_)) |
| 75 .Times(0); | 75 .Times(0); |
| 76 | 76 |
| 77 { | 77 { |
| 78 scoped_ptr<LocalInputMonitor> local_input_monitor = | 78 scoped_ptr<LocalInputMonitor> local_input_monitor = |
| 79 LocalInputMonitor::Create(task_runner_, | 79 LocalInputMonitor::Create(task_runner_, |
| 80 task_runner_, | 80 task_runner_, |
| 81 task_runner_, | 81 task_runner_, |
| 82 client_session_control_factory_.GetWeakPtr()); | 82 client_session_control_factory_.GetWeakPtr()); |
| 83 task_runner_ = NULL; | 83 task_runner_ = nullptr; |
| 84 } | 84 } |
| 85 | 85 |
| 86 run_loop_.Run(); | 86 run_loop_.Run(); |
| 87 } | 87 } |
| 88 | 88 |
| 89 } // namespace remoting | 89 } // namespace remoting |
| OLD | NEW |