roll clang 139990:140930

BUG=none
TEST=none
TBR=hans

Review URL: http://codereview.chromium.org/8174007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104419 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 6 insertions, 6 deletions

diff --git a/DEPS b/DEPS
index d975046..64ac925 100644
--- a/DEPS
+++ b/DEPS
@@ -37,7 +37,7 @@ vars = {
   # tools/clang/scripts/update.sh. The script reads this line here.
   # Do NOT CHANGE this if you don't know what you're doing -- see
   # http://code.google.com/p/chromium/wiki/UpdatingClang
-  "clang_revision": "139990",
+  "clang_revision": "140930",
 }
 
 deps = {
diff --git a/tools/clang/plugins/ChromeClassTester.cpp b/tools/clang/plugins/ChromeClassTester.cpp
index bb61e06..3bcbf58 100644
--- a/tools/clang/plugins/ChromeClassTester.cpp
+++ b/tools/clang/plugins/ChromeClassTester.cpp
@@ -138,10 +138,10 @@ void ChromeClassTester::emitWarning(SourceLocation loc, const char* raw_error) {
   std::string err;
   err = "[chromium-style] ";
   err += raw_error;
-  Diagnostic::Level level =
+  DiagnosticsEngine::Level level =
       diagnostic().getWarningsAsErrors() ?
-      Diagnostic::Error :
-      Diagnostic::Warning;
+      DiagnosticsEngine::Error :
+      DiagnosticsEngine::Warning;
   unsigned id = diagnostic().getCustomDiagID(level, err);
   DiagnosticBuilder B = diagnostic().Report(full, id);
 }
diff --git a/tools/clang/plugins/ChromeClassTester.h b/tools/clang/plugins/ChromeClassTester.h
index 6552a2a..81f3a50 100644
--- a/tools/clang/plugins/ChromeClassTester.h
+++ b/tools/clang/plugins/ChromeClassTester.h
@@ -28,7 +28,7 @@ class ChromeClassTester : public clang::ASTConsumer {
 
  protected:
   clang::CompilerInstance& instance() { return instance_; }
-  clang::Diagnostic& diagnostic() { return diagnostic_; }
+  clang::DiagnosticsEngine& diagnostic() { return diagnostic_; }
 
   // Emits a simple warning; this shouldn't be used if you require printf-style
   // printing.
@@ -55,7 +55,7 @@ class ChromeClassTester : public clang::ASTConsumer {
   bool IsIgnoredType(const std::string& base_name);
 
   clang::CompilerInstance& instance_;
-  clang::Diagnostic& diagnostic_;
+  clang::DiagnosticsEngine& diagnostic_;
 
   // List of banned namespaces.
   std::vector<std::string> banned_namespaces_;