Revert 257618 "roll clang 198389:202554"

trunk/src/tools/clang/plugins/ChromeClassTester.cpp

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // A general interface for filtering and only acting on classes in Chromium C++
 // code.
 
 #include "ChromeClassTester.h"
 
 #include <sys/param.h>
@@ skipping 92 matching lines @@
     CheckChromeEnum(enum_location, enum_decl);
   }
 }
 
 void ChromeClassTester::emitWarning(SourceLocation loc,
                                     const char* raw_error) {
   FullSourceLoc full(loc, instance().getSourceManager());
   std::string err;
   err = "[chromium-style] ";
   err += raw_error;
-  DiagnosticIDs::Level level =
+  DiagnosticsEngine::Level level =
       diagnostic().getWarningsAsErrors() ?
-      DiagnosticIDs::Error :
-      DiagnosticIDs::Warning;
-  unsigned id = diagnostic().getDiagnosticIDs()->getCustomDiagID(level, err);
+      DiagnosticsEngine::Error :
+      DiagnosticsEngine::Warning;
+  unsigned id = diagnostic().getCustomDiagID(level, err);
   DiagnosticBuilder builder = diagnostic().Report(full, id);
 }
 
 bool ChromeClassTester::InBannedNamespace(const Decl* record) {
   std::string n = GetNamespace(record);
   if (!n.empty()) {
     return std::find(banned_namespaces_.begin(), banned_namespaces_.end(), n)
         != banned_namespaces_.end();
   }
 
@@ skipping 180 matching lines @@
   PresumedLoc ploc = source_manager.getPresumedLoc(spelling_location);
   if (ploc.isInvalid()) {
     // If we're in an invalid location, we're looking at things that aren't
     // actually stated in the source.
     return false;
   }
 
   *filename = ploc.getFilename();
   return true;
 }