Fix black background when locking with fullscreen window:

ui/compositor/layer_animator.cc

Index: ui/compositor/layer_animator.cc
diff --git a/ui/compositor/layer_animator.cc b/ui/compositor/layer_animator.cc
index 98261fe539e1e287eb62f6cedcd082f70cc12c8a..49985557217cdf207fbf73378436fa4a4c0dde7e 100644
--- a/ui/compositor/layer_animator.cc
+++ b/ui/compositor/layer_animator.cc
@@ -35,17 +35,21 @@ namespace {
 const int kDefaultTransitionDurationMs = 120;
 const int kTimerIntervalMs = 10;
 
+}  // namespace
+
+namespace internal {
+
 // Returns the AnimationContainer we're added to.
-ui::AnimationContainer* GetAnimationContainer() {
-  static ui::AnimationContainer* container = NULL;
-  if (!container) {
-    container = new AnimationContainer();
-    container->AddRef();
-  }
-  return container;
+ui::AnimationContainer* GetLayerAnimationContainer() {
+ static ui::AnimationContainer* container = NULL;
+ if (!container) {
+   container = new AnimationContainer();
+   container->AddRef();
+ }
+ return container;
 }
 
-}  // namespace
+} // namespace internal
 
 // static
 bool LayerAnimator::disable_animations_for_test_ = false;
@@ -180,8 +184,9 @@ void LayerAnimator::StartTogether(
 
   adding_animations_ = true;
   if (!is_animating()) {
-    if (GetAnimationContainer()->is_running())
-      last_step_time_ = GetAnimationContainer()->last_tick_time();
+    if (internal::GetLayerAnimationContainer()->is_running())
+      last_step_time_ =
+          internal::GetLayerAnimationContainer()->last_tick_time();
     else
       last_step_time_ = base::TimeTicks::Now();
   }
@@ -389,9 +394,9 @@ void LayerAnimator::UpdateAnimationState() {
 
   const bool should_start = is_animating();
   if (should_start && !is_started_)
-    GetAnimationContainer()->Start(this);
+    internal::GetLayerAnimationContainer()->Start(this);
   else if (!should_start && is_started_)
-    GetAnimationContainer()->Stop(this);
+    internal::GetLayerAnimationContainer()->Stop(this);
 
   is_started_ = should_start;
 }
@@ -675,8 +680,8 @@ bool LayerAnimator::StartSequenceImmediately(LayerAnimationSequence* sequence) {
   base::TimeTicks start_time;
   if (is_animating() || adding_animations_)
     start_time = last_step_time_;
-  else if (GetAnimationContainer()->is_running())
-    start_time = GetAnimationContainer()->last_tick_time();
+  else if (internal::GetLayerAnimationContainer()->is_running())
+    start_time = internal::GetLayerAnimationContainer()->last_tick_time();
   else
     start_time = base::TimeTicks::Now();