Move PPB/PPP_MouseLock out of dev/.

ppapi/cpp/mouse_lock.cc

Index: ppapi/cpp/mouse_lock.cc
diff --git a/ppapi/cpp/dev/mouse_lock_dev.cc b/ppapi/cpp/mouse_lock.cc
similarity index 57%
rename from ppapi/cpp/dev/mouse_lock_dev.cc
rename to ppapi/cpp/mouse_lock.cc
index 57b724dc576128fda9a929a4c0f4c6dadf9d6706..4d3b9bf70ee26d15d41a018050e80d6c3faf6f2d 100644
--- a/ppapi/cpp/dev/mouse_lock_dev.cc
+++ b/ppapi/cpp/mouse_lock.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ppapi/cpp/dev/mouse_lock_dev.h"
+#include "ppapi/cpp/mouse_lock.h"
 
-#include "ppapi/c/dev/ppb_mouse_lock_dev.h"
-#include "ppapi/c/dev/ppp_mouse_lock_dev.h"
+#include "ppapi/c/ppb_mouse_lock.h"
+#include "ppapi/c/ppp_mouse_lock.h"
 #include "ppapi/cpp/completion_callback.h"
 #include "ppapi/cpp/instance.h"
 #include "ppapi/cpp/module.h"
@@ -15,47 +15,47 @@ namespace pp {
 
 namespace {
 
-static const char kPPPMouseLockInterface[] = PPP_MOUSELOCK_DEV_INTERFACE;
+static const char kPPPMouseLockInterface[] = PPP_MOUSELOCK_INTERFACE;
 
 void MouseLockLost(PP_Instance instance) {
   void* object =
       pp::Instance::GetPerInstanceObject(instance, kPPPMouseLockInterface);
   if (!object)
     return;
-  static_cast<MouseLock_Dev*>(object)->MouseLockLost();
+  static_cast<MouseLock*>(object)->MouseLockLost();
 }
 
-const PPP_MouseLock_Dev ppp_mouse_lock = {
+const PPP_MouseLock ppp_mouse_lock = {
   &MouseLockLost
 };
 
-template <> const char* interface_name<PPB_MouseLock_Dev>() {
-  return PPB_MOUSELOCK_DEV_INTERFACE;
+template <> const char* interface_name<PPB_MouseLock>() {
+  return PPB_MOUSELOCK_INTERFACE;
 }
 
 }  // namespace
 
-MouseLock_Dev::MouseLock_Dev(Instance* instance)
+MouseLock::MouseLock(Instance* instance)
     : associated_instance_(instance) {
   pp::Module::Get()->AddPluginInterface(kPPPMouseLockInterface,
                                         &ppp_mouse_lock);
   associated_instance_->AddPerInstanceObject(kPPPMouseLockInterface, this);
 }
 
-MouseLock_Dev::~MouseLock_Dev() {
+MouseLock::~MouseLock() {
   associated_instance_->RemovePerInstanceObject(kPPPMouseLockInterface, this);
 }
 
-int32_t MouseLock_Dev::LockMouse(const CompletionCallback& cc) {
-  if (!has_interface<PPB_MouseLock_Dev>())
+int32_t MouseLock::LockMouse(const CompletionCallback& cc) {
+  if (!has_interface<PPB_MouseLock>())
     return cc.MayForce(PP_ERROR_NOINTERFACE);
-  return get_interface<PPB_MouseLock_Dev>()->LockMouse(
+  return get_interface<PPB_MouseLock>()->LockMouse(
       associated_instance_->pp_instance(), cc.pp_completion_callback());
 }
 
-void MouseLock_Dev::UnlockMouse() {
-  if (has_interface<PPB_MouseLock_Dev>()) {
-    get_interface<PPB_MouseLock_Dev>()->UnlockMouse(
+void MouseLock::UnlockMouse() {
+  if (has_interface<PPB_MouseLock>()) {
+    get_interface<PPB_MouseLock>()->UnlockMouse(
         associated_instance_->pp_instance());
   }
 }