Use ContainsValue() instead of std::find() in chrome/browser/ui/

chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/extensions/browser_actions_controller.h"
 
 #include <stddef.h>
 
 #include <string>
 #include <utility>
 
 #include "base/macros.h"
+#include "base/stl_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/browser/extensions/extension_message_bubble_controller.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #import "chrome/browser/ui/cocoa/extensions/browser_action_button.h"
 #import "chrome/browser/ui/cocoa/extensions/browser_actions_container_view.h"
 #import "chrome/browser/ui/cocoa/extensions/extension_popup_controller.h"
 #import "chrome/browser/ui/cocoa/extensions/toolbar_actions_bar_bubble_mac.h"
 #import "chrome/browser/ui/cocoa/extensions/toolbar_actions_bar_bubble_views_presenter.h"
@@ skipping 430 matching lines @@
         new ui::NinePartImageIds(IMAGE_GRID(IDR_DEVELOPER_MODE_HIGHLIGHT)));
   }
   [containerView_ setHighlight:std::move(highlight)];
 
   std::vector<ToolbarActionViewController*> toolbarActions =
       toolbarActionsBar_->GetActions();
   // Check that every button has an action in the referenced actions.
   // Tracking down crbug.com/653100.
   // TODO(devlin): Remove or relax this one the bug is fixed?
   for (BrowserActionButton* button in buttons_.get()) {
-    CHECK(std::find(toolbarActions.begin(), toolbarActions.end(),
-                    [button viewController]) != toolbarActions.end());
+    CHECK(base::ContainsValue(toolbarActions, [button viewController]));
   }
   // Reorder |buttons_| to reflect |toolbarActions|. (Ugly n^2 sort, but the
   // data set should be tiny.)
   for (size_t refIndex = 0; refIndex < toolbarActions.size(); ++refIndex) {
     NSUInteger buttonIndex = refIndex;
     ToolbarActionViewController* refAction = toolbarActions[refIndex];
     for (; buttonIndex < [buttons_ count]; ++buttonIndex) {
       if ([[self buttonAtIndex:buttonIndex] viewController] == refAction)
         break;
     }
@@ skipping 373 matching lines @@
 }
 
 #pragma mark -
 #pragma mark Testing Methods
 
 - (BrowserActionButton*)buttonWithIndex:(NSUInteger)index {
   return index < [buttons_ count] ? [buttons_ objectAtIndex:index] : nil;
 }
 
 @end