jingle/glue/chrome_async_socket.cc - Issue 12680003: net: split net/ssl out of net/base - Code Review

Chromium Code Reviews

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

(1116)

My Issues | Starred Open | Closed | All

Unified Diff: jingle/glue/chrome_async_socket.cc

Issue 12680003: net: split net/ssl out of net/base (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 9 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

« content/browser/loader/resource_loader.cc ('K') | « content/shell/shell_url_request_context_getter.cc ('k') | jingle/glue/chrome_async_socket_unittest.cc » ('j') | net/base/DEPS » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: jingle/glue/chrome_async_socket.cc

diff --git a/jingle/glue/chrome_async_socket.cc b/jingle/glue/chrome_async_socket.cc

index 667ec7db1c831f0ce681bbf4e5f30e1ccd8704b7..5dc8bb13677129cf14eaa7d6a056198e9409aef2 100644

--- a/jingle/glue/chrome_async_socket.cc

+++ b/jingle/glue/chrome_async_socket.cc

@@ -5,8 +5,8 @@

#include "jingle/glue/chrome_async_socket.h"

#include <algorithm>

-#include <cstring>

#include <cstdlib>

+#include <cstring>

#include "base/basictypes.h"

#include "base/bind.h"

@@ -18,10 +18,10 @@

#include "net/base/host_port_pair.h"

#include "net/base/io_buffer.h"

#include "net/base/net_util.h"

-#include "net/base/ssl_config_service.h"

#include "net/socket/client_socket_handle.h"

#include "net/socket/ssl_client_socket.h"

#include "net/socket/tcp_client_socket.h"

+#include "net/ssl/ssl_config_service.h"

#include "third_party/libjingle/source/talk/base/socketaddress.h"

namespace jingle_glue {

« content/browser/loader/resource_loader.cc ('K') | « content/shell/shell_url_request_context_getter.cc ('k') | jingle/glue/chrome_async_socket_unittest.cc » ('j') | net/base/DEPS » ('J')

Powered by Google App Engine

This is Rietveld 408576698