Rename PPB_Flash_DeviceID interface to PPB_Flash_DRM

ppapi/proxy/flash_drm_resource.h

Index: ppapi/proxy/flash_drm_resource.h
diff --git a/ppapi/proxy/flash_device_id_resource.h b/ppapi/proxy/flash_drm_resource.h
similarity index 49%
rename from ppapi/proxy/flash_device_id_resource.h
rename to ppapi/proxy/flash_drm_resource.h
index 19c9e63cb954eb9e31633132d461fd9531ee6e37..6fe18a7d1c448e6ad1b6cfd4228dab7517403aa0 100644
--- a/ppapi/proxy/flash_device_id_resource.h
+++ b/ppapi/proxy/flash_drm_resource.h
@@ -2,46 +2,42 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef PPAPI_PROXY_FLASH_DEVICE_ID_RESOURCE_H_
-#define PPAPI_PROXY_FLASH_DEVICE_ID_RESOURCE_H_
+#ifndef PPAPI_PROXY_FLASH_DRM_RESOURCE_H_
+#define PPAPI_PROXY_FLASH_DRM_RESOURCE_H_
 
 #include "ppapi/proxy/plugin_resource.h"
 #include "ppapi/proxy/ppapi_proxy_export.h"
 #include "ppapi/shared_impl/tracked_callback.h"
-#include "ppapi/thunk/ppb_flash_device_id_api.h"
+#include "ppapi/thunk/ppb_flash_drm_api.h"
 
 namespace ppapi {
 namespace proxy {
 
-class FlashDeviceIDResource
+class FlashDRMResource
     : public PluginResource,
-      public thunk::PPB_Flash_DeviceID_API {
+      public thunk::PPB_Flash_DRM_API {
  public:
-  FlashDeviceIDResource(Connection connection,
+  FlashDRMResource(Connection connection,
                         PP_Instance instance);

[yzshen1, 2013/05/21 06:32:31]

wrong indent.

[raymes, 2013/05/21 16:32:51]

Done.

-  virtual ~FlashDeviceIDResource();
+  virtual ~FlashDRMResource();
 
   // Resource override.
-  virtual thunk::PPB_Flash_DeviceID_API* AsPPB_Flash_DeviceID_API() OVERRIDE;
+  virtual thunk::PPB_Flash_DRM_API* AsPPB_Flash_DRM_API() OVERRIDE;
 
-  // PPB_Flash_DeviceID_API implementation.
+  // PPB_Flash_DRM_API implementation.
   virtual int32_t GetDeviceID(PP_Var* id,
                               scoped_refptr<TrackedCallback> callback) OVERRIDE;
 
  private:
-  // IPC message handler.
-  void OnPluginMsgGetDeviceIDReply(const ResourceMessageReplyParams& params,
+  void OnPluginMsgGetDeviceIDReply(PP_Var* dest,
+                                   scoped_refptr<TrackedCallback> callback,
+                                   const ResourceMessageReplyParams& params,
                                    const std::string& id);
 
-  // Non-null when a callback is pending.
-  PP_Var* dest_;
-
-  scoped_refptr<TrackedCallback> callback_;
-
-  DISALLOW_COPY_AND_ASSIGN(FlashDeviceIDResource);
+  DISALLOW_COPY_AND_ASSIGN(FlashDRMResource);
 };
 
 }  // namespace proxy
 }  // namespace ppapi
 
-#endif  // PPAPI_PROXY_FLASH_DEVICE_ID_RESOURCE_H_
+#endif  // PPAPI_PROXY_FLASH_DRM_RESOURCE_H_