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

chrome/browser/local_discovery/service_discovery_client_mac_unittest.mm

 // 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.
 
 #import <Cocoa/Cocoa.h>
 #include <stdint.h>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/macros.h"
 #include "base/run_loop.h"
+#include "base/stl_util.h"
 #include "chrome/browser/local_discovery/service_discovery_client.h"
 #include "chrome/browser/local_discovery/service_discovery_client_mac.h"
 #import "chrome/browser/ui/cocoa/test/cocoa_test_helper.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "net/base/ip_endpoint.h"
 #include "net/base/sockaddr_storage.h"
 #include "testing/gtest_mac.h"
 
 @interface TestNSNetService : NSNetService {
  @private
@@ skipping 125 matching lines @@
   resolver_impl->GetContainerForTesting()->OnResolveUpdate(
       ServiceResolver::STATUS_SUCCESS);
 
   base::RunLoop().RunUntilIdle();
 
   EXPECT_EQ(1, num_resolves_);
 
   const std::vector<std::string>& metadata =
       last_service_description_.metadata;
   EXPECT_EQ(2u, metadata.size());
-  EXPECT_NE(metadata.end(),
-            std::find(metadata.begin(), metadata.end(), "ab"));
-  EXPECT_NE(metadata.end(),
-            std::find(metadata.begin(), metadata.end(), "d=e"));
+  EXPECT_TRUE(base::ContainsValue(metadata, "ab"));
+  EXPECT_TRUE(base::ContainsValue(metadata, "d=e"));
 
   EXPECT_EQ(ip_address, last_service_description_.ip_address);
   EXPECT_EQ(kPort, last_service_description_.address.port());
   EXPECT_EQ(kIp, last_service_description_.address.host());
 }
 
 // https://crbug.com/586628
 TEST_F(ServiceDiscoveryClientMacTest, ResolveInvalidUnicodeRecord) {
   const std::string test_service_name = "Test.123._testing._tcp.local";
   std::unique_ptr<ServiceResolver> resolver = client()->CreateServiceResolver(
@@ skipping 33 matching lines @@
   resolver_impl->GetContainerForTesting()->OnResolveUpdate(
       ServiceResolver::STATUS_SUCCESS);
 
   base::RunLoop().RunUntilIdle();
 
   EXPECT_EQ(1, num_resolves_);
 
   const std::vector<std::string>& metadata =
       last_service_description_.metadata;
   EXPECT_EQ(2u, metadata.size());
-  EXPECT_NE(metadata.end(),
-            std::find(metadata.begin(), metadata.end(), "a=b"));
-  EXPECT_NE(metadata.end(),
-            std::find(metadata.begin(), metadata.end(), "cd=e9"));
+  EXPECT_TRUE(base::ContainsValue(metadata, "a=b"));
+  EXPECT_TRUE(base::ContainsValue(metadata, "cd=e9"));
 
   EXPECT_EQ(ip_address, last_service_description_.ip_address);
   EXPECT_EQ(kPort, last_service_description_.address.port());
   EXPECT_EQ(kIp, last_service_description_.address.host());
 }
 
 TEST_F(ServiceDiscoveryClientMacTest, ResolveInvalidServiceName) {
   base::RunLoop run_loop;
 
   // This is the same invalid U+1F4A9 code unit sequence as in
@@ skipping 13 matching lines @@
           base::Unretained(this), run_loop.QuitClosure()));
   resolver->StartResolving();
 
   run_loop.Run();
 
   EXPECT_EQ(1, num_resolves_);
   EXPECT_EQ(ServiceResolver::STATUS_KNOWN_NONEXISTENT, last_status_);
 }
 
 }  // namespace local_discovery