Use ContainsValue() instead of std::find() in ui/android, ui/base and ui/views

ui/views/layout/grid_layout.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/views/layout/grid_layout.h"
 
-#include <algorithm>
-
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
+#include "base/stl_util.h"
 #include "ui/views/border.h"
 #include "ui/views/layout/layout_provider.h"
 #include "ui/views/view.h"
 #include "ui/views/window/dialog_delegate.h"
 
 namespace views {
 
 // LayoutElement ------------------------------------------------------
 
 // A LayoutElement has a size and location along one axis. It contains
@@ skipping 456 matching lines @@
       }
     }
   }
   AccumulateMasterColumns();
 }
 
 void ColumnSet::AccumulateMasterColumns() {
   DCHECK(master_columns_.empty());
   for (const auto& column : columns_) {
     Column* master_column = column->GetLastMasterColumn();
-    if (master_column &&
-        std::find(master_columns_.begin(), master_columns_.end(),
-                  master_column) == master_columns_.end()) {
+    if (master_column && !base::ContainsValue(master_columns_, master_column)) {
       master_columns_.push_back(master_column);
     }
     // At this point, GetLastMasterColumn may not == master_column
     // (may have to go through a few Columns)_. Reset master_column to
     // avoid hops.
     column->master_column_ = master_column;
   }
 }
 
 void ColumnSet::UnifyLinkedColumnSizes() {
@@ skipping 521 matching lines @@
 
 ColumnSet* GridLayout::GetLastValidColumnSet() {
   for (int i = current_row_ - 1; i >= 0; --i) {
     if (rows_[i]->column_set())
       return rows_[i]->column_set();
   }
   return nullptr;
 }
 
 }  // namespace views