Merge 176248

> More conversion from uint to size_t for shared memory allocation sizes.
> 
> BUG=164678
> Review URL: https://codereview.chromium.org/11783095

TBR=cevans@chromium.org
Review URL: https://codereview.chromium.org/11883020

git-svn-id: svn://svn.chromium.org/chrome/branches/1364/src@176730 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 2 deletions

diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index ce775a8f..55a1537 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -723,7 +723,10 @@ void RenderThreadImpl::RecordUserMetrics(const std::string& action) {
 }
 
 scoped_ptr<base::SharedMemory>
-    RenderThreadImpl::HostAllocateSharedMemoryBuffer(uint32 size) {
+    RenderThreadImpl::HostAllocateSharedMemoryBuffer(size_t size) {
+  if (size > static_cast<size_t>(std::numeric_limits<int>::max()))
+    return scoped_ptr<base::SharedMemory>();
+
   //if (!size)
   //  return scoped_ptr<base::SharedMemory>();
 
@@ -937,7 +940,7 @@ base::WaitableEvent* RenderThreadImpl::GetShutDownEvent() {
 }
 
 scoped_ptr<base::SharedMemory> RenderThreadImpl::AllocateSharedMemory(
-    uint32 size) {
+    size_t size) {
   return scoped_ptr<base::SharedMemory>(
       HostAllocateSharedMemoryBuffer(size));
 }