| Index: extensions/browser/api/socket/socket_api.h
|
| diff --git a/extensions/browser/api/socket/socket_api.h b/extensions/browser/api/socket/socket_api.h
|
| index 9094f6097d648ae8cc3b534071e47b50c825bb8d..9a73a82d6c88ced4f9fba695fdc54fef5f784a8b 100644
|
| --- a/extensions/browser/api/socket/socket_api.h
|
| +++ b/extensions/browser/api/socket/socket_api.h
|
| @@ -117,8 +117,8 @@ class SocketAsyncApiFunction : public AsyncApiFunction {
|
| bool PrePrepare() override;
|
| bool Respond() override;
|
|
|
| - virtual scoped_ptr<SocketResourceManagerInterface>
|
| - CreateSocketResourceManager();
|
| + virtual std::unique_ptr<SocketResourceManagerInterface>
|
| + CreateSocketResourceManager();
|
|
|
| int AddSocket(Socket* socket);
|
| Socket* GetSocket(int api_resource_id);
|
| @@ -138,11 +138,11 @@ class SocketAsyncApiFunction : public AsyncApiFunction {
|
| int socket_id);
|
| void OnFirewallHoleOpened(
|
| int socket_id,
|
| - scoped_ptr<AppFirewallHole, content::BrowserThread::DeleteOnUIThread>
|
| + std::unique_ptr<AppFirewallHole, content::BrowserThread::DeleteOnUIThread>
|
| hole);
|
| #endif // OS_CHROMEOS
|
|
|
| - scoped_ptr<SocketResourceManagerInterface> manager_;
|
| + std::unique_ptr<SocketResourceManagerInterface> manager_;
|
| };
|
|
|
| class SocketExtensionWithDnsLookupFunction : public SocketAsyncApiFunction {
|
| @@ -182,7 +182,7 @@ class SocketCreateFunction : public SocketAsyncApiFunction {
|
| FRIEND_TEST_ALL_PREFIXES(SocketUnitTest, Create);
|
| enum SocketType { kSocketTypeInvalid = -1, kSocketTypeTCP, kSocketTypeUDP };
|
|
|
| - scoped_ptr<api::socket::Create::Params> params_;
|
| + std::unique_ptr<api::socket::Create::Params> params_;
|
| SocketType socket_type_;
|
| };
|
|
|
| @@ -272,7 +272,7 @@ class SocketListenFunction : public SocketAsyncApiFunction {
|
| void AsyncWorkStart() override;
|
|
|
| private:
|
| - scoped_ptr<api::socket::Listen::Params> params_;
|
| + std::unique_ptr<api::socket::Listen::Params> params_;
|
| };
|
|
|
| class SocketAcceptFunction : public SocketAsyncApiFunction {
|
| @@ -289,9 +289,9 @@ class SocketAcceptFunction : public SocketAsyncApiFunction {
|
| void AsyncWorkStart() override;
|
|
|
| private:
|
| - void OnAccept(int result_code, scoped_ptr<net::TCPClientSocket> socket);
|
| + void OnAccept(int result_code, std::unique_ptr<net::TCPClientSocket> socket);
|
|
|
| - scoped_ptr<api::socket::Accept::Params> params_;
|
| + std::unique_ptr<api::socket::Accept::Params> params_;
|
| };
|
|
|
| class SocketReadFunction : public SocketAsyncApiFunction {
|
| @@ -309,7 +309,7 @@ class SocketReadFunction : public SocketAsyncApiFunction {
|
| void OnCompleted(int result, scoped_refptr<net::IOBuffer> io_buffer);
|
|
|
| private:
|
| - scoped_ptr<api::socket::Read::Params> params_;
|
| + std::unique_ptr<api::socket::Read::Params> params_;
|
| };
|
|
|
| class SocketWriteFunction : public SocketAsyncApiFunction {
|
| @@ -350,7 +350,7 @@ class SocketRecvFromFunction : public SocketAsyncApiFunction {
|
| uint16_t port);
|
|
|
| private:
|
| - scoped_ptr<api::socket::RecvFrom::Params> params_;
|
| + std::unique_ptr<api::socket::RecvFrom::Params> params_;
|
| };
|
|
|
| class SocketSendToFunction : public SocketExtensionWithDnsLookupFunction {
|
| @@ -394,7 +394,7 @@ class SocketSetKeepAliveFunction : public SocketAsyncApiFunction {
|
| void Work() override;
|
|
|
| private:
|
| - scoped_ptr<api::socket::SetKeepAlive::Params> params_;
|
| + std::unique_ptr<api::socket::SetKeepAlive::Params> params_;
|
| };
|
|
|
| class SocketSetNoDelayFunction : public SocketAsyncApiFunction {
|
| @@ -411,7 +411,7 @@ class SocketSetNoDelayFunction : public SocketAsyncApiFunction {
|
| void Work() override;
|
|
|
| private:
|
| - scoped_ptr<api::socket::SetNoDelay::Params> params_;
|
| + std::unique_ptr<api::socket::SetNoDelay::Params> params_;
|
| };
|
|
|
| class SocketGetInfoFunction : public SocketAsyncApiFunction {
|
| @@ -428,7 +428,7 @@ class SocketGetInfoFunction : public SocketAsyncApiFunction {
|
| void Work() override;
|
|
|
| private:
|
| - scoped_ptr<api::socket::GetInfo::Params> params_;
|
| + std::unique_ptr<api::socket::GetInfo::Params> params_;
|
| };
|
|
|
| class SocketGetNetworkListFunction : public AsyncExtensionFunction {
|
| @@ -459,7 +459,7 @@ class SocketJoinGroupFunction : public SocketAsyncApiFunction {
|
| void Work() override;
|
|
|
| private:
|
| - scoped_ptr<api::socket::JoinGroup::Params> params_;
|
| + std::unique_ptr<api::socket::JoinGroup::Params> params_;
|
| };
|
|
|
| class SocketLeaveGroupFunction : public SocketAsyncApiFunction {
|
| @@ -476,7 +476,7 @@ class SocketLeaveGroupFunction : public SocketAsyncApiFunction {
|
| void Work() override;
|
|
|
| private:
|
| - scoped_ptr<api::socket::LeaveGroup::Params> params_;
|
| + std::unique_ptr<api::socket::LeaveGroup::Params> params_;
|
| };
|
|
|
| class SocketSetMulticastTimeToLiveFunction : public SocketAsyncApiFunction {
|
| @@ -494,7 +494,7 @@ class SocketSetMulticastTimeToLiveFunction : public SocketAsyncApiFunction {
|
| void Work() override;
|
|
|
| private:
|
| - scoped_ptr<api::socket::SetMulticastTimeToLive::Params> params_;
|
| + std::unique_ptr<api::socket::SetMulticastTimeToLive::Params> params_;
|
| };
|
|
|
| class SocketSetMulticastLoopbackModeFunction : public SocketAsyncApiFunction {
|
| @@ -512,7 +512,7 @@ class SocketSetMulticastLoopbackModeFunction : public SocketAsyncApiFunction {
|
| void Work() override;
|
|
|
| private:
|
| - scoped_ptr<api::socket::SetMulticastLoopbackMode::Params> params_;
|
| + std::unique_ptr<api::socket::SetMulticastLoopbackMode::Params> params_;
|
| };
|
|
|
| class SocketGetJoinedGroupsFunction : public SocketAsyncApiFunction {
|
| @@ -530,7 +530,7 @@ class SocketGetJoinedGroupsFunction : public SocketAsyncApiFunction {
|
| void Work() override;
|
|
|
| private:
|
| - scoped_ptr<api::socket::GetJoinedGroups::Params> params_;
|
| + std::unique_ptr<api::socket::GetJoinedGroups::Params> params_;
|
| };
|
|
|
| class SocketSecureFunction : public SocketAsyncApiFunction {
|
| @@ -547,9 +547,9 @@ class SocketSecureFunction : public SocketAsyncApiFunction {
|
|
|
| private:
|
| // Callback from TLSSocket::UpgradeSocketToTLS().
|
| - void TlsConnectDone(scoped_ptr<TLSSocket> socket, int result);
|
| + void TlsConnectDone(std::unique_ptr<TLSSocket> socket, int result);
|
|
|
| - scoped_ptr<api::socket::Secure::Params> params_;
|
| + std::unique_ptr<api::socket::Secure::Params> params_;
|
| scoped_refptr<net::URLRequestContextGetter> url_request_getter_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(SocketSecureFunction);
|
|
|