Fix new -Wconstant-conversion versions after clang r259271

http://llvm.org/viewvc/llvm-project?view=revision&revision=259271 made clang's -Wconversion stricter. This (together with https://chromium-review.googlesource.com/#/c/324860/) fixes all new instances in a chromium/mac build. No behavior change. BUG=none Review URL: https://codereview.chromium.org/1650843002 Cr-Commit-Position: refs/heads/master@{#372689}
Denger-Network · Feb 1, 2016 · 4e290e7 · 4e290e7
1 parent 4d11b74
commit 4e290e7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/rlz/lib/machine_id_unittest.cc b/rlz/lib/machine_id_unittest.cc
@@ -14,7 +14,7 @@ TEST(MachineDealCodeTestMachineId, MachineId) {
   base::string16 computer_sid(base::UTF8ToUTF16(
         "S-1-5-21-2345599882-2448789067-1921365677"));
   std::string id;
-  rlz_lib::testing::GetMachineIdImpl(computer_sid, 2651229008, &id);
+  rlz_lib::testing::GetMachineIdImpl(computer_sid, -1643738288, &id);
   EXPECT_STREQ("A341BA986A7E86840688977FCF20C86E253F00919E068B50F8",
                id.c_str());
 }
diff --git a/tools/battor_agent/battor_connection_impl_unittest.cc b/tools/battor_agent/battor_connection_impl_unittest.cc
@@ -198,7 +198,7 @@ TEST_F(BattOrConnectionImplTest, ReadMessageInvalidType) {
 
   const char data[] = {
       BATTOR_CONTROL_BYTE_START,
-      UINT8_MAX,
+      static_cast<char>(UINT8_MAX),
       BATTOR_CONTROL_BYTE_ESCAPE,
       BATTOR_CONTROL_MESSAGE_TYPE_RESET,
       0x04,