Move sockets APIs out of src/chrome

chrome/browser/extensions/api/api_resource_manager.h

 // Copyright (c) 2012 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_API_RESOURCE_MANAGER_H_
 #define CHROME_BROWSER_EXTENSIONS_API_API_RESOURCE_MANAGER_H_
 
 #include <map>
 
 #include "base/containers/hash_tables.h"
 #include "base/lazy_instance.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/ref_counted.h"
 #include "base/threading/non_thread_safe.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "components/browser_context_keyed_service/browser_context_keyed_service.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_service.h"
 #include "extensions/browser/browser_context_keyed_api_factory.h"
 #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.
 //
 // Users of this class should define kThreadId to be the thread that
 // ApiResourceManager to works on. The default is defined in ApiResource.
 // The user must also define a static const char* service_name() that returns
 // the name of the service, and in order for ApiResourceManager to use
 // service_name() friend this class.
 //
@@ skipping 102 matching lines @@
       }
       case chrome::NOTIFICATION_EXTENSION_HOST_DESTROYED: {
         ExtensionHost* host = content::Details<ExtensionHost>(details).ptr();
         data_->InitiateExtensionSuspendedCleanup(host->extension_id());
         break;
       }
     }
   }
 
  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();
   }
   static const bool kServiceHasOwnInstanceInIncognito = true;
   static const bool kServiceIsNULLWhileTesting = true;
 
   // ApiResourceData class handles resource bookkeeping on a thread
   // where resource lifetime is handled.
   class ApiResourceData : public base::RefCountedThreadSafe<ApiResourceData> {
    public:
@@ skipping 151 matching lines @@
   };
 
   content::BrowserThread::ID thread_id_;
   content::NotificationRegistrar registrar_;
   scoped_refptr<ApiResourceData> data_;
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_API_API_RESOURCE_MANAGER_H_