Add ContainsKey() and ContainsValue() and use them where appropriate.

R=ochang@chromium.org

Review URL: https://codereview.chromium.org/1540263003 .

2 files changed, 7 insertions, 10 deletions

diff --git a/fpdfsdk/src/javascript/JS_Runtime.cpp b/fpdfsdk/src/javascript/JS_Runtime.cpp
index f52e23a094..b08823f6ed 100644
--- a/fpdfsdk/src/javascript/JS_Runtime.cpp
+++ b/fpdfsdk/src/javascript/JS_Runtime.cpp
@@ -26,6 +26,7 @@
 #include "global.h"
 #include "report.h"
 #include "util.h"
+#include "third_party/base/stl_util.h"
 
 // static
 void IJS_Runtime::Initialize(unsigned int slot, void* isolate) {
@@ -206,11 +207,11 @@ v8::Local<v8::Context> CJS_Runtime::NewJSContext() {
 }
 
 void CJS_Runtime::AddObserver(Observer* observer) {
-  ASSERT(m_observers.find(observer) == m_observers.end());
+  ASSERT(!pdfium::ContainsKey(m_observers, observer));
   m_observers.insert(observer);
 }
 
 void CJS_Runtime::RemoveObserver(Observer* observer) {
-  ASSERT(m_observers.find(observer) != m_observers.end());
+  ASSERT(pdfium::ContainsKey(m_observers, observer));
   m_observers.erase(observer);
 }
diff --git a/fpdfsdk/src/javascript/util.cpp b/fpdfsdk/src/javascript/util.cpp
index cb9c9b2231..a14e81c203 100644
--- a/fpdfsdk/src/javascript/util.cpp
+++ b/fpdfsdk/src/javascript/util.cpp
@@ -468,17 +468,13 @@ void util::printx(const std::string& cFormat,
       case '\\':
         break;
       case '>': {
-        for (std::string::iterator it = cSource.begin(); it != cSource.end();
-             it++) {
-          *it = toupper(*it);
-        }
+        for (char& c : cSource)
+          c = toupper(c);
         break;
       }
       case '<': {
-        for (std::string::iterator it = cSource.begin(); it != cSource.end();
-             it++) {
-          *it = tolower(*it);
-        }
+        for (char& c : cSource)
+          c = tolower(c);
         break;
       }
       case '=':