[cast_channel] Make CastSocket not inherit from ApiResource

extensions/browser/api/cast_channel/cast_channel_api.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 EXTENSIONS_BROWSER_API_CAST_CHANNEL_CAST_CHANNEL_API_H_
 #define EXTENSIONS_BROWSER_API_CAST_CHANNEL_CAST_CHANNEL_API_H_
 
 #include <memory>
 #include <string>
 
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/threading/thread_checker.h"
-#include "extensions/browser/api/api_resource_manager.h"
 #include "extensions/browser/api/async_api_function.h"
 #include "extensions/browser/api/cast_channel/cast_socket.h"
 #include "extensions/browser/browser_context_keyed_api_factory.h"
 #include "extensions/common/api/cast_channel.h"
 
 class CastChannelAPITest;
 
 namespace content {
 class BrowserContext;
 }
 
 namespace net {
 class IPEndPoint;
 }
 
 namespace extensions {
 
 struct Event;
 
 namespace api {
 namespace cast_channel {
+class CastSocketService;
 class Logger;
 }  // namespace cast_channel
 }  // namespace api
 
 namespace cast_channel = api::cast_channel;
 
 class CastChannelAPI : public BrowserContextKeyedAPI,
                        public base::SupportsWeakPtr<CastChannelAPI> {
  public:
   explicit CastChannelAPI(content::BrowserContext* context);
@@ skipping 48 matching lines @@
   std::unique_ptr<base::Timer> injected_timeout_timer_;
 
   DISALLOW_COPY_AND_ASSIGN(CastChannelAPI);
 };
 
 class CastChannelAsyncApiFunction : public AsyncApiFunction {
  public:
   CastChannelAsyncApiFunction();
 
  protected:
-  typedef ApiResourceManager<cast_channel::CastSocket>::ApiResourceData
-      SocketData;
-
   ~CastChannelAsyncApiFunction() override;
 
   // AsyncApiFunction:
   bool PrePrepare() override;
   bool Respond() override;
 
   // Returns the socket corresponding to |channel_id| if one exists.  Otherwise,
   // sets the function result with CHANNEL_ERROR_INVALID_CHANNEL_ID, completes
   // the function, and returns null.
   cast_channel::CastSocket* GetSocketOrCompleteWithError(int channel_id);
 
   // Adds |socket| to |manager_| and returns the new channel_id.  |manager_|
   // assumes ownership of |socket|.
-  int AddSocket(cast_channel::CastSocket* socket);
+  int AddSocket(std::unique_ptr<cast_channel::CastSocket> socket);
 
   // Removes the CastSocket corresponding to |channel_id| from the resource
   // manager.
   void RemoveSocket(int channel_id);
 
   // Sets the function result to a ChannelInfo obtained from the state of
   // |socket|.
   void SetResultFromSocket(const cast_channel::CastSocket& socket);
 
   // Sets the function result to a ChannelInfo populated with |channel_id| and
   // |error|.
   void SetResultFromError(int channel_id, cast_channel::ChannelError error);
 
   // Returns the socket corresponding to |channel_id| if one exists, or null
   // otherwise.
   cast_channel::CastSocket* GetSocket(int channel_id) const;
 
  private:
   // Sets the function result from |channel_info|.
   void SetResultFromChannelInfo(const cast_channel::ChannelInfo& channel_info);
 
-  // The collection of CastSocket API resources.
-  scoped_refptr<SocketData> sockets_;
+  // Manages creating and removing cast sockets.
+  api::cast_channel::CastSocketService* cast_socket_service_;
 };
 
 class CastChannelOpenFunction : public CastChannelAsyncApiFunction {
  public:
   CastChannelOpenFunction();
 
  protected:
   ~CastChannelOpenFunction() override;
 
   // AsyncApiFunction:
   bool PrePrepare() override;
   bool Prepare() override;
   void AsyncWorkStart() override;
 
  private:
   DECLARE_EXTENSION_FUNCTION("cast.channel.open", CAST_CHANNEL_OPEN)
 
   // Defines a callback used to send events to the extension's
   // EventRouter.
-  //     Parameter #0 is the extension's ID.
-  //     Parameter #1 is a scoped pointer to the event payload.
-  using EventDispatchCallback =
-      base::Callback<void(const std::string&, std::unique_ptr<Event>)>;
+  //     Parameter #0 is a scoped pointer to the event payload.
+  using EventDispatchCallback = base::Callback<void(std::unique_ptr<Event>)>;
 
   // Receives incoming messages and errors and provides additional API and
   // origin socket context.
   class CastMessageHandler : public cast_channel::CastTransport::Delegate {
    public:
     CastMessageHandler(const EventDispatchCallback& ui_dispatch_cb,
                        cast_channel::CastSocket* socket,
                        scoped_refptr<api::cast_channel::Logger> logger);
     ~CastMessageHandler() override;
 
@@ skipping 74 matching lines @@
 
   std::unique_ptr<cast_channel::Close::Params> params_;
   CastChannelAPI* api_;
 
   DISALLOW_COPY_AND_ASSIGN(CastChannelCloseFunction);
 };
 
 }  // namespace extensions
 
 #endif  // EXTENSIONS_BROWSER_API_CAST_CHANNEL_CAST_CHANNEL_API_H_