| Index: extensions/browser/api/cast_channel/cast_channel_api.h
|
| diff --git a/extensions/browser/api/cast_channel/cast_channel_api.h b/extensions/browser/api/cast_channel/cast_channel_api.h
|
| index ebb3173a54e97c02d9f1877b25df8fc3bf126bb9..32a8cc0f152e8fd76a19f86c6a0521d0f6134a34 100644
|
| --- a/extensions/browser/api/cast_channel/cast_channel_api.h
|
| +++ b/extensions/browser/api/cast_channel/cast_channel_api.h
|
| @@ -48,17 +48,10 @@ class CastChannelAPI : public BrowserContextKeyedAPI,
|
| // BrowserContextKeyedAPI implementation.
|
| static BrowserContextKeyedAPIFactory<CastChannelAPI>* GetFactoryInstance();
|
|
|
| - // Returns a new CastSocket that connects to |ip_endpoint| with authentication
|
| - // |channel_auth| and is to be owned by |extension_id|.
|
| - scoped_ptr<cast_channel::CastSocket> CreateCastSocket(
|
| - const std::string& extension_id,
|
| - const net::IPEndPoint& ip_endpoint,
|
| - cast_channel::ChannelAuthType channel_auth,
|
| - const base::TimeDelta& timeout);
|
| -
|
| // Returns a pointer to the Logger member variable.
|
| // TODO(imcheng): Consider whether it is possible for this class to own the
|
| - // CastSockets and make this class the sole owner of Logger. Alternatively,
|
| + // CastSockets and make this class the sole owner of Logger.
|
| + // Alternatively,
|
| // consider making Logger not ref-counted by passing a weak
|
| // reference of Logger to the CastSockets instead.
|
| scoped_refptr<cast_channel::Logger> GetLogger();
|
| @@ -67,6 +60,10 @@ class CastChannelAPI : public BrowserContextKeyedAPI,
|
| // testing.
|
| void SetSocketForTest(scoped_ptr<cast_channel::CastSocket> socket_for_test);
|
|
|
| + // Returns a test CastSocket instance, if it is defined.
|
| + // Otherwise returns a scoped_ptr with a NULL ptr value.
|
| + scoped_ptr<cast_channel::CastSocket> GetSocketForTest();
|
| +
|
| private:
|
| friend class BrowserContextKeyedAPIFactory<CastChannelAPI>;
|
| friend class ::CastChannelAPITest;
|
|
|