Index: blimp/net/blob_channel/blob_channel_receiver_unittest.cc |
diff --git a/blimp/net/blob_channel/blob_channel_receiver_unittest.cc b/blimp/net/blob_channel/blob_channel_receiver_unittest.cc |
index 3a42ffe3d6c7ecb4e99781b3579169235570ccc2..18890744c680eee3af5373105ad76ff3d83748ac 100644 |
--- a/blimp/net/blob_channel/blob_channel_receiver_unittest.cc |
+++ b/blimp/net/blob_channel/blob_channel_receiver_unittest.cc |
@@ -33,22 +33,21 @@ MATCHER_P(BlobDataEqual, expected, "") { |
class NullBlobReceiverDelegate : public BlobChannelReceiver::Delegate { |
Wez
2016/05/25 02:47:44
nit: You could move this into test_common.h since
Kevin M
2016/05/25 20:23:38
Moved to mock_blob_receiver.h, added mock expectat
|
public: |
- using BlobChannelReceiver::Delegate::OnBlobReceived; |
+ void SetReceiver(BlobChannelReceiver* receiver) override {} |
}; |
class BlobChannelReceiverTest : public testing::Test { |
public: |
BlobChannelReceiverTest() |
- : delegate_(new NullBlobReceiverDelegate), |
- cache_(new testing::StrictMock<MockBlobCache>), |
- blob_receiver_(new BlobChannelReceiver(base::WrapUnique(cache_), |
- base::WrapUnique(delegate_))) |
+ : cache_(new testing::StrictMock<MockBlobCache>), |
+ blob_receiver_(BlobChannelReceiver::Create( |
+ base::WrapUnique(cache_), |
+ base::WrapUnique(new NullBlobReceiverDelegate))) |
{} |
~BlobChannelReceiverTest() override {} |
- NullBlobReceiverDelegate* delegate_; |
testing::StrictMock<MockBlobCache>* cache_; |
std::unique_ptr<BlobChannelReceiver> blob_receiver_; |
}; |
@@ -69,7 +68,7 @@ TEST_F(BlobChannelReceiverTest, GetFromDelegateReceiveMethod) { |
EXPECT_CALL(*cache_, Put(kBlobId, BlobDataEqual(payload))); |
EXPECT_CALL(*cache_, Get(kBlobId)).WillOnce(Return(payload)); |
- delegate_->OnBlobReceived(kBlobId, payload); |
+ blob_receiver_->OnBlobReceived(kBlobId, payload); |
auto result = blob_receiver_->Get(kBlobId); |