cc: Control activation from the Scheduler

cc/scheduler/scheduler_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 "cc/scheduler/scheduler.h"
 
 #include <string>
 #include <vector>
 
 #include "base/logging.h"
@@ skipping 96 matching lines @@
                                             swap_will_happen_if_draw_happens_);
   }
   virtual void ScheduledActionCommit() OVERRIDE {
     actions_.push_back("ScheduledActionCommit");
     states_.push_back(scheduler_->StateAsValueForTesting().release());
   }
   virtual void ScheduledActionUpdateVisibleTiles() OVERRIDE {
     actions_.push_back("ScheduledActionUpdateVisibleTiles");
     states_.push_back(scheduler_->StateAsValueForTesting().release());
   }
-  virtual void ScheduledActionActivatePendingTreeIfNeeded() OVERRIDE {
-    actions_.push_back("ScheduledActionActivatePendingTreeIfNeeded");
+  virtual void ScheduledActionActivatePendingTree() OVERRIDE {
+    actions_.push_back("ScheduledActionActivatePendingTree");
     states_.push_back(scheduler_->StateAsValueForTesting().release());
   }
   virtual void ScheduledActionBeginOutputSurfaceCreation() OVERRIDE {
     actions_.push_back("ScheduledActionBeginOutputSurfaceCreation");
     states_.push_back(scheduler_->StateAsValueForTesting().release());
   }
   virtual void ScheduledActionAcquireLayerTexturesForMainThread() OVERRIDE {
     actions_.push_back("ScheduledActionAcquireLayerTexturesForMainThread");
     states_.push_back(scheduler_->StateAsValueForTesting().release());
   }
@@ skipping 512 matching lines @@
 
   // Get the compositor to do a ScheduledActionDrawAndSwapForced.
   scheduler->SetCanDraw(true);
   scheduler->SetNeedsRedraw();
   scheduler->SetNeedsForcedRedraw();
   EXPECT_TRUE(client.HasAction("ScheduledActionDrawAndSwapForced"));
 }
 
 }  // namespace
 }  // namespace cc