Updated to most recent version RE2 and remove upstreamed patches.

third_party/re2/patches/re2-msvc9-chrome.patch

Index: third_party/re2/patches/re2-msvc9-chrome.patch
diff --git a/third_party/re2/patches/re2-msvc9-chrome.patch b/third_party/re2/patches/re2-msvc9-chrome.patch
index 17da0cd079b5b8794a4b60927f9a14ed1afaace3..ce5d05aada2e76ecbdd2c0311a587c9c08e3124f 100644
--- a/third_party/re2/patches/re2-msvc9-chrome.patch
+++ b/third_party/re2/patches/re2-msvc9-chrome.patch
@@ -1,7 +1,7 @@
-diff --git a/third_party/re2/AUTHORS b/third_party/re2/AUTHORS
+diff --git a/AUTHORS b/AUTHORS
 index 3c0f928..e17d9bf 100644
---- a/third_party/re2/AUTHORS
-+++ b/third_party/re2/AUTHORS
+--- a/AUTHORS
++++ b/AUTHORS
 @@ -8,5 +8,6 @@
  
  # Please keep the list sorted.
@@ -9,23 +9,23 @@ index 3c0f928..e17d9bf 100644
 +Brian Gunlogson <unixman83@gmail.com>
  Google Inc.
  Stefano Rivera <stefano.rivera@gmail.com>
-diff --git a/third_party/re2/CONTRIBUTORS b/third_party/re2/CONTRIBUTORS
-index ac64332..15053eb 100644
---- a/third_party/re2/CONTRIBUTORS
-+++ b/third_party/re2/CONTRIBUTORS
+diff --git a/CONTRIBUTORS b/CONTRIBUTORS
+index 7b44e04..7f6a93d 100644
+--- a/CONTRIBUTORS
++++ b/CONTRIBUTORS
 @@ -26,6 +26,7 @@
  
  # Please keep the list sorted.
  
 +Brian Gunlogson <unixman83@gmail.com>
  Dominic Battré <battre@chromium.org>
+ John Millikin <jmillikin@gmail.com>
  Rob Pike <r@google.com>
- Russ Cox <rsc@swtch.com>
-diff --git a/third_party/re2/mswin/stdint.h b/third_party/re2/mswin/stdint.h
+diff --git a/mswin/stdint.h b/mswin/stdint.h
 new file mode 100644
 index 0000000..d02608a
 --- /dev/null
-+++ b/third_party/re2/mswin/stdint.h
++++ b/mswin/stdint.h
 @@ -0,0 +1,247 @@
 +// ISO C9x  compliant stdint.h for Microsoft Visual Studio
 +// Based on ISO/IEC 9899:TC2 Committee draft (May 6, 2005) WG14/N1124 
@@ -274,10 +274,10 @@ index 0000000..d02608a
 +
 +
 +#endif // _MSC_STDINT_H_ ]
-diff --git a/third_party/re2/re2/compile.cc b/third_party/re2/re2/compile.cc
+diff --git a/re2/compile.cc b/re2/compile.cc
 index 9cddb71..adb45fd 100644
---- a/third_party/re2/re2/compile.cc
-+++ b/third_party/re2/re2/compile.cc
+--- a/re2/compile.cc
++++ b/re2/compile.cc
 @@ -502,7 +502,7 @@ int Compiler::RuneByteSuffix(uint8 lo, uint8 hi, bool foldcase, int next) {
      return UncachedRuneByteSuffix(lo, hi, foldcase, next);
    }
@@ -287,10 +287,10 @@ index 9cddb71..adb45fd 100644
    map<uint64, int>::iterator it = rune_cache_.find(key);
    if (it != rune_cache_.end())
      return it->second;
-diff --git a/third_party/re2/re2/prefilter_tree.cc b/third_party/re2/re2/prefilter_tree.cc
+diff --git a/re2/prefilter_tree.cc b/re2/prefilter_tree.cc
 index d8bc37a..cdcf77e 100644
---- a/third_party/re2/re2/prefilter_tree.cc
-+++ b/third_party/re2/re2/prefilter_tree.cc
+--- a/re2/prefilter_tree.cc
++++ b/re2/prefilter_tree.cc
 @@ -8,6 +8,11 @@
  #include "re2/prefilter_tree.h"
  #include "re2/re2.h"
@@ -303,10 +303,10 @@ index d8bc37a..cdcf77e 100644
  DEFINE_int32(filtered_re2_min_atom_len,
               3,
               "Strings less than this length are not stored as atoms");
-diff --git a/third_party/re2/re2/re2.cc b/third_party/re2/re2/re2.cc
-index 3cc3dd4..989add6 100644
---- a/third_party/re2/re2/re2.cc
-+++ b/third_party/re2/re2/re2.cc
+diff --git a/re2/re2.cc b/re2/re2.cc
+index 8d1d468..0da886d 100644
+--- a/re2/re2.cc
++++ b/re2/re2.cc
 @@ -11,7 +11,13 @@
  
  #include <stdio.h>
@@ -348,10 +348,10 @@ index 3cc3dd4..989add6 100644
  
  RE2::Options::Options(RE2::CannedOptions opt)
    : encoding_(opt == RE2::Latin1 ? EncodingLatin1 : EncodingUTF8),
-diff --git a/third_party/re2/re2/re2.h b/third_party/re2/re2/re2.h
-index 9f5b66d..98b06b8 100644
---- a/third_party/re2/re2/re2.h
-+++ b/third_party/re2/re2/re2.h
+diff --git a/re2/re2.h b/re2/re2.h
+index 272028b..c509853 100644
+--- a/re2/re2.h
++++ b/re2/re2.h
 @@ -552,28 +552,16 @@ class RE2 {
      // If this happens too often, RE2 falls back on the NFA implementation.
  
@@ -384,10 +384,10 @@ index 9f5b66d..98b06b8 100644
      /*implicit*/ Options(CannedOptions);
  
      Encoding encoding() const { return encoding_; }
-diff --git a/third_party/re2/re2/stringpiece.h b/third_party/re2/re2/stringpiece.h
+diff --git a/re2/stringpiece.h b/re2/stringpiece.h
 index ab9297c..38a5150 100644
---- a/third_party/re2/re2/stringpiece.h
-+++ b/third_party/re2/re2/stringpiece.h
+--- a/re2/stringpiece.h
++++ b/re2/stringpiece.h
 @@ -23,6 +23,9 @@
  #include <cstddef>
  #include <iosfwd>
@@ -398,10 +398,10 @@ index ab9297c..38a5150 100644
  
  namespace re2 {
  
-diff --git a/third_party/re2/re2/testing/re2_test.cc b/third_party/re2/re2/testing/re2_test.cc
+diff --git a/re2/testing/re2_test.cc b/re2/testing/re2_test.cc
 index b99cacf..911e868 100644
---- a/third_party/re2/re2/testing/re2_test.cc
-+++ b/third_party/re2/re2/testing/re2_test.cc
+--- a/re2/testing/re2_test.cc
++++ b/re2/testing/re2_test.cc
 @@ -6,7 +6,9 @@
  // TODO: Test extractions for PartialMatch/Consume
  
@@ -440,10 +440,10 @@ index b99cacf..911e868 100644
  
  TEST(RE2, FullMatchTypeTests) {
    // Type tests
-diff --git a/third_party/re2/util/logging.h b/third_party/re2/util/logging.h
-index 734e7a1..7302ea6 100644
---- a/third_party/re2/util/logging.h
-+++ b/third_party/re2/util/logging.h
+diff --git a/util/logging.h b/util/logging.h
+index 4443f7c..d0a2d87 100644
+--- a/util/logging.h
++++ b/util/logging.h
 @@ -7,8 +7,13 @@
  #ifndef RE2_UTIL_LOGGING_H__
  #define RE2_UTIL_LOGGING_H__
@@ -458,10 +458,10 @@ index 734e7a1..7302ea6 100644
  
  // Debug-only checking.
  #define DCHECK(condition) assert(condition)
-diff --git a/third_party/re2/util/mutex.h b/third_party/re2/util/mutex.h
+diff --git a/util/mutex.h b/util/mutex.h
 index 9787bfb..e321fae 100644
---- a/third_party/re2/util/mutex.h
-+++ b/third_party/re2/util/mutex.h
+--- a/util/mutex.h
++++ b/util/mutex.h
 @@ -12,8 +12,10 @@
  
  namespace re2 {
@@ -484,10 +484,10 @@ index 9787bfb..e321fae 100644
  # ifdef GMUTEX_TRYLOCK
    // We need Windows NT or later for TryEnterCriticalSection().  If you
    // don't need that functionality, you can remove these _WIN32_WINNT
-diff --git a/third_party/re2/util/pcre.cc b/third_party/re2/util/pcre.cc
+diff --git a/util/pcre.cc b/util/pcre.cc
 index 5e67e1f..1602133 100644
---- a/third_party/re2/util/pcre.cc
-+++ b/third_party/re2/util/pcre.cc
+--- a/util/pcre.cc
++++ b/util/pcre.cc
 @@ -11,6 +11,11 @@
  #include "util/flags.h"
  #include "util/pcre.h"
@@ -500,10 +500,10 @@ index 5e67e1f..1602133 100644
  #define PCREPORT(level) LOG(level)
  
  // Default PCRE limits.
-diff --git a/third_party/re2/util/pcre.h b/third_party/re2/util/pcre.h
+diff --git a/util/pcre.h b/util/pcre.h
 index 4dda95d..771ac91 100644
---- a/third_party/re2/util/pcre.h
-+++ b/third_party/re2/util/pcre.h
+--- a/util/pcre.h
++++ b/util/pcre.h
 @@ -180,9 +180,15 @@ struct pcre_extra { int flags, match_limit, match_limit_recursion; };
  #define PCRE_ERROR_MATCHLIMIT 2
  #define PCRE_ERROR_RECURSIONLIMIT 3
@@ -520,10 +520,10 @@ index 4dda95d..771ac91 100644
  }  // namespace re2
  #endif
  
-diff --git a/third_party/re2/util/stringprintf.cc b/third_party/re2/util/stringprintf.cc
+diff --git a/util/stringprintf.cc b/util/stringprintf.cc
 index c908181..d4691d1 100644
---- a/third_party/re2/util/stringprintf.cc
-+++ b/third_party/re2/util/stringprintf.cc
+--- a/util/stringprintf.cc
++++ b/util/stringprintf.cc
 @@ -4,6 +4,10 @@
  
  #include "util/util.h"
@@ -535,10 +535,10 @@ index c908181..d4691d1 100644
  namespace re2 { 
  
  static void StringAppendV(string* dst, const char* format, va_list ap) {
-diff --git a/third_party/re2/util/test.cc b/third_party/re2/util/test.cc
+diff --git a/util/test.cc b/util/test.cc
 index 0644829..2fe1bfa 100644
---- a/third_party/re2/util/test.cc
-+++ b/third_party/re2/util/test.cc
+--- a/util/test.cc
++++ b/util/test.cc
 @@ -3,7 +3,9 @@
  // license that can be found in the LICENSE file.
  
@@ -563,10 +563,10 @@ index 0644829..2fe1bfa 100644
  }
  }  // namespace re2
  
-diff --git a/third_party/re2/util/util.h b/third_party/re2/util/util.h
-index 63a9c6f..dab7e16 100644
---- a/third_party/re2/util/util.h
-+++ b/third_party/re2/util/util.h
+diff --git a/util/util.h b/util/util.h
+index c46ab1b..17ef824 100644
+--- a/util/util.h
++++ b/util/util.h
 @@ -12,7 +12,9 @@
  #include <stddef.h>         // For size_t
  #include <assert.h>
@@ -575,9 +575,9 @@ index 63a9c6f..dab7e16 100644
  #include <sys/time.h>
 +#endif
  #include <time.h>
+ #include <ctype.h>	// For isdigit, isalpha.
  
- // C++
-@@ -50,7 +52,11 @@ using std::tr1::unordered_set;
+@@ -51,7 +53,11 @@ using std::tr1::unordered_set;
  #else
  
  #include <unordered_set>
@@ -589,10 +589,10 @@ index 63a9c6f..dab7e16 100644
  
  #endif
  
-diff --git a/third_party/re2/util/valgrind.h b/third_party/re2/util/valgrind.h
+diff --git a/util/valgrind.h b/util/valgrind.h
 index ca10b1a..d097b0c 100644
---- a/third_party/re2/util/valgrind.h
-+++ b/third_party/re2/util/valgrind.h
+--- a/util/valgrind.h
++++ b/util/valgrind.h
 @@ -4064,6 +4064,7 @@ typedef
  #endif /* PLAT_ppc64_aix5 */