[cast_channel] Make CastSocket not inherit from ApiResource

extensions/browser/api/cast_channel/cast_socket.cc

Index: extensions/browser/api/cast_channel/cast_socket.cc
diff --git a/extensions/browser/api/cast_channel/cast_socket.cc b/extensions/browser/api/cast_channel/cast_socket.cc
index 2952fcc91f743118467ecf7a6a6a74df8c3bcf4f..f35fac3c2b10d10d672852c4385a804242eb162b 100644
--- a/extensions/browser/api/cast_channel/cast_socket.cc
+++ b/extensions/browser/api/cast_channel/cast_socket.cc
@@ -56,18 +56,6 @@
 #define LOG_WITH_CONNECTION(level) LOG(level) << CONNECTION_INFO()
 
 namespace extensions {
-static base::LazyInstance<BrowserContextKeyedAPIFactory<
-    ApiResourceManager<api::cast_channel::CastSocket>>>::DestructorAtExit
-    g_factory = LAZY_INSTANCE_INITIALIZER;
-
-// static
-template <>
-BrowserContextKeyedAPIFactory<
-    ApiResourceManager<api::cast_channel::CastSocket>>*
-ApiResourceManager<api::cast_channel::CastSocket>::GetFactoryInstance() {
-  return g_factory.Pointer();
-}
-
 namespace api {
 namespace cast_channel {
 namespace {
@@ -97,13 +85,7 @@ class FakeCertVerifier : public net::CertVerifier {
 
 }  // namespace
 
-CastSocket::CastSocket(const std::string& owner_extension_id)
-    : ApiResource(owner_extension_id) {
-}
-
-bool CastSocket::IsPersistent() const {
-  return true;
-}
+CastSocket::CastSocket() {}
 
 CastSocketImpl::CastSocketImpl(const std::string& owner_extension_id,
                                const net::IPEndPoint& ip_endpoint,
@@ -132,8 +114,7 @@ CastSocketImpl::CastSocketImpl(const std::string& owner_extension_id,
                                const scoped_refptr<Logger>& logger,
                                uint64_t device_capabilities,
                                const AuthContext& auth_context)
-    : CastSocket(owner_extension_id),
-      owner_extension_id_(owner_extension_id),
+    : owner_extension_id_(owner_extension_id),
       channel_id_(0),
       ip_endpoint_(ip_endpoint),
       channel_auth_(channel_auth),
@@ -196,6 +177,10 @@ bool CastSocketImpl::audio_only() const {
   return audio_only_;
 }
 
+const std::string& CastSocketImpl::owner_extension_id() const {
+  return owner_extension_id_;
+}
+
 std::unique_ptr<net::TCPClientSocket> CastSocketImpl::CreateTcpSocket() {
   net::AddressList addresses(ip_endpoint_);
   return std::unique_ptr<net::TCPClientSocket>(