cc: Making BeginFrameSources support multiple BeginFrameObservers.

cc/scheduler/begin_frame_source_unittest.cc

 // Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <deque>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
 #include "base/test/test_simple_task_runner.h"
@@ skipping 44 matching lines @@
 // When used LastUsedBeginFrameArgs **should** be updated.
 #define SEND_BEGIN_FRAME_USED(source, frame_time, deadline, interval) \
   SEND_BEGIN_FRAME(new_args, source, frame_time, deadline, interval);
 
 namespace cc {
 namespace {
 
 class MockBeginFrameObserver : public BeginFrameObserver {
  public:
   MOCK_METHOD1(OnBeginFrame, void(const BeginFrameArgs&));
-  MOCK_CONST_METHOD0(LastUsedBeginFrameArgs, const BeginFrameArgs());
+  MOCK_METHOD0(LastUsedBeginFrameArgs, const BeginFrameArgs());
 
-  virtual void AsValueInto(base::trace_event::TracedValue* dict) const {
+  virtual void AsValueInto(base::trace_event::TracedValue* dict) {
     dict->SetString("type", "MockBeginFrameObserver");
     dict->BeginDictionary("last_begin_frame_args");
     LastUsedBeginFrameArgs().AsValueInto(dict);
     dict->EndDictionary();
   }
 
   // A value different from the normal default returned by a BeginFrameObserver
   // so it is easiable traced back here.
   static const BeginFrameArgs kDefaultBeginFrameArgs;
 
@@ skipping 146 matching lines @@
 // BeginFrameSource testing ----------------------------------------------
 TEST(BeginFrameSourceMixInTest, ObserverManipulation) {
   MockBeginFrameObserver obs;
   MockBeginFrameObserver otherObs;
   FakeBeginFrameSource source;
 
   source.AddObserver(&obs);
   EXPECT_EQ(&obs, source.GetObserver());
 
 #ifndef NDEBUG
-  // Adding an observer when an observer already exists should DCHECK fail.
-  EXPECT_DEATH({ source.AddObserver(&otherObs); }, "");
-
   // Removing wrong observer should DCHECK fail.
   EXPECT_DEATH({ source.RemoveObserver(&otherObs); }, "");
 
   // Removing an observer when there is no observer should DCHECK fail.
   EXPECT_DEATH({
                  source.RemoveObserver(&obs);
                  source.RemoveObserver(&obs);
                },
                "");
 #endif
@@ skipping 30 matching lines @@
   source.SetNeedsBeginFrames(true);
   EXPECT_TRUE(source.NeedsBeginFrames());
   source.SetNeedsBeginFrames(false);
   EXPECT_FALSE(source.NeedsBeginFrames());
 }
 
 class LoopingBeginFrameObserver : public BeginFrameObserverMixIn {
  public:
   BeginFrameSource* source_;
 
-  void AsValueInto(base::trace_event::TracedValue* dict) const override {
+  void AsValueInto(base::trace_event::TracedValue* dict) override {
     dict->SetString("type", "LoopingBeginFrameObserver");
     dict->BeginDictionary("source");
     source_->AsValueInto(dict);
     dict->EndDictionary();
   }
 
  protected:
   // BeginFrameObserverMixIn
   bool OnBeginFrameMixInDelegate(const BeginFrameArgs& args) override {
     return true;
@@ skipping 468 matching lines @@
   mux_->SetActiveSource(source2_);
   SEND_BEGIN_FRAME_DROP(*source2_, 750, 1050, 300);
   SEND_BEGIN_FRAME_USED(*source2_, 1050, 1250, 300);
 
   mux_->SetActiveSource(source1_);
   SEND_BEGIN_FRAME_DROP(*source2_, 1100, 1400, 300);
 }
 
 }  // namespace
 }  // namespace cc