Commit cf285d2d authored by Will Harris's avatar Will Harris Committed by Commit Bot

Fix two implicit conversions warnings in mojo/service_manager.

../../services/service_manager/tests/lifecycle/lifecycle_unittest.cc(329,28):  warning: implicit conversion loses integer precision: 'size_t' (aka 'unsigned long long') to 'int' [-Wshorten-64-to-32]
      base::BarrierClosure(instance_count, loop.QuitClosure());
      ~~~~                 ^~~~~~~~~~~~~~
../../services/service_manager/tests/lifecycle/lifecycle_unittest.cc(365,28):  warning: implicit conversion loses integer precision: 'size_t' (aka 'unsigned long long') to 'int' [-Wshorten-64-to-32]
      base::BarrierClosure(instance_count, loop.QuitClosure());
      ~~~~

../../mojo/public/cpp/platform/tests/platform_handle_unittest.cc(108,61):  warning: implicit conversion loses integer precision: 'std::basic_string<char, std::char_traits<char>, std::allocator<char> >::size_type' (aka 'unsigned long long') to 'int' [-Wshorten-64-to-32]
    test_file.WriteAtCurrentPos(kTestData.data(), kTestData.size());
              ~~~~~~~~~~~~~~~~~                   ~~~~~~~~~~^~~~~~
../../mojo/public/cpp/platform/tests/platform_handle_unittest.cc(130,40):  warning: implicit conversion loses integer precision: 'std::vector<char, std::allocator<char> >::size_type' (aka 'unsigned long long') to 'int' [-Wshorten-64-to-32]
    file.Read(0, buffer.data(), buffer.size());
         ~~~~                   ~~~~~~~^~~~~~

BUG=879657

Change-Id: Icddec5f4ba2e5e0365fe4e70268730ef4e5aa99d
Reviewed-on: https://chromium-review.googlesource.com/1220471Reviewed-by: default avatarKen Rockot <rockot@chromium.org>
Commit-Queue: Will Harris <wfh@chromium.org>
Cr-Commit-Position: refs/heads/master@{#590459}
parent dc34b9c2
......@@ -105,7 +105,8 @@ class PlatformHandleTest : public testing::Test,
base::File test_file(temp_dir_.GetPath().AppendASCII("test"),
base::File::FLAG_CREATE | base::File::FLAG_WRITE |
base::File::FLAG_READ);
test_file.WriteAtCurrentPos(kTestData.data(), kTestData.size());
test_file.WriteAtCurrentPos(kTestData.data(),
static_cast<int>(kTestData.size()));
#if defined(OS_WIN)
return PlatformHandle(
......@@ -127,7 +128,7 @@ class PlatformHandleTest : public testing::Test,
base::File file(handle.GetFD().get());
#endif
std::vector<char> buffer(kTestData.size());
file.Read(0, buffer.data(), buffer.size());
file.Read(0, buffer.data(), static_cast<int>(buffer.size()));
std::string contents(buffer.begin(), buffer.end());
// Let |handle| retain ownership.
......
......@@ -322,11 +322,11 @@ TEST_F(LifecycleTest, PackagedApp_CrashCrashesOtherProvidedApp) {
EXPECT_TRUE(instances()->HasInstanceForName(kTestPackageAppNameB));
EXPECT_TRUE(instances()->HasInstanceForName(kTestPackageName));
size_t instance_count = instances()->GetNewInstanceCount();
EXPECT_EQ(3u, instance_count);
ASSERT_EQ(3u, instance_count);
base::RunLoop loop;
base::RepeatingClosure quit_on_last =
base::BarrierClosure(instance_count, loop.QuitClosure());
base::RepeatingClosure quit_on_last = base::BarrierClosure(
static_cast<int>(instance_count), loop.QuitClosure());
lifecycle_a.set_connection_error_handler(quit_on_last);
lifecycle_b.set_connection_error_handler(quit_on_last);
lifecycle_package.set_connection_error_handler(quit_on_last);
......@@ -358,11 +358,11 @@ TEST_F(LifecycleTest, PackagedApp_GracefulQuitPackageQuitsAll) {
EXPECT_TRUE(instances()->HasInstanceForName(kTestPackageAppNameB));
EXPECT_TRUE(instances()->HasInstanceForName(kTestPackageName));
size_t instance_count = instances()->GetNewInstanceCount();
EXPECT_EQ(3u, instance_count);
ASSERT_EQ(3u, instance_count);
base::RunLoop loop;
base::RepeatingClosure quit_on_last =
base::BarrierClosure(instance_count, loop.QuitClosure());
base::RepeatingClosure quit_on_last = base::BarrierClosure(
static_cast<int>(instance_count), loop.QuitClosure());
lifecycle_a.set_connection_error_handler(quit_on_last);
lifecycle_b.set_connection_error_handler(quit_on_last);
lifecycle_package.set_connection_error_handler(quit_on_last);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment