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

Unified Diff: extensions/browser/api/socket/tls_socket.cc

Issue 1226353004: Generate all extension schema namespaces as "api" and instead vary the generated bundle names. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase 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 | « extensions/browser/api/socket/tls_socket.h ('k') | extensions/browser/api/sockets_tcp/sockets_tcp_api.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/browser/api/socket/tls_socket.cc
diff --git a/extensions/browser/api/socket/tls_socket.cc b/extensions/browser/api/socket/tls_socket.cc
index 1853d31ef96c924885fc8be8d6479e1fa7b4be89..5e1008d63afdac3cf565e413f1c3ff765c8a3ceb 100644
--- a/extensions/browser/api/socket/tls_socket.cc
+++ b/extensions/browser/api/socket/tls_socket.cc
@@ -179,7 +179,7 @@ void TLSSocket::UpgradeSocketToTLS(
net::CertVerifier* cert_verifier,
net::TransportSecurityState* transport_security_state,
const std::string& extension_id,
- core_api::socket::SecureOptions* options,
+ api::socket::SecureOptions* options,
const TLSSocket::SecureCallback& callback) {
DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
TCPSocket* tcp_socket = static_cast<TCPSocket*>(socket);
@@ -244,8 +244,7 @@ void TLSSocket::UpgradeSocketToTLS(
ssl_config_service->GetSSLConfig(&ssl_config);
if (options && options->tls_version.get()) {
uint16 version_min = 0, version_max = 0;
- core_api::socket::TLSVersionConstraints* versions =
- options->tls_version.get();
+ api::socket::TLSVersionConstraints* versions = options->tls_version.get();
if (versions->min.get()) {
version_min = SSLProtocolVersionFromString(*versions->min.get());
}
« no previous file with comments | « extensions/browser/api/socket/tls_socket.h ('k') | extensions/browser/api/sockets_tcp/sockets_tcp_api.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698