Fix up a couple of things we missed for the ppapi scripting yak shave.

BUG=82606
TEST=Compiles + ppapi tests pass

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

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

3 files changed, 13 insertions, 3 deletions

diff --git a/ppapi/cpp/private/instance_private.cc b/ppapi/cpp/private/instance_private.cc
index 2a924a3..9257abc 100644
--- a/ppapi/cpp/private/instance_private.cc
+++ b/ppapi/cpp/private/instance_private.cc
@@ -43,6 +43,12 @@ InstancePrivate::InstancePrivate(PP_Instance instance) : Instance(instance) {
 
 InstancePrivate::~InstancePrivate() {}
 
+#ifdef PPAPI_INSTANCE_REMOVE_SCRIPTING
+Var InstancePrivate::GetInstanceObject() {
+  return Var();
+}
+#endif
+
 VarPrivate InstancePrivate::GetWindowObject() {
   if (!has_interface<PPB_Instance_Private>())
     return VarPrivate();
diff --git a/ppapi/cpp/private/instance_private.h b/ppapi/cpp/private/instance_private.h
index 226494c..3931cab 100644
--- a/ppapi/cpp/private/instance_private.h
+++ b/ppapi/cpp/private/instance_private.h
@@ -28,10 +28,10 @@ class InstancePrivate : public Instance {
   // @{
   /// @name PPP_Instance_Private methods for the plugin to override:
 
+#ifdef PPAPI_INSTANCE_REMOVE_SCRIPTING
   /// See PPP_Instance_Private.GetInstanceObject.
-  // TODO(dmichael):  Put this virtual function here and remove the
-  //                  'Var GetInstanceObject()' version from pp::Instance.
-  //virtual VarPrivate GetInstanceObject();
+  virtual Var GetInstanceObject();
+#endif
 
   // @}
 
diff --git a/ppapi/cpp/private/var_private.h b/ppapi/cpp/private/var_private.h
index 5ab1e07b..b2f4204 100644
--- a/ppapi/cpp/private/var_private.h
+++ b/ppapi/cpp/private/var_private.h
@@ -11,6 +11,10 @@ namespace pp {
 
 class InstancePrivate;
 
+namespace deprecated {
+class ScriptableObject;
+}
+
 // VarPrivate is a version of Var that exposes the private scripting API.
 // It's designed to be mostly interchangable with Var since most callers will
 // be dealing with Vars from various places.