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

extensions/browser/api/sockets_tcp_server/sockets_tcp_server_api.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/sockets_tcp_server/sockets_tcp_server_api.h"
 
 #include "content/public/common/socket_permission_request.h"
 #include "extensions/browser/api/socket/tcp_socket.h"
 #include "extensions/browser/api/sockets_tcp_server/tcp_server_socket_event_dispatcher.h"
 #include "extensions/common/api/sockets/sockets_manifest_data.h"
 #include "extensions/common/permissions/permissions_data.h"
 #include "extensions/common/permissions/socket_permission.h"
 #include "net/base/net_errors.h"
 
 using content::SocketPermissionRequest;
 using extensions::ResumableTCPServerSocket;
-using extensions::core_api::sockets_tcp_server::SocketInfo;
-using extensions::core_api::sockets_tcp_server::SocketProperties;
+using extensions::api::sockets_tcp_server::SocketInfo;
+using extensions::api::sockets_tcp_server::SocketProperties;
 
 namespace {
 
 const char kSocketNotFoundError[] = "Socket not found";
 const char kPermissionError[] = "Does not have permission";
 const int kDefaultListenBacklog = SOMAXCONN;
 
 linked_ptr<SocketInfo> CreateSocketInfo(int socket_id,
                                         ResumableTCPServerSocket* socket) {
   linked_ptr<SocketInfo> socket_info(new SocketInfo());
@@ skipping 23 matching lines @@
     socket->set_name(*properties->name.get());
   }
   if (properties->persistent.get()) {
     socket->set_persistent(*properties->persistent.get());
   }
 }
 
 }  // namespace
 
 namespace extensions {
-namespace core_api {
+namespace api {
 
 TCPServerSocketAsyncApiFunction::~TCPServerSocketAsyncApiFunction() {}
 
 scoped_ptr<SocketResourceManagerInterface>
 TCPServerSocketAsyncApiFunction::CreateSocketResourceManager() {
   return scoped_ptr<SocketResourceManagerInterface>(
              new SocketResourceManager<ResumableTCPServerSocket>()).Pass();
 }
 
 ResumableTCPServerSocket* TCPServerSocketAsyncApiFunction::GetTcpSocket(
@@ skipping 46 matching lines @@
   SetSocketProperties(socket, &params_.get()->properties);
   results_ = sockets_tcp_server::Update::Results::Create();
 }
 
 SocketsTcpServerSetPausedFunction::SocketsTcpServerSetPausedFunction()
     : socket_event_dispatcher_(NULL) {}
 
 SocketsTcpServerSetPausedFunction::~SocketsTcpServerSetPausedFunction() {}
 
 bool SocketsTcpServerSetPausedFunction::Prepare() {
-  params_ = core_api::sockets_tcp_server::SetPaused::Params::Create(*args_);
+  params_ = api::sockets_tcp_server::SetPaused::Params::Create(*args_);
   EXTENSION_FUNCTION_VALIDATE(params_.get());
 
   socket_event_dispatcher_ =
       TCPServerSocketEventDispatcher::Get(browser_context());
   DCHECK(socket_event_dispatcher_)
       << "There is no socket event dispatcher. "
          "If this assertion is failing during a test, then it is likely that "
          "TestExtensionSystem is failing to provide an instance of "
          "TCPServerSocketEventDispatcher.";
   return socket_event_dispatcher_ != NULL;
@@ skipping 16 matching lines @@
 
   results_ = sockets_tcp_server::SetPaused::Results::Create();
 }
 
 SocketsTcpServerListenFunction::SocketsTcpServerListenFunction()
     : socket_event_dispatcher_(NULL) {}
 
 SocketsTcpServerListenFunction::~SocketsTcpServerListenFunction() {}
 
 bool SocketsTcpServerListenFunction::Prepare() {
-  params_ = core_api::sockets_tcp_server::Listen::Params::Create(*args_);
+  params_ = api::sockets_tcp_server::Listen::Params::Create(*args_);
   EXTENSION_FUNCTION_VALIDATE(params_.get());
 
   socket_event_dispatcher_ =
       TCPServerSocketEventDispatcher::Get(browser_context());
   DCHECK(socket_event_dispatcher_)
       << "There is no socket event dispatcher. "
          "If this assertion is failing during a test, then it is likely that "
          "TestExtensionSystem is failing to provide an instance of "
          "TCPServerSocketEventDispatcher.";
   return socket_event_dispatcher_ != NULL;
@@ skipping 113 matching lines @@
       int socket_id = *it;
       ResumableTCPServerSocket* socket = GetTcpSocket(socket_id);
       if (socket) {
         socket_infos.push_back(CreateSocketInfo(socket_id, socket));
       }
     }
   }
   results_ = sockets_tcp_server::GetSockets::Results::Create(socket_infos);
 }
 
-}  // namespace core_api
+}  // namespace api
 }  // namespace extensions