diff options
| author | dmichael <dmichael@chromium.org> | 2014-09-12 18:07:44 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-13 01:10:04 +0000 |
| commit | d1b2c8f719b0ab471a476bf53911a3657bb4c06a (patch) | |
| tree | 9960e9bc6826d0a75094a0feeed54b1cbc9369f4 /content/ppapi_plugin | |
| parent | 67edf766aa17c66b10bcb7e65125bc4652c90e5b (diff) | |
| download | chromium_src-d1b2c8f719b0ab471a476bf53911a3657bb4c06a.zip chromium_src-d1b2c8f719b0ab471a476bf53911a3657bb4c06a.tar.gz chromium_src-d1b2c8f719b0ab471a476bf53911a3657bb4c06a.tar.bz2 | |
PPAPI: Fix GetBrowserInterface race conditions
BUG=413513
Review URL: https://codereview.chromium.org/568793002
Cr-Commit-Position: refs/heads/master@{#294715}
Diffstat (limited to 'content/ppapi_plugin')
| -rw-r--r-- | content/ppapi_plugin/ppapi_thread.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/content/ppapi_plugin/ppapi_thread.cc b/content/ppapi_plugin/ppapi_thread.cc index 39af7ff..f2358c1 100644 --- a/content/ppapi_plugin/ppapi_thread.cc +++ b/content/ppapi_plugin/ppapi_thread.cc @@ -107,7 +107,7 @@ PpapiThread::PpapiThread(const CommandLine& command_line, bool is_broker) base::RandInt(0, std::numeric_limits<PP_Module>::max())), next_plugin_dispatcher_id_(1) { ppapi::proxy::PluginGlobals* globals = ppapi::proxy::PluginGlobals::Get(); - globals->set_plugin_proxy_delegate(this); + globals->SetPluginProxyDelegate(this); globals->set_command_line( command_line.GetSwitchValueASCII(switches::kPpapiFlashArgs)); @@ -127,7 +127,7 @@ PpapiThread::~PpapiThread() { void PpapiThread::Shutdown() { ChildThread::Shutdown(); - ppapi::proxy::PluginGlobals::Get()->set_plugin_proxy_delegate(NULL); + ppapi::proxy::PluginGlobals::Get()->SetPluginProxyDelegate(NULL); if (plugin_entry_points_.shutdown_module) plugin_entry_points_.shutdown_module(); webkit_platform_support_->Shutdown(); |