squash! 121.0.6167.57

checkpoint
little-bear-labs · Jan 16, 2024 · 95d399b · 95d399b
1 parent 826f6ba
commit 95d399b
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 944 deletions.
diff --git a/chromium_edits/120.0.6099.200/url/url_canon_ipfs.cc b/chromium_edits/120.0.6099.200/url/url_canon_ipfs.cc
@@ -35,8 +35,7 @@ bool url::CanonicalizeIpfsURL(const char* spec,
   Parsed parsed_input;
   ParseStandardURL(spec, spec_len, &parsed_input);
   return CanonicalizeStandardURL(
-      spec,
-      spec_len,
+      spec, spec_len,
       parsed_input,
       scheme_type,
       charset_converter,

diff --git a/chromium_edits/122.0.6194.0/chrome/browser/chrome_content_browser_client.cc.patch b/chromium_edits/122.0.6194.0/chrome/browser/chrome_content_browser_client.cc.patch
@@ -46,7 +46,8 @@ index 667370e623970..c09550c753e8e 100644
        RenderFrameHost::FromID(render_process_id, render_frame_id);
    WebContents* web_contents = WebContents::FromRenderFrameHost(frame_host);
  #endif  // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(ENABLE_EXTENSIONS) || \
-         // !BUILDFLAG(IS_ANDROID)
+-        // !BUILDFLAG(IS_ANDROID)
++        // !BUILDFLAG(IS_ANDROID) || BUILDFLAG(ENABLE_IPFS)
 +#if BUILDFLAG(ENABLE_IPFS)
 +  if (base::FeatureList::IsEnabled(ipfs::kEnableIpfs)) {
 +    network::mojom::URLLoaderFactory* default_factory = g_browser_process->system_network_context_manager()->GetURLLoaderFactory();

diff --git a/component/cache_requestor.cc b/component/cache_requestor.cc
@@ -143,7 +143,7 @@ void Self::OnBodyRead(Task task, int code) {
   }
 }
 void Self::Store(std::string key, std::string headers, std::string body) {
-  VLOG(1) << "Store(" << name() << ',' << key << ',' << headers.size() << ','
+  VLOG(2) << "Store(" << name() << ',' << key << ',' << headers.size() << ','
           << body.size() << ')';
   auto bound = base::BindOnce(&Self::OnEntryCreated, base::Unretained(this),
                               key, headers, body);
@@ -186,7 +186,7 @@ void Self::OnHeaderWritten(scoped_refptr<net::StringIOBuffer> buf,
   buf = base::MakeRefCounted<net::StringIOBuffer>(body);
   DCHECK(buf);
   auto f = [](scoped_refptr<net::StringIOBuffer>, int c) {
-    VLOG(1) << "body write " << c;
+    VLOG(2) << "body write " << c;
   };
   auto bound = base::BindOnce(f, buf);
   entry->WriteData(1, 0, buf.get(), buf->size(), std::move(bound), true);