diff --git a/crypto/BUILD.gn b/crypto/BUILD.gn index f8d58ae34dae..8b64afc0ddee 100644 --- a/crypto/BUILD.gn +++ b/crypto/BUILD.gn @@ -4,9 +4,10 @@ import("//build/buildflag_header.gni") import("//build/config/chromeos/ui_mode.gni") -# import("//components/nacl/toolchain.gni") +if (!use_cobalt_customizations) { +import("//components/nacl/toolchain.gni") +} import("//crypto/features.gni") -import("//build_overrides/crypto.gni") import("//testing/test.gni") buildflag_header("buildflags") { diff --git a/crypto/METADATA b/crypto/METADATA index b9ff5a1cbeac..fffa850fa0b3 100644 --- a/crypto/METADATA +++ b/crypto/METADATA @@ -5,12 +5,12 @@ description: third_party { identifier { type: "ChromiumVersion" - value: "114.0.5735.331" # from https://chromereleases.googleblog.com/2023/08/long-term-support-channel-update-for_23.html + value: "114.0.5735.358" # from https://chromereleases.googleblog.com/2024/03/long-term-support-channel-update-for_26.html } identifier { type: "Git" value: "https://chromium.googlesource.com/chromium/src.git" - version: "fed499399d3f44d3a7957549d493bf30a5d8c867" + version: "1759c6ae9316996b9f150c0ce9d0ca78a3d15c02" } identifier { type: "UpstreamSubdir" diff --git a/crypto/ec_private_key.cc b/crypto/ec_private_key.cc index 3994a8a00a3a..2b56908a28ac 100644 --- a/crypto/ec_private_key.cc +++ b/crypto/ec_private_key.cc @@ -11,7 +11,6 @@ #include "base/check_op.h" #include "crypto/openssl_util.h" -#include "third_party/boringssl/src/include/openssl/bn.h" #include "third_party/boringssl/src/include/openssl/bytestring.h" #include "third_party/boringssl/src/include/openssl/ec.h" #include "third_party/boringssl/src/include/openssl/ec_key.h" diff --git a/crypto/ec_private_key_unittest.cc b/crypto/ec_private_key_unittest.cc index 863fdc8bfe6d..12ec3c94e06d 100644 --- a/crypto/ec_private_key_unittest.cc +++ b/crypto/ec_private_key_unittest.cc @@ -9,7 +9,6 @@ #include #include -#include "base/macros.h" #include "testing/gtest/include/gtest/gtest.h" namespace { diff --git a/crypto/ec_signature_creator_impl.cc b/crypto/ec_signature_creator_impl.cc index f81fceffd200..3129ef487231 100644 --- a/crypto/ec_signature_creator_impl.cc +++ b/crypto/ec_signature_creator_impl.cc @@ -7,7 +7,6 @@ #include #include -#include "base/logging.h" #include "crypto/ec_private_key.h" #include "crypto/openssl_util.h" #include "third_party/boringssl/src/include/openssl/bn.h" diff --git a/crypto/hmac_unittest.cc b/crypto/hmac_unittest.cc index 2c48ccfef2ad..364503791980 100644 --- a/crypto/hmac_unittest.cc +++ b/crypto/hmac_unittest.cc @@ -2,12 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "crypto/hmac.h" + #include +#include #include -#include "base/macros.h" -#include "crypto/hmac.h" #include "testing/gtest/include/gtest/gtest.h" static const size_t kSHA1DigestSize = 20; diff --git a/crypto/secure_util.cc b/crypto/secure_util.cc index 659f46663952..a1ff9e45ccc2 100644 --- a/crypto/secure_util.cc +++ b/crypto/secure_util.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include - #include "crypto/secure_util.h" #include "third_party/boringssl/src/include/openssl/mem.h"