Generate all extension schema namespaces as "api" and instead vary the generated bundle names.

extensions/browser/api/socket/tls_socket.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "extensions/browser/api/socket/tls_socket.h"
 
 #include "base/callback_helpers.h"
 #include "base/logging.h"
 #include "extensions/browser/api/api_resource.h"
 #include "net/base/address_list.h"
@@ skipping 161 matching lines @@
   return Socket::TYPE_TLS;
 }
 
 // static
 void TLSSocket::UpgradeSocketToTLS(
     Socket* socket,
     scoped_refptr<net::SSLConfigService> ssl_config_service,
     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);
   scoped_ptr<net::SSLClientSocket> null_sock;
 
   if (!tcp_socket || tcp_socket->GetSocketType() != Socket::TYPE_TCP ||
       !tcp_socket->ClientStream() || !tcp_socket->IsConnected() ||
       tcp_socket->HasPendingRead()) {
     DVLOG(1) << "Failing before trying. socket is " << tcp_socket;
     if (tcp_socket) {
@@ skipping 44 matching lines @@
   DCHECK(transport_security_state);
   net::SSLClientSocketContext context;
   context.cert_verifier = cert_verifier;
   context.transport_security_state = transport_security_state;
 
   // Fill in the SSL socket params.
   net::SSLConfig ssl_config;
   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());
     }
     if (versions->max.get()) {
       version_max = SSLProtocolVersionFromString(*versions->max.get());
     }
     if (version_min) {
       ssl_config.version_min = version_min;
     }
     if (version_max) {
@@ skipping 38 matching lines @@
     if (status != net::OK) {
       DVLOG(1) << "Status is not OK or IO-pending: "
                << net::ErrorToString(status);
     }
     connect_cb.Run(status);
   }
 }
 
 }  // namespace extensions