| Index: tools/clang/plugins/ChromeClassTester.cpp | 
| diff --git a/tools/clang/plugins/ChromeClassTester.cpp b/tools/clang/plugins/ChromeClassTester.cpp | 
| index 08e0d40d0a94ac5d985ab0e30c497fc02c85c548..e8f1507447b92f39dfd8caa63a67ea744242df1d 100644 | 
| --- a/tools/clang/plugins/ChromeClassTester.cpp | 
| +++ b/tools/clang/plugins/ChromeClassTester.cpp | 
| @@ -197,30 +197,20 @@ bool ChromeClassTester::HasIgnoredBases(const CXXRecordDecl* record) { | 
| bool ChromeClassTester::InImplementationFile(SourceLocation record_location) { | 
| std::string filename; | 
|  | 
| -  if (options_.follow_macro_expansion) { | 
| -    // If |record_location| is a macro, check the whole chain of expansions. | 
| -    const SourceManager& source_manager = instance_.getSourceManager(); | 
| -    while (true) { | 
| -      if (GetFilename(record_location, &filename)) { | 
| -        if (ends_with(filename, ".cc") || ends_with(filename, ".cpp") || | 
| -            ends_with(filename, ".mm")) { | 
| -          return true; | 
| -        } | 
| -      } | 
| -      if (!record_location.isMacroID()) { | 
| -        break; | 
| +  // If |record_location| is a macro, check the whole chain of expansions. | 
| +  const SourceManager& source_manager = instance_.getSourceManager(); | 
| +  while (true) { | 
| +    if (GetFilename(record_location, &filename)) { | 
| +      if (ends_with(filename, ".cc") || ends_with(filename, ".cpp") || | 
| +          ends_with(filename, ".mm")) { | 
| +        return true; | 
| } | 
| -      record_location = | 
| -          source_manager.getImmediateExpansionRange(record_location).first; | 
| } | 
| -  } else { | 
| -    if (!GetFilename(record_location, &filename)) | 
| -      return false; | 
| - | 
| -    if (ends_with(filename, ".cc") || ends_with(filename, ".cpp") || | 
| -        ends_with(filename, ".mm")) { | 
| -      return true; | 
| +    if (!record_location.isMacroID()) { | 
| +      break; | 
| } | 
| +    record_location = | 
| +        source_manager.getImmediateExpansionRange(record_location).first; | 
| } | 
|  | 
| return false; | 
|  |