Browser Plugin: Allocate Instance IDs in BrowserPluginEmbedder instead of BrowserPluginManager

content/renderer/browser_plugin/browser_plugin_manager.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_RENDERER_BROWSER_PLUGIN_BROWSER_PLUGIN_MANAGER_H_
 #define CONTENT_RENDERER_BROWSER_PLUGIN_BROWSER_PLUGIN_MANAGER_H_
 
 #include "base/id_map.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
@@ skipping 30 matching lines @@
   BrowserPluginManager(RenderViewImpl* render_view);
 
   // Creates a new BrowserPlugin object with a unique identifier.
   // BrowserPlugin is responsible for associating itself with the
   // BrowserPluginManager via AddBrowserPlugin. When it is destroyed, it is
   // responsible for removing its association via RemoveBrowserPlugin.
   virtual BrowserPlugin* CreateBrowserPlugin(
       RenderViewImpl* render_view,
       WebKit::WebFrame* frame,
       const WebKit::WebPluginParams& params) = 0;
+  virtual void AllocateInstanceID(BrowserPlugin* browser_plugin) = 0;
 
   void AddBrowserPlugin(int instance_id, BrowserPlugin* browser_plugin);
   void RemoveBrowserPlugin(int instance_id);
   BrowserPlugin* GetBrowserPlugin(int instance_id) const;
   void UpdateFocusState();
   RenderViewImpl* render_view() const { return render_view_; }
 
   // RenderViewObserver implementation.
 
   // BrowserPluginManager must override the default Send behavior.
   virtual bool Send(IPC::Message* msg) OVERRIDE = 0;
 
   // Don't destroy the BrowserPluginManager when the RenderViewImpl goes away.
   // BrowserPluginManager's lifetime is managed by a reference count. Once
   // the host RenderViewImpl and all BrowserPlugins release their references,
   // then the BrowserPluginManager will be destroyed.
   virtual void OnDestruct() OVERRIDE {}
 
  protected:
   // Friend RefCounted so that the dtor can be non-public.
   friend class base::RefCounted<BrowserPluginManager>;
 
   // Static factory instance (always NULL for non-test).
   static BrowserPluginManagerFactory* factory_;
 
   virtual ~BrowserPluginManager();
   IDMap<BrowserPlugin> instances_;
   base::WeakPtr<RenderViewImpl> render_view_;
-  int browser_plugin_counter_;
+
+  DISALLOW_COPY_AND_ASSIGN(BrowserPluginManager);
 };
 
 }  // namespace content
 
 #endif //  CONTENT_RENDERER_BROWSER_PLUGIN_BROWSER_PLUGIN_MANAGER_H_