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

Unified Diff: media/base/mock_media_log.h

Issue 2815303006: Convert MediaLog from being ref counted to owned by WebMediaPlayer. (Closed)
Patch Set: Rebase. Created 3 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 | « media/base/mock_filters.h ('k') | media/base/pipeline_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/mock_media_log.h
diff --git a/media/base/mock_media_log.h b/media/base/mock_media_log.h
index c992fc22315b8a5be198c80e6ecbe861bffdbbb6..9e90fbe52a408a203692251c40d8ff80f6cb2db0 100644
--- a/media/base/mock_media_log.h
+++ b/media/base/mock_media_log.h
@@ -16,15 +16,16 @@
// |outer| is the std::string searched for substring |sub|.
#define CONTAINS_STRING(outer, sub) (std::string::npos != (outer).find(sub))
-// "media_log_" is expected to be a scoped_refptr<MockMediaLog>, optionally a
-// StrictMock, in scope of the usage of this macro.
-#define EXPECT_MEDIA_LOG(x) EXPECT_CALL(*media_log_, DoAddEventLogString((x)))
+// "media_log_" is expected to be a MockMediaLog, optionally a StrictMock, in
+// scope of the usage of this macro.
+#define EXPECT_MEDIA_LOG(x) EXPECT_CALL(media_log_, DoAddEventLogString((x)))
namespace media {
class MockMediaLog : public MediaLog {
public:
MockMediaLog();
+ ~MockMediaLog() override;
MOCK_METHOD1(DoAddEventLogString, void(const std::string& event));
@@ -35,9 +36,6 @@ class MockMediaLog : public MediaLog {
DoAddEventLogString(MediaEventToLogString(*event));
}
- protected:
- virtual ~MockMediaLog();
-
private:
DISALLOW_COPY_AND_ASSIGN(MockMediaLog);
};
« no previous file with comments | « media/base/mock_filters.h ('k') | media/base/pipeline_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698