bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium revision 304f01a1 (#358063)

Browse Source 
- Improve ordering of CefLoadHandler callbacks. OnLoadingStateChange will
  be called before and after all calls to OnLoadStart and OnLoadEnd.
  OnLoadStart/OnLoadEnd calls will occur as matching pairs
  (see http://crbug.com/539952#c2).
- Remove the |requesting_url| argument to CefGeolocationHandler::
  OnCancelGeolocationPermission. Clients can use the |request_id| argument
  to track this information themselves.
- Fix a crash when loading the PDF extension in multiple browsers with a
  custom CefRequestContext (issue #1757).
This commit is contained in:
Marshall Greenblatt
2015-11-10 15:18:16 -05:00
parent e0974ea64d
commit c6111d5947
92 changed files with 1918 additions and 902 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
tests/unittests/plugin_unittest.cc
View File

@ -35,10 +35,6 @@ class PluginBrowserTest : public client::ClientAppBrowser::Delegate {
void OnBeforeCommandLineProcessing(
CefRefPtr<client::ClientAppBrowser> app,
CefRefPtr<CefCommandLine> command_line) override {
// Enables testing of the plugin placeholder.
// See LoadablePluginPlaceholder::DidFinishLoadingCallback.
command_line->AppendSwitch("enable-plugin-placeholder-testing");
// Allow all plugin loading by default.
command_line->AppendSwitchWithValue("plugin-policy", "allow");
}
@ -50,6 +46,9 @@ class PluginBrowserTest : public client::ClientAppBrowser::Delegate {
const char kPdfHtmlUrl[] = "http://tests/pdf.html";
const char kPdfDirectUrl[] = "http://tests/pdf.pdf";
// Delay waiting for the plugin placeholder to load.
const int64 kPlaceholderLoadDelayMs = 1000;
// Delay waiting for iframe tests to load the PDF file.
#if defined(OS_LINUX)
const int64 kPdfLoadDelayMs = 7000;
@ -246,29 +245,12 @@ class PluginTestHandler : public RoutingTestHandler,
frame->ExecuteJavaScript(code, frame->GetURL(), 0);
}
void WaitForPlaceholderLoad(CefRefPtr<CefFrame> frame) const {
void WaitForPlaceholderLoad(CefRefPtr<CefFrame> frame) {
// Waits for the placeholder to load.
// See LoadablePluginPlaceholder::DidFinishLoadingCallback and
// chrome/browser/plugins/plugin_power_saver_browsertest.cc.
const std::string& code =
"var plugin = " + GetPluginNode() +";"
"if (plugin === undefined ||"
" (plugin.nodeName !== 'OBJECT' && plugin.nodeName !== 'EMBED')) {"
" window.testQuery({request:'placeholder_error'});"
"} else {"
" function handleEvent(event) {"
" if (event.data === 'placeholderLoaded') {"
" window.testQuery({request:'placeholder_ready'});"
" plugin.removeEventListener('message', handleEvent);"
" }"
" }"
" plugin.addEventListener('message', handleEvent);"
" if (plugin.hasAttribute('placeholderLoaded')) {"
" window.testQuery({request:'placeholder_ready'});"
" plugin.removeEventListener('message', handleEvent);"
" }"
"}";
frame->ExecuteJavaScript(code, frame->GetURL(), 0);
CefPostDelayedTask(TID_UI,
base::Bind(&PluginTestHandler::TriggerContextMenu, this,
frame->GetBrowser()),
kPlaceholderLoadDelayMs);
}
void WaitForPlaceholderHide(CefRefPtr<CefFrame> frame) const {
@ -430,15 +412,7 @@ class PluginTestHandler : public RoutingTestHandler,
// Wait for the first PDF file to load.
WaitForPluginLoad(frame);
}
} else if (request == "placeholder_ready") {
EXPECT_FALSE(got_placeholder_ready_);
got_placeholder_ready_.yes();
// The plugin placeholder has loaded.
CefPostTask(TID_UI,
base::Bind(&PluginTestHandler::TriggerContextMenu, this, browser));
} else if (request == "placeholder_hidden") {
EXPECT_TRUE(got_placeholder_ready_);
EXPECT_FALSE(got_placeholder_hidden_);
got_placeholder_hidden_.yes();
@ -536,11 +510,6 @@ class PluginTestHandler : public RoutingTestHandler,
context_handler_ = NULL;
}
if (HasBlock() || HasDisable())
EXPECT_TRUE(got_placeholder_ready_);
else
EXPECT_FALSE(got_placeholder_ready_);
if (HasContextHide()) {
EXPECT_TRUE(got_placeholder_hidden_);
EXPECT_FALSE(got_plugin_ready_);
@ -614,7 +583,6 @@ class PluginTestHandler : public RoutingTestHandler,
TrackCallback got_on_load_end_pdf2_;
TrackCallback got_pdf_plugin_found_;
TrackCallback got_pdf_plugin_missing_;
TrackCallback got_placeholder_ready_;
TrackCallback got_placeholder_hidden_;
TrackCallback got_plugin_ready_;
TrackCallback got_run_context_menu_;