commit 4caa6675fc971e670cf72d1c3c44672b707415d6
author Ken Rockot <rockot@chromium.org> Tue Jun 02 16:17:07 2015 -0700
committer Ken Rockot <rockot@chromium.org> Tue Jun 02 16:17:07 2015 -0700
tree 6dc24ccf0198ea74ef60e176450da124d1479d96
parent 957a327b6dcd141ee2b4c93b38ef5bdc3eb972fd

Add explicit casts from size_t to uint32_t

x64 MSVC is unhappy with the implict conversions.

R=viettrungluu@chromium.org, azani@chromium.org
BUG=

Review URL: https://codereview.chromium.org/1155973004

mojo/public/cpp/bindings/tests/union_unittest.cc

diff --git a/mojo/public/cpp/bindings/tests/union_unittest.cc b/mojo/public/cpp/bindings/tests/union_unittest.cc
index 65a23fa..e6e38de 100644
--- a/mojo/public/cpp/bindings/tests/union_unittest.cc
+++ b/mojo/public/cpp/bindings/tests/union_unittest.cc
@@ -499,7 +499,8 @@
   Serialize_(small_struct.Pass(), &buf, &data);
 
   void* raw_buf = buf.Leak();
-  mojo::internal::BoundsChecker bounds_checker(data, size, 0);
+  mojo::internal::BoundsChecker bounds_checker(data,
+                                               static_cast<uint32_t>(size), 0);
   EXPECT_TRUE(internal::SmallStruct_Data::Validate(raw_buf, &bounds_checker));
   free(raw_buf);
 }
@@ -519,7 +520,8 @@
   data->pod_union.tag = static_cast<internal::PodUnion_Data::PodUnion_Tag>(100);
 
   void* raw_buf = buf.Leak();
-  mojo::internal::BoundsChecker bounds_checker(data, size, 0);
+  mojo::internal::BoundsChecker bounds_checker(data,
+                                               static_cast<uint32_t>(size), 0);
   EXPECT_FALSE(internal::SmallStruct_Data::Validate(raw_buf, &bounds_checker));
   free(raw_buf);
 }
@@ -537,7 +539,8 @@
       internal::SmallStructNonNullableUnion_Data::New(&buf);
 
   void* raw_buf = buf.Leak();
-  mojo::internal::BoundsChecker bounds_checker(data, size, 0);
+  mojo::internal::BoundsChecker bounds_checker(data,
+                                               static_cast<uint32_t>(size), 0);
   EXPECT_FALSE(internal::SmallStructNonNullableUnion_Data::Validate(
       raw_buf, &bounds_checker));
   free(raw_buf);
@@ -555,7 +558,8 @@
   Serialize_(small_struct.Pass(), &buf, &data);
 
   void* raw_buf = buf.Leak();
-  mojo::internal::BoundsChecker bounds_checker(data, size, 0);
+  mojo::internal::BoundsChecker bounds_checker(data,
+                                               static_cast<uint32_t>(size), 0);
   EXPECT_TRUE(internal::SmallStruct_Data::Validate(raw_buf, &bounds_checker));
   free(raw_buf);
 }