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

Unified Diff: cc/scheduler/begin_frame_source_unittest.cc

Issue 1136123009: Remove "mixin" from BeginFrameSource/Observer base classes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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 | « cc/scheduler/begin_frame_source.cc ('k') | cc/scheduler/scheduler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/scheduler/begin_frame_source_unittest.cc
diff --git a/cc/scheduler/begin_frame_source_unittest.cc b/cc/scheduler/begin_frame_source_unittest.cc
index 22126bead4504af443d585740c491a68710833a9..71f42dea5c9bfb41d69c48dc4ffb46c9e67fe189 100644
--- a/cc/scheduler/begin_frame_source_unittest.cc
+++ b/cc/scheduler/begin_frame_source_unittest.cc
@@ -170,16 +170,16 @@ const BeginFrameArgs MockBeginFrameObserver::kDefaultBeginFrameArgs =
-1,
-1);
-// BeginFrameObserverMixIn testing ---------------------------------------
-class MockMinimalBeginFrameObserverMixIn : public BeginFrameObserverMixIn {
+// BeginFrameObserverBase testing ---------------------------------------
+class MockMinimalBeginFrameObserverBase : public BeginFrameObserverBase {
public:
MOCK_METHOD1(OnBeginFrameMixInDelegate, bool(const BeginFrameArgs&));
int64_t dropped_begin_frame_args() const { return dropped_begin_frame_args_; }
};
-TEST(BeginFrameObserverMixInTest, OnBeginFrameImplementation) {
+TEST(BeginFrameObserverBaseTest, OnBeginFrameImplementation) {
using ::testing::Return;
- MockMinimalBeginFrameObserverMixIn obs;
+ MockMinimalBeginFrameObserverBase obs;
::testing::InSequence ordered; // These calls should be ordered
// Initial conditions
@@ -280,7 +280,7 @@ TEST(BeginFrameSourceMixInTest, NeedsBeginFrames) {
EXPECT_FALSE(source.NeedsBeginFrames());
}
-class LoopingBeginFrameObserver : public BeginFrameObserverMixIn {
+class LoopingBeginFrameObserver : public BeginFrameObserverBase {
public:
BeginFrameSource* source_;
@@ -292,7 +292,7 @@ class LoopingBeginFrameObserver : public BeginFrameObserverMixIn {
}
protected:
- // BeginFrameObserverMixIn
+ // BeginFrameObserverBase
bool OnBeginFrameMixInDelegate(const BeginFrameArgs& args) override {
sunnyps 2015/05/26 21:45:44 Please rename OnBeginFrameMixInDelegate too. I wou
return true;
}
« no previous file with comments | « cc/scheduler/begin_frame_source.cc ('k') | cc/scheduler/scheduler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698