Remove whitelist restriction for Shared Modules on dev channel.

Add another extension to the whitelist for Shared Modules on stable and
supporting Pepper interfaces

BUG=234789

Review URL: https://chromiumcodereview.appspot.com/22407017

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

chrome/browser/chrome_content_browser_client.cc

@@ -272,11 +272,12 @@ const char* kPredefinedAllowedSocketOrigins[] = {
   "ghbfeebgmiidnnmeobbbaiamklmpbpii",  // see crbug.com/134099
   "jdfhpkjeckflbbleddjlpimecpbjdeep",  // see crbug.com/142514
   "iabmpiboiopbgfabjmgeedhcmjenhbla",  // see crbug.com/165080
-  "B7CF8A292249681AF81771650BA4CEEAF19A4560", // see crbug.com/165080
-  "6EAED1924DB611B6EEF2A664BD077BE7EAD33B8F", // see crbug.com/234789
-  "7525AF4F66763A70A883C4700529F647B470E4D2", // see crbug.com/238084
-  "0B549507088E1564D672F7942EB87CA4DAD73972", // see crbug.com/238084
-  "864288364E239573E777D3E0E36864E590E95C74"  // see crbug.com/238084
+  "B7CF8A292249681AF81771650BA4CEEAF19A4560",  // see crbug.com/165080
+  "6EAED1924DB611B6EEF2A664BD077BE7EAD33B8F",  // see crbug.com/234789
+  "4EB74897CB187C7633357C2FE832E0AD6A44883A",  // see crbug.com/234789
+  "7525AF4F66763A70A883C4700529F647B470E4D2",  // see crbug.com/238084
+  "0B549507088E1564D672F7942EB87CA4DAD73972",  // see crbug.com/238084
+  "864288364E239573E777D3E0E36864E590E95C74"   // see crbug.com/238084
 };
 #endif
 

chrome/browser/renderer_host/pepper/pepper_crx_file_system_message_filter.cc

@@ -29,7 +29,8 @@ namespace chrome {
 namespace {
 
 const char* kPredefinedAllowedCrxFsOrigins[] = {
-  "6EAED1924DB611B6EEF2A664BD077BE7EAD33B8F"  // see crbug.com/234789
+  "6EAED1924DB611B6EEF2A664BD077BE7EAD33B8F",  // see crbug.com/234789
+  "4EB74897CB187C7633357C2FE832E0AD6A44883A"   // see crbug.com/234789
 };
 
 }  // namespace

chrome/common/extensions/api/_manifest_features.json

@@ -146,14 +146,20 @@
       ]
     }
   ],
-  "export": {
-    "channel": "stable",
-    "extension_types": ["shared_module"],
-    "whitelist": [
-      "gpcckkmippodnppallflahfabmeilgjg", // browser and unit tests
-      "6EAED1924DB611B6EEF2A664BD077BE7EAD33B8F"
-    ]
-  },
+  "export": [
+    {
+      "channel": "stable",
+      "extension_types": ["shared_module"],
+      "whitelist": [
+        "6EAED1924DB611B6EEF2A664BD077BE7EAD33B8F",
+        "4EB74897CB187C7633357C2FE832E0AD6A44883A"
+      ]
+    },
+    {
+      "channel": "dev",
+      "extension_types": ["shared_module"]
+    }
+  ],
   "externally_connectable": {
     "channel": "stable",
     "extension_types": [

chrome/renderer/chrome_content_renderer_client.cc

@@ -208,6 +208,7 @@ bool ShouldUseJavaScriptSettingForPlugin(const WebPluginInfo& plugin) {
 #if defined(ENABLE_PLUGINS)
 const char* kPredefinedAllowedFileHandleOrigins[] = {
   "6EAED1924DB611B6EEF2A664BD077BE7EAD33B8F",  // see crbug.com/234789
+  "4EB74897CB187C7633357C2FE832E0AD6A44883A"   // see crbug.com/234789
 };
 #endif
 

chrome/test/data/extensions/pending_updates_with_imports/Preferences

@@ -35,9 +35,11 @@
               "version": "2",
               "manifest_version": 2,
               "name": "My extension 2",
-              "export": [
-                "*"
-              ],
+              "export": {
+                "resources": [
+                  "*"
+                ]
+              },
               "background": {
                 "page": "background.html"
               }