Revert of Update re2

third_party/re2/re2/testing/tester.h

 // Copyright 2008 The RE2 Authors.  All Rights Reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
 // Comparative tester for regular expression matching.
 // Checks all implementations against each other.
 
 #ifndef RE2_TESTING_TESTER_H__
 #define RE2_TESTING_TESTER_H__
 
@@ skipping 66 matching lines @@
   Regexp::ParseFlags flags_;        // flags for parsing regexp_str_
   bool error_;                      // error during constructor?
 
   Regexp* regexp_;                  // parsed regexp
   int num_captures_;                // regexp_->NumCaptures() cached
   Prog* prog_;                      // compiled program
   Prog* rprog_;                     // compiled reverse program
   PCRE* re_;                        // PCRE implementation
   RE2* re2_;                        // RE2 implementation
 
-  DISALLOW_COPY_AND_ASSIGN(TestInstance);
+  DISALLOW_EVIL_CONSTRUCTORS(TestInstance);
 };
 
 // A group of TestInstances for all possible configurations.
 class Tester {
  public:
   explicit Tester(const StringPiece& regexp);
   ~Tester();
 
   bool error() { return error_; }
 
   // Runs a single test case: search in text, which is in context,
   // using the given anchoring.
   bool TestCase(const StringPiece& text, const StringPiece& context,
                 Prog::Anchor anchor);
 
   // Run TestCase(text, text, anchor) for all anchoring modes.
   bool TestInput(const StringPiece& text);
 
   // Run TestCase(text, context, anchor) for all anchoring modes.
   bool TestInputInContext(const StringPiece& text, const StringPiece& context);
 
  private:
   bool error_;
   vector<TestInstance*> v_;
 
-  DISALLOW_COPY_AND_ASSIGN(Tester);
+  DISALLOW_EVIL_CONSTRUCTORS(Tester);
 };
 
 // Run all possible tests using regexp and text.
 bool TestRegexpOnText(const StringPiece& regexp, const StringPiece& text);
 
 }  // namespace re2
 
 #endif  // RE2_TESTING_TESTER_H__