This is followup from Charlie's comments on Fady's cl: http://chromiumcodereview.appspot.com/10560022, it seems I cannot upload patch to that issue (since I'm not owner), I'm creating a new one.

Split Embedder and Guest 'roles' for browser plugin, web contents can now play any or both roles, main idea is to have more readable separation between the two.
Also stop creating browser_plugin counterpart in browser/host for every web_contents, instead create them only when there's a browser_plugin element.


BUG= 141232

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=157650

Review URL: https://chromiumcodereview.appspot.com/10868012

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

1 files changed, 42 insertions, 0 deletions

diff --git a/content/browser/browser_plugin/test_browser_plugin_embedder.cc b/content/browser/browser_plugin/test_browser_plugin_embedder.cc
new file mode 100644
index 0000000..8d0ae8f
--- /dev/null
+++ b/content/browser/browser_plugin/test_browser_plugin_embedder.cc
@@ -0,0 +1,42 @@
+// 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.
+
+#include "content/browser/browser_plugin/test_browser_plugin_embedder.h"
+
+#include "base/time.h"
+#include "content/browser/browser_plugin/browser_plugin_embedder.h"
+#include "content/browser/browser_plugin/browser_plugin_guest.h"
+#include "content/browser/renderer_host/render_view_host_impl.h"
+#include "content/browser/web_contents/web_contents_impl.h"
+#include "content/public/test/test_utils.h"
+
+namespace content {
+
+TestBrowserPluginEmbedder::TestBrowserPluginEmbedder(
+    WebContentsImpl* web_contents,
+    RenderViewHost* render_view_host)
+    : BrowserPluginEmbedder(web_contents, render_view_host) {
+}
+
+TestBrowserPluginEmbedder::~TestBrowserPluginEmbedder() {
+}
+
+void TestBrowserPluginEmbedder::AddGuest(int instance_id,
+                                         WebContents* guest_web_contents,
+                                         int64 frame_id) {
+  BrowserPluginEmbedder::AddGuest(instance_id, guest_web_contents, frame_id);
+  if (message_loop_runner_)
+    message_loop_runner_->Quit();
+}
+
+void TestBrowserPluginEmbedder::WaitForGuestAdded() {
+  // Check if guests were already created.
+  if (guest_web_contents_by_instance_id_.size() > 0)
+    return;
+  // Wait otherwise.
+  message_loop_runner_ = new MessageLoopRunner();
+  message_loop_runner_->Run();
+}
+
+}  // namespace content