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

Unified Diff: jingle/notifier/base/ssl_adapter.cc

Issue 3358028: Revert r59012 which started using Chrome sockets for sync. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: Created 10 years, 3 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 | « jingle/notifier/base/ssl_adapter.h ('k') | jingle/notifier/base/static_assert.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: jingle/notifier/base/ssl_adapter.cc
diff --git a/remoting/jingle_glue/ssl_adapter.cc b/jingle/notifier/base/ssl_adapter.cc
similarity index 70%
rename from remoting/jingle_glue/ssl_adapter.cc
rename to jingle/notifier/base/ssl_adapter.cc
index 68d350cae5891cbcd6ba0b2f17b01f024505c729..2111244119af95b96c81b5f647b417bd570912a3 100644
--- a/remoting/jingle_glue/ssl_adapter.cc
+++ b/jingle/notifier/base/ssl_adapter.cc
@@ -2,26 +2,26 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "remoting/jingle_glue/ssl_adapter.h"
+#include "jingle/notifier/base/ssl_adapter.h"
#if defined(OS_WIN)
#include "talk/base/ssladapter.h"
#else
-#include "remoting/jingle_glue/ssl_socket_adapter.h"
+#include "jingle/notifier/communicator/ssl_socket_adapter.h"
#endif
-namespace remoting {
+namespace notifier {
talk_base::SSLAdapter* CreateSSLAdapter(talk_base::AsyncSocket* socket) {
talk_base::SSLAdapter* ssl_adapter =
#if defined(OS_WIN)
talk_base::SSLAdapter::Create(socket);
#else
- remoting::SSLSocketAdapter::Create(socket);
+ notifier::SSLSocketAdapter::Create(socket);
#endif
DCHECK(ssl_adapter);
return ssl_adapter;
}
-} // namespace remoting
+} // namespace notifier
« no previous file with comments | « jingle/notifier/base/ssl_adapter.h ('k') | jingle/notifier/base/static_assert.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698