Remove plugin connection to PPAPI scriptable objects (var deprecated). Also

src/trusted/plugin/ppapi/scriptable_handle_ppapi.h

 // Copyright (c) 2011 The Native Client Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // PPAPI-based implementation of the interface for a scriptable object.
 
 #ifndef NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PPAPI_SCRIPTABLE_HANDLE_PPAPI_H_
 #define NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PPAPI_SCRIPTABLE_HANDLE_PPAPI_H_
 
 #include <string>
@@ skipping 12 matching lines @@
 // Encapsulates a browser scriptable object for a PPAPI NaCl plugin.
 class ScriptableHandlePpapi : public pp::deprecated::ScriptableObject,
                               public ScriptableHandle {
  public:
   // Factory method for creation.
   static ScriptableHandlePpapi* New(PortableHandle* handle);
 
   // If not NULL, this var should be reused to pass this object to the browser.
   pp::VarPrivate* var() { return var_; }
 
-// Turn off the ability to set a proxy if we're removing scripting.  In this
-// case, the ScriptableHandle can only refer to the NaCl plugin.
-// TODO(dmichael): Clean up all traces of scripting proxying.
-#ifndef PPAPI_INSTANCE_REMOVE_SCRIPTING
-  // If this scriptable handle corresponds to the NaCl plugin itself and the
-  // plugin has successfully loaded the NaCl module and started proxied
-  // execution, scripting should be redirected via this proxy.
-  void set_scriptable_proxy(const pp::VarPrivate& proxy) {
-    scriptable_proxy_ = proxy;
-  }
-#endif
-
   // ------ Methods inherited from pp::deprecated::ScriptableObject:
 
   // Returns true for preloaded NaCl Plugin properties.
   // Does not set |exception|.
   virtual bool HasProperty(const pp::Var& name, pp::Var* exception);
   // Returns true for preloaded NaCl Plugin methods and SRPC methods exported
   // from a NaCl module. Does not set |exception|.
   virtual bool HasMethod(const pp::Var& name, pp::Var* exception);
 
   // Gets the value of a preloaded NaCl Plugin property.
@@ skipping 58 matching lines @@
   // This is never set for objects that are not shared with the browser nor for
   // objects created during SRPC calls as they are taken over by the browser on
   // return.
   pp::VarPrivate* var_;
 
   // We should have no more than one internal plugin owner for this object,
   // and only that owner should call Unref(). To CHECK for that keep a counter.
   int num_unref_calls_;
 
   bool handle_is_plugin_;  // Whether (portable) handle() is a plugin.
-
-#ifdef PPAPI_INSTANCE_REMOVE_SCRIPTING
-  // If untrusted scripting is disabled, make this a VarPrivate just so that
-  // it has all the methods it needs to compile.  This is a hack to avoid having
-  // conditional compilation at every call-site for things like HasProperty,
-  // HasMethod, etc.  We turn off untrusted scripting above by removing the
-  // setter for scriptable_proxy_, so it's always invalid.
-  // TODO(dmichael): Remove scriptable_proxy_ and all other traces of untrusted
-  // scripting.
-  pp::VarPrivate scriptable_proxy_;
-#else
-  pp::Var scriptable_proxy_;  // Proxy for NaCl module's scripting interface.
-#endif
 };
 
 }  // namespace plugin
 
 #endif  // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PPAPI_SCRIPTABLE_HANDLE_PPAPI_H_