Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(19)

Unified Diff: extensions/browser/api/cast_channel/cast_test_util.h

Issue 1902873002: Convert //extensions/browser/api from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: extensions/browser/api/cast_channel/cast_test_util.h
diff --git a/extensions/browser/api/cast_channel/cast_test_util.h b/extensions/browser/api/cast_channel/cast_test_util.h
index 550a460a66a3b1f9df4854407732e44fb22c9eaf..0c8d75551e0be69a2b8c9c7f07330f116db63210 100644
--- a/extensions/browser/api/cast_channel/cast_test_util.h
+++ b/extensions/browser/api/cast_channel/cast_test_util.h
@@ -27,7 +27,8 @@ class MockCastTransport : public extensions::api::cast_channel::CastTransport {
MockCastTransport();
~MockCastTransport() override;
- void SetReadDelegate(scoped_ptr<CastTransport::Delegate> delegate) override;
+ void SetReadDelegate(
+ std::unique_ptr<CastTransport::Delegate> delegate) override;
MOCK_METHOD2(SendMessage,
void(const extensions::api::cast_channel::CastMessage& message,
@@ -39,7 +40,7 @@ class MockCastTransport : public extensions::api::cast_channel::CastTransport {
CastTransport::Delegate* current_delegate() const;
private:
- scoped_ptr<CastTransport::Delegate> delegate_;
+ std::unique_ptr<CastTransport::Delegate> delegate_;
DISALLOW_COPY_AND_ASSIGN(MockCastTransport);
};
@@ -70,7 +71,7 @@ class MockCastSocket : public CastSocket {
// Proxy for ConnectRawPtr. Unpacks scoped_ptr into a GMock-friendly bare
// ptr.
- void Connect(scoped_ptr<CastTransport::Delegate> delegate,
+ void Connect(std::unique_ptr<CastTransport::Delegate> delegate,
base::Callback<void(ChannelError)> callback) override {
delegate_ = std::move(delegate);
ConnectRawPtr(delegate_.get(), callback);
@@ -92,8 +93,8 @@ class MockCastSocket : public CastSocket {
MockCastTransport* mock_transport() const { return mock_transport_.get(); }
private:
- scoped_ptr<MockCastTransport> mock_transport_;
- scoped_ptr<CastTransport::Delegate> delegate_;
+ std::unique_ptr<MockCastTransport> mock_transport_;
+ std::unique_ptr<CastTransport::Delegate> delegate_;
DISALLOW_COPY_AND_ASSIGN(MockCastSocket);
};
« no previous file with comments | « extensions/browser/api/cast_channel/cast_socket_unittest.cc ('k') | extensions/browser/api/cast_channel/cast_test_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698