Move PPB/PPP_MouseLock out of dev/.

BUG=41781
TEST=None


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

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

17 files changed, 42 insertions, 45 deletions

diff --git a/ppapi/native_client/src/shared/ppapi_proxy/browser_globals.cc b/ppapi/native_client/src/shared/ppapi_proxy/browser_globals.cc
index ab94ccf..c167591 100644
--- a/ppapi/native_client/src/shared/ppapi_proxy/browser_globals.cc
+++ b/ppapi/native_client/src/shared/ppapi_proxy/browser_globals.cc
@@ -394,10 +394,9 @@ const PPB_Fullscreen* PPBFullscreenInterface() {
   return ppb;
 }
 
-const PPB_MouseLock_Dev* PPBMouseLockInterface() {
-  static const PPB_MouseLock_Dev* ppb =
-      static_cast<const PPB_MouseLock_Dev*>(
-          GetBrowserInterfaceSafe(PPB_MOUSELOCK_DEV_INTERFACE));
+const PPB_MouseLock* PPBMouseLockInterface() {
+  static const PPB_MouseLock* ppb = static_cast<const PPB_MouseLock*>(
+      GetBrowserInterfaceSafe(PPB_MOUSELOCK_INTERFACE));
   return ppb;
 }
 
diff --git a/ppapi/native_client/src/shared/ppapi_proxy/browser_globals.h b/ppapi/native_client/src/shared/ppapi_proxy/browser_globals.h
index 6ce901b..804968d 100644
--- a/ppapi/native_client/src/shared/ppapi_proxy/browser_globals.h
+++ b/ppapi/native_client/src/shared/ppapi_proxy/browser_globals.h
@@ -9,7 +9,6 @@
 #include "ppapi/c/dev/ppb_find_dev.h"
 #include "ppapi/c/dev/ppb_font_dev.h"
 #include "ppapi/c/dev/ppb_memory_dev.h"
-#include "ppapi/c/dev/ppb_mouse_lock_dev.h"
 #include "ppapi/c/dev/ppb_scrollbar_dev.h"
 #include "ppapi/c/dev/ppb_testing_dev.h"
 #include "ppapi/c/dev/ppb_var_deprecated.h"
@@ -29,6 +28,7 @@
 #include "ppapi/c/ppb_input_event.h"
 #include "ppapi/c/ppb_instance.h"
 #include "ppapi/c/ppb_messaging.h"
+#include "ppapi/c/ppb_mouse_lock.h"
 #include "ppapi/c/ppb_url_loader.h"
 #include "ppapi/c/ppb_url_request_info.h"
 #include "ppapi/c/ppb_url_response_info.h"
@@ -117,7 +117,7 @@ const PPB_KeyboardInputEvent* PPBKeyboardInputEventInterface();
 const PPB_Memory_Dev* PPBMemoryInterface();  // shared
 const PPB_MouseInputEvent* PPBMouseInputEventInterface();
 const PPB_Messaging* PPBMessagingInterface();
-const PPB_MouseLock_Dev* PPBMouseLockInterface();
+const PPB_MouseLock* PPBMouseLockInterface();
 const PPB_PDF* PPBPDFInterface();
 const PPB_Scrollbar_Dev* PPBScrollbarInterface();
 const PPB_Testing_Dev* PPBTestingInterface();
diff --git a/ppapi/native_client/src/shared/ppapi_proxy/browser_ppb_mouse_lock_rpc_server.cc b/ppapi/native_client/src/shared/ppapi_proxy/browser_ppb_mouse_lock_rpc_server.cc
index b85bf09..2951d66 100644
--- a/ppapi/native_client/src/shared/ppapi_proxy/browser_ppb_mouse_lock_rpc_server.cc
+++ b/ppapi/native_client/src/shared/ppapi_proxy/browser_ppb_mouse_lock_rpc_server.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
-// SRPC-abstraction wrappers around PPB_MouseLock_Dev functions.
+// SRPC-abstraction wrappers around PPB_MouseLock functions.
 
 #include "native_client/src/include/nacl_macros.h"
 #include "native_client/src/include/nacl_scoped_ptr.h"
@@ -11,8 +11,8 @@
 #include "native_client/src/shared/ppapi_proxy/browser_globals.h"
 #include "native_client/src/shared/ppapi_proxy/utility.h"
 #include "native_client/src/trusted/desc/nacl_desc_wrapper.h"
-#include "ppapi/c/dev/ppb_mouse_lock_dev.h"
 #include "ppapi/c/pp_errors.h"
+#include "ppapi/c/ppb_mouse_lock.h"
 #include "srpcgen/ppb_rpc.h"
 
 using ppapi_proxy::DebugPrintf;
diff --git a/ppapi/native_client/src/shared/ppapi_proxy/browser_ppp.cc b/ppapi/native_client/src/shared/ppapi_proxy/browser_ppp.cc
index 69bdc14..d31de782 100644
--- a/ppapi/native_client/src/shared/ppapi_proxy/browser_ppp.cc
+++ b/ppapi/native_client/src/shared/ppapi_proxy/browser_ppp.cc
@@ -27,7 +27,6 @@
 #include "native_client/src/trusted/desc/nacl_desc_wrapper.h"
 #include "native_client/src/trusted/plugin/plugin.h"
 #include "ppapi/c/dev/ppp_find_dev.h"
-#include "ppapi/c/dev/ppp_mouse_lock_dev.h"
 #include "ppapi/c/dev/ppp_printing_dev.h"
 #include "ppapi/c/dev/ppp_scrollbar_dev.h"
 #include "ppapi/c/dev/ppp_selection_dev.h"
@@ -36,6 +35,7 @@
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/ppp.h"
 #include "ppapi/c/ppp_input_event.h"
+#include "ppapi/c/ppp_mouse_lock.h"
 #include "ppapi/c/private/ppb_nacl_private.h"
 
 namespace ppapi_proxy {
@@ -173,7 +173,7 @@ const void* BrowserPpp::GetPluginInterface(const char* interface_name) {
   } else if (strcmp(interface_name, PPP_MESSAGING_INTERFACE) == 0) {
     ppp_interface =
         reinterpret_cast<const void*>(BrowserMessaging::GetInterface());
-  } else if (strcmp(interface_name, PPP_MOUSELOCK_DEV_INTERFACE) == 0) {
+  } else if (strcmp(interface_name, PPP_MOUSELOCK_INTERFACE) == 0) {
     ppp_interface =
        reinterpret_cast<const void*>(BrowserMouseLock::GetInterface());
   } else if (strcmp(interface_name, PPP_INPUT_EVENT_INTERFACE) == 0) {
diff --git a/ppapi/native_client/src/shared/ppapi_proxy/browser_ppp_mouse_lock.cc b/ppapi/native_client/src/shared/ppapi_proxy/browser_ppp_mouse_lock.cc
index 75cc38c..88cf406 100644
--- a/ppapi/native_client/src/shared/ppapi_proxy/browser_ppp_mouse_lock.cc
+++ b/ppapi/native_client/src/shared/ppapi_proxy/browser_ppp_mouse_lock.cc
@@ -29,8 +29,8 @@ void MouseLockLost(PP_Instance instance) {
 
 }  // namespace
 
-const PPP_MouseLock_Dev* BrowserMouseLock::GetInterface() {
-  static const PPP_MouseLock_Dev mouse_lock_interface = {
+const PPP_MouseLock* BrowserMouseLock::GetInterface() {
+  static const PPP_MouseLock mouse_lock_interface = {
     MouseLockLost
   };
   return &mouse_lock_interface;
diff --git a/ppapi/native_client/src/shared/ppapi_proxy/browser_ppp_mouse_lock.h b/ppapi/native_client/src/shared/ppapi_proxy/browser_ppp_mouse_lock.h
index 94ffffc..c5abff7 100644
--- a/ppapi/native_client/src/shared/ppapi_proxy/browser_ppp_mouse_lock.h
+++ b/ppapi/native_client/src/shared/ppapi_proxy/browser_ppp_mouse_lock.h
@@ -6,14 +6,14 @@
 #define NATIVE_CLIENT_SRC_SHARED_PPAPI_PROXY_BROWSER_PPP_MOUSE_LOCK_H_
 
 #include "native_client/src/include/nacl_macros.h"
-#include "ppapi/c/dev/ppp_mouse_lock_dev.h"
+#include "ppapi/c/ppp_mouse_lock.h"
 
 namespace ppapi_proxy {
 
-// Implements the trusted side of the PPP_MouseLock_Dev interface.
+// Implements the trusted side of the PPP_MouseLock interface.
 class BrowserMouseLock {
  public:
-  static const PPP_MouseLock_Dev* GetInterface();
+  static const PPP_MouseLock* GetInterface();
 
  private:
   NACL_DISALLOW_COPY_AND_ASSIGN(BrowserMouseLock);
diff --git a/ppapi/native_client/src/shared/ppapi_proxy/plugin_globals.cc b/ppapi/native_client/src/shared/ppapi_proxy/plugin_globals.cc
index 79c5b25..8efe062 100644
--- a/ppapi/native_client/src/shared/ppapi_proxy/plugin_globals.cc
+++ b/ppapi/native_client/src/shared/ppapi_proxy/plugin_globals.cc
@@ -119,9 +119,9 @@ const PPP_Messaging* PPPMessagingInterface() {
   return static_cast<const PPP_Messaging*>(ppp);
 }
 
-const PPP_MouseLock_Dev* PPPMouseLockInterface() {
-  static const void* ppp = GetPluginInterfaceSafe(PPP_MOUSELOCK_DEV_INTERFACE);
-  return static_cast<const PPP_MouseLock_Dev*>(ppp);
+const PPP_MouseLock* PPPMouseLockInterface() {
+  static const void* ppp = GetPluginInterfaceSafe(PPP_MOUSELOCK_INTERFACE);
+  return static_cast<const PPP_MouseLock*>(ppp);
 }
 
 const PPP_Printing_Dev* PPPPrintingInterface() {
diff --git a/ppapi/native_client/src/shared/ppapi_proxy/plugin_globals.h b/ppapi/native_client/src/shared/ppapi_proxy/plugin_globals.h
index c3a4665..b470400 100644
--- a/ppapi/native_client/src/shared/ppapi_proxy/plugin_globals.h
+++ b/ppapi/native_client/src/shared/ppapi_proxy/plugin_globals.h
@@ -7,7 +7,6 @@
 
 #include "ppapi/c/dev/ppb_memory_dev.h"
 #include "ppapi/c/dev/ppp_find_dev.h"
-#include "ppapi/c/dev/ppp_mouse_lock_dev.h"
 #include "ppapi/c/dev/ppp_printing_dev.h"
 #include "ppapi/c/dev/ppp_scrollbar_dev.h"
 #include "ppapi/c/dev/ppp_selection_dev.h"
@@ -20,6 +19,7 @@
 #include "ppapi/c/ppp_input_event.h"
 #include "ppapi/c/ppp_instance.h"
 #include "ppapi/c/ppp_messaging.h"
+#include "ppapi/c/ppp_mouse_lock.h"
 #include "native_client/src/untrusted/irt/irt_ppapi.h"
 
 struct NaClSrpcChannel;
@@ -63,7 +63,7 @@ const PPP_Find_Dev* PPPFindInterface();
 const PPP_InputEvent* PPPInputEventInterface();
 const PPP_Instance* PPPInstanceInterface();
 const PPP_Messaging* PPPMessagingInterface();
-const PPP_MouseLock_Dev* PPPMouseLockInterface();
+const PPP_MouseLock* PPPMouseLockInterface();
 const PPP_Printing_Dev* PPPPrintingInterface();
 const PPP_Scrollbar_Dev* PPPScrollbarInterface();
 const PPP_Selection_Dev* PPPSelectionInterface();
diff --git a/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb.cc b/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb.cc
index fa24d45..8c571e2b 100644
--- a/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb.cc
+++ b/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb.cc
@@ -74,7 +74,7 @@ InterfaceMapElement interface_map[] = {
     PluginInputEvent::GetMouseInterface1_0(), true },
   { PPB_MOUSE_INPUT_EVENT_INTERFACE_1_1,
     PluginInputEvent::GetMouseInterface1_1(), true },
-  { PPB_MOUSELOCK_DEV_INTERFACE, PluginMouseLock::GetInterface(), true },
+  { PPB_MOUSELOCK_INTERFACE, PluginMouseLock::GetInterface(), true },
   { PPB_OPENGLES2_INTERFACE, PluginGraphics3D::GetOpenGLESInterface(),
     true },
   { PPB_PDF_INTERFACE, PluginPDF::GetInterface(), true },
diff --git a/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_mouse_lock.cc b/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_mouse_lock.cc
index f528813..d60d2fd 100644
--- a/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_mouse_lock.cc
+++ b/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_mouse_lock.cc
@@ -8,9 +8,9 @@
 #include "native_client/src/shared/ppapi_proxy/plugin_callback.h"
 #include "native_client/src/shared/ppapi_proxy/plugin_globals.h"
 #include "native_client/src/shared/ppapi_proxy/utility.h"
-#include "ppapi/c/dev/ppb_mouse_lock_dev.h"
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/pp_errors.h"
+#include "ppapi/c/ppb_mouse_lock.h"
 #include "srpcgen/ppb_rpc.h"
 
 namespace ppapi_proxy {
@@ -57,8 +57,8 @@ void UnlockMouse(PP_Instance instance) {
 
 }  // namespace
 
-const PPB_MouseLock_Dev* PluginMouseLock::GetInterface() {
-  static const PPB_MouseLock_Dev mouse_lock_interface = {
+const PPB_MouseLock* PluginMouseLock::GetInterface() {
+  static const PPB_MouseLock mouse_lock_interface = {
     LockMouse,
     UnlockMouse
   };
diff --git a/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_mouse_lock.h b/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_mouse_lock.h
index bb64a72..cd54e01 100644
--- a/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_mouse_lock.h
+++ b/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_mouse_lock.h
@@ -6,15 +6,15 @@
 #define NATIVE_CLIENT_SRC_SHARED_PPAPI_PROXY_PLUGIN_PPB_MOUSE_LOCK_H_
 
 #include "native_client/src/include/nacl_macros.h"
-#include "ppapi/c/dev/ppb_mouse_lock_dev.h"
+#include "ppapi/c/ppb_mouse_lock.h"
 
 namespace ppapi_proxy {
 
-// Implements the untrusted side of the PPB_MouseLock_Dev interface.
+// Implements the untrusted side of the PPB_MouseLock interface.
 class PluginMouseLock {
  public:
   PluginMouseLock();
-  static const PPB_MouseLock_Dev* GetInterface();
+  static const PPB_MouseLock* GetInterface();
 
  private:
   NACL_DISALLOW_COPY_AND_ASSIGN(PluginMouseLock);
diff --git a/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppp_mouse_lock_rpc_server.cc b/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppp_mouse_lock_rpc_server.cc
index 9d5a6dc..da3220d 100644
--- a/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppp_mouse_lock_rpc_server.cc
+++ b/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppp_mouse_lock_rpc_server.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
-// SRPC-abstraction wrappers around PPP_MouseLock_Dev functions.
+// SRPC-abstraction wrappers around PPP_MouseLock functions.
 
 #include "native_client/src/include/portability.h"
 #include "native_client/src/include/portability_process.h"
 #include "native_client/src/shared/ppapi_proxy/plugin_globals.h"
 #include "native_client/src/shared/ppapi_proxy/utility.h"
-#include "ppapi/c/dev/ppp_mouse_lock_dev.h"
+#include "ppapi/c/ppp_mouse_lock.h"
 #include "srpcgen/ppp_rpc.h"
 
 using ppapi_proxy::DebugPrintf;
diff --git a/ppapi/native_client/src/shared/ppapi_proxy/ppb_mouse_lock.srpc b/ppapi/native_client/src/shared/ppapi_proxy/ppb_mouse_lock.srpc
index 715c748..ffa601c 100644
--- a/ppapi/native_client/src/shared/ppapi_proxy/ppb_mouse_lock.srpc
+++ b/ppapi/native_client/src/shared/ppapi_proxy/ppb_mouse_lock.srpc
@@ -2,8 +2,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 #
-# RPC methods used to implement PPB_MouseLock_Dev calls from the plugin.
-# See ppapi/c/dev/ppb_mouse_lock_dev.h for interface details.
+# RPC methods used to implement PPB_MouseLock calls from the plugin.
+# See ppapi/c/ppb_mouse_lock.h for interface details.
 
 {
  'name': 'PpbMouseLockRpc',
diff --git a/ppapi/native_client/src/shared/ppapi_proxy/ppp_mouse_lock.srpc b/ppapi/native_client/src/shared/ppapi_proxy/ppp_mouse_lock.srpc
index da370a5..32f2e34 100644
--- a/ppapi/native_client/src/shared/ppapi_proxy/ppp_mouse_lock.srpc
+++ b/ppapi/native_client/src/shared/ppapi_proxy/ppp_mouse_lock.srpc
@@ -2,8 +2,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-# RPC methods used to implement PPP_MouseLock_Dev calls to the plugin.
-# See ppapi/c/dev/ppp_mouse_lock_dev.h for interface details.
+# RPC methods used to implement PPP_MouseLock calls to the plugin.
+# See ppapi/c/ppp_mouse_lock.h for interface details.
 {
  'name': 'PppMouseLockRpc',
  'rpcs': [
diff --git a/ppapi/native_client/src/trusted/plugin/plugin.cc b/ppapi/native_client/src/trusted/plugin/plugin.cc
index 1648d2e..e67e2c8 100644
--- a/ppapi/native_client/src/trusted/plugin/plugin.cc
+++ b/ppapi/native_client/src/trusted/plugin/plugin.cc
@@ -53,7 +53,6 @@
 #include "native_client/src/trusted/service_runtime/nacl_error_code.h"
 
 #include "ppapi/c/dev/ppp_find_dev.h"
-#include "ppapi/c/dev/ppp_mouse_lock_dev.h"
 #include "ppapi/c/dev/ppp_printing_dev.h"
 #include "ppapi/c/dev/ppp_scrollbar_dev.h"
 #include "ppapi/c/dev/ppp_selection_dev.h"
@@ -62,9 +61,9 @@
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/ppp_input_event.h"
 #include "ppapi/c/ppp_instance.h"
+#include "ppapi/c/ppp_mouse_lock.h"
 #include "ppapi/c/private/ppb_uma_private.h"
 #include "ppapi/cpp/dev/find_dev.h"
-#include "ppapi/cpp/dev/mouse_lock_dev.h"
 #include "ppapi/cpp/dev/printing_dev.h"
 #include "ppapi/cpp/dev/scrollbar_dev.h"
 #include "ppapi/cpp/dev/selection_dev.h"
@@ -74,6 +73,7 @@
 #include "ppapi/cpp/image_data.h"
 #include "ppapi/cpp/input_event.h"
 #include "ppapi/cpp/module.h"
+#include "ppapi/cpp/mouse_lock.h"
 #include "ppapi/cpp/rect.h"
 
 using ppapi_proxy::BrowserPpp;
@@ -306,17 +306,17 @@ class FindAdapter : public pp::Find_Dev {
 };
 
 
-// Derive a class from pp::MouseLock_Dev to forward PPP_MouseLock_Dev calls to
+// Derive a class from pp::MouseLock to forward PPP_MouseLock calls to
 // the plugin.
-class MouseLockAdapter : public pp::MouseLock_Dev {
+class MouseLockAdapter : public pp::MouseLock {
  public:
   explicit MouseLockAdapter(Plugin* plugin)
-    : pp::MouseLock_Dev(plugin),
+    : pp::MouseLock(plugin),
       plugin_(plugin) {
     BrowserPpp* proxy = plugin_->ppapi_proxy();
     CHECK(proxy != NULL);
-    ppp_mouse_lock_ = static_cast<const PPP_MouseLock_Dev*>(
-        proxy->GetPluginInterface(PPP_MOUSELOCK_DEV_INTERFACE));
+    ppp_mouse_lock_ = static_cast<const PPP_MouseLock*>(
+        proxy->GetPluginInterface(PPP_MOUSELOCK_INTERFACE));
   }
 
   void MouseLockLost() {
@@ -326,7 +326,7 @@ class MouseLockAdapter : public pp::MouseLock_Dev {
 
  private:
   Plugin* plugin_;
-  const PPP_MouseLock_Dev* ppp_mouse_lock_;
+  const PPP_MouseLock* ppp_mouse_lock_;
 
   NACL_DISALLOW_COPY_AND_ASSIGN(MouseLockAdapter);
 };
diff --git a/ppapi/native_client/src/trusted/plugin/plugin.h b/ppapi/native_client/src/trusted/plugin/plugin.h
index 5c528a3..1fde3bf 100644
--- a/ppapi/native_client/src/trusted/plugin/plugin.h
+++ b/ppapi/native_client/src/trusted/plugin/plugin.h
@@ -44,7 +44,7 @@ class DescWrapperFactory;
 
 namespace pp {
 class Find_Dev;
-class MouseLock_Dev;
+class MouseLock;
 class Printing_Dev;
 class Selection_Dev;
 class URLLoader;
@@ -532,7 +532,7 @@ class Plugin : public pp::InstancePrivate {
   // Adapter class constructors require a reference to 'this', so we can't
   // contain them directly.
   nacl::scoped_ptr<pp::Find_Dev> find_adapter_;
-  nacl::scoped_ptr<pp::MouseLock_Dev> mouse_lock_adapter_;
+  nacl::scoped_ptr<pp::MouseLock> mouse_lock_adapter_;
   nacl::scoped_ptr<pp::Printing_Dev> printing_adapter_;
   nacl::scoped_ptr<pp::Selection_Dev> selection_adapter_;
   nacl::scoped_ptr<pp::WidgetClient_Dev> widget_client_adapter_;
diff --git a/ppapi/native_client/tests/ppapi_browser/ppb_dev/ppapi_ppb_dev.cc b/ppapi/native_client/tests/ppapi_browser/ppb_dev/ppapi_ppb_dev.cc
index efa544e..d1e6d6a 100644
--- a/ppapi/native_client/tests/ppapi_browser/ppb_dev/ppapi_ppb_dev.cc
+++ b/ppapi/native_client/tests/ppapi_browser/ppb_dev/ppapi_ppb_dev.cc
@@ -31,7 +31,6 @@
 #include "ppapi/c/dev/ppb_gles_chromium_texture_mapping_dev.h"
 #include "ppapi/c/dev/ppb_layer_compositor_dev.h"
 #include "ppapi/c/dev/ppb_memory_dev.h"
-#include "ppapi/c/dev/ppb_mouse_lock_dev.h"
 #include "ppapi/c/dev/ppb_scrollbar_dev.h"
 #include "ppapi/c/dev/ppb_surface_3d_dev.h"
 #include "ppapi/c/dev/ppb_testing_dev.h"
@@ -68,7 +67,6 @@ void TestGetDevInterfaces() {
       PPB_GLES_CHROMIUM_TEXTURE_MAPPING_DEV_INTERFACE) == NULL);
   CHECK(GetBrowserInterface(PPB_LAYER_COMPOSITOR_DEV_INTERFACE) == NULL);
   CHECK(GetBrowserInterface(PPB_MEMORY_DEV_INTERFACE) == NULL);
-  CHECK(GetBrowserInterface(PPB_MOUSELOCK_DEV_INTERFACE) == NULL);
   CHECK(GetBrowserInterface(PPB_SCROLLBAR_DEV_INTERFACE) == NULL);
   CHECK(GetBrowserInterface(PPB_SURFACE_3D_DEV_INTERFACE) == NULL);
   CHECK(GetBrowserInterface(PPB_TESTING_DEV_INTERFACE) == NULL);