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

Unified Diff: remoting/protocol/fake_session.h

Issue 4313001: Rename classes for Chromoting: (Closed) Base URL: http://git.chromium.org/git/chromium.git
Patch Set: Resolve merge conflicts Created 10 years, 1 month 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/chromotocol_server.h ('k') | remoting/protocol/fake_session.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/fake_session.h
diff --git a/remoting/protocol/fake_connection.h b/remoting/protocol/fake_session.h
similarity index 86%
rename from remoting/protocol/fake_connection.h
rename to remoting/protocol/fake_session.h
index ddc9cab29f3f85808037da8cc0963d2447aab870..d32535133214e65c993ee81a6336d0c32e2329e4 100644
--- a/remoting/protocol/fake_connection.h
+++ b/remoting/protocol/fake_session.h
@@ -2,17 +2,19 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef REMOTING_PROTOCOL_FAKE_CONNECTION_H_
-#define REMOTING_PROTOCOL_FAKE_CONNECTION_H_
+#ifndef REMOTING_PROTOCOL_FAKE_SESSION_H_
+#define REMOTING_PROTOCOL_FAKE_SESSION_H_
#include <vector>
#include "base/scoped_ptr.h"
#include "net/socket/socket.h"
-#include "remoting/protocol/chromotocol_connection.h"
+#include "remoting/protocol/session.h"
namespace remoting {
+namespace protocol {
+
extern const char kTestJid[];
// FakeSocket implement net::Socket interface for FakeConnection. All data
@@ -50,12 +52,12 @@ class FakeSocket : public net::Socket {
int input_pos_;
};
-// FakeChromotocolConnection is a dummy ChromotocolConnection that uses
-// FakeSocket for all channels.
-class FakeChromotocolConnection : public ChromotocolConnection {
+// FakeSession is a dummy protocol::Session that uses FakeSocket for all
+// channels.
+class FakeSession : public Session {
public:
- FakeChromotocolConnection();
- virtual ~FakeChromotocolConnection();
+ FakeSession();
+ virtual ~FakeSession();
StateChangeCallback* state_change_callback() { return callback_.get(); }
@@ -97,6 +99,8 @@ class FakeChromotocolConnection : public ChromotocolConnection {
bool closed_;
};
+} // namespace protocol
+
} // namespace remoting
-#endif // REMOTING_PROTOCOL_FAKE_CONNECTION_H_
+#endif // REMOTING_PROTOCOL_FAKE_SESSION_H_
« no previous file with comments | « remoting/protocol/chromotocol_server.h ('k') | remoting/protocol/fake_session.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698