diff --git a/DEPS b/DEPS index 5c35e6d6..74e2522f 100644 --- a/DEPS +++ b/DEPS @@ -38,7 +38,7 @@ deps = { 'crashpad/third_party/mini_chromium/mini_chromium': Var('chromium_git') + '/chromium/mini_chromium@' + - 'dc3d480305b27a5a1fb57f51a997529e00fed00b', + 'ef0ded8717340c9fe48e8e0f34f3e0e74d10a392', 'crashpad/third_party/zlib/zlib': Var('chromium_git') + '/chromium/src/third_party/zlib@' + '13dc246a58e4b72104d35f9b1809af95221ebda7', diff --git a/client/prune_crash_reports_test.cc b/client/prune_crash_reports_test.cc index 14eb2e0b..130ea72a 100644 --- a/client/prune_crash_reports_test.cc +++ b/client/prune_crash_reports_test.cc @@ -14,12 +14,14 @@ #include "client/prune_crash_reports.h" +#include #include #include #include #include +#include "base/numerics/safe_conversions.h" #include "base/rand_util.h" #include "gmock/gmock.h" #include "gtest/gtest.h" @@ -209,8 +211,8 @@ TEST(PruneCrashReports, PruneOrder) { reports.push_back(temp); } // The randomness from std::rand() is not, so use a better rand() instead. - const auto random_generator = [](int rand_max) { - return base::RandInt(0, rand_max - 1); + const auto random_generator = [](ptrdiff_t rand_max) { + return base::RandInt(0, base::checked_cast(rand_max) - 1); }; std::random_shuffle(reports.begin(), reports.end(), random_generator); std::vector pending_reports( diff --git a/snapshot/win/crashpad_snapshot_test_crashing_child.cc b/snapshot/win/crashpad_snapshot_test_crashing_child.cc index 2cfb9906..b0caa065 100644 --- a/snapshot/win/crashpad_snapshot_test_crashing_child.cc +++ b/snapshot/win/crashpad_snapshot_test_crashing_child.cc @@ -12,6 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include #include #include "base/files/file_path.h" diff --git a/snapshot/win/crashpad_snapshot_test_dump_without_crashing.cc b/snapshot/win/crashpad_snapshot_test_dump_without_crashing.cc index b6c9814a..a9fbdcf5 100644 --- a/snapshot/win/crashpad_snapshot_test_dump_without_crashing.cc +++ b/snapshot/win/crashpad_snapshot_test_dump_without_crashing.cc @@ -12,6 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include #include #include "base/logging.h"