Change the permission check for Pepper socket API to support both the public and private APIs.

chrome/renderer/chrome_content_renderer_client.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/renderer/chrome_content_renderer_client.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/path_service.h"
@@ skipping 1198 matching lines @@
 #if defined(ENABLE_PLUGINS)
   factory_manager->RegisterFactory(ChromePPAPIInterfaceFactory);
 #endif
 }
 
 bool ChromeContentRendererClient::IsPluginAllowedToCallRequestOSFileHandle(
     WebKit::WebPluginContainer* container) const {
 #if defined(ENABLE_PLUGINS)
   if (!container)
     return false;
-  return IsExtensionOrSharedModuleWhitelisted(
-      container->element().document().baseURL(),
-      extension_dispatcher_->extensions(),
-      allowed_file_handle_origins_,
-      switches::kAllowNaClFileHandleAPI);
+  GURL url = container->element().document().baseURL();
+  const ExtensionSet* extension_set = extension_dispatcher_->extensions();
+
+  return IsExtensionOrSharedModuleWhitelisted(url, extension_set,
+                                              allowed_file_handle_origins_) ||
+         IsHostAllowedByCommandLine(url, extension_set,
+                                    switches::kAllowNaClFileHandleAPI);
 #else
   return false;
 #endif
 }
 
 WebKit::WebSpeechSynthesizer*
 ChromeContentRendererClient::OverrideSpeechSynthesizer(
     WebKit::WebSpeechSynthesizerClient* client) {
   return new TtsDispatcher(client);
 }
@@ skipping 18 matching lines @@
 
   if (container->element().shadowHost().isNull())
     return false;
 
   WebString tag_name = container->element().shadowHost().tagName();
   return tag_name.equals(WebString::fromUTF8(kWebViewTagName)) ||
     tag_name.equals(WebString::fromUTF8(kAdViewTagName));
 }
 
 }  // namespace chrome