Use ContainsValue() instead of std::find() in ui/wm and ui/message_center

ui/wm/core/window_animations_unittest.cc

 // Copyright (c) 2012 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 "ui/wm/core/window_animations.h"
 
 #include <memory>
 
 #include "base/macros.h"
+#include "base/stl_util.h"
 #include "base/time/time.h"
 #include "ui/aura/test/aura_test_base.h"
 #include "ui/aura/test/test_windows.h"
 #include "ui/aura/window.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/layer_animator.h"
 #include "ui/compositor/scoped_animation_duration_scale_mode.h"
 #include "ui/gfx/animation/animation_container_element.h"
 #include "ui/gfx/geometry/vector2d.h"
 #include "ui/wm/core/transient_window_manager.h"
@@ skipping 131 matching lines @@
     animating_window->Hide();
     EXPECT_TRUE(AnimateOnChildWindowVisibilityChanged(
         animating_window.get(), false));
     EXPECT_TRUE(animating_layer->GetAnimator()->is_animating());
     EXPECT_FALSE(animating_layer->delegate());
 
     // Make sure the Hide animation create another layer, and both are in
     // the parent layer.
     EXPECT_NE(animating_window->layer(), animating_layer);
     EXPECT_TRUE(
-        std::find(parent->layer()->children().begin(),
-                  parent->layer()->children().end(),
-                  animating_layer) !=
-        parent->layer()->children().end());
-    EXPECT_TRUE(
-        std::find(parent->layer()->children().begin(),
-                  parent->layer()->children().end(),
-                  animating_window->layer()) !=
-        parent->layer()->children().end());
+        base::ContainsValue(parent->layer()->children(), animating_layer));
+    EXPECT_TRUE(base::ContainsValue(parent->layer()->children(),
+                                    animating_window->layer()));
     // Current layer must be already hidden.
     EXPECT_FALSE(animating_window->layer()->visible());
 
     EXPECT_EQ(1, GetWindowZPosition(animating_window.get()));
     EXPECT_EQ(1, GetLayerZPosition(animating_window->layer()));
     EXPECT_EQ(2, GetLayerZPosition(animating_layer));
 
     parent->StackChildAtTop(other.get());
     EXPECT_EQ(0, GetWindowZPosition(animating_window.get()));
     EXPECT_EQ(1, GetWindowZPosition(other.get()));
 
     EXPECT_EQ(0, GetLayerZPosition(animating_window->layer()));
     EXPECT_EQ(1, GetLayerZPosition(other->layer()));
     // Make sure the animating layer is on top.
     EXPECT_EQ(2, GetLayerZPosition(animating_layer));
 
     // Animating layer must be gone
     animating_layer->GetAnimator()->StopAnimating();
-    EXPECT_TRUE(
-        std::find(parent->layer()->children().begin(),
-                  parent->layer()->children().end(),
-                  animating_layer) ==
-        parent->layer()->children().end());
+    EXPECT_FALSE(
+        base::ContainsValue(parent->layer()->children(), animating_layer));
   }
 }
 
 TEST_F(WindowAnimationsTest, HideAnimationDetachLayersWithTransientChildren) {
   TransientWindowStackingClient transient_stacking_client;
 
   std::unique_ptr<aura::Window> parent(
       aura::test::CreateTestWindowWithId(0, NULL));
 
   std::unique_ptr<aura::Window> other(
@@ skipping 118 matching lines @@
   wm::SetWindowVisibilityAnimationType(window.get(),
                                        WINDOW_VISIBILITY_ANIMATION_TYPE_ROTATE);
   AnimateOnChildWindowVisibilityChanged(window.get(), true);
   window->layer()->GetAnimator()->Step(base::TimeTicks::Now() +
                                        base::TimeDelta::FromSeconds(5));
   AnimateOnChildWindowVisibilityChanged(window.get(), false);
   animating_layer->GetAnimator()->StopAnimating();
 }
 
 }  // namespace wm