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

Unified Diff: media/blink/webmediaplayer_impl_unittest.cc

Issue 2640573002: Remove WebMediaPlayerDelegate null checks (Closed)
Patch Set: Undo accidental delete of WMPI::delegate_ Created 3 years, 11 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 | « media/blink/webmediaplayer_impl.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 b68bba6eb50b7cf8e1e850729b78e7ae0e0c5b92..f254a4f3f9bfbbc84d545b972ea0275d4b39f108 100644
--- a/media/blink/webmediaplayer_impl_unittest.cc
+++ b/media/blink/webmediaplayer_impl_unittest.cc
@@ -103,9 +103,7 @@ class DummyWebMediaPlayerClient : public blink::WebMediaPlayerClient {
DISALLOW_COPY_AND_ASSIGN(DummyWebMediaPlayerClient);
};
-class MockWebMediaPlayerDelegate
- : public WebMediaPlayerDelegate,
- public base::SupportsWeakPtr<MockWebMediaPlayerDelegate> {
+class MockWebMediaPlayerDelegate : public WebMediaPlayerDelegate {
public:
MockWebMediaPlayerDelegate() = default;
~MockWebMediaPlayerDelegate() = default;
@@ -199,7 +197,7 @@ class WebMediaPlayerImplTest : public testing::Test {
void InitializeWebMediaPlayerImpl() {
wmpi_.reset(new WebMediaPlayerImpl(
- web_local_frame_, &client_, nullptr, delegate_.AsWeakPtr(),
+ web_local_frame_, &client_, nullptr, &delegate_,
base::MakeUnique<DefaultRendererFactory>(
media_log_, nullptr, DefaultRendererFactory::GetGpuFactoriesCB()),
url_index_,
« no previous file with comments | « media/blink/webmediaplayer_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698