Enable CSP by default for extensions with manifest_version >= 2.

chrome/browser/extensions/content_security_policy_apitest.cc

Index: chrome/browser/extensions/content_security_policy_apitest.cc
===================================================================
--- chrome/browser/extensions/content_security_policy_apitest.cc	(revision 110274)
+++ chrome/browser/extensions/content_security_policy_apitest.cc	(working copy)
@@ -7,8 +7,12 @@
 #include "net/base/mock_host_resolver.h"
 
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ContentSecurityPolicy) {
-  CommandLine::ForCurrentProcess()->AppendSwitch(
-      switches::kEnableExperimentalExtensionApis);
   ASSERT_TRUE(StartTestServer());
   ASSERT_TRUE(RunExtensionTest("content_security_policy")) << message_;
 }
+
+IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DefaultContentSecurityPolicy) {
+  ASSERT_TRUE(StartTestServer());
+  ASSERT_TRUE(RunExtensionTest("default_content_security_policy")) <<
+      message_;
+}