Towards moving guest management to chrome: Introduce GuestViewManager

content/browser/browser_plugin/test_browser_plugin_guest_manager.cc

 // Copyright (c) 2013 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_guest_manager.h"
 
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/test/test_utils.h"
 
 namespace content {
 
-TestBrowserPluginGuestManager::TestBrowserPluginGuestManager() {
+TestBrowserPluginGuestManager::TestBrowserPluginGuestManager(
+    BrowserContext* context)
+    : BrowserPluginGuestManager(context),
+      last_guest_added_(NULL) {
 }
 
 TestBrowserPluginGuestManager::~TestBrowserPluginGuestManager() {
 }
 
 void TestBrowserPluginGuestManager::AddGuest(
     int instance_id,
-    WebContentsImpl* guest_web_contents) {
+    WebContents* guest_web_contents) {
   BrowserPluginGuestManager::AddGuest(instance_id, guest_web_contents);
-  if (message_loop_runner_)
+  last_guest_added_ = guest_web_contents;
+  if (message_loop_runner_.get())
     message_loop_runner_->Quit();
 }
 
-void TestBrowserPluginGuestManager::WaitForGuestAdded() {
+WebContents* TestBrowserPluginGuestManager::WaitForGuestAdded() {
   // Check if guests were already created.
-  if (guest_web_contents_by_instance_id_.size() > 0)
-    return;
+  if (last_guest_added_)

[lazyboy, 2014/05/01 20:06:59]

Set last_guest_added_ = NULL after returning the value.

[Fady Samuel, 2014/05/01 21:05:28]

Done.

+    return last_guest_added_;
   // Wait otherwise.
   message_loop_runner_ = new MessageLoopRunner();
   message_loop_runner_->Run();
+  return last_guest_added_;
 }
 
 }  // namespace content