summaryrefslogtreecommitdiff
path: root/chromium/tools/clang/plugins/ChromeClassTester.cpp
diff options
context:
space:
mode:
authorAndras Becsi <andras.becsi@digia.com>2013-12-11 21:33:03 +0100
committerAndras Becsi <andras.becsi@digia.com>2013-12-13 12:34:07 +0100
commitf2a33ff9cbc6d19943f1c7fbddd1f23d23975577 (patch)
tree0586a32aa390ade8557dfd6b4897f43a07449578 /chromium/tools/clang/plugins/ChromeClassTester.cpp
parent5362912cdb5eea702b68ebe23702468d17c3017a (diff)
downloadqtwebengine-chromium-f2a33ff9cbc6d19943f1c7fbddd1f23d23975577.tar.gz
Update Chromium to branch 1650 (31.0.1650.63)
Change-Id: I57d8c832eaec1eb2364e0a8e7352a6dd354db99f Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'chromium/tools/clang/plugins/ChromeClassTester.cpp')
-rw-r--r--chromium/tools/clang/plugins/ChromeClassTester.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/chromium/tools/clang/plugins/ChromeClassTester.cpp b/chromium/tools/clang/plugins/ChromeClassTester.cpp
index ee8452dbc1e..e44e7da7e50 100644
--- a/chromium/tools/clang/plugins/ChromeClassTester.cpp
+++ b/chromium/tools/clang/plugins/ChromeClassTester.cpp
@@ -140,9 +140,13 @@ bool ChromeClassTester::InImplementationFile(SourceLocation record_location) {
void ChromeClassTester::BuildBannedLists() {
banned_namespaces_.push_back("std");
banned_namespaces_.push_back("__gnu_cxx");
- banned_namespaces_.push_back("WebKit");
banned_namespaces_.push_back("WebTestRunner");
+ // We're in the process of renaming WebKit to blink.
+ // TODO(abarth): Remove WebKit once the rename is complete.
+ banned_namespaces_.push_back("WebKit");
+ banned_namespaces_.push_back("blink");
+
banned_directories_.push_back("third_party/");
banned_directories_.push_back("native_client/");
banned_directories_.push_back("breakpad/");