| 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 <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 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 115 std::sort(words_expected.begin(), words_expected.end()); | 115 std::sort(words_expected.begin(), words_expected.end()); |
| 116 return words_args == words_expected; | 116 return words_args == words_expected; |
| 117 } | 117 } |
| 118 | 118 |
| 119 } // namespace | 119 } // namespace |
| 120 | 120 |
| 121 class ClientSessionTest : public testing::Test { | 121 class ClientSessionTest : public testing::Test { |
| 122 public: | 122 public: |
| 123 ClientSessionTest() : client_jid_("user@domain/rest-of-jid") {} | 123 ClientSessionTest() : client_jid_("user@domain/rest-of-jid") {} |
| 124 | 124 |
| 125 virtual void SetUp() OVERRIDE; | 125 virtual void SetUp() override; |
| 126 virtual void TearDown() OVERRIDE; | 126 virtual void TearDown() override; |
| 127 | 127 |
| 128 // Creates the client session. | 128 // Creates the client session. |
| 129 void CreateClientSession(); | 129 void CreateClientSession(); |
| 130 | 130 |
| 131 // Disconnects the client session. | 131 // Disconnects the client session. |
| 132 void DisconnectClientSession(); | 132 void DisconnectClientSession(); |
| 133 | 133 |
| 134 // Stops and releases the ClientSession, allowing the MessageLoop to quit. | 134 // Stops and releases the ClientSession, allowing the MessageLoop to quit. |
| 135 void StopClientSession(); | 135 void StopClientSession(); |
| 136 | 136 |
| (...skipping 671 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 |
| OLD | NEW |