Skipping renaming of begin/end/etc. should be unconditional.

tools/clang/rewrite_to_chrome_style/RewriteToChromeStyle.cpp

Index: tools/clang/rewrite_to_chrome_style/RewriteToChromeStyle.cpp
diff --git a/tools/clang/rewrite_to_chrome_style/RewriteToChromeStyle.cpp b/tools/clang/rewrite_to_chrome_style/RewriteToChromeStyle.cpp
index bfea42763df2be4ee1cd66bde12c55fcf34ca489..8e1cb077ff290bebc9d06a365dd4172f3a7dea5b 100644
--- a/tools/clang/rewrite_to_chrome_style/RewriteToChromeStyle.cpp
+++ b/tools/clang/rewrite_to_chrome_style/RewriteToChromeStyle.cpp
@@ -225,26 +225,14 @@ bool IsBlacklistedMethod(const clang::CXXMethodDecl& decl) {
   clang::StringRef name = decl.getName();
 
   // These methods should never be renamed.
-  static const char* kBlacklistMethods[] = {"trace", "traceImpl", "lock",
-                                            "unlock", "try_lock"};
+  static const char* kBlacklistMethods[] = {"trace",  "traceImpl", "lock",
+                                            "unlock", "try_lock",  "begin",
+                                            "end",    "rbegin",    "rend"};
   for (const auto& b : kBlacklistMethods) {
     if (name == b)
       return true;
   }
 
-  // Iterator methods shouldn't be renamed to work with stl and range-for
-  // loops.
-  std::string ret_type = decl.getReturnType().getAsString();
-  if (ret_type.find("iterator") != std::string::npos ||
-      ret_type.find("Iterator") != std::string::npos) {
-    static const char* kIteratorBlacklist[] = {"begin", "end", "rbegin",
-                                               "rend"};
-    for (const auto& b : kIteratorBlacklist) {
-      if (name == b)
-        return true;
-    }
-  }
-
   // Subclasses of InspectorAgent will subclass "disable()" from both blink and
   // from gen/, which is problematic, but DevTools folks don't want to rename
   // it or split this up. So don't rename it at all.