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

extensions/browser/api/socket/tls_socket.h

 // 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_API_SOCKET_TLS_SOCKET_H_
 #define CHROME_BROWSER_EXTENSIONS_API_SOCKET_TLS_SOCKET_H_
 
 #include <string>
 
 #include "extensions/browser/api/socket/socket.h"
@@ skipping 79 matching lines @@
   // Note: |callback| may be synchronously invoked before
   // UpgradeSocketToTLS() returns. Currently using the older chrome.socket
   // version of SecureOptions, to avoid having the older API implementation
   // depend on the newer one.
   static void UpgradeSocketToTLS(
       Socket* socket,
       scoped_refptr<net::SSLConfigService> 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 SecureCallback& callback);
 
  private:
   int WriteImpl(net::IOBuffer* io_buffer,
                 int io_buffer_size,
                 const net::CompletionCallback& callback) override;
 
   void OnReadComplete(const scoped_refptr<net::IOBuffer>& io_buffer,
                       int result);
 
   scoped_ptr<net::StreamSocket> tls_socket_;
   ReadCompletionCallback read_callback_;
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_API_SOCKET_TLS_SOCKET_H_