Add an instance parameter to var objects, audio, and the 2D API. This replaces the module in most cases.

This will be used in the proxy to multiplex one plugin across multiple renderer processes. We need the instance in the proxy to know which process to send it to.

I added a deprecated var object creation function for native client, which
depends on the module and this is very difficult to change. Because it doesn't
have the multiplexing requirements, this is fine for now.

TEST=ppapi ui tests
BUG=none
Review URL: http://codereview.chromium.org/6085009

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

4 files changed, 11 insertions, 6 deletions

diff --git a/ppapi/cpp/dev/audio_config_dev.cc b/ppapi/cpp/dev/audio_config_dev.cc
index c8f8f3a..754a78f 100644
--- a/ppapi/cpp/dev/audio_config_dev.cc
+++ b/ppapi/cpp/dev/audio_config_dev.cc
@@ -4,6 +4,7 @@
 
 #include "ppapi/cpp/dev/audio_config_dev.h"
 
+#include "ppapi/cpp/instance.h"
 #include "ppapi/cpp/module.h"
 #include "ppapi/cpp/module_impl.h"
 
@@ -22,14 +23,15 @@ AudioConfig_Dev::AudioConfig_Dev()
       sample_frame_count_(0) {
 }
 
-AudioConfig_Dev::AudioConfig_Dev(PP_AudioSampleRate_Dev sample_rate,
+AudioConfig_Dev::AudioConfig_Dev(Instance* instance,
+                                 PP_AudioSampleRate_Dev sample_rate,
                                  uint32_t sample_frame_count)
     : sample_rate_(sample_rate),
       sample_frame_count_(sample_frame_count) {
   if (has_interface<PPB_AudioConfig_Dev>()) {
     PassRefFromConstructor(
         get_interface<PPB_AudioConfig_Dev>()->CreateStereo16Bit(
-        Module::Get()->pp_module(), sample_rate, sample_frame_count));
+        instance->pp_instance(), sample_rate, sample_frame_count));
   }
 }
 
diff --git a/ppapi/cpp/dev/audio_config_dev.h b/ppapi/cpp/dev/audio_config_dev.h
index 1229156..6b0f1f2 100644
--- a/ppapi/cpp/dev/audio_config_dev.h
+++ b/ppapi/cpp/dev/audio_config_dev.h
@@ -11,6 +11,8 @@
 
 namespace pp {
 
+class Instance;
+
 // Typical usage:
 //
 //   // Create an audio config with a supported frame count.
@@ -34,7 +36,8 @@ class AudioConfig_Dev : public Resource {
   // semple frame count.
   //
   // See PPB_AudioConfigDev.CreateStereo16Bit for more.
-  AudioConfig_Dev(PP_AudioSampleRate_Dev sample_rate,
+  AudioConfig_Dev(Instance* instance,
+                  PP_AudioSampleRate_Dev sample_rate,
                   uint32_t sample_frame_count);
 
   // Returns a supported frame count for use in the constructor.
diff --git a/ppapi/cpp/dev/audio_dev.cc b/ppapi/cpp/dev/audio_dev.cc
index 850d4d1..b80d196 100644
--- a/ppapi/cpp/dev/audio_dev.cc
+++ b/ppapi/cpp/dev/audio_dev.cc
@@ -16,14 +16,14 @@ template <> const char* interface_name<PPB_Audio_Dev>() {
 
 }  // namespace
 
-Audio_Dev::Audio_Dev(const Instance& instance,
+Audio_Dev::Audio_Dev(Instance* instance,
                      const AudioConfig_Dev& config,
                      PPB_Audio_Callback callback,
                      void* user_data)
     : config_(config) {
   if (has_interface<PPB_Audio_Dev>()) {
     PassRefFromConstructor(get_interface<PPB_Audio_Dev>()->Create(
-        instance.pp_instance(), config.pp_resource(), callback, user_data));
+        instance->pp_instance(), config.pp_resource(), callback, user_data));
   }
 }
 
diff --git a/ppapi/cpp/dev/audio_dev.h b/ppapi/cpp/dev/audio_dev.h
index 983e53c..a355cb6 100644
--- a/ppapi/cpp/dev/audio_dev.h
+++ b/ppapi/cpp/dev/audio_dev.h
@@ -17,7 +17,7 @@ namespace pp {
 class Audio_Dev : public Resource {
  public:
   Audio_Dev() {}
-  Audio_Dev(const Instance& instance,
+  Audio_Dev(Instance* instance,
             const AudioConfig_Dev& config,
             PPB_Audio_Callback callback,
             void* user_data);