media/blink/webmediaplayer_impl_unittest.cc - Issue 1851293002: Remove BLINK_ASSERT() and BLINK_ASSERT_NOT_REACHED() macros.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: media/blink/webmediaplayer_impl_unittest.cc

Issue 1851293002: Remove BLINK_ASSERT() and BLINK_ASSERT_NOT_REACHED() macros. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Check the |callbacks| for nullptr and use explicit delete. 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

« no previous file with comments | « content/test/mock_webblob_registry_impl.cc ('k') | third_party/WebKit/Source/modules/encryptedmedia/MediaKeyStatusMap.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/blink/webmediaplayer_impl_unittest.cc

diff --git a/media/blink/webmediaplayer_impl_unittest.cc b/media/blink/webmediaplayer_impl_unittest.cc

index 10c74c86bcea47ba9d3e73fd85e2ea870f0e32b8..67d454e2363a6b05d47010307b40e8263e916ac4 100644

--- a/media/blink/webmediaplayer_impl_unittest.cc

+++ b/media/blink/webmediaplayer_impl_unittest.cc

@@ -15,6 +15,7 @@

#include "media/base/audio_hardware_config.h"

#include "media/base/media_log.h"

#include "media/base/test_helpers.h"

+#include "media/blink/mock_webframeclient.h"

#include "media/blink/webmediaplayer_delegate.h"

#include "media/blink/webmediaplayer_impl.h"

#include "media/blink/webmediaplayer_params.h"

@@ -34,10 +35,6 @@ int64_t OnAdjustAllocatedMemory(int64_t delta) {

return 0;

}

-// Dummy superclass necessary since blink::WebFrameClient() has a protected

-// destructor.

-class DummyWebFrameClient : public blink::WebFrameClient {};

class DummyWebMediaPlayerClient : public blink::WebMediaPlayerClient {

public:

DummyWebMediaPlayerClient() {}

@@ -133,7 +130,7 @@ class WebMediaPlayerImplTest : public testing::Test {

base::Thread media_thread_;

// Blink state.

- DummyWebFrameClient web_frame_client_;

+ MockWebFrameClient web_frame_client_;

blink::WebView* web_view_;

blink::WebLocalFrame* web_local_frame_;