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

Side by Side Diff: remoting/test/app_remoting_connected_client_fixture.cc

Issue 1164143002: Added new driver for chromoting. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Windows return at FAIL() fix Created 5 years, 6 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/remoting_test.gypi ('k') | remoting/test/chromoting_test_driver.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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "remoting/test/app_remoting_connected_client_fixture.h" 5 #include "remoting/test/app_remoting_connected_client_fixture.h"
6 6
7 #include "base/json/json_reader.h" 7 #include "base/json/json_reader.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/run_loop.h" 9 #include "base/run_loop.h"
10 #include "base/thread_task_runner_handle.h" 10 #include "base/thread_task_runner_handle.h"
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 AppRemotingConnectedClientFixture::~AppRemotingConnectedClientFixture() { 49 AppRemotingConnectedClientFixture::~AppRemotingConnectedClientFixture() {
50 } 50 }
51 51
52 void AppRemotingConnectedClientFixture::SetUp() { 52 void AppRemotingConnectedClientFixture::SetUp() {
53 client_.reset(new TestChromotingClient()); 53 client_.reset(new TestChromotingClient());
54 client_->AddRemoteConnectionObserver(this); 54 client_->AddRemoteConnectionObserver(this);
55 55
56 StartConnection(); 56 StartConnection();
57 57
58 if (!connection_is_ready_for_tests_) { 58 if (!connection_is_ready_for_tests_) {
59 FAIL() << "Remote host connection could not be established."; 59 ADD_FAILURE() << "Remote host connection could not be established.";
60 client_->EndConnection(); 60 client_->EndConnection();
61 } 61 }
62 } 62 }
63 63
64 void AppRemotingConnectedClientFixture::TearDown() { 64 void AppRemotingConnectedClientFixture::TearDown() {
65 // |client_| destroys some of its members via DeleteSoon on the message loop's 65 // |client_| destroys some of its members via DeleteSoon on the message loop's
66 // TaskRunner so we need to run the loop until it has no more work to do. 66 // TaskRunner so we need to run the loop until it has no more work to do.
67 client_->RemoveRemoteConnectionObserver(this); 67 client_->RemoveRemoteConnectionObserver(this);
68 client_.reset(); 68 client_.reset();
69 69
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
243 DCHECK(run_loop_); 243 DCHECK(run_loop_);
244 // Now that the main window is visible, give the app some time to settle 244 // Now that the main window is visible, give the app some time to settle
245 // before signaling that it is ready to run tests. 245 // before signaling that it is ready to run tests.
246 timer_->Start(FROM_HERE, base::TimeDelta::FromSeconds(2), 246 timer_->Start(FROM_HERE, base::TimeDelta::FromSeconds(2),
247 run_loop_->QuitClosure()); 247 run_loop_->QuitClosure());
248 } 248 }
249 } 249 }
250 250
251 } // namespace test 251 } // namespace test
252 } // namespace remoting 252 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/remoting_test.gypi ('k') | remoting/test/chromoting_test_driver.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698