Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1896)

Unified Diff: content/renderer/browser_plugin/mock_browser_plugin_manager.h

Issue 299753011: Move allocate instance id to chrome/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: HasPermission function moved Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/renderer/browser_plugin/mock_browser_plugin_manager.h
diff --git a/content/renderer/browser_plugin/mock_browser_plugin_manager.h b/content/renderer/browser_plugin/mock_browser_plugin_manager.h
index 1ec85e34b8b7a07964b2acab20124301ff2da2ff..b3614c74c94058a3cd703ed16f3c22f0b6e41bff 100644
--- a/content/renderer/browser_plugin/mock_browser_plugin_manager.h
+++ b/content/renderer/browser_plugin/mock_browser_plugin_manager.h
@@ -13,6 +13,8 @@
namespace content {
+class MockBrowserPlugin;
+
class MockBrowserPluginManager : public BrowserPluginManager {
public:
MockBrowserPluginManager(RenderViewImpl* render_view);
@@ -22,15 +24,20 @@ class MockBrowserPluginManager : public BrowserPluginManager {
RenderViewImpl* render_view,
blink::WebFrame* frame,
bool auto_navigate) OVERRIDE;
- virtual void AllocateInstanceID(
- const base::WeakPtr<BrowserPlugin>& browser_plugin) OVERRIDE;
// Provides access to the messages that have been received by this thread.
IPC::TestSink& sink() { return sink_; }
+ // Allocates instance ID for the browser plugin.
+ void AllocateInstanceID(BrowserPlugin* browser_plugin);
+
// RenderViewObserver override.
virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
virtual bool Send(IPC::Message* msg) OVERRIDE;
+
+ // Returns the latest browser plugin that was created by this manager.
+ MockBrowserPlugin* last_plugin() { return last_plugin_; }
+
protected:
virtual ~MockBrowserPluginManager();
void AllocateInstanceIDACK(BrowserPlugin* browser_plugin,
@@ -42,6 +49,7 @@ class MockBrowserPluginManager : public BrowserPluginManager {
scoped_ptr<IPC::MessageReplyDeserializer> reply_deserializer_;
int guest_instance_id_counter_;
+ MockBrowserPlugin* last_plugin_;
DISALLOW_COPY_AND_ASSIGN(MockBrowserPluginManager);
};

Powered by Google App Engine
This is Rietveld 408576698