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

Unified Diff: remoting/protocol/pseudotcp_adapter_unittest.cc

Issue 1177983009: Move remoting-specific adapters from jingle/glue to remoting/protocol (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/protocol/pseudotcp_adapter.cc ('k') | remoting/protocol/pseudotcp_channel_factory.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/pseudotcp_adapter_unittest.cc
diff --git a/jingle/glue/pseudotcp_adapter_unittest.cc b/remoting/protocol/pseudotcp_adapter_unittest.cc
similarity index 96%
rename from jingle/glue/pseudotcp_adapter_unittest.cc
rename to remoting/protocol/pseudotcp_adapter_unittest.cc
index 212a2d06dd32b76e4f40e9fd86436d5c4a9ef8c9..3babfa9ee8bb11444705c18323fb04c11838cbdb 100644
--- a/jingle/glue/pseudotcp_adapter_unittest.cc
+++ b/remoting/protocol/pseudotcp_adapter_unittest.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2015 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "jingle/glue/pseudotcp_adapter.h"
+#include "remoting/protocol/pseudotcp_adapter.h"
#include <vector>
@@ -13,18 +13,11 @@
#include "net/base/io_buffer.h"
#include "net/base/net_errors.h"
#include "net/base/test_completion_callback.h"
-#include "net/udp/udp_socket.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
-
-namespace jingle_glue {
-namespace {
-class FakeSocket;
-} // namespace
-} // namespace jingle_glue
-
-namespace jingle_glue {
+namespace remoting {
+namespace protocol {
namespace {
@@ -301,7 +294,7 @@ class TCPChannelTester : public base::RefCountedThreadSafe<TCPChannelTester> {
class PseudoTcpAdapterTest : public testing::Test {
protected:
void SetUp() override {
- JingleThreadWrapper::EnsureForCurrentMessageLoop();
+ jingle_glue::JingleThreadWrapper::EnsureForCurrentMessageLoop();
host_socket_ = new FakeSocket();
client_socket_ = new FakeSocket();
@@ -309,8 +302,9 @@ class PseudoTcpAdapterTest : public testing::Test {
host_socket_->Connect(client_socket_);
client_socket_->Connect(host_socket_);
- host_pseudotcp_.reset(new PseudoTcpAdapter(host_socket_));
- client_pseudotcp_.reset(new PseudoTcpAdapter(client_socket_));
+ host_pseudotcp_.reset(new PseudoTcpAdapter(make_scoped_ptr(host_socket_)));
+ client_pseudotcp_.reset(
+ new PseudoTcpAdapter(make_scoped_ptr(client_socket_)));
}
FakeSocket* host_socket_;
@@ -441,4 +435,5 @@ TEST_F(PseudoTcpAdapterTest, WriteWaitsForSendLetsDataThrough) {
} // namespace
-} // namespace jingle_glue
+} // namespace protocol
+} // namespace remoting
« no previous file with comments | « remoting/protocol/pseudotcp_adapter.cc ('k') | remoting/protocol/pseudotcp_channel_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698