Merge to XFA: Add ContainsKey() and ContainsValue() and use them where appropriate.

TBR=ochang@chromium.org

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

(cherry picked from commit 1fc92867ca53f0fba4272fbee3814d844f487495)

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

3 files changed, 10 insertions, 14 deletions

diff --git a/fpdfsdk/src/fsdk_mgr.cpp b/fpdfsdk/src/fsdk_mgr.cpp
index 5e847b78e5..e27823bea2 100644
--- a/fpdfsdk/src/fsdk_mgr.cpp
+++ b/fpdfsdk/src/fsdk_mgr.cpp
@@ -13,6 +13,7 @@
 #include "fpdfsdk/include/javascript/IJavaScript.h"
 #include "public/fpdf_ext.h"
 #include "third_party/base/nonstd_unique_ptr.h"
+#include "third_party/base/stl_util.h"
 
 #ifdef PDF_ENABLE_XFA
 #include "../include/fpdfxfa/fpdfxfa_app.h"
@@ -772,9 +773,7 @@ CPDFSDK_Annot* CPDFSDK_PageView::GetFXWidgetAtPoint(FX_FLOAT pageX,
 void CPDFSDK_PageView::KillFocusAnnotIfNeeded() {
   // if there is a focused annot on the page, we should kill the focus first.
   if (CPDFSDK_Annot* focusedAnnot = m_pSDKDoc->GetFocusAnnot()) {
-    auto it =
-        std::find(m_fxAnnotArray.begin(), m_fxAnnotArray.end(), focusedAnnot);
-    if (it != m_fxAnnotArray.end())
+    if (pdfium::ContainsValue(m_fxAnnotArray, focusedAnnot))
       KillFocusAnnot();
   }
 }
@@ -1154,7 +1153,7 @@ bool CPDFSDK_PageView::IsValidAnnot(const CPDF_Annot* p) const {
     return false;
 
   const auto& annots = m_pAnnotList->All();
-  return std::find(annots.begin(), annots.end(), p) != annots.end();
+  return pdfium::ContainsValue(annots, p);
 }
 
 CPDFSDK_Annot* CPDFSDK_PageView::GetFocusAnnot() {
diff --git a/fpdfsdk/src/javascript/JS_Runtime.cpp b/fpdfsdk/src/javascript/JS_Runtime.cpp
index eaf2dda36c..a20ca8f44d 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"
 
 #ifdef PDF_ENABLE_XFA
 #include "../../../xfa/src/fxjse/src/value.h"
@@ -326,11 +327,11 @@ FX_BOOL CJS_Runtime::SetHValueByName(const CFX_ByteStringC& utf8Name,
 
 #endif
 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 '=':