Remove BrowserPluginGuestManager

content/browser/browser_plugin/browser_plugin_host_browsertest.cc

 // Copyright 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 "base/command_line.h"
 #include "base/memory/singleton.h"
 #include "base/run_loop.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/test_timeouts.h"
 #include "content/browser/browser_plugin/browser_plugin_embedder.h"
 #include "content/browser/browser_plugin/browser_plugin_guest.h"
 #include "content/browser/browser_plugin/browser_plugin_host_factory.h"
 #include "content/browser/browser_plugin/test_browser_plugin_guest.h"
 #include "content/browser/browser_plugin/test_browser_plugin_guest_delegate.h"
-#include "content/browser/browser_plugin/test_browser_plugin_guest_manager.h"
 #include "content/browser/browser_plugin/test_guest_manager_delegate.h"
 #include "content/browser/child_process_security_policy_impl.h"
 #include "content/browser/frame_host/render_frame_host_impl.h"
 #include "content/browser/frame_host/render_widget_host_view_guest.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/common/browser_plugin/browser_plugin_messages.h"
 #include "content/common/view_messages.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
@@ skipping 68 matching lines @@
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TestBrowserPluginEmbedder);
 };
 
 // Test factory for creating test instances of BrowserPluginEmbedder and
 // BrowserPluginGuest.
 class TestBrowserPluginHostFactory : public BrowserPluginHostFactory {
  public:
-  virtual BrowserPluginGuestManager*
-      CreateBrowserPluginGuestManager(BrowserContext* context) OVERRIDE {
-    guest_manager_instance_count_++;
-    if (message_loop_runner_)
-      message_loop_runner_->Quit();
-    return new TestBrowserPluginGuestManager(context);
-  }
-
   virtual BrowserPluginGuest* CreateBrowserPluginGuest(
       int instance_id,
       WebContentsImpl* web_contents) OVERRIDE {
     return new TestBrowserPluginGuest(instance_id, web_contents);
   }
 
   // Also keeps track of number of instances created.
   virtual BrowserPluginEmbedder* CreateBrowserPluginEmbedder(
       WebContentsImpl* web_contents) OVERRIDE {
 
     return new TestBrowserPluginEmbedder(web_contents);
   }
 
   // Singleton getter.
   static TestBrowserPluginHostFactory* GetInstance() {
     return Singleton<TestBrowserPluginHostFactory>::get();
   }
 
-  // Waits for at least one embedder to be created in the test. Returns true if
-  // we have a guest, false if waiting times out.
-  void WaitForGuestManagerCreation() {
-    // Check if already have created an instance.
-    if (guest_manager_instance_count_ > 0)
-      return;
-    // Wait otherwise.
-    message_loop_runner_ = new MessageLoopRunner();
-    message_loop_runner_->Run();
-  }
-
  protected:
-  TestBrowserPluginHostFactory() : guest_manager_instance_count_(0) {}
+  TestBrowserPluginHostFactory() {}
   virtual ~TestBrowserPluginHostFactory() {}
 
  private:
   // For Singleton.
   friend struct DefaultSingletonTraits<TestBrowserPluginHostFactory>;
 
   scoped_refptr<MessageLoopRunner> message_loop_runner_;
-  int guest_manager_instance_count_;
 
   DISALLOW_COPY_AND_ASSIGN(TestBrowserPluginHostFactory);
 };
 
 // Test factory class for browser plugin that creates guests with short hang
 // timeout.
 class TestShortHangTimeoutGuestFactory : public TestBrowserPluginHostFactory {
  public:
   virtual BrowserPluginGuest* CreateBrowserPluginGuest(
       int instance_id, WebContentsImpl* web_contents) OVERRIDE {
@@ skipping 66 matching lines @@
       : test_embedder_(NULL),
         test_guest_(NULL),
         test_guest_manager_(NULL) {}
 
   virtual void SetUp() OVERRIDE {
     // Override factory to create tests instances of BrowserPlugin*.
     BrowserPluginEmbedder::set_factory_for_testing(
         TestBrowserPluginHostFactory::GetInstance());
     BrowserPluginGuest::set_factory_for_testing(
         TestBrowserPluginHostFactory::GetInstance());
-    BrowserPluginGuestManager::set_factory_for_testing(
-        TestBrowserPluginHostFactory::GetInstance());
     ContentBrowserTest::SetUp();
   }
   virtual void TearDown() OVERRIDE {
     BrowserPluginEmbedder::set_factory_for_testing(NULL);
     BrowserPluginGuest::set_factory_for_testing(NULL);
 
     ContentBrowserTest::TearDown();
   }
 
   static void SimulateSpaceKeyPress(WebContents* web_contents) {
@@ skipping 55 matching lines @@
 
     if (!is_guest_data_url) {
       test_url = embedded_test_server()->GetURL(guest_url);
       ExecuteSyncJSFunction(
           rfh, base::StringPrintf("SetSrc('%s');", test_url.spec().c_str()));
     } else {
       ExecuteSyncJSFunction(
           rfh, base::StringPrintf("SetSrc('%s');", guest_url.c_str()));
     }
 
-    // Wait to make sure embedder is created/attached to WebContents.
-    TestBrowserPluginHostFactory::GetInstance()->WaitForGuestManagerCreation();
-
     test_embedder_ = static_cast<TestBrowserPluginEmbedder*>(
         embedder_web_contents->GetBrowserPluginEmbedder());
     ASSERT_TRUE(test_embedder_);
 
-    test_guest_manager_ = static_cast<TestBrowserPluginGuestManager*>(
-        BrowserPluginGuestManager::FromBrowserContext(
-            test_embedder_->GetWebContents()->GetBrowserContext()));
-    ASSERT_TRUE(test_guest_manager_);
+    test_guest_manager_ =
+        static_cast<TestGuestManagerDelegate*>(
+            embedder_web_contents->GetBrowserContext()->
+                GetGuestManagerDelegate());
 
-    WebContentsImpl* test_guest_web_contents = static_cast<WebContentsImpl*>(
-        test_guest_manager_->WaitForGuestAdded());
+    WebContentsImpl* test_guest_web_contents =
+        test_guest_manager_->WaitForGuestAdded();
 
     test_guest_ = static_cast<TestBrowserPluginGuest*>(
         test_guest_web_contents->GetBrowserPluginGuest());
     test_guest_->WaitForLoadStop();
   }
 
   TestBrowserPluginEmbedder* test_embedder() const { return test_embedder_; }
   TestBrowserPluginGuest* test_guest() const { return test_guest_; }
-  TestBrowserPluginGuestManager* test_guest_manager() const {
+  TestGuestManagerDelegate* test_guest_manager() const {
     return test_guest_manager_;
   }
 
  private:
   TestBrowserPluginEmbedder* test_embedder_;
   TestBrowserPluginGuest* test_guest_;
-  TestBrowserPluginGuestManager* test_guest_manager_;
+  TestGuestManagerDelegate* test_guest_manager_;
   DISALLOW_COPY_AND_ASSIGN(BrowserPluginHostTest);
 };
 
 // This test ensures that if guest isn't there and we resize the guest (from
 // js), it remembers the size correctly.
 //
 // Initially we load an embedder with a guest without a src attribute (which has
 // dimension 640x480), resize it to 100x200, and then we set the source to a
 // sample guest. In the end we verify that the correct size has been set.
 IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, NavigateAfterResize) {
@@ skipping 693 matching lines @@
     scoped_ptr<base::Value> value =
         content::ExecuteScriptAndGetValue(
             guest_rfh, "document.getElementById('input1').value");
     std::string actual_value;
     ASSERT_TRUE(value->GetAsString(&actual_value));
     EXPECT_EQ(base::UTF16ToUTF8(expected_value), actual_value);
   }
 }
 
 }  // namespace content