cr63 rebased patch for linux output name #9

AlexeyBarabash · 2017-12-27T09:39:08Z

Pretty much the same as PR #3 , rebased for master and chromium 63 .

bridiver · 2017-12-27T16:02:34Z

browser/net/brave_httpse_network_delegate.cc

@@ -9,6 +9,7 @@
 #include "brave/browser/net/url_context.h"
 #include "brave/components/brave_shields/browser/brave_shields_util.h"
 #include "brave/components/brave_shields/browser/https_everywhere_service.h"
+#include "content/public/browser/browser_thread.h"


was this a lint fix or a rebase issue?

no, there were a compiler errors on linux debug build, like

../../brave/browser/net/brave_httpse_network_delegate.cc:23:23: error: use of undeclared identifier 'BrowserThread' DCHECK_CURRENTLY_ON(BrowserThread::FILE);

bridiver

++

Simplify and fix logic around content settings

With vpython3 get the following error: ________ running 'vpython3 script/download_rust_deps.py' in 'C:\bb4\brave-browser\src/brave' [E2021-02-09T20:44:06.398243-05:00 32528 0 annotate.go:241] original error: no such package: infra/python/wheels/psutil/windows-amd64_cp38_cp38m [E2021-02-09T20:44:06.398243-05:00 32528 0 annotate.go:241] [E2021-02-09T20:44:06.398243-05:00 32528 0 annotate.go:241] goroutine 73: [E2021-02-09T20:44:06.398243-05:00 32528 0 annotate.go:241] #0 go.chromium.org/luci/cipd/client/cipd/client.go:1838 - cipd.(*clientImpl).humanErr() [E2021-02-09T20:44:06.398243-05:00 32528 0 annotate.go:241] #1 go.chromium.org/luci/cipd/client/cipd/client.go:816 - cipd.(*clientImpl).ResolveVersion() [E2021-02-09T20:44:06.398243-05:00 32528 0 annotate.go:241] #2 go.chromium.org/luci/cipd/client/cipd/resolver.go:176 - cipd.(*Resolver).resolveVersion.func1() [E2021-02-09T20:44:06.398243-05:00 32528 0 annotate.go:241] #3 go.chromium.org/luci/common/sync/promise/promise.go:84 - promise.(*Promise).runGen() [E2021-02-09T20:44:06.398243-05:00 32528 0 annotate.go:241] #4 runtime/asm_amd64.s:1374 - runtime.goexit() [E2021-02-09T20:44:06.398243-05:00 32528 0 annotate.go:241] [E2021-02-09T20:44:06.398243-05:00 32528 0 annotate.go:241] goroutine 72: [E2021-02-09T20:44:06.398243-05:00 32528 0 annotate.go:241] From frame 0 to 0, the following wrappers were found: [E2021-02-09T20:44:06.398243-05:00 32528 0 annotate.go:241] internal reason: MultiError 1/1: following first non-nil error. [E2021-02-09T20:44:06.398243-05:00 32528 0 annotate.go:241] [E2021-02-09T20:44:06.398243-05:00 32528 0 annotate.go:241] #0 go.chromium.org/luci/cipd/client/cipd/ensure/file.go:255 - ensure.(*File).Resolve.func1.1() [E2021-02-09T20:44:06.398243-05:00 32528 0 annotate.go:241] reason: failed to resolve infra/python/wheels/psutil/windows-amd64_cp38_cp38m@version:5.7.2 (line 0) [E2021-02-09T20:44:06.398243-05:00 32528 0 annotate.go:241] [E2021-02-09T20:44:06.398243-05:00 32528 0 annotate.go:241] #1 go.chromium.org/luci/common/sync/parallel/runner.go:51 - parallel.(*WorkItem).execute() [E2021-02-09T20:44:06.398243-05:00 32528 0 annotate.go:241] #2 go.chromium.org/luci/common/sync/parallel/runner.go:149 - parallel.(*Runner).dispatchLoopBody.func2() [E2021-02-09T20:44:06.398243-05:00 32528 0 annotate.go:241] #3 runtime/asm_amd64.s:1374 - runtime.goexit() [E2021-02-09T20:44:06.399254-05:00 32528 0 annotate.go:241] [E2021-02-09T20:44:06.399254-05:00 32528 0 annotate.go:241] goroutine 1: [E2021-02-09T20:44:06.399254-05:00 32528 0 annotate.go:241] #0 go.chromium.org/luci/vpython/venv/config.go:183 - venv.(*Config).makeEnv() [E2021-02-09T20:44:06.399254-05:00 32528 0 annotate.go:241] reason: failed to resolve packages [E2021-02-09T20:44:06.399254-05:00 32528 0 annotate.go:241] [E2021-02-09T20:44:06.399254-05:00 32528 0 annotate.go:241] #1 go.chromium.org/luci/vpython/venv/venv.go:163 - venv.With() [E2021-02-09T20:44:06.399254-05:00 32528 0 annotate.go:241] #2 go.chromium.org/luci/vpython/run.go:62 - vpython.Run() [E2021-02-09T20:44:06.399254-05:00 32528 0 annotate.go:241] #3 go.chromium.org/luci/vpython/application/application.go:320 - application.(*application).mainImpl() [E2021-02-09T20:44:06.399254-05:00 32528 0 annotate.go:241] #4 go.chromium.org/luci/vpython/application/application.go:408 - application.(*Config).Main.func1() [E2021-02-09T20:44:06.399254-05:00 32528 0 annotate.go:241] #5 go.chromium.org/luci/vpython/application/support.go:46 - application.run() [E2021-02-09T20:44:06.399254-05:00 32528 0 annotate.go:241] #6 go.chromium.org/luci/vpython/application/application.go:407 - application.(*Config).Main() [E2021-02-09T20:44:06.399254-05:00 32528 0 annotate.go:241] #7 vpython/main.go:109 - main.mainImpl() [E2021-02-09T20:44:06.399254-05:00 32528 0 annotate.go:241] #8 vpython/main.go:115 - main.main() [E2021-02-09T20:44:06.399254-05:00 32528 0 annotate.go:241] #9 runtime/proc.go:204 - runtime.main() [E2021-02-09T20:44:06.399254-05:00 32528 0 annotate.go:241] #10 runtime/asm_amd64.s:1374 - runtime.goexit() Error: Command 'vpython3 script/download_rust_deps.py' returned non-zero exit status 1 in C:\bb4\brave-browser\src/brave ----- Also, see https://bugs.chromium.org/p/chromium/issues/detail?id=1141986

The following Chromium change is causing an issue with Python3 on Win: https://chromium.googlesource.com/chromium/src/+/efdcb8407e0d9139e142aaf236cffb97b5e6d7f1%5E%21/#F0 It added the wheel for psutil 5.7.2 to .vpython3. But there doesn't appear to be a prebuilt wheel for the particular architecture (amd64_cp38_cp38m). Even when I try to use pip to install that version of psutil, pip downloads the source distribution and tries to build locally (which fails since we don't have python-dev installed) instead of grabbing a prebuilt package. With vpython3 get the following error: ________ running 'vpython3 script/download_rust_deps.py' in 'C:\bb4\brave-browser\src/brave' [E2021-02-09T20:44:06.398243-05:00 32528 0 annotate.go:241] original error: no such package: infra/python/wheels/psutil/windows-amd64_cp38_cp38m [E2021-02-09T20:44:06.398243-05:00 32528 0 annotate.go:241] [E2021-02-09T20:44:06.398243-05:00 32528 0 annotate.go:241] goroutine 73: [E2021-02-09T20:44:06.398243-05:00 32528 0 annotate.go:241] #0 go.chromium.org/luci/cipd/client/cipd/client.go:1838 - cipd.(*clientImpl).humanErr() [E2021-02-09T20:44:06.398243-05:00 32528 0 annotate.go:241] #1 go.chromium.org/luci/cipd/client/cipd/client.go:816 - cipd.(*clientImpl).ResolveVersion() [E2021-02-09T20:44:06.398243-05:00 32528 0 annotate.go:241] #2 go.chromium.org/luci/cipd/client/cipd/resolver.go:176 - cipd.(*Resolver).resolveVersion.func1() [E2021-02-09T20:44:06.398243-05:00 32528 0 annotate.go:241] #3 go.chromium.org/luci/common/sync/promise/promise.go:84 - promise.(*Promise).runGen() [E2021-02-09T20:44:06.398243-05:00 32528 0 annotate.go:241] #4 runtime/asm_amd64.s:1374 - runtime.goexit() [E2021-02-09T20:44:06.398243-05:00 32528 0 annotate.go:241] [E2021-02-09T20:44:06.398243-05:00 32528 0 annotate.go:241] goroutine 72: [E2021-02-09T20:44:06.398243-05:00 32528 0 annotate.go:241] From frame 0 to 0, the following wrappers were found: [E2021-02-09T20:44:06.398243-05:00 32528 0 annotate.go:241] internal reason: MultiError 1/1: following first non-nil error. [E2021-02-09T20:44:06.398243-05:00 32528 0 annotate.go:241] [E2021-02-09T20:44:06.398243-05:00 32528 0 annotate.go:241] #0 go.chromium.org/luci/cipd/client/cipd/ensure/file.go:255 - ensure.(*File).Resolve.func1.1() [E2021-02-09T20:44:06.398243-05:00 32528 0 annotate.go:241] reason: failed to resolve infra/python/wheels/psutil/windows-amd64_cp38_cp38m@version:5.7.2 (line 0) [E2021-02-09T20:44:06.398243-05:00 32528 0 annotate.go:241] [E2021-02-09T20:44:06.398243-05:00 32528 0 annotate.go:241] #1 go.chromium.org/luci/common/sync/parallel/runner.go:51 - parallel.(*WorkItem).execute() [E2021-02-09T20:44:06.398243-05:00 32528 0 annotate.go:241] #2 go.chromium.org/luci/common/sync/parallel/runner.go:149 - parallel.(*Runner).dispatchLoopBody.func2() [E2021-02-09T20:44:06.398243-05:00 32528 0 annotate.go:241] #3 runtime/asm_amd64.s:1374 - runtime.goexit() [E2021-02-09T20:44:06.399254-05:00 32528 0 annotate.go:241] [E2021-02-09T20:44:06.399254-05:00 32528 0 annotate.go:241] goroutine 1: [E2021-02-09T20:44:06.399254-05:00 32528 0 annotate.go:241] #0 go.chromium.org/luci/vpython/venv/config.go:183 - venv.(*Config).makeEnv() [E2021-02-09T20:44:06.399254-05:00 32528 0 annotate.go:241] reason: failed to resolve packages [E2021-02-09T20:44:06.399254-05:00 32528 0 annotate.go:241] [E2021-02-09T20:44:06.399254-05:00 32528 0 annotate.go:241] #1 go.chromium.org/luci/vpython/venv/venv.go:163 - venv.With() [E2021-02-09T20:44:06.399254-05:00 32528 0 annotate.go:241] #2 go.chromium.org/luci/vpython/run.go:62 - vpython.Run() [E2021-02-09T20:44:06.399254-05:00 32528 0 annotate.go:241] #3 go.chromium.org/luci/vpython/application/application.go:320 - application.(*application).mainImpl() [E2021-02-09T20:44:06.399254-05:00 32528 0 annotate.go:241] #4 go.chromium.org/luci/vpython/application/application.go:408 - application.(*Config).Main.func1() [E2021-02-09T20:44:06.399254-05:00 32528 0 annotate.go:241] #5 go.chromium.org/luci/vpython/application/support.go:46 - application.run() [E2021-02-09T20:44:06.399254-05:00 32528 0 annotate.go:241] #6 go.chromium.org/luci/vpython/application/application.go:407 - application.(*Config).Main() [E2021-02-09T20:44:06.399254-05:00 32528 0 annotate.go:241] #7 vpython/main.go:109 - main.mainImpl() [E2021-02-09T20:44:06.399254-05:00 32528 0 annotate.go:241] #8 vpython/main.go:115 - main.main() [E2021-02-09T20:44:06.399254-05:00 32528 0 annotate.go:241] #9 runtime/proc.go:204 - runtime.main() [E2021-02-09T20:44:06.399254-05:00 32528 0 annotate.go:241] #10 runtime/asm_amd64.s:1374 - runtime.goexit() Error: Command 'vpython3 script/download_rust_deps.py' returned non-zero exit status 1 in C:\bb4\brave-browser\src/brave ----- Also, see https://bugs.chromium.org/p/chromium/issues/detail?id=1141986

Don't initialize callbacks from HistogramsBraveizer's constructor. Initializing all the StatisticsRecorder::ScopedHistogramSampleObserver objects for each histogram from the constructor would be too early and will cause crashes on DCHECK-enabled builds, like the following one: [2883544:2883544:0624/122638.724689:FATAL:bind_internal.h(843)] Check failed: receiver->HasAtLeastOneRef(). base::Bind{Once,Repeating}() refuses to create the first reference to ref-counted objects. That typically happens around PostTask() in their constructor, and such objects can be destroyed before `new` returns if the task resolves fast enough. #0 0x7faa83f3c119 base::debug::CollectStackTrace() #1 0x7faa83e389d3 base::debug::StackTrace::StackTrace() #2 0x7faa83e59cc4 logging::LogMessage::~LogMessage() #3 0x7faa83e5a70e logging::LogMessage::~LogMessage() #4 0x563a89be9924 _ZN4base8internal34BanUnconstructedRefCountedReceiverIMN10[...] #5 0x563a8a4e6f40 base::internal::BindState<>::Create<>() #6 0x563a8a4e6a91 brave::HistogramsBraveizer::InitCallbacks() #7 0x563a8a96f0bf BraveBrowserProcessImpl::BraveBrowserProcessImpl() #8 0x563a8a73eaee ChromeBrowserMainParts::PreEarlyInitialization() #9 0x563a8aad13e5 ChromeBrowserMainPartsPosix::PreEarlyInitialization() #10 0x7faa817a6952 content::BrowserMainLoop::EarlyInitialization() #11 0x7faa817aaa2b content::BrowserMainRunnerImpl::Initialize() [...] Therefore, this patch delays the initialization of the callbacks until the HistogramsBraveizer object is properly constructed, by using an static Create method instead.

# This is the 1st commit message: Add federated client to BraveFederated component # This is the commit message #2: Remove unnecessary files # This is the commit message #3: Hook up learning service # This is the commit message #4: Unlink client with DataStore # This is the commit message #5: comment # This is the commit message #6: temp # This is the commit message #7: todos # This is the commit message #8: Change to follow Chromium styleguide # This is the commit message #9: Refactor 1 # This is the commit message #10: Use grpc_support for comms

cr63 rebased patch for linux output name

78cee0d

AlexeyBarabash requested review from bridiver and bbondy December 27, 2017 09:39

bridiver reviewed Dec 27, 2017

View reviewed changes

bridiver approved these changes Dec 27, 2017

View reviewed changes

bridiver merged commit d6d2b1c into master Dec 27, 2017

bsclifton deleted the linux_build_output_name_cr63 branch June 18, 2018 06:25

bbondy added a commit that referenced this pull request Feb 18, 2019

Merge pull request #9 from brave/simplify-and-fix

f44b34f

Simplify and fix logic around content settings

stephendonner mentioned this pull request Dec 14, 2022

Restore the DNS over HTTPS work-around on Windows #15989

Merged

25 tasks

yrliou mentioned this pull request Apr 24, 2023

Reject Solana SignTransaction/SignAllTransactions when blockhash is invalid #18200

Merged

25 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

cr63 rebased patch for linux output name #9

cr63 rebased patch for linux output name #9

AlexeyBarabash commented Dec 27, 2017

bridiver Dec 27, 2017

AlexeyBarabash Dec 27, 2017

bridiver left a comment

cr63 rebased patch for linux output name #9

cr63 rebased patch for linux output name #9

Conversation

AlexeyBarabash commented Dec 27, 2017

bridiver Dec 27, 2017

Choose a reason for hiding this comment

AlexeyBarabash Dec 27, 2017

Choose a reason for hiding this comment

bridiver left a comment

Choose a reason for hiding this comment