Use ContainsValue() instead of std::find() in ui/accessibility, ui/gl and ui/ozone

ui/accessibility/ax_tree_unittest.cc

 // Copyright 2013 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/accessibility/ax_tree.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <memory>
 
+#include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/accessibility/ax_node.h"
 #include "ui/accessibility/ax_serializable_tree.h"
 #include "ui/accessibility/ax_tree_serializer.h"
 
 using base::DoubleToString;
 using base::IntToString;
 using base::StringPrintf;
@@ skipping 485 matching lines @@
   update.root_id = 1;
   update.nodes[0].id = 1;
   update.nodes[0].child_ids.push_back(3);
   update.nodes[1].id = 3;
   EXPECT_TRUE(tree.Unserialize(update)) << tree.error();
   std::vector<int> created = fake_delegate.node_creation_finished_ids();
   std::vector<int> subtree_reparented =
       fake_delegate.subtree_reparented_finished_ids();
   std::vector<int> node_reparented =
       fake_delegate.node_reparented_finished_ids();
-  ASSERT_EQ(std::find(created.begin(), created.end(), 3), created.end());
-  ASSERT_NE(std::find(subtree_reparented.begin(), subtree_reparented.end(), 3),
-            subtree_reparented.end());
-  ASSERT_EQ(std::find(node_reparented.begin(), node_reparented.end(), 3),
-            node_reparented.end());
+  ASSERT(!base::ContainsValue(created, 3));
+  ASSERT(base::ContainsValue(subtree_reparented, 3));
+  ASSERT(!base::ContainsValue(node_reparented, 3));

[sadrul, 2017/06/14 02:43:01]

Use ASSERT_FALSE/ASSERT_TRUE in the above.

[Tripta, 2017/06/14 05:46:17]

Done.

 }
 
 TEST(AXTreeTest, TreeDelegateIsNotCalledForReparenting) {
   AXTreeUpdate initial_state;
   initial_state.root_id = 1;
   initial_state.nodes.resize(2);
   initial_state.nodes[0].id = 1;
   initial_state.nodes[0].child_ids.push_back(2);
   initial_state.nodes[1].id = 2;
 
@@ skipping 246 matching lines @@
       fake_delegate2.attribute_change_log();
   ASSERT_EQ(3U, change_log2.size());
   EXPECT_EQ("controlsIds changed from 2,2 to ", change_log2[0]);
   EXPECT_EQ("detailsIds changed from 3 to 2,2", change_log2[1]);
   EXPECT_EQ("flowtoIds changed from  to 3", change_log2[2]);
 
   tree.SetDelegate(NULL);
 }
 
 }  // namespace ui