| Index: chrome/browser/sync/notifier/communicator/xmpp_socket_adapter.cc
|
| ===================================================================
|
| --- chrome/browser/sync/notifier/communicator/xmpp_socket_adapter.cc (revision 30107)
|
| +++ chrome/browser/sync/notifier/communicator/xmpp_socket_adapter.cc (working copy)
|
| @@ -9,12 +9,17 @@
|
|
|
| #include "base/logging.h"
|
| #include "chrome/browser/sync/notifier/communicator/product_info.h"
|
| +#if defined(OS_LINUX) || defined(OS_MACOSX)
|
| +#include "chrome/browser/sync/notifier/communicator/ssl_socket_adapter.h"
|
| +#endif
|
| #include "talk/base/byteorder.h"
|
| #include "talk/base/common.h"
|
| #include "talk/base/firewallsocketserver.h"
|
| #include "talk/base/logging.h"
|
| #include "talk/base/socketadapters.h"
|
| +#if defined(OS_WIN)
|
| #include "talk/base/ssladapter.h"
|
| +#endif
|
| #include "talk/xmpp/xmppengine.h"
|
|
|
| namespace notifier {
|
| @@ -132,7 +137,11 @@
|
| }
|
|
|
| #if defined(FEATURE_ENABLE_SSL)
|
| +#if defined(OS_WIN)
|
| talk_base::SSLAdapter* ssl = talk_base::SSLAdapter::Create(socket);
|
| +#else
|
| + notifier::SSLSocketAdapter* ssl = notifier::SSLSocketAdapter::Create(socket);
|
| +#endif
|
| socket = ssl;
|
| #endif
|
|
|
| @@ -320,8 +329,13 @@
|
|
|
| ASSERT(write_buffer_length_ == 0);
|
|
|
| +#if defined(OS_WIN)
|
| talk_base::SSLAdapter* ssl_adapter =
|
| - static_cast<talk_base::SSLAdapter*>(socket_);
|
| + static_cast<talk_base::SSLAdapter*>(socket_);
|
| +#else
|
| + notifier::SSLSocketAdapter* ssl_adapter =
|
| + static_cast<notifier::SSLSocketAdapter*>(socket_);
|
| +#endif
|
|
|
| if (allow_unverified_certs_) {
|
| ssl_adapter->set_ignore_bad_cert(true);
|
|
|