Convert resources to take an instance key instead of an Instance*.

Review URL: https://chromiumcodereview.appspot.com/9381010

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

1 files changed, 8 insertions, 4 deletions

diff --git a/ppapi/cpp/audio.h b/ppapi/cpp/audio.h
index 8df9f37d..a07fcf5 100644
--- a/ppapi/cpp/audio.h
+++ b/ppapi/cpp/audio.h
@@ -8,7 +8,6 @@
 #include "ppapi/c/pp_stdint.h"
 #include "ppapi/c/ppb_audio.h"
 #include "ppapi/cpp/audio_config.h"
-#include "ppapi/cpp/instance.h"
 #include "ppapi/cpp/resource.h"
 
 /// @file
@@ -17,6 +16,8 @@
 
 namespace pp {
 
+class InstanceHandle;
+
 /// An audio resource. Refer to the
 /// <a href="/native-client/devguide/coding/audio">Audio</a>
 /// chapter in the Developer's Guide for information on using this interface.
@@ -38,14 +39,17 @@ class Audio : public Resource {
   /// the device configuration and is specified in the <code>AudioConfig</code>
   /// documentation.
   ///
-  /// @param[in] instance A pointer to an <code>Instance</code> identifying one
-  /// instance of a module.
+  /// @param[in] instance The instance with which this resource will be
+  /// associated.
+  //
   /// @param[in] config An <code>AudioConfig</code> containing the audio config
   /// resource.
+  //
   /// @param[in] callback A <code>PPB_Audio_Callback</code> callback function
   /// that the browser calls when it needs more samples to play.
+  //
   /// @param[in] user_data A pointer to user data used in the callback function.
-  Audio(Instance* instance,
+  Audio(const InstanceHandle& instance,
         const AudioConfig& config,
         PPB_Audio_Callback callback,
         void* user_data);