diff options
| author | lazyboy@chromium.org <lazyboy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-05 11:09:42 +0000 |
|---|---|---|
| committer | lazyboy@chromium.org <lazyboy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-05 11:09:42 +0000 |
| commit | e1c913c665472a11722a2e657c54dc3830d85378 (patch) | |
| tree | 61eeaa2ab2ee87a56a67706a6cfd26183639c309 /content/browser/browser_plugin/browser_plugin_guest.cc | |
| parent | de7dac9fe6c237c84d75e7a3d67f0d899a9c7b1a (diff) | |
| download | chromium_src-e1c913c665472a11722a2e657c54dc3830d85378.zip chromium_src-e1c913c665472a11722a2e657c54dc3830d85378.tar.gz chromium_src-e1c913c665472a11722a2e657c54dc3830d85378.tar.bz2 | |
<webview> Rewrite IME related tests from content_browsertests to WebViewTest.
This is part of onging effort to nuke BrowserPluginHostTest to browser_tests.
This CL also moves ReloadEmbedder test to browser_tests.
This CL also deletes two tests which cannot be written outside of content/.
These tests are:
BrowserPluginHostTest.EmbedderChangedAfterSwap
BrowserPluginHostTest.EmbedderSameAfterNav
The remaining test BrowserPluginHostTest.AcceptDragEvents is also removed b/c:
1. it cannot be directly translated in chrome/ layer
2. we have a bit of coverage for drag and drop for chromeos in WebViewInteractiveTest.
Therefore this CL entirely removes BrowserPluginHostTest class.
BUG=368077,308405,339904,379001
Test=No visible change, internal integration test related changes.
Review URL: https://codereview.chromium.org/309503004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@275065 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/browser_plugin/browser_plugin_guest.cc')
| -rw-r--r-- | content/browser/browser_plugin/browser_plugin_guest.cc | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/content/browser/browser_plugin/browser_plugin_guest.cc b/content/browser/browser_plugin/browser_plugin_guest.cc index d01bbd0..929871e 100644 --- a/content/browser/browser_plugin/browser_plugin_guest.cc +++ b/content/browser/browser_plugin/browser_plugin_guest.cc @@ -9,7 +9,6 @@ #include "base/message_loop/message_loop.h" #include "base/strings/utf_string_conversions.h" #include "content/browser/browser_plugin/browser_plugin_embedder.h" -#include "content/browser/browser_plugin/browser_plugin_host_factory.h" #include "content/browser/browser_thread_impl.h" #include "content/browser/child_process_security_policy_impl.h" #include "content/browser/frame_host/render_frame_host_impl.h" @@ -40,9 +39,6 @@ namespace content { -// static -BrowserPluginHostFactory* BrowserPluginGuest::factory_ = NULL; - class BrowserPluginGuest::EmbedderWebContentsObserver : public WebContentsObserver { public: @@ -262,14 +258,8 @@ BrowserPluginGuest* BrowserPluginGuest::Create( scoped_ptr<base::DictionaryValue> extra_params, BrowserPluginGuest* opener) { RecordAction(base::UserMetricsAction("BrowserPlugin.Guest.Create")); - BrowserPluginGuest* guest = NULL; - if (factory_) { - guest = factory_->CreateBrowserPluginGuest(instance_id, web_contents); - } else { - guest = new BrowserPluginGuest(instance_id, - web_contents->opener() != NULL, - web_contents); - } + BrowserPluginGuest* guest = new BrowserPluginGuest( + instance_id, web_contents->opener() != NULL, web_contents); web_contents->SetBrowserPluginGuest(guest); WebContents* opener_web_contents = NULL; if (opener) { |