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

chrome/browser/translate/translate_manager_render_view_host_unittest.cc

 // Copyright 2014 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 <stddef.h>
 
-#include <algorithm>
 #include <memory>
 #include <set>
 #include <tuple>
 #include <utility>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/run_loop.h"
+#include "base/stl_util.h"
 #include "base/strings/stringprintf.h"
 #include "build/build_config.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/test_extension_system.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/renderer_context_menu/render_view_context_menu_test_util.h"
 #include "chrome/browser/translate/chrome_translate_client.h"
 #include "chrome/browser/translate/translate_service.h"
 #include "chrome/browser/ui/browser_window.h"
@@ skipping 574 matching lines @@
   current_supported_languages.clear();
   translate::TranslateDownloadManager::GetSupportedLanguages(
       &current_supported_languages);
   // "xx" can't be displayed in the Translate infobar, so this is eliminated.
   EXPECT_EQ(server_languages.size() - 1, current_supported_languages.size());
   // Not sure we need to guarantee the order of languages, so we find them.
   for (size_t i = 0; i < server_languages.size(); ++i) {
     const std::string& lang = server_languages[i];
     if (lang == "xx")
       continue;
-    EXPECT_NE(current_supported_languages.end(),
-              std::find(current_supported_languages.begin(),
-                        current_supported_languages.end(), lang))
+    EXPECT_TRUE(base::ContainsValue(current_supported_languages, lang))
         << "lang=" << lang;
   }
 }
 
 // The rest of the tests in this file depend on the translate infobar. They
 // should be ported to use the translate bubble. On Aura there is no infobar
 // so the tests are not compiled.
 #if !defined(USE_AURA)
 TEST_F(TranslateManagerRenderViewHostTest, NormalTranslate) {
   // See BubbleNormalTranslate for corresponding bubble UX testing.
@@ skipping 1130 matching lines @@
 
   // Check the bubble exists instead of the infobar.
   translate::TranslateInfoBarDelegate* infobar = GetTranslateInfoBar();
   ASSERT_TRUE(infobar == NULL);
   TranslateBubbleModel* bubble = factory->model();
   ASSERT_TRUE(bubble != NULL);
   EXPECT_EQ(TranslateBubbleModel::VIEW_STATE_TRANSLATING,
             bubble->GetViewState());
 }
 #endif  // defined(USE_AURA)