Replace <meta> tag with header for content-security-policy on chrome:// pages.

chrome/test/functional/special_tabs.py

Index: chrome/test/functional/special_tabs.py
===================================================================
--- chrome/test/functional/special_tabs.py	(revision 103729)
+++ chrome/test/functional/special_tabs.py	(working copy)
@@ -40,7 +40,7 @@
     'chrome://bugreport/#0': { 'title': 'Feedback' },
     'chrome://chrome-urls': { 'title': 'Chrome URLs' },
     'chrome://crashes': { 'title': 'Crashes' },
-    'chrome://credits': { 'title': 'Credits', 'CSP': False },
+    'chrome://credits': { 'title': 'Credits' },
     'chrome://downloads': { 'title': 'Downloads' },
     'chrome://dns': { 'title': 'About DNS' },
     'chrome://settings/extensionSettings': { 'title': 'Extensions' },
@@ -54,50 +54,50 @@
     'chrome://memory-redirect': { 'title': 'About Memory' },
     'chrome://net-internals': {},
     'chrome://net-internals/help.html': {},
-    'chrome://newtab': { 'title': 'New Tab', 'CSP': False },
+    'chrome://newtab': { 'title': 'New Tab' },
     'chrome://plugins': { 'title': 'Plug-ins' },
     'chrome://sessions': { 'title': 'Sessions' },
     'chrome://settings': { 'title': 'Preferences - Basics' },
-    'chrome://stats': { 'CSP': False },
+    'chrome://stats': {},
     'chrome://sync': { 'title': 'Sync Internals' },
     'chrome://sync-internals': { 'title': 'Sync Internals' },
     'chrome://tasks': { 'title': 'Task Manager - Chromium' },
-    'chrome://terms': { 'CSP': False },
-    'chrome://textfields': { 'title': 'chrome://textfields', 'CSP': False },
+    'chrome://terms': {},
+    'chrome://textfields': { 'title': 'chrome://textfields' },
     'chrome://version': { 'title': 'About Version' },
     'chrome://view-http-cache': {},
     'chrome://workers': { 'title': 'Workers' },
   }
   broken_special_url_tabs = {
     # crashed under debug when invoked from location bar (bug 88223).
-    'chrome://devtools': { 'CSP': False },
+    'chrome://devtools': {},
 
     # returns "not available" despite having an URL constant.
-    'chrome://dialog': { 'CSP': False },
+    'chrome://dialog': {},
 
     # separate window on mac, PC untested, not implemented elsewhere.
-    'chrome://ipc': { 'CSP': False },
+    'chrome://ipc': {},
 
     # race against redirects via meta-refresh.
-    'chrome://memory': { 'CSP': False },
+    'chrome://memory': {},
   }
 
   chromeos_special_url_tabs = {
-    'chrome://active-downloads': { 'title': 'Downloads', 'CSP': False },
-    'chrome://choose-mobile-network': { 'title': 'undefined', 'CSP': False },
-    'chrome://imageburner': { 'title':'Create a Recovery Media', 'CSP': False },
-    'chrome://keyboardoverlay': { 'title': 'Keyboard Overlay', 'CSP': False },
-    'chrome://login': { 'CSP': False },
+    'chrome://active-downloads': { 'title': 'Downloads' },
+    'chrome://choose-mobile-network': { 'title': 'undefined' },
+    'chrome://imageburner': { 'title':'Create a Recovery Media' },
+    'chrome://keyboardoverlay': { 'title': 'Keyboard Overlay' },
+    'chrome://login': {},
     'chrome://network': { 'title': 'About Network' },
-    'chrome://oobe': { 'title': 'undefined', 'CSP': False },
-    'chrome://os-credits': { 'title': 'Credits', 'CSP': False },
-    'chrome://proxy-settings': { 'CSP': False },
-    'chrome://register': { 'CSP': False },
-    'chrome://sim-unlock': { 'title': 'Enter SIM Card PIN', 'CSP': False },
-    'chrome://system': { 'title': 'About System', 'CSP': False },
+    'chrome://oobe': { 'title': 'undefined' },
+    'chrome://os-credits': { 'title': 'Credits' },
+    'chrome://proxy-settings': {},
+    'chrome://register': {},
+    'chrome://sim-unlock': { 'title': 'Enter SIM Card PIN' },
+    'chrome://system': { 'title': 'About System' },
 
     # OVERRIDE - usually a warning page without CSP (so far).
-    'chrome://flags': { 'CSP': False },
+    'chrome://flags': {},
 
     # OVERRIDE - title and page different on CrOS
     'chrome://settings/about': { 'title': 'Settings - About' },
@@ -118,24 +118,24 @@
   }
   broken_chromeos_special_url_tabs = {
     # returns "not available" page on chromeos=1 linux but has an URL constant.
-    'chrome://activationmessage': { 'CSP': False },
-    'chrome://cloudprintresources': { 'CSP': False },
-    'chrome://cloudprintsetup': { 'CSP': False },
-    'chrome://collected-cookies': { 'CSP': False },
-    'chrome://constrained-test': { 'CSP': False },
-    'chrome://enterprise-enrollment': { 'CSP': False },
-    'chrome://http-auth': { 'CSP': False },
-    'chrome://login-container': { 'CSP': False },
-    'chrome://media-player': { 'CSP': False },
-    'chrome://screenshots': { 'CSP': False },
-    'chrome://slideshow': { 'CSP': False },
-    'chrome://syncresources': { 'CSP': False },
-    'chrome://theme': { 'CSP': False },
+    'chrome://activationmessage': {},
+    'chrome://cloudprintresources': {},
+    'chrome://cloudprintsetup': {},
+    'chrome://collected-cookies': {},
+    'chrome://constrained-test': {},
+    'chrome://enterprise-enrollment': {},
+    'chrome://http-auth': {},
+    'chrome://login-container': {},
+    'chrome://media-player': {},
+    'chrome://screenshots': {},
+    'chrome://slideshow': {},
+    'chrome://syncresources': {},
+    'chrome://theme': {},
 
     # crashes on chromeos=1 on linux, possibly missing real CrOS features.
-    'chrome://cryptohome': { 'CSP': False},
-    'chrome://mobilesetup': { 'CSP': False },
-    'chrome://print': { 'CSP': False },
+    'chrome://cryptohome': { },
+    'chrome://mobilesetup': {},
+    'chrome://print': {},
     'chrome://tasks': {},
   }
 
@@ -164,7 +164,6 @@
     # OVERRIDE - different title for Google Chrome vs. Chromium.
     'chrome://terms': {
       'title': 'Google Chrome Terms of Service',
-      'CSP': False
     },
   }
   broken_google_special_url_tabs = {}
@@ -173,7 +172,6 @@
     # OVERRIDE - different title for Google Chrome OS vs. Chromium OS.
     'chrome://terms': {
       'title': 'Google Chrome OS Terms',
-      'CSP': False
     },
   }
   broken_google_chromeos_special_url_tabs = {}
@@ -282,9 +280,7 @@
       include_list = []
       exclude_list = []
       if 'CSP' in properties and not properties['CSP']:
-        exclude_list.extend(['X-WebKit-CSP'])
       else:
-        include_list.extend(['X-WebKit-CSP'])
         exclude_list.extend(['<script>', 'onclick=', 'onload=',
                              'onchange=', 'onsubmit=', 'javascript:'])
       if 'includes' in properties: