Convert the pp::proxy namespace to the ppapi::proxy namespace.

This is more consistent with the stuff in shared_impl, and removes a lot of
namespace using goop.

Add a unified resource tracker shared between the proxy and the impl.

This renames the old ResourceObjectBase to Resource and removes the old
PluginResource. It moves the resource tracker from the impl to the
shared_impl, and makes the proxy use it.

Some things become a little less neat because there's no proxy resource base
class. In particular GetDispatcher() is now gone. I considered whether to
add a helper base class that provides this function, but decided against it
and had individual resource classes implement this when their implementation
would find it useful. This is because ultimately I want more of this
functionality to move into the shared_impl, and it's easier to do that if
there are fewer proxy-specific things in the resources.

This changes the way that plugins are added to the tracker. Previously they
would only be in the tracker if the plugin had a reference to them, although
they could be alive if the impl had a scoped_ptr referencing an object. This
actually has the bug that if we then give the resource back to the plugin,
it wouldn't be refcounted properly and everything would get confused.

Now the tracker tracks all live resource objects whether or not the plugin
has a ref. This works basically like the var tracker (it would be nice if
the var and resource trackers shared more code, but that would further
complicate this already overcomplicated patch). The resource tracker takes an
extra ref whenever the plugin has one or more, and otherwise just tracks live
resources.

BUG=
TEST=

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

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

1 files changed, 8 insertions, 9 deletions

diff --git a/ppapi/proxy/plugin_var_tracker.h b/ppapi/proxy/plugin_var_tracker.h
index c6f3c93..09c7c21 100644
--- a/ppapi/proxy/plugin_var_tracker.h
+++ b/ppapi/proxy/plugin_var_tracker.h
@@ -20,16 +20,15 @@ struct PPB_Var;
 template<typename T> struct DefaultSingletonTraits;
 
 namespace ppapi {
+
 class ProxyObjectVar;
-}
 
-namespace pp {
 namespace proxy {
 
 class PluginDispatcher;
 
 // Tracks live strings and objects in the plugin process.
-class PluginVarTracker : public ppapi::VarTracker {
+class PluginVarTracker : public VarTracker {
  public:
   PluginVarTracker();
   ~PluginVarTracker();
@@ -66,7 +65,7 @@ class PluginVarTracker : public ppapi::VarTracker {
 
  protected:
   // VarTracker protected overrides.
-  virtual int32 AddVarInternal(::ppapi::Var* var, AddVarRefMode mode) OVERRIDE;
+  virtual int32 AddVarInternal(Var* var, AddVarRefMode mode) OVERRIDE;
   virtual void TrackedObjectGettingOneRef(VarMap::const_iterator iter) OVERRIDE;
   virtual void ObjectGettingZeroRef(VarMap::iterator iter) OVERRIDE;
   virtual bool DeleteObjectInfoIfNecessary(VarMap::iterator iter) OVERRIDE;
@@ -96,16 +95,16 @@ class PluginVarTracker : public ppapi::VarTracker {
   // count, so in the creation case the refcount will be 0. It's assumed in
   // this case the caller will either adjust the refcount or the
   // track_with_no_reference_count.
-  PP_Var GetOrCreateObjectVarID(ppapi::ProxyObjectVar* object);
+  PP_Var GetOrCreateObjectVarID(ProxyObjectVar* object);
 
   // Sends an addref or release message to the browser for the given object ID.
-  void SendAddRefObjectMsg(const ppapi::ProxyObjectVar& proxy_object);
-  void SendReleaseObjectMsg(const ppapi::ProxyObjectVar& proxy_object);
+  void SendAddRefObjectMsg(const ProxyObjectVar& proxy_object);
+  void SendReleaseObjectMsg(const ProxyObjectVar& proxy_object);
 
   // Looks up the given host var. If we already know about it, returns a
   // reference to the already-tracked object. If it doesn't creates a new one
   // and returns it. If it's created, it's not added to the map.
-  scoped_refptr<ppapi::ProxyObjectVar> FindOrMakePluginVarFromHostVar(
+  scoped_refptr<ProxyObjectVar> FindOrMakePluginVarFromHostVar(
       const PP_Var& var,
       PluginDispatcher* dispatcher);
 
@@ -117,6 +116,6 @@ class PluginVarTracker : public ppapi::VarTracker {
 };
 
 }  // namespace proxy
-}  // namespace pp
+}  // namespace ppapi
 
 #endif  // PPAPI_PROXY_PLUGIN_VAR_TRACKER_H_