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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/browser_plugin/browser_plugin_host_browsertest.cc

Issue 10868012: Browser Plugin: New Implementation (Browser Side) (Closed) Base URL: http://git.chromium.org/chromium/src.git@master-trial-obrowser
Patch Set: integrate windows fix by Fady (original cl #10910228) Created 8 years, 3 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
« content/browser/browser_plugin/browser_plugin_guest_helper.h ('K') | « content/browser/browser_plugin/browser_plugin_guest_helper.cc ('k') | content/browser/browser_plugin/browser_plugin_host_factory.h » ('j') | content/browser/renderer_host/render_view_host_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/browser_plugin/browser_plugin_host_browsertest.cc
diff --git a/content/browser/browser_plugin/browser_plugin_host_browsertest.cc b/content/browser/browser_plugin/browser_plugin_host_browsertest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..6c9a689ff2f1876091025688d5795e7ebd67b584
--- /dev/null
+++ b/content/browser/browser_plugin/browser_plugin_host_browsertest.cc
@@ -0,0 +1,449 @@
+// 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 "base/memory/singleton.h"
+#include "base/run_loop.h"
+#include "base/utf_string_conversions.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_embedder.h"
+#include "content/browser/browser_plugin/test_browser_plugin_guest.h"
+#include "content/browser/browser_plugin/test_timeout_tracker.h"
+#include "content/browser/renderer_host/render_view_host_impl.h"
+#include "content/browser/web_contents/web_contents_impl.h"
+#include "content/common/view_messages.h"
+#include "content/public/browser/notification_service.h"
+#include "content/public/browser/notification_types.h"
+#include "content/public/test/browser_test_utils.h"
+#include "content/public/test/test_utils.h"
+#include "content/shell/shell.h"
+#include "content/test/content_browser_test_utils.h"
+#include "content/test/content_browser_test.h"
+#include "ipc/ipc_message.h"
+#include "net/base/net_util.h"
+#include "net/test/test_server.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
+
+using WebKit::WebInputEvent;
+using WebKit::WebMouseEvent;
+using content::BrowserPluginEmbedder;
+using content::BrowserPluginGuest;
+using content::BrowserPluginHostFactory;
+
+namespace content {
+
+const char* kHTMLForGuest =
+ "data:text/html,<html><body>hello world</body></html>";
+
+// Test factory for creating test instances of BrowserPluginEmbedder and
+// BrowserPluginGuest.
+class TestBrowserPluginHostFactory : public BrowserPluginHostFactory {
+ public:
+ virtual BrowserPluginGuest* CreateBrowserPluginGuest(
+ int instance_id,
+ WebContentsImpl* web_contents,
+ RenderViewHost* render_view_host) OVERRIDE {
+ return new TestBrowserPluginGuest(instance_id,
+ web_contents,
+ render_view_host);
+ }
+
+ // Also keeps track of number of instances created.
+ virtual BrowserPluginEmbedder* CreateBrowserPluginEmbedder(
+ WebContentsImpl* web_contents,
+ RenderViewHost* render_view_host) OVERRIDE {
+ embedder_instance_count_++;
+ if (message_loop_runner_)
+ message_loop_runner_->Quit();
+
+ return new TestBrowserPluginEmbedder(web_contents, render_view_host);
+ }
+
+ // 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.
+ bool WaitForEmbedderCreation() {
+ // Check if already have created instance.
+ if (embedder_instance_count_ > 0)
+ return true;
+ // Wait otherwise.
+ message_loop_runner_ = new MessageLoopRunner();
+ return TestTimeoutTracker::RunInActionTimeout(
+ message_loop_runner_.get());
+ }
+
+ protected:
+ TestBrowserPluginHostFactory() : embedder_instance_count_(0) {}
+ virtual ~TestBrowserPluginHostFactory() {}
+
+ private:
+ // For Singleton.
+ friend struct DefaultSingletonTraits<TestBrowserPluginHostFactory>;
+
+ scoped_refptr<MessageLoopRunner> message_loop_runner_;
+ int embedder_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,
+ RenderViewHost* render_view_host) OVERRIDE {
+ BrowserPluginGuest* ret = new TestBrowserPluginGuest(instance_id,
Charlie Reis 2012/09/13 00:51:44 nit: ret -> guest (ret is not a useful variable na
lazyboy 2012/09/13 15:56:24 Done.
+ web_contents,
+ render_view_host);
+ ret->SetGuestHangTimeoutForTesting(TestTimeouts::tiny_timeout());
+ return ret;
+ }
+
+ // Singleton getter.
+ static TestShortHangTimeoutGuestFactory* GetInstance() {
+ return Singleton<TestShortHangTimeoutGuestFactory>::get();
+ }
+
+ protected:
+ TestShortHangTimeoutGuestFactory() {}
+ virtual ~TestShortHangTimeoutGuestFactory() {}
+
+ private:
+ // For Singleton.
+ friend struct DefaultSingletonTraits<TestShortHangTimeoutGuestFactory>;
+
+ DISALLOW_COPY_AND_ASSIGN(TestShortHangTimeoutGuestFactory);
+};
+
+class BrowserPluginHostTest : public ContentBrowserTest {
+ public:
+ BrowserPluginHostTest() {}
+
+ virtual void SetUp() OVERRIDE {
+ // Override factory to create tests instances of BrowserPlugin*.
+ content::BrowserPluginEmbedder::set_factory_for_testing(
+ TestBrowserPluginHostFactory::GetInstance());
+ content::BrowserPluginGuest::set_factory_for_testing(
+ TestBrowserPluginHostFactory::GetInstance());
+
+ ContentBrowserTest::SetUp();
+ }
+ virtual void TearDown() OVERRIDE {
+ content::BrowserPluginEmbedder::set_factory_for_testing(NULL);
+ content::BrowserPluginGuest::set_factory_for_testing(NULL);
+
+ ContentBrowserTest::TearDown();
+ }
+
+ static void SimulateTabKeyPress(WebContents* web_contents) {
+ SimulateKeyPress(web_contents,
+ ui::VKEY_TAB,
+ false, // control.
+ false, // shift.
+ false, // alt.
+ false); // command.
+ }
+
+ private:
+ DISALLOW_COPY_AND_ASSIGN(BrowserPluginHostTest);
+};
+
+// This test loads a guest that has infinite loop, therefore it hangs the guest
+// and eventually gets killed.
+IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, NavigateGuest) {
+ // Override the hang timeout for guest to be very small.
+ content::BrowserPluginGuest::set_factory_for_testing(
+ TestShortHangTimeoutGuestFactory::GetInstance());
+ ASSERT_TRUE(test_server()->Start());
+ GURL test_url(test_server()->GetURL("files/browser_plugin_embedder.html"));
+ NavigateToURL(shell(), test_url);
+
+ WebContentsImpl* embedder_web_contents = static_cast<WebContentsImpl*>(
+ shell()->web_contents());
+ RenderViewHostImpl* rvh = static_cast<RenderViewHostImpl*>(
+ embedder_web_contents->GetRenderViewHost());
+
+ test_url = test_server()->GetURL(
+ "files/browser_plugin_infinite_loop_child.html");
+ rvh->ExecuteJavascriptAndGetValue(string16(), ASCIIToUTF16(
+ StringPrintf("SetSrc('%s');", test_url.spec().c_str())));
+
+ // Wait to make sure embedder is created/attached to WebContents.
+ ASSERT_TRUE(
+ TestBrowserPluginHostFactory::GetInstance()->WaitForEmbedderCreation());
+
+ TestBrowserPluginEmbedder* test_embedder =
+ static_cast<TestBrowserPluginEmbedder*>(
+ embedder_web_contents->GetBrowserPluginEmbedder());
+ ASSERT_TRUE(test_embedder);
+ ASSERT_TRUE(test_embedder->WaitForGuestAdded());
+
+ // Verify that we have exactly one guest.
+ const BrowserPluginEmbedder::ContainerInstanceMap& instance_map =
+ test_embedder->guest_web_contents_for_testing();
+ EXPECT_EQ(1u, instance_map.size());
+
+ WebContentsImpl* test_guest_web_contents = static_cast<WebContentsImpl*>(
+ instance_map.begin()->second);
+ TestBrowserPluginGuest* test_guest = static_cast<TestBrowserPluginGuest*>(
+ test_guest_web_contents->GetBrowserPluginGuest());
+
+ // Wait for the guest to send an UpdateRectMsg, meaning it is ready.
+ ASSERT_TRUE(test_guest->WaitForUpdateRectMsg());
+
+ // Send a mouse event to the guest.
+ WebKit::WebMouseEvent mouse_event;
+ mouse_event.type = WebInputEvent::MouseDown;
+ mouse_event.button = WebMouseEvent::ButtonMiddle;
+ mouse_event.x = 35;
+ mouse_event.y = 35;
+ mouse_event.globalX = 35;
+ mouse_event.globalY = 35;
+
+ IPC::Message* input_message = new ViewMsg_HandleInputEvent(
+ embedder_web_contents->GetRenderViewHost()->GetRoutingID());
+ input_message->WriteData(reinterpret_cast<const char*>(&mouse_event),
+ sizeof(WebKit::WebMouseEvent));
+ embedder_web_contents->GetRenderViewHost()->Send(input_message);
+
+ // Expect the guest to crash.
+ ASSERT_TRUE(test_guest->WaitForCrashed());
+}
+
+// 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), then resize it to 100x200, 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) {
+ ASSERT_TRUE(test_server()->Start());
+ GURL test_url(test_server()->GetURL(
+ "files/browser_plugin_embedder.html"));
+ NavigateToURL(shell(), test_url);
+
+ WebContentsImpl* embedder_web_contents = static_cast<WebContentsImpl*>(
+ shell()->web_contents());
+ RenderViewHostImpl* rvh = static_cast<RenderViewHostImpl*>(
+ embedder_web_contents->GetRenderViewHost());
+
+ int nxt_width = 100;
+ int nxt_height = 200;
+ rvh->ExecuteJavascriptAndGetValue(string16(), ASCIIToUTF16(
+ StringPrintf("SetSize(%d, %d);", nxt_width, nxt_height)));
+
+ rvh->ExecuteJavascriptAndGetValue(string16(), ASCIIToUTF16(
+ StringPrintf("SetSrc('%s');", kHTMLForGuest)));
+
+ // Wait to make sure embedder is created/attached to WebContents.
+ ASSERT_TRUE(
+ TestBrowserPluginHostFactory::GetInstance()->WaitForEmbedderCreation());
+
+ TestBrowserPluginEmbedder* test_embedder =
+ static_cast<TestBrowserPluginEmbedder*>(
+ embedder_web_contents->GetBrowserPluginEmbedder());
+ ASSERT_TRUE(test_embedder);
+ ASSERT_TRUE(test_embedder->WaitForGuestAdded());
+
+ // Verify that we have exactly one guest.
+ const BrowserPluginEmbedder::ContainerInstanceMap& instance_map =
+ test_embedder->guest_web_contents_for_testing();
+ EXPECT_EQ(1u, instance_map.size());
+
+ WebContentsImpl* test_guest_web_contents = static_cast<WebContentsImpl*>(
+ instance_map.begin()->second);
+ TestBrowserPluginGuest* test_guest = static_cast<TestBrowserPluginGuest*>(
+ test_guest_web_contents->GetBrowserPluginGuest());
+
+
+ // Wait for the guest to send an UpdateRectMsg, the dimensions should be
+ // 100 x 200.
+ ASSERT_TRUE(test_guest->WaitForUpdateRectMsgWithSize(nxt_width, nxt_height));
+}
+
+IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, AdvanceFocus) {
+ ASSERT_TRUE(test_server()->Start());
+ GURL test_url(test_server()->GetURL(
+ "files/browser_plugin_focus.html"));
+ NavigateToURL(shell(), test_url);
+
+ WebContentsImpl* embedder_web_contents = static_cast<WebContentsImpl*>(
+ shell()->web_contents());
+ RenderViewHostImpl* rvh = static_cast<RenderViewHostImpl*>(
+ embedder_web_contents->GetRenderViewHost());
+
+ test_url = test_server()->GetURL(
+ "files/browser_plugin_focus_child.html");
+ rvh->ExecuteJavascriptAndGetValue(string16(), ASCIIToUTF16(
+ StringPrintf("SetSrc('%s');", test_url.spec().c_str())));
+
+ // Wait to make sure embedder is created/attached to WebContents.
+ ASSERT_TRUE(
+ TestBrowserPluginHostFactory::GetInstance()->WaitForEmbedderCreation());
+
+ TestBrowserPluginEmbedder* test_embedder =
+ static_cast<TestBrowserPluginEmbedder*>(
+ embedder_web_contents->GetBrowserPluginEmbedder());
+ ASSERT_TRUE(test_embedder);
+ ASSERT_TRUE(test_embedder->WaitForGuestAdded());
+
+ // Verify that we have exactly one guest.
+ const BrowserPluginEmbedder::ContainerInstanceMap& instance_map =
+ test_embedder->guest_web_contents_for_testing();
+ EXPECT_EQ(1u, instance_map.size());
+
+ WebContentsImpl* test_guest_web_contents = static_cast<WebContentsImpl*>(
+ instance_map.begin()->second);
+ TestBrowserPluginGuest* test_guest = static_cast<TestBrowserPluginGuest*>(
+ test_guest_web_contents->GetBrowserPluginGuest());
+ ASSERT_TRUE(test_guest->WaitForUpdateRectMsg());
+
+ SimulateMouseClick(embedder_web_contents);
+ BrowserPluginHostTest::SimulateTabKeyPress(embedder_web_contents);
+ // Wait until we focus into the guest.
+ ASSERT_TRUE(test_guest->WaitForFocus());
+
+ // TODO(fsamuel): A third Tab key press should not be necessary.
+ // The browser plugin will take keyboard focus but it will not
+ // focus an initial element. The initial element is dependent
+ // upon tab direction which WebKit does not propagate to the plugin.
+ // See http://crbug.com/147644.
+ BrowserPluginHostTest::SimulateTabKeyPress(embedder_web_contents);
+ BrowserPluginHostTest::SimulateTabKeyPress(embedder_web_contents);
+ BrowserPluginHostTest::SimulateTabKeyPress(embedder_web_contents);
+ ASSERT_TRUE(test_guest->WaitForAdvanceFocus());
+}
+
+// This test opens a page in http and then opens another page in https, forcing
+// a RenderViewHost swap in the web_contents. We verify if the embedder in the
Charlie Reis 2012/09/13 00:51:44 nit: verify if -> verify that
lazyboy 2012/09/13 15:56:24 Done.
+// web_contents gets cleared properly.
+IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, EmbedderChangedAfterSwap) {
+ ASSERT_TRUE(test_server()->Start());
+ net::TestServer https_server(
+ net::TestServer::TYPE_HTTPS,
+ net::TestServer::kLocalhost,
+ FilePath(FILE_PATH_LITERAL("content/test/data")));
+ ASSERT_TRUE(https_server.Start());
+
+ // 1. Load an embedder page with one guest in it.
+ GURL test_url(test_server()->GetURL("files/browser_plugin_embedder.html"));
+ NavigateToURL(shell(), test_url);
+
+ WebContentsImpl* embedder_web_contents = static_cast<WebContentsImpl*>(
+ shell()->web_contents());
+ RenderViewHostImpl* rvh = static_cast<RenderViewHostImpl*>(
+ embedder_web_contents->GetRenderViewHost());
+ rvh->ExecuteJavascriptAndGetValue(string16(), ASCIIToUTF16(
+ StringPrintf("SetSrc('%s');", kHTMLForGuest)));
+
+ // Wait to make sure embedder is created/attached to WebContents.
+ TestBrowserPluginHostFactory::GetInstance()->WaitForEmbedderCreation();
+
+ TestBrowserPluginEmbedder* test_embedder_before_swap =
+ static_cast<TestBrowserPluginEmbedder*>(
+ embedder_web_contents->GetBrowserPluginEmbedder());
+ ASSERT_TRUE(test_embedder_before_swap);
+ test_embedder_before_swap->WaitForGuestAdded();
+
+ // Verify that we have exactly one guest.
+ const BrowserPluginEmbedder::ContainerInstanceMap& instance_map =
+ test_embedder_before_swap->guest_web_contents_for_testing();
+ EXPECT_EQ(1u, instance_map.size());
+
+ WebContentsImpl* test_guest_web_contents = static_cast<WebContentsImpl*>(
+ instance_map.begin()->second);
+ TestBrowserPluginGuest* test_guest = static_cast<TestBrowserPluginGuest*>(
+ test_guest_web_contents->GetBrowserPluginGuest());
+
+ // Wait for the guest to send an UpdateRectMsg, which means the guest is
+ // ready.
+ test_guest->WaitForUpdateRectMsg();
+
+ // This URL is loaded in https, forcing a RenderViewHost swap.
+ GURL test_https_url(https_server.GetURL(
+ "files/browser_plugin_title_change.html"));
+
+ // 2. Navigate to a URL in https, so we trigger a RenderViewHost swap.
Charlie Reis 2012/09/13 00:51:44 nit: Move the test_https_url lines below this line
lazyboy 2012/09/13 15:56:24 Done.
+ content::WindowedNotificationObserver swap_observer(
+ content::NOTIFICATION_WEB_CONTENTS_SWAPPED,
+ content::Source<WebContents>(embedder_web_contents));
+ NavigateToURL(shell(), test_https_url);
+ swap_observer.Wait();
+
+ TestBrowserPluginEmbedder* test_embedder_after_swap =
+ static_cast<TestBrowserPluginEmbedder*>(
+ static_cast<WebContentsImpl*>(shell()->web_contents())->
+ GetBrowserPluginEmbedder());
+ // Verify we have a no embedder in web_contents (since the new page doesn't
+ // have any browser plugin).
+ ASSERT_TRUE(!test_embedder_after_swap);
+ ASSERT_NE(test_embedder_before_swap, test_embedder_after_swap);
+}
+
+// This test opens two pages in http and there is no RenderViewHost swap,
+// therefore the embedder created on first page navigation stays the same in
+// web_contents.
+IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, EmbedderSameAfterNav) {
+ ASSERT_TRUE(test_server()->Start());
+
+ GURL test_url(test_server()->GetURL("files/browser_plugin_embedder.html"));
+ NavigateToURL(shell(), test_url);
+
+ WebContentsImpl* embedder_web_contents = static_cast<WebContentsImpl*>(
+ shell()->web_contents());
+ RenderViewHostImpl* rvh = static_cast<RenderViewHostImpl*>(
+ embedder_web_contents->GetRenderViewHost());
+
+ rvh->ExecuteJavascriptAndGetValue(string16(), ASCIIToUTF16(
+ StringPrintf("SetSrc('%s');", kHTMLForGuest)));
+
+ // Wait to make sure embedder is created/attached to WebContents.
+ TestBrowserPluginHostFactory::GetInstance()->WaitForEmbedderCreation();
+
+ TestBrowserPluginEmbedder* test_embedder_ =
+ static_cast<TestBrowserPluginEmbedder*>(
+ embedder_web_contents->GetBrowserPluginEmbedder());
+ ASSERT_TRUE(test_embedder_);
+ test_embedder_->WaitForGuestAdded();
+
+ // Verify that we have exactly one guest.
+ const BrowserPluginEmbedder::ContainerInstanceMap& instance_map =
+ test_embedder_->guest_web_contents_for_testing();
+ EXPECT_EQ(1u, instance_map.size());
+
+ WebContentsImpl* test_guest_web_contents = static_cast<WebContentsImpl*>(
+ instance_map.begin()->second);
+ TestBrowserPluginGuest* test_guest = static_cast<TestBrowserPluginGuest*>(
+ test_guest_web_contents->GetBrowserPluginGuest());
+
+ // Wait for the guest to send an UpdateRectMsg, which means the guest is
+ // ready.
+ test_guest->WaitForUpdateRectMsg();
+
+ // Navigate to another page in same host and port, so RenderViewHost swap
+ // does not happen and existing embedder doesn't change in web_contents.
+ GURL test_url_new(test_server()->GetURL(
+ "files/browser_plugin_title_change.html"));
+ const string16 expected_title = ASCIIToUTF16("done");
+ content::TitleWatcher title_watcher(shell()->web_contents(), expected_title);
+ NavigateToURL(shell(), test_url_new);
+ LOG(INFO) << "Start waiting for title";
+ string16 actual_title = title_watcher.WaitAndGetTitle();
+ EXPECT_EQ(expected_title, actual_title);
+ LOG(INFO) << "Done navigating to second page";
+
+ TestBrowserPluginEmbedder* test_embedder_after_nav =
+ static_cast<TestBrowserPluginEmbedder*>(
+ embedder_web_contents->GetBrowserPluginEmbedder());
+ // Embedder must not change in web_contents.
+ ASSERT_EQ(test_embedder_after_nav, test_embedder_);
+}
+
+} // namespace content
« content/browser/browser_plugin/browser_plugin_guest_helper.h ('K') | « content/browser/browser_plugin/browser_plugin_guest_helper.cc ('k') | content/browser/browser_plugin/browser_plugin_host_factory.h » ('j') | content/browser/renderer_host/render_view_host_impl.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698