| Index: components/nacl/browser/nacl_host_message_filter.cc
|
| diff --git a/components/nacl/browser/nacl_host_message_filter.cc b/components/nacl/browser/nacl_host_message_filter.cc
|
| index d7811595042ae69ffd762dfbe2c7ff9eb6c1d9d5..c4f5d5fbc2768e214e269f4d11431748dd91cda5 100644
|
| --- a/components/nacl/browser/nacl_host_message_filter.cc
|
| +++ b/components/nacl/browser/nacl_host_message_filter.cc
|
| @@ -4,7 +4,11 @@
|
|
|
| #include "components/nacl/browser/nacl_host_message_filter.h"
|
|
|
| +#include <stddef.h>
|
| +#include <stdint.h>
|
| +
|
| #include "base/sys_info.h"
|
| +#include "build/build_config.h"
|
| #include "components/nacl/browser/bad_message.h"
|
| #include "components/nacl/browser/nacl_browser.h"
|
| #include "components/nacl/browser/nacl_file_host.h"
|
| @@ -31,21 +35,20 @@ namespace {
|
| const size_t kMaxPreOpenResourceFiles = 200;
|
|
|
| ppapi::PpapiPermissions GetNaClPermissions(
|
| - uint32 permission_bits,
|
| + uint32_t permission_bits,
|
| content::BrowserContext* browser_context,
|
| const GURL& document_url) {
|
| // Only allow NaCl plugins to request certain permissions. We don't want
|
| // a compromised renderer to be able to start a nacl plugin with e.g. Flash
|
| // permissions which may expand the surface area of the sandbox.
|
| - uint32 masked_bits = permission_bits & ppapi::PERMISSION_DEV;
|
| + uint32_t masked_bits = permission_bits & ppapi::PERMISSION_DEV;
|
| if (content::PluginService::GetInstance()->PpapiDevChannelSupported(
|
| browser_context, document_url))
|
| masked_bits |= ppapi::PERMISSION_DEV_CHANNEL;
|
| return ppapi::PpapiPermissions::GetForCommandLine(masked_bits);
|
| }
|
|
|
| -
|
| -ppapi::PpapiPermissions GetPpapiPermissions(uint32 permission_bits,
|
| +ppapi::PpapiPermissions GetPpapiPermissions(uint32_t permission_bits,
|
| int render_process_id,
|
| int render_view_id) {
|
| // We get the URL from WebContents from the RenderViewHost, since we don't
|
| @@ -127,7 +130,7 @@ void NaClHostMessageFilter::OnLaunchNaCl(
|
| // up permissions, and we don't have the right browser state to look up some
|
| // of the whitelisting parameters anyway.
|
| if (launch_params.process_type == kPNaClTranslatorProcessType) {
|
| - uint32 perms = launch_params.permission_bits & ppapi::PERMISSION_DEV;
|
| + uint32_t perms = launch_params.permission_bits & ppapi::PERMISSION_DEV;
|
| LaunchNaClContinuationOnIOThread(
|
| launch_params,
|
| reply_msg,
|
|
|