Apply CSP to about:conflicts page.

chrome/test/functional/special_tabs.py

 #!/usr/bin/python
 # Copyright (c) 2011 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.
 
 import logging
 import os
 
 import pyauto_functional  # Must be imported before pyauto
 import pyauto
@@ skipping 133 matching lines @@
   broken_linux_special_url_tabs = {
   }
 
   mac_special_url_tabs = {
   }
 
   broken_mac_special_url_tabs = {
   }
 
   win_special_url_tabs = {
-    'chrome://conflicts': { 'CSP': False },
+    'chrome://conflicts': {},
 
     # OVERRIDE - different title for page.
     'chrome://settings': { 'title': 'Options - Basics' },
   }
 
   broken_win_special_url_tabs = {
     # Sync on windows badly broken at the moment.
     'chrome://sync': {},
   }
 
@@ skipping 111 matching lines @@
   def testSpecialAcceratorTabs(self):
     """Test special tabs created by acclerators like IDC_SHOW_HISTORY,
        IDC_SHOW_DOWNLOADS."""
     for accel, title in self.special_accelerator_tabs.iteritems():
       self.RunCommand(accel)
       self.assertEqual(title, self.GetActiveTabTitle())
 
 
 if __name__ == '__main__':
   pyauto_functional.Main()