Fix gmock leak issue in AutoplayUmaHelperTest

third_party/WebKit/Source/core/html/AutoplayUmaHelperTest.cpp

Index: third_party/WebKit/Source/core/html/AutoplayUmaHelperTest.cpp
diff --git a/third_party/WebKit/Source/core/html/AutoplayUmaHelperTest.cpp b/third_party/WebKit/Source/core/html/AutoplayUmaHelperTest.cpp
index 77f75addd94e243a69901208bf53158b882779f4..f5be095187bd2a56259507ff6eebc13904b72d6e 100644
--- a/third_party/WebKit/Source/core/html/AutoplayUmaHelperTest.cpp
+++ b/third_party/WebKit/Source/core/html/AutoplayUmaHelperTest.cpp
@@ -45,37 +45,34 @@ class AutoplayUmaHelperTest : public testing::Test {
     return toHTMLVideoElement(*element);
   }
 
-  MockAutoplayUmaHelper& umaHelper() {
-    return *(static_cast<MockAutoplayUmaHelper*>(
-        mediaElement().m_autoplayUmaHelper.get()));
-  }
+  MockAutoplayUmaHelper& umaHelper() { return *m_umaHelper; }
 
   std::unique_ptr<DummyPageHolder>& pageHolder() { return m_pageHolder; }
 
-  MOCK_METHOD0(TestEnded, void());
-
  private:
   void SetUp() override {
     m_pageHolder = DummyPageHolder::create(IntSize(800, 600));
     document().documentElement()->setInnerHTML("<video id=video></video>",
                                                ASSERT_NO_EXCEPTION);
     HTMLMediaElement& element = mediaElement();
-    element.m_autoplayUmaHelper = new MockAutoplayUmaHelper(&element);
+    m_umaHelper = new MockAutoplayUmaHelper(&element);
+    element.m_autoplayUmaHelper = m_umaHelper;
   }
 
+  void TearDown() override { m_umaHelper.clear(); }
+
   std::unique_ptr<DummyPageHolder> m_pageHolder;
+  Persistent<MockAutoplayUmaHelper> m_umaHelper;
 };
 
 TEST_F(AutoplayUmaHelperTest, VisibilityChangeWhenUnload) {
-  // This is to avoid handleContextDestroyed() to be called during TearDown().
-  EXPECT_CALL(*this, TestEnded())
-      .After(EXPECT_CALL(umaHelper(), handleContextDestroyed()));
+  EXPECT_CALL(umaHelper(), handleContextDestroyed());
 
   mediaElement().setMuted(true);
   umaHelper().onAutoplayInitiated(AutoplaySource::Attribute);
   umaHelper().handlePlayingEvent();
   pageHolder().reset();
-  TestEnded();
+  ::testing::Mock::VerifyAndClear(&umaHelper());
 }
 
 }  // namespace blink