Commit e3f45e6c authored by Hwanseung Lee's avatar Hwanseung Lee Committed by Commit Bot

Use ContainsValue() instead of std::find() at components/translate

replace std::find() with base::containsValue()
at components/translate

Bug: 561800
Change-Id: I8ec6023122fb42e7abcf1105bf24e4a0c1f9c5d0
Reviewed-on: https://chromium-review.googlesource.com/1102440Reviewed-by: default avatarDavid Roger <droger@chromium.org>
Commit-Queue: Hwanseung Lee <hs1217.lee@samsung.com>
Cr-Commit-Position: refs/heads/master@{#567958}
parent 08c274e5
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
#include <vector> #include <vector>
#include "base/run_loop.h" #include "base/run_loop.h"
#include "base/stl_util.h"
#include "base/test/bind_test_util.h" #include "base/test/bind_test_util.h"
#include "base/test/scoped_command_line.h" #include "base/test/scoped_command_line.h"
#include "base/test/scoped_task_environment.h" #include "base/test/scoped_task_environment.h"
...@@ -102,14 +103,12 @@ TEST(TranslateLanguageListTest, GetSupportedLanguages) { ...@@ -102,14 +103,12 @@ TEST(TranslateLanguageListTest, GetSupportedLanguages) {
// Check there are a lot of default languages. // Check there are a lot of default languages.
EXPECT_GE(languages.size(), 100ul); EXPECT_GE(languages.size(), 100ul);
// Check that some very common languages are there. // Check that some very common languages are there.
const auto begin = languages.begin(); EXPECT_TRUE(base::ContainsValue(languages, "en"));
const auto end = languages.end(); EXPECT_TRUE(base::ContainsValue(languages, "es"));
EXPECT_NE(end, std::find(begin, end, "en")); EXPECT_TRUE(base::ContainsValue(languages, "fr"));
EXPECT_NE(end, std::find(begin, end, "es")); EXPECT_TRUE(base::ContainsValue(languages, "ru"));
EXPECT_NE(end, std::find(begin, end, "fr")); EXPECT_TRUE(base::ContainsValue(languages, "zh-CN"));
EXPECT_NE(end, std::find(begin, end, "ru")); EXPECT_TRUE(base::ContainsValue(languages, "zh-TW"));
EXPECT_NE(end, std::find(begin, end, "zh-CN"));
EXPECT_NE(end, std::find(begin, end, "zh-TW"));
} }
// Check that we contact the translate server to update the supported language // Check that we contact the translate server to update the supported language
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
#include "base/feature_list.h" #include "base/feature_list.h"
#include "base/i18n/rtl.h" #include "base/i18n/rtl.h"
#include "base/stl_util.h"
#include "base/strings/string16.h" #include "base/strings/string16.h"
#include "base/strings/string_piece.h" #include "base/strings/string_piece.h"
#include "base/strings/string_split.h" #include "base/strings/string_split.h"
...@@ -248,8 +249,7 @@ void TranslatePrefs::AddToLanguageList(const std::string& input_language, ...@@ -248,8 +249,7 @@ void TranslatePrefs::AddToLanguageList(const std::string& input_language,
} }
// Add the language to the list. // Add the language to the list.
if (std::find(languages.begin(), languages.end(), chrome_language) == if (!base::ContainsValue(languages, chrome_language)) {
languages.end()) {
languages.push_back(chrome_language); languages.push_back(chrome_language);
UpdateLanguageList(languages); UpdateLanguageList(languages);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment