Commit 36fadc62 authored by Ganesh Borle's avatar Ganesh Borle Committed by Commit Bot

Changed std::find() to ContainsValue()/ContainsKey() in src/base/*

Bug: 561800

Change-Id: I1d92457335d4ee13b7289ce3601160083702e367
Reviewed-on: https://chromium-review.googlesource.com/919021
Commit-Queue: srirama chandra sekhar <srirama.m@samsung.com>
Reviewed-by: default avatarGabriel Charette <gab@chromium.org>
Cr-Commit-Position: refs/heads/master@{#537214}
parent ce3464b2
...@@ -256,6 +256,7 @@ Fu Junwei <junwei.fu@intel.com> ...@@ -256,6 +256,7 @@ Fu Junwei <junwei.fu@intel.com>
Gaetano Mendola <mendola@gmail.com> Gaetano Mendola <mendola@gmail.com>
Gajendra N <gajendra.n@samsung.com> Gajendra N <gajendra.n@samsung.com>
Gajendra Singh <wxjg68@motorola.com> Gajendra Singh <wxjg68@motorola.com>
Ganesh Borle <ganesh.borle@samsung.com>
Gao Chun <chun.gao@intel.com> Gao Chun <chun.gao@intel.com>
Gao Chun <gaochun.dev@gmail.com> Gao Chun <gaochun.dev@gmail.com>
George Joseph <kottackal.george@gmail.com> George Joseph <kottackal.george@gmail.com>
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
// found in the LICENSE file. // found in the LICENSE file.
#include "base/mac/objc_release_properties.h" #include "base/mac/objc_release_properties.h"
#include "base/stl_util.h"
#import "base/mac/scoped_nsautorelease_pool.h" #import "base/mac/scoped_nsautorelease_pool.h"
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
...@@ -216,8 +217,7 @@ struct NumberHolder { ...@@ -216,8 +217,7 @@ struct NumberHolder {
@selector(baseCvcDynamic), @selector(derivedCvcDynamic), @selector(baseCvcDynamic), @selector(derivedCvcDynamic),
@selector(protoCvcDynamic), @selector(protoCvcDynamic),
}; };
if (std::find(dynamicMethods.begin(), dynamicMethods.end(), sel) == if (!base::ContainsValue(dynamicMethods, sel)) {
dynamicMethods.end()) {
return NO; return NO;
} }
id (*imp)() = []() -> id { return nil; }; id (*imp)() = []() -> id { return nil; };
......
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
#include <algorithm> #include <algorithm>
#include "base/logging.h" #include "base/logging.h"
#include "base/stl_util.h"
namespace base { namespace base {
namespace internal { namespace internal {
...@@ -35,7 +36,7 @@ SchedulerWorker* SchedulerWorkerStack::Peek() const { ...@@ -35,7 +36,7 @@ SchedulerWorker* SchedulerWorkerStack::Peek() const {
} }
bool SchedulerWorkerStack::Contains(const SchedulerWorker* worker) const { bool SchedulerWorkerStack::Contains(const SchedulerWorker* worker) const {
return std::find(stack_.begin(), stack_.end(), worker) != stack_.end(); return ContainsValue(stack_, worker);
} }
void SchedulerWorkerStack::Remove(const SchedulerWorker* worker) { void SchedulerWorkerStack::Remove(const SchedulerWorker* worker) {
......
...@@ -1217,9 +1217,7 @@ TraceEventHandle TraceLog::AddTraceEventWithThreadIdAndTimestamp( ...@@ -1217,9 +1217,7 @@ TraceEventHandle TraceLog::AddTraceEventWithThreadIdAndTimestamp(
std::vector<StringPiece> existing_names = base::SplitStringPiece( std::vector<StringPiece> existing_names = base::SplitStringPiece(
existing_name->second, ",", base::KEEP_WHITESPACE, existing_name->second, ",", base::KEEP_WHITESPACE,
base::SPLIT_WANT_NONEMPTY); base::SPLIT_WANT_NONEMPTY);
bool found = std::find(existing_names.begin(), existing_names.end(), if (!ContainsValue(existing_names, new_name)) {
new_name) != existing_names.end();
if (!found) {
if (!existing_names.empty()) if (!existing_names.empty())
existing_name->second.push_back(','); existing_name->second.push_back(',');
existing_name->second.append(new_name); existing_name->second.append(new_name);
......
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
#include "base/json/json_writer.h" #include "base/json/json_writer.h"
#include "base/logging.h" #include "base/logging.h"
#include "base/memory/ptr_util.h" #include "base/memory/ptr_util.h"
#include "base/stl_util.h"
#include "base/strings/string_util.h" #include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h" #include "base/strings/utf_string_conversions.h"
#include "base/trace_event/memory_usage_estimator.h" #include "base/trace_event/memory_usage_estimator.h"
...@@ -1338,7 +1339,7 @@ void ListValue::AppendStrings(const std::vector<string16>& in_values) { ...@@ -1338,7 +1339,7 @@ void ListValue::AppendStrings(const std::vector<string16>& in_values) {
bool ListValue::AppendIfNotPresent(std::unique_ptr<Value> in_value) { bool ListValue::AppendIfNotPresent(std::unique_ptr<Value> in_value) {
DCHECK(in_value); DCHECK(in_value);
if (std::find(list_.begin(), list_.end(), *in_value) != list_.end()) if (ContainsValue(list_, *in_value))
return false; return false;
list_.push_back(std::move(*in_value)); list_.push_back(std::move(*in_value));
......
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