Make NaCl PPAPI proxy honor the Disable3DApis policy.

BUG=chromium:90037
TEST=manual

Review URL: http://codereview.chromium.org/7808001

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

1 files changed, 6 insertions, 5 deletions

diff --git a/ppapi/native_client/src/trusted/plugin/plugin.h b/ppapi/native_client/src/trusted/plugin/plugin.h
index 3918aff..35e0f8b 100644
--- a/ppapi/native_client/src/trusted/plugin/plugin.h
+++ b/ppapi/native_client/src/trusted/plugin/plugin.h
@@ -9,9 +9,10 @@
 #define NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PLUGIN_H_
 
 #include <stdio.h>
+
 #include <map>
-#include <set>
 #include <queue>
+#include <set>
 #include <string>
 #include <vector>
 
@@ -46,8 +47,8 @@ class MouseLock_Dev;
 class Printing_Dev;
 class Selection_Dev;
 class URLLoader;
-class WidgetClient_Dev;
 class URLUtil_Dev;
+class WidgetClient_Dev;
 class Zoom_Dev;
 }
 
@@ -297,7 +298,7 @@ class Plugin : public pp::InstancePrivate {
   // Tests if the MIME type is not a NaCl MIME type.
   bool IsForeignMIMEType() const;
   // Returns true if PPAPI Dev interfaces should be allowed.
-  bool enable_dev_interface() { return enable_dev_interface_; }
+  bool enable_dev_interfaces() { return enable_dev_interfaces_; }
 
   Manifest const* manifest() const { return manifest_.get(); }
 
@@ -351,7 +352,7 @@ class Plugin : public pp::InstancePrivate {
   MethodInfo* GetMethodInfo(uintptr_t method_id, CallType call_type);
 
   // Check url and decide if PPAPI Dev interfaces are required.
-  bool RequiresDevInterface(const nacl::string& manifest_url);
+  bool RequiresDevInterfaces(const nacl::string& manifest_url);
 
   // Callback used when getting the URL for the .nexe file.  If the URL loading
   // is successful, the file descriptor is opened and can be passed to sel_ldr
@@ -468,7 +469,7 @@ class Plugin : public pp::InstancePrivate {
   ppapi_proxy::BrowserPpp* ppapi_proxy_;
 
   // PPAPI Dev interfaces are disabled by default.
-  bool enable_dev_interface_;
+  bool enable_dev_interfaces_;
 
   // If we get a DidChangeView event before the nexe is loaded, we store it and
   // replay it to nexe after it's loaded.