Remove BrowserPluginGuestManager

content/browser/browser_plugin/test_guest_manager_delegate.cc

 // Copyright 2014 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_guest_manager_delegate.h"
 
 #include "base/logging.h"
 #include "base/memory/singleton.h"
 #include "base/strings/stringprintf.h"
 #include "base/values.h"
+#include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/browser/site_instance.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/common/url_constants.h"
+#include "content/public/test/test_utils.h"
 #include "net/base/escape.h"
 
 namespace content {
 
 class GuestWebContentsObserver
     : public content::WebContentsObserver {
  public:
   explicit GuestWebContentsObserver(WebContents* guest_web_contents)
       : WebContentsObserver(guest_web_contents),
         guest_instance_id_(guest_web_contents->GetEmbeddedInstanceID()) {
   }
 
   virtual ~GuestWebContentsObserver() {
   }
 
   virtual void WebContentsDestroyed(WebContents* web_contents) OVERRIDE {
     TestGuestManagerDelegate::GetInstance()->RemoveGuest(guest_instance_id_);
     delete this;
   }
 
  private:
   int guest_instance_id_;
   DISALLOW_COPY_AND_ASSIGN(GuestWebContentsObserver);
 };
 
 TestGuestManagerDelegate::TestGuestManagerDelegate()
-    : next_instance_id_(0) {
+    : last_guest_added_(NULL),
+      next_instance_id_(0) {
 }
 
 TestGuestManagerDelegate::~TestGuestManagerDelegate() {
 }
 
 // static.
 TestGuestManagerDelegate* TestGuestManagerDelegate::GetInstance() {
   return Singleton<TestGuestManagerDelegate>::get();
 }
 
+WebContentsImpl* TestGuestManagerDelegate::WaitForGuestAdded() {
+  fprintf(stderr, ">>>%s\n", __PRETTY_FUNCTION__);

[lazyboy, 2014/05/05 21:40:54]

Remove debug code.

[Fady Samuel, 2014/05/07 17:32:59]

Done.

+  // Check if guests were already created.
+  if (last_guest_added_) {
+    WebContentsImpl* last_guest_added = last_guest_added_;
+    last_guest_added_ = NULL;
+    return last_guest_added;
+  }
+  // Wait otherwise.
+  message_loop_runner_ = new MessageLoopRunner();
+  message_loop_runner_->Run();
+  WebContentsImpl* last_guest_added = last_guest_added_;
+  last_guest_added_ = NULL;
+  return last_guest_added;
+}
+
 content::WebContents* TestGuestManagerDelegate::CreateGuest(
     SiteInstance* embedder_site_instance,
     int instance_id,
     const StorageInfo& storage_info,
     scoped_ptr<base::DictionaryValue> extra_params) {
   const GURL& embedder_site_url = embedder_site_instance->GetSiteURL();
   const std::string& host = embedder_site_url.host();
 
   std::string url_encoded_partition = net::EscapeQueryParamValue(
       storage_info.partition_id, false);
@@ skipping 28 matching lines @@
   return ++next_instance_id_;
 }
 
 void TestGuestManagerDelegate::AddGuest(
     int guest_instance_id,
     WebContents* guest_web_contents) {
   DCHECK(guest_web_contents_by_instance_id_.find(guest_instance_id) ==
          guest_web_contents_by_instance_id_.end());
   guest_web_contents_by_instance_id_[guest_instance_id] = guest_web_contents;
   new GuestWebContentsObserver(guest_web_contents);
+  last_guest_added_ = static_cast<WebContentsImpl*>(guest_web_contents);
+  if (message_loop_runner_)
+    message_loop_runner_->Quit();
 }
 
 void TestGuestManagerDelegate::RemoveGuest(
     int guest_instance_id) {
   GuestInstanceMap::iterator it =
       guest_web_contents_by_instance_id_.find(guest_instance_id);
   DCHECK(it != guest_web_contents_by_instance_id_.end());
   guest_web_contents_by_instance_id_.erase(it);
 }
 
@@ skipping 31 matching lines @@
     if (embedder_web_contents != guest->GetEmbedderWebContents())
       continue;
 
     if (callback.Run(guest))
       return true;
   }
   return false;
 }
 
 }  // namespace content