Move sockets APIs out of src/chrome

chrome/browser/extensions/api/api_resource_manager.h

Index: chrome/browser/extensions/api/api_resource_manager.h
diff --git a/chrome/browser/extensions/api/api_resource_manager.h b/chrome/browser/extensions/api/api_resource_manager.h
index 3a115ca5dc80790fd223432af150c34056c3eb7d..e037ca0cc7e1fedf54f3e49848ed17d54250027d 100644
--- a/chrome/browser/extensions/api/api_resource_manager.h
+++ b/chrome/browser/extensions/api/api_resource_manager.h
@@ -23,15 +23,16 @@
 #include "extensions/common/extension.h"
 
 namespace extensions {
+
 namespace api {
 class SerialEventDispatcher;
+}
+
+namespace core_api {
 class TCPServerSocketEventDispatcher;
 class TCPSocketEventDispatcher;
 class UDPSocketEventDispatcher;
 }
-}
-
-namespace extensions {
 
 // An ApiResourceManager manages the lifetime of a set of resources that
 // ApiFunctions use. Examples are sockets or USB connections.
@@ -154,12 +155,14 @@ class ApiResourceManager : public BrowserContextKeyedAPI,
   }
 
  private:
+  // TODO(rockot): ApiResourceData could be moved out of ApiResourceManager and
+  // we could avoid maintaining a friends list here.
   friend class api::SerialEventDispatcher;
-  friend class api::TCPServerSocketEventDispatcher;
-  friend class api::TCPSocketEventDispatcher;
-  friend class api::UDPSocketEventDispatcher;
+  friend class core_api::TCPServerSocketEventDispatcher;
+  friend class core_api::TCPSocketEventDispatcher;
+  friend class core_api::UDPSocketEventDispatcher;
   friend class BrowserContextKeyedAPIFactory<ApiResourceManager<T> >;
-  // BrowserContextKeyedAPI implementation.

[James Cook, 2014/03/06 18:31:00]

nit: I would keep this comment since these statics actually are the BCKA
implementation details.

[Ken Rockot(use gerrit already), 2014/03/06 18:46:32]

Yeah, that was a manual merge mistake. Fixed.

+
   static const char* service_name() {
     return T::service_name();
   }