chromium 122.0.6226.2

4 files changed, 317 insertions, 4 deletions

diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index f78fb6f..92302c1 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -31,6 +31,8 @@ AUX chromium-120-speech-dispatcher-include.h 2233 BLAKE2B df78a67015752df51d8b85
 AUX chromium-121-blink_libxml2_downgrade.patch 1306 BLAKE2B 0b92ec706b32bd54e5c26793b7775c60952c452dc323ca706b0bf4bc90f599a1395258350c2acdd8bcd1e0af7e410b9e7469a0cf8be931a787b726acd3c9fc0a SHA512 0829d6c840cd6a371f7e47d8e350be0b928970ac8ea8b6131528046ca4d2ff36947066a317af92a9377cc9ed0fb2668eeea1d07f4c7c83b75aa581490fa01281
 AUX chromium-121-icu74.patch 667 BLAKE2B 5370787b44b68eee8180429f58b183da325756f5b1ff2fab49c5919a5a16f08a08aeabf722e750d4dbae59b4c5a34b73c754ed44be98667021000ebd6ee4f008 SHA512 ff141a090cbb1e136cdfea581e8880c6b63da0ec2d49c43e6885a2410782c31622dba45668bd4e62b8d080b01103d0acdc98b7b7340a2882cf5ace7181cd5daf
 AUX chromium-121-qrgen-disablerust.patch 3295 BLAKE2B 6ba03f01ee7c14d7dff1c8d8890f5242e4ef706fba4582cd232fd48a02ed360fa51ad4f34f4e4a3a36864549f855bbd984eb9e34d766eea65e7e7079088640db SHA512 dfd94c7fa2c414e5a7f78bcb1a17618fe20796a23ea8449a88e69e8bf508a693052bbe3c033ff45fdd6d06b6765db43fcfc7faea483d55e46a51b67ec7bd9d1f
+AUX chromium-122-VirtualCursor-std-layout.patch 8478 BLAKE2B 755a985a4e4049d8fd5850a202d09bd98348ae1336a23fb3dcb58e9a8c9f538943072dcd4aa02f99be04c44958f8843ea82217c8475e87adf7e706dc50decc4c SHA512 848a14d504d3b4f463c8b91c830c95aef2128ccadf097213d617d87db68a8b1dce6b96ca2ae0f790751402643ec72475285ca4a207a20cb88ffdfdb1e6b7afce
+AUX chromium-122-qrgen-disablerust.patch 3378 BLAKE2B 34ac10a8f53f46cce4e77ad2b9d8e78113905be04a45965532ed8b6f5a0ee8348636a1f38970b3dcdeec6730d508b429db1f952da5a63979b0e11c175b97376d SHA512 6377ea12dae8caee1daab4c2ec29920e4211b3ebde1dbf3e2f1eb034aedc1ef97a7bfbe3723c869d8b39cad47848e40733bed2998e0e9bb3fd6912d71a203471
 AUX chromium-78-protobuf-RepeatedPtrField-export.patch 694 BLAKE2B 3fffcb6a7289bac848b89275a9f76e4302042362fa9bcf2689df01e0a00806c7e838210fa8696ee8e2134127ec4cfb5c3b632e2739c225f8e9586e01de7035ce SHA512 e3a80775d958740eedc7c3df0e9dd12b0e6a51ccf871a2085ab77246814e748428133d27c60322a102eb8f50bb65fc2c607e0d2665a92393be55befcbf566ab0
 AUX chromium-93-InkDropHost-crash.patch 1134 BLAKE2B 1593c406c48b629ea3170a518cf86e936af36c554bc97a380324ab6fc930e49a359dc3ef6787ab08314a6a8f5da85714b0fa9d8589d6a46b1d06cbbd7e401f22 SHA512 474d7f55505e1275238d71d1723d74a66fc9f27a16ed293aa80ffefbe5500cd65a0bf13ec76a9bca0334a245f22120099fb367d12b93adc14500104d11cd3bff
 AUX chromium-98-EnumTable-crash.patch 2854 BLAKE2B 4478e14e7f0c0d251b659546c2e4b83b712b072317c35f63376d7d58e2fa3563f0518b4cc333c5902140cfcd333b5860737d4c7ccbb3680fee1b60de25ad0917 SHA512 a1b55b04da7218cda037a38a543032aa741a589d2f0691d69f28eb173ffeff284d2f4da2cab1708335ecfc0a3c12ecbd57c4c48dee3eca44d659d9a3f9a7dff6
@@ -41,8 +43,8 @@ AUX chromium-launcher-r7.sh 1631 BLAKE2B ae28d758264446511fd2b64ba69fe920144b351
 AUX chromium-shim_headers.patch 1510 BLAKE2B 9716cd250b249c6255aca01a385ef8a2a6f1df9ea3cf7499715543c14f8be62fd323b6048b890aa2be45891e7a765d92de3f41c3b3a88c08dae4b806c048e20f SHA512 c74bcf690a41b4f9b364477d23408d493aa674e3bd014940098a594471297c2a425241f908510061b5f11c9cfe009c4a803370edd757d3c0ab8d9c0cc128135c
 AUX chromium-use-oauth2-client-switches-as-default.patch 1085 BLAKE2B baf3c463305934c126af4f7c5be305863edc7eec3add5b5ada30565b49b5944021eb40f1a9643e7eec3f973c502d9b02426f00b760570fcea5f1509219e41c6f SHA512 fe2878ee45778bac894ea17a668511d27ad2ca40988d5f11439790b700bfefd6560f3931415b4e6c543fcbbfc7cfef55cc757ed4ace1d111039ae78c46b81945
 AUX chromium.default 148 BLAKE2B 5ee5b582c59a6e4bef87bbb0e232e2470ad412b1fbbb3b9af6ef7153edb55c5b9080cc16a5a115b0c5b3c381aa87ce57a7b12bdd2070e67dac10a6c2995ddbaf SHA512 0d4849e03592fb58b05e62a43021eca7e61615616c8907c3b2e445402e03adaf9e8fa25b0a745d6c31eb037456215cc02b59e345a3a06d932e76cf990c92d739
-DIST chromium-121.0.6156.3.tar.xz 3310473440 BLAKE2B 7fa5df2b749ec30617e83282260bd75b6c332ae9296dc9a48bd179a8537973e6834bfa316cbaf472f9c611140a05c2be5f04371b9ccabffc204477046ec23695 SHA512 1f8b5280f562776b37c91714c709e4d0941bb5c3b2a3677266585911bd8a4a5ea1f65382c66a9920af5847f7d5dc25ff29f8d0acc0678ed1fd14d80480f9c9ef
 DIST chromium-122.0.6170.5.tar.xz 3309112384 BLAKE2B 639f1bf86b425abd9ea5a0ca66390be77333723b010ea3eb30f1f0d0ddea3b18398c14884022e46a5e63c8dbf26d642685105cba8a4b84ac0f205db4c2d04cd1 SHA512 eac05555aac60baf86459328b28737d05e50bffe9f1e8c04c55f78f9c425ea30e51445fe197a6daa63c7bc22c81704c74669df0ded2db03745281b122abc8b76
+DIST chromium-122.0.6226.2.tar.xz 3305442564 BLAKE2B dc1030f1913f18ebdf382bab858a66ea555b0ee213cb02a6116cd7e68eaefec90fe2539a951efb9de01cb288106f6d521c833417f77e78a60367a4603a8d55e8 SHA512 69843914e50479111b993eadae3fa7a467d5c84c60e8ec1aa1a7e69a2401432d4d3ecf54ee71a9873e8f0f0207940a3729da67b3caf761c237b1afa9ab2976ad
 DIST chromium-profiler-0.2.tar 259952640 BLAKE2B 5e82389fce00b267280d633b26551231c558b80f0c92cd7d60271095a3503365ab673e7a46dc5f74f8a82db1f21262cb24dcc0531d954bab5fb3b175dab3394d SHA512 9fa89a5ab728419683e7495ae676567480987d68a2d589f2aa97bfcbcf123f3c8f97f8bca5f65e5e3f6e41475535add473ded83b9c7a33bb4746a9d05b298a6c
-EBUILD chromium-121.0.6156.3.ebuild 39048 BLAKE2B 487dcb1f9aa3572f38dcaf01b9887d758d4f59e6724f4ebe43222a0c14416d48033df53a2fe416fec2167b2a471788a0df4a17fe1bde4fb7a07200d04b7a24b9 SHA512 0a0ab962ac73ce8e43ab2e6644d14a2dcc5ff2d3a5ecb6d53124177e98371c8c0f4bd8cbb4b03e501a4e0bf6b6f82c09121b313eff1e6f4d3f5192e7bad8b2cd
 EBUILD chromium-122.0.6170.5.ebuild 39048 BLAKE2B 487dcb1f9aa3572f38dcaf01b9887d758d4f59e6724f4ebe43222a0c14416d48033df53a2fe416fec2167b2a471788a0df4a17fe1bde4fb7a07200d04b7a24b9 SHA512 0a0ab962ac73ce8e43ab2e6644d14a2dcc5ff2d3a5ecb6d53124177e98371c8c0f4bd8cbb4b03e501a4e0bf6b6f82c09121b313eff1e6f4d3f5192e7bad8b2cd
+EBUILD chromium-122.0.6226.2.ebuild 39048 BLAKE2B dd9db60b3bb9dfe78c6ea87529b34aad634c12c713960ad4764c08aa1c8804484dea0c134db42fa143e53b0b7c7fa28c96dc5bdadc016b77de1f77b6bd61781b SHA512 28f1c6984439183e8e27c5bd9cd9d43122671661a742a771bf657c499e251e46417f2aab57686c64253e5709a69c19b1b77f2e861c32779c90bbf624c27fe20a
diff --git a/www-client/chromium/chromium-121.0.6156.3.ebuild b/www-client/chromium/chromium-122.0.6226.2.ebuild
index dd2529d..61a1e2a 100644
--- a/www-client/chromium/chromium-121.0.6156.3.ebuild
+++ b/www-client/chromium/chromium-122.0.6226.2.ebuild
@@ -319,7 +319,7 @@ src_prepare() {
 	local PATCHES=(
 		"${FILESDIR}/chromium-105-protobuf-RepeatedPtrField-export.patch"
 		"${FILESDIR}/chromium-120-compiler.patch"
-		"${FILESDIR}/chromium-114-VirtualCursor-std-layout.patch"
+		"${FILESDIR}/chromium-122-VirtualCursor-std-layout.patch"
 		"${FILESDIR}/chromium-119-minizip.patch"
 		"${FILESDIR}/chromium-113-authenticator-request-dialog-model-include.patch"
 		"${FILESDIR}/chromium-118-blink-buildgn.patch"
@@ -327,7 +327,7 @@ src_prepare() {
 		"${FILESDIR}/chromium-118-freetype-blink.patch"
 		"${FILESDIR}/chromium-119-minizip-types.patch"
 		"${FILESDIR}/chromium-121-blink_libxml2_downgrade.patch"
-		"${FILESDIR}/chromium-121-qrgen-disablerust.patch"
+		"${FILESDIR}/chromium-122-qrgen-disablerust.patch"
 		"${FILESDIR}/chromium-121-icu74.patch"
 
 		"${FILESDIR}/chromium-111-InkDropHost-crash.patch"
diff --git a/www-client/chromium/files/chromium-122-VirtualCursor-std-layout.patch b/www-client/chromium/files/chromium-122-VirtualCursor-std-layout.patch
new file mode 100644
index 0000000..822a9b7
--- /dev/null
+++ b/www-client/chromium/files/chromium-122-VirtualCursor-std-layout.patch
@@ -0,0 +1,219 @@
+diff --git a/sql/recover_module/btree.cc b/sql/recover_module/btree.cc
+index ad985a3d7c..a013c4df17 100644
+--- a/sql/recover_module/btree.cc
++++ b/sql/recover_module/btree.cc
+@@ -136,16 +136,22 @@ static_assert(std::is_trivially_destructible<LeafPageDecoder>::value,
+               "Move the destructor to the .cc file if it's non-trival");
+ #endif  // !DCHECK_IS_ON()
+ 
+-LeafPageDecoder::LeafPageDecoder(DatabasePageReader* db_reader) noexcept
+-    : page_id_(db_reader->page_id()),
+-      db_reader_(db_reader),
+-      cell_count_(ComputeCellCount(db_reader)),
+-      next_read_index_(0),
+-      last_record_size_(0) {
++LeafPageDecoder::LeafPageDecoder() noexcept = default;
++
++void LeafPageDecoder::Initialize(DatabasePageReader* db_reader) {
++  page_id_ = db_reader->page_id();
++  db_reader_ = db_reader;
++  cell_count_ = ComputeCellCount(db_reader);
++  next_read_index_ = 0;
++  last_record_size_ = 0;
+   DCHECK(IsOnValidPage(db_reader));
+   DCHECK(DatabasePageReader::IsValidPageId(page_id_));
+ }
+ 
++void LeafPageDecoder::Reset() {
++  db_reader_ = nullptr;
++}
++
+ bool LeafPageDecoder::TryAdvance() {
+   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+   DCHECK(CanAdvance());
+diff --git a/sql/recover_module/btree.h b/sql/recover_module/btree.h
+index 155be1ef17..ed27107804 100644
+--- a/sql/recover_module/btree.h
++++ b/sql/recover_module/btree.h
+@@ -104,9 +104,7 @@ class LeafPageDecoder {
+  public:
+   // Creates a decoder for a DatabasePageReader's last read page.
+   //
+-  // |db_reader| must have been used to read an inner page of a table B-tree.
+-  // |db_reader| must outlive this instance.
+-  explicit LeafPageDecoder(DatabasePageReader* db_reader) noexcept;
++  LeafPageDecoder() noexcept;
+   ~LeafPageDecoder() noexcept = default;
+ 
+   LeafPageDecoder(const LeafPageDecoder&) = delete;
+@@ -154,6 +152,17 @@ class LeafPageDecoder {
+   // read as long as CanAdvance() returns true.
+   bool TryAdvance();
+ 
++  // Initialize with DatabasePageReader
++  // |db_reader| must have been used to read an inner page of a table B-tree.
++  // |db_reader| must outlive this instance.
++  void Initialize(DatabasePageReader* db_reader);
++
++  // Reset internal DatabasePageReader
++  void Reset();
++
++  // True if DatabasePageReader is valid
++  bool IsValid() { return (db_reader_ != nullptr); }
++
+   // True if the given reader may point to an inner page in a table B-tree.
+   //
+   // The last ReadPage() call on |db_reader| must have succeeded.
+@@ -167,16 +176,16 @@ class LeafPageDecoder {
+   static int ComputeCellCount(DatabasePageReader* db_reader);
+ 
+   // The number of the B-tree page this reader is reading.
+-  const int64_t page_id_;
++  int64_t page_id_;
+   // Used to read the tree page.
+   //
+   // Raw pointer usage is acceptable because this instance's owner is expected
+   // to ensure that the DatabasePageReader outlives this.
+   // This field is not a raw_ptr<> because it caused a
+   // std::is_trivially_destructible static_assert failure.
+-  RAW_PTR_EXCLUSION DatabasePageReader* const db_reader_;
++  RAW_PTR_EXCLUSION DatabasePageReader* db_reader_;
+   // Caches the ComputeCellCount() value for this reader's page.
+-  const int cell_count_ = ComputeCellCount(db_reader_);
++  int cell_count_;
+ 
+   // The reader's cursor state.
+   //
+diff --git a/sql/recover_module/cursor.cc b/sql/recover_module/cursor.cc
+index 8983af57e5..de5157c5a8 100644
+--- a/sql/recover_module/cursor.cc
++++ b/sql/recover_module/cursor.cc
+@@ -28,7 +28,7 @@ VirtualCursor::~VirtualCursor() {
+ int VirtualCursor::First() {
+   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+   inner_decoders_.clear();
+-  leaf_decoder_ = nullptr;
++  leaf_decoder_.Reset();
+ 
+   AppendPageDecoder(table_->root_page_id());
+   return Next();
+@@ -38,18 +38,18 @@ int VirtualCursor::Next() {
+   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+   record_reader_.Reset();
+ 
+-  while (!inner_decoders_.empty() || leaf_decoder_.get()) {
+-    if (leaf_decoder_.get()) {
+-      if (!leaf_decoder_->CanAdvance()) {
++  while (!inner_decoders_.empty() || leaf_decoder_.IsValid()) {
++    if (leaf_decoder_.IsValid()) {
++      if (!leaf_decoder_.CanAdvance()) {
+         // The leaf has been exhausted. Remove it from the DFS stack.
+-        leaf_decoder_ = nullptr;
++        leaf_decoder_.Reset();
+         continue;
+       }
+-      if (!leaf_decoder_->TryAdvance())
++      if (!leaf_decoder_.TryAdvance())
+         continue;
+ 
+-      if (!payload_reader_.Initialize(leaf_decoder_->last_record_size(),
+-                                      leaf_decoder_->last_record_offset())) {
++      if (!payload_reader_.Initialize(leaf_decoder_.last_record_size(),
++                                      leaf_decoder_.last_record_offset())) {
+         continue;
+       }
+       if (!record_reader_.Initialize())
+@@ -102,13 +102,13 @@ int VirtualCursor::ReadColumn(int column_index,
+ int64_t VirtualCursor::RowId() {
+   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+   DCHECK(record_reader_.IsInitialized());
+-  DCHECK(leaf_decoder_.get());
+-  return leaf_decoder_->last_record_rowid();
++  DCHECK(leaf_decoder_.IsValid());
++  return leaf_decoder_.last_record_rowid();
+ }
+ 
+ void VirtualCursor::AppendPageDecoder(int page_id) {
+   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+-  DCHECK(leaf_decoder_.get() == nullptr)
++  DCHECK(!leaf_decoder_.IsValid())
+       << __func__
+       << " must only be called when the current path has no leaf decoder";
+ 
+@@ -116,7 +116,7 @@ void VirtualCursor::AppendPageDecoder(int page_id) {
+     return;
+ 
+   if (LeafPageDecoder::IsOnValidPage(&db_reader_)) {
+-    leaf_decoder_ = std::make_unique<LeafPageDecoder>(&db_reader_);
++    leaf_decoder_.Initialize(&db_reader_);
+     return;
+   }
+ 
+diff --git a/sql/recover_module/cursor.h b/sql/recover_module/cursor.h
+index 4cb0655700..4be15393e3 100644
+--- a/sql/recover_module/cursor.h
++++ b/sql/recover_module/cursor.h
+@@ -128,7 +128,7 @@ class VirtualCursor {
+   std::vector<std::unique_ptr<InnerPageDecoder>> inner_decoders_;
+ 
+   // Decodes the leaf page containing records.
+-  std::unique_ptr<LeafPageDecoder> leaf_decoder_;
++  LeafPageDecoder leaf_decoder_;
+ 
+   SEQUENCE_CHECKER(sequence_checker_);
+ };
+diff --git a/sql/recover_module/pager.cc b/sql/recover_module/pager.cc
+index 7f5b368e51..cb7e2fda21 100644
+--- a/sql/recover_module/pager.cc
++++ b/sql/recover_module/pager.cc
+@@ -24,8 +24,7 @@ static_assert(DatabasePageReader::kMaxPageId <= std::numeric_limits<int>::max(),
+               "ints are not appropriate for representing page IDs");
+ 
+ DatabasePageReader::DatabasePageReader(VirtualTable* table)
+-    : page_data_(std::make_unique<uint8_t[]>(table->page_size())),
+-      table_(table) {
++    : page_data_(table->page_size()), table_(table) {
+   CHECK(table != nullptr);
+   CHECK(IsValidPageSize(table->page_size()));
+ }
+@@ -59,7 +58,7 @@ int DatabasePageReader::ReadPage(int page_id) {
+                 "The |read_offset| computation above may overflow");
+ 
+   int sqlite_status =
+-      RawRead(sqlite_file, read_size, read_offset, page_data_.get());
++      RawRead(sqlite_file, read_size, read_offset, page_data_.data());
+ 
+   // |page_id_| needs to be set to kHighestInvalidPageId if the read failed.
+   // Otherwise, future ReadPage() calls with the previous |page_id_| value
+diff --git a/sql/recover_module/pager.h b/sql/recover_module/pager.h
+index d60c5a4f07..f39ce84d74 100644
+--- a/sql/recover_module/pager.h
++++ b/sql/recover_module/pager.h
+@@ -6,8 +6,8 @@
+ #define SQL_RECOVER_MODULE_PAGER_H_
+ 
+ #include <cstdint>
+-#include <memory>
+ #include <ostream>
++#include <vector>
+ 
+ #include "base/check_op.h"
+ #include "base/memory/raw_ptr.h"
+@@ -73,7 +73,7 @@ class DatabasePageReader {
+     DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+     CHECK(IsValidPageId(page_id_))
+         << "Successful ReadPage() required before accessing pager state";
+-    return page_data_.get();
++    return page_data_.data();
+   }
+ 
+   // The number of bytes in the page read by the last ReadPage() call.
+@@ -140,7 +140,7 @@ class DatabasePageReader {
+   int page_id_ = kHighestInvalidPageId;
+   // Stores the bytes of the last page successfully read by ReadPage().
+   // The content is undefined if the last call to ReadPage() did not succeed.
+-  const std::unique_ptr<uint8_t[]> page_data_;
++  const std::vector<uint8_t> page_data_;
+   // Raw pointer usage is acceptable because this instance's owner is expected
+   // to ensure that the VirtualTable outlives this.
+   const raw_ptr<VirtualTable> table_;
diff --git a/www-client/chromium/files/chromium-122-qrgen-disablerust.patch b/www-client/chromium/files/chromium-122-qrgen-disablerust.patch
new file mode 100644
index 0000000..2f049cf
--- /dev/null
+++ b/www-client/chromium/files/chromium-122-qrgen-disablerust.patch
@@ -0,0 +1,92 @@
+diff --git a/components/qr_code_generator/BUILD.gn b/components/qr_code_generator/BUILD.gn
+index c45d0c4039..ba2e27878b 100644
+--- a/components/qr_code_generator/BUILD.gn
++++ b/components/qr_code_generator/BUILD.gn
+@@ -3,7 +3,7 @@
+ # found in the LICENSE file.
+ 
+ import("//build/buildflag_header.gni")
+-import("//build/config/rust.gni")
++# import("//build/config/rust.gni")
+ import("//testing/libfuzzer/fuzzer_test.gni")
+ 
+ declare_args() {
+@@ -40,20 +40,20 @@ source_set("qr_code_generator") {
+   ]
+   deps = [
+     ":qr_code_generator_features",
+-    ":qr_code_generator_ffi_glue",
++#    ":qr_code_generator_ffi_glue",
+     "//base",
+   ]
+   public_deps = [ "//base" ]
+ }
+ 
+-rust_static_library("qr_code_generator_ffi_glue") {
+-  allow_unsafe = true  # Needed for FFI that underpins the `cxx` crate.
+-  crate_root = "qr_code_generator_ffi_glue.rs"
+-  sources = [ "qr_code_generator_ffi_glue.rs" ]
+-  cxx_bindings = [ "qr_code_generator_ffi_glue.rs" ]
+-  visibility = [ ":qr_code_generator" ]
+-  deps = [ "//third_party/rust/qr_code/v2:lib" ]
+-}
++#rust_static_library("qr_code_generator_ffi_glue") {
++#  allow_unsafe = true  # Needed for FFI that underpins the `cxx` crate.
++#  crate_root = "qr_code_generator_ffi_glue.rs"
++#  sources = [ "qr_code_generator_ffi_glue.rs" ]
++#  cxx_bindings = [ "qr_code_generator_ffi_glue.rs" ]
++#  visibility = [ ":qr_code_generator" ]
++#  deps = [ "//third_party/rust/qr_code/v2:lib" ]
++#}
+ 
+ source_set("unit_tests") {
+   testonly = true
+diff --git a/components/qr_code_generator/qr_code_generator.cc b/components/qr_code_generator/qr_code_generator.cc
+index 39c59ee3b4..e0d26ef086 100644
+--- a/components/qr_code_generator/qr_code_generator.cc
++++ b/components/qr_code_generator/qr_code_generator.cc
+@@ -11,12 +11,12 @@
+ #include <vector>
+ 
+ #include "base/check_op.h"
+-#include "base/containers/span_rust.h"
++//#include "base/containers/span_rust.h"
+ #include "base/memory/raw_ptr.h"
+ #include "base/notreached.h"
+ #include "base/numerics/safe_conversions.h"
+ #include "components/qr_code_generator/features.h"
+-#include "components/qr_code_generator/qr_code_generator_ffi_glue.rs.h"
++//#include "components/qr_code_generator/qr_code_generator_ffi_glue.rs.h"
+ 
+ namespace qr_code_generator {
+ 
+@@ -572,7 +572,7 @@ size_t SegmentSpanLength(base::span<const QRCodeGenerator::Segment> segments) {
+   return sum;
+ }
+ 
+-absl::optional<QRCodeGenerator::GeneratedCode> GenerateQrCodeUsingRust(
++/*absl::optional<QRCodeGenerator::GeneratedCode> GenerateQrCodeUsingRust(
+     base::span<const uint8_t> in,
+     absl::optional<int> min_version) {
+   rust::Slice<const uint8_t> rs_in = base::SpanToRustSlice(in);
+@@ -595,7 +595,7 @@ absl::optional<QRCodeGenerator::GeneratedCode> GenerateQrCodeUsingRust(
+   code.qr_size = base::checked_cast<int>(result_width);
+   CHECK_EQ(code.data.size(), static_cast<size_t>(code.qr_size * code.qr_size));
+   return code;
+-}
++}*/
+ 
+ }  // namespace
+ 
+@@ -613,9 +613,9 @@ QRCodeGenerator::GeneratedCode::~GeneratedCode() = default;
+ absl::optional<QRCodeGenerator::GeneratedCode> QRCodeGenerator::Generate(
+     base::span<const uint8_t> in,
+     absl::optional<int> min_version) {
+-  if (IsRustyQrCodeGeneratorFeatureEnabled()) {
++  /*if (IsRustyQrCodeGeneratorFeatureEnabled()) {
+     return GenerateQrCodeUsingRust(in, min_version);
+-  }
++  }*/
+ 
+   if (in.size() > kMaxInputSize) {
+     return absl::nullopt;