chromeos-dbus-bindings: Fix more sign issues

BUG=None
TEST=Compiles on Android without sign comparison warnings.

Change-Id: I818975146bd028e50ae20948211b959e022fb0bb
Reviewed-on: https://chromium-review.googlesource.com/288926
Tested-by: Christopher Wiley <wiley@chromium.org>
Reviewed-by: Alex Vakulenko <avakulenko@chromium.org>
Commit-Queue: Christopher Wiley <wiley@chromium.org>

5 files changed, 16 insertions, 16 deletions

diff --git a/chromeos-dbus-bindings/adaptor_generator_unittest.cc b/chromeos-dbus-bindings/adaptor_generator_unittest.cc
index 6fe34bb..70b6421 100644
--- a/chromeos-dbus-bindings/adaptor_generator_unittest.cc
+++ b/chromeos-dbus-bindings/adaptor_generator_unittest.cc
@@ -230,8 +230,8 @@ class AdaptorGeneratorTest : public Test {
   base::FilePath CreateInputFile(const string& contents) {
     base::FilePath path;
     EXPECT_TRUE(base::CreateTemporaryFileInDir(temp_dir_.path(), &path));
-    EXPECT_EQ(contents.size(),
-              base::WriteFile(path, contents.c_str(), contents.size()));
+    int written = base::WriteFile(path, contents.c_str(), contents.size());
+    EXPECT_EQ(contents.size(), static_cast<size_t>(written));
     return path;
   }
 
diff --git a/chromeos-dbus-bindings/method_name_generator_unittest.cc b/chromeos-dbus-bindings/method_name_generator_unittest.cc
index f239c91..040c188 100644
--- a/chromeos-dbus-bindings/method_name_generator_unittest.cc
+++ b/chromeos-dbus-bindings/method_name_generator_unittest.cc
@@ -44,8 +44,8 @@ class MethodNameGeneratorTest : public Test {
   base::FilePath CreateInputFile(const string& contents) {
     base::FilePath path;
     EXPECT_TRUE(base::CreateTemporaryFileInDir(temp_dir_.path(), &path));
-    EXPECT_EQ(contents.size(),
-              base::WriteFile(path, contents.c_str(), contents.size()));
+    int written = base::WriteFile(path, contents.c_str(), contents.size());
+    EXPECT_EQ(contents.size(), static_cast<size_t>(written));
     return path;
   }
 
diff --git a/chromeos-dbus-bindings/proxy_generator_mock_unittest.cc b/chromeos-dbus-bindings/proxy_generator_mock_unittest.cc
index f12b8ec..aebc973 100644
--- a/chromeos-dbus-bindings/proxy_generator_mock_unittest.cc
+++ b/chromeos-dbus-bindings/proxy_generator_mock_unittest.cc
@@ -131,8 +131,8 @@ class ProxyGeneratorMockTest : public Test {
   base::FilePath CreateInputFile(const string& contents) {
     base::FilePath path;
     EXPECT_TRUE(base::CreateTemporaryFileInDir(temp_dir_.path(), &path));
-    EXPECT_EQ(contents.size(),
-              base::WriteFile(path, contents.c_str(), contents.size()));
+    int written = base::WriteFile(path, contents.c_str(), contents.size());
+    EXPECT_EQ(contents.size(), static_cast<size_t>(written));
     return path;
   }
 
diff --git a/chromeos-dbus-bindings/proxy_generator_unittest.cc b/chromeos-dbus-bindings/proxy_generator_unittest.cc
index 653bb8e..165bd61 100644
--- a/chromeos-dbus-bindings/proxy_generator_unittest.cc
+++ b/chromeos-dbus-bindings/proxy_generator_unittest.cc
@@ -1256,8 +1256,8 @@ class ProxyGeneratorTest : public Test {
   base::FilePath CreateInputFile(const string& contents) {
     base::FilePath path;
     EXPECT_TRUE(base::CreateTemporaryFileInDir(temp_dir_.path(), &path));
-    EXPECT_EQ(contents.size(),
-              base::WriteFile(path, contents.c_str(), contents.size()));
+    int written = base::WriteFile(path, contents.c_str(), contents.size());
+    EXPECT_EQ(contents.size(), static_cast<size_t>(written));
     return path;
   }
 
diff --git a/chromeos-dbus-bindings/xml_interface_parser_unittest.cc b/chromeos-dbus-bindings/xml_interface_parser_unittest.cc
index 8876b16..69173ec 100644
--- a/chromeos-dbus-bindings/xml_interface_parser_unittest.cc
+++ b/chromeos-dbus-bindings/xml_interface_parser_unittest.cc
@@ -75,34 +75,34 @@ TEST_F(XmlInterfaceParserTest, GoodInputFile) {
   EXPECT_TRUE(parser_.ParseXmlInterfaceFile(kGoodInterfaceFileContents,
                                             {"DummyInterface"}));
   const vector<Interface>& interfaces = parser_.interfaces();
-  ASSERT_EQ(1, interfaces.size());
+  ASSERT_EQ(1u, interfaces.size());
   const Interface& interface = interfaces.back();
 
   EXPECT_EQ(kInterfaceName, interface.name);
   EXPECT_EQ("/org/chromium/Test", interface.path);
-  ASSERT_EQ(2, interface.methods.size());
-  ASSERT_EQ(1, interface.signals.size());
+  ASSERT_EQ(2u, interface.methods.size());
+  ASSERT_EQ(1u, interface.signals.size());
 
   // <method name="Scan">
   EXPECT_EQ(kScanMethod, interface.methods[0].name);
   EXPECT_EQ(Interface::Method::Kind::kAsync, interface.methods[0].kind);
   EXPECT_FALSE(interface.methods[0].is_const);
   EXPECT_TRUE(interface.methods[0].include_dbus_message);
-  ASSERT_EQ(1, interface.methods[0].input_arguments.size());
+  ASSERT_EQ(1u, interface.methods[0].input_arguments.size());
 
   // <arg name="args" type="a{sv}" direction="in"/>
   EXPECT_EQ(kArgsArgument, interface.methods[0].input_arguments[0].name);
   EXPECT_EQ(kArrayStringVariantType,
             interface.methods[0].input_arguments[0].type);
-  EXPECT_EQ(0, interface.methods[0].output_arguments.size());
+  EXPECT_EQ(0u, interface.methods[0].output_arguments.size());
 
   // <method name="GetBlob">
   EXPECT_EQ(kGetBlobMethod, interface.methods[1].name);
   EXPECT_EQ(Interface::Method::Kind::kNormal, interface.methods[1].kind);
   EXPECT_TRUE(interface.methods[1].is_const);
   EXPECT_FALSE(interface.methods[1].include_dbus_message);
-  EXPECT_EQ(1, interface.methods[1].input_arguments.size());
-  EXPECT_EQ(1, interface.methods[1].output_arguments.size());
+  EXPECT_EQ(1u, interface.methods[1].input_arguments.size());
+  EXPECT_EQ(1u, interface.methods[1].output_arguments.size());
 
   // <arg name="name" type="s"/>  (direction="in" is implicit)
   EXPECT_EQ(kNameArgument, interface.methods[1].input_arguments[0].name);
@@ -114,7 +114,7 @@ TEST_F(XmlInterfaceParserTest, GoodInputFile) {
 
   // <signal name="BSSRemoved">
   EXPECT_EQ(kBssRemovedSignal, interface.signals[0].name);
-  EXPECT_EQ(1, interface.signals[0].arguments.size());
+  EXPECT_EQ(1u, interface.signals[0].arguments.size());
 
   // <arg name="BSS" type="o"/>
   EXPECT_EQ(kBssArgument, interface.signals[0].arguments[0].name);