Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Partial fix for crash when using additional_trust_anchors #10

Closed
wants to merge 2 commits into from
Closed

Partial fix for crash when using additional_trust_anchors #10

wants to merge 2 commits into from

Conversation

ghostoy
Copy link
Member

@ghostoy ghostoy commented Mar 18, 2016

No description provided.

@rogerwang
Copy link
Member

merged with the master patch.

@rogerwang rogerwang closed this Mar 19, 2016
rogerwang pushed a commit that referenced this pull request Dec 5, 2016
@rsolomakhin
[Merge M-56] Save non-local profiles to local when editing it in paym…
bacaf59 
…ent request

Do not persist the relationship between non-local profile and its local
copy since all non-local profiles are going to be local.

The user will not see the non-local profile in the same payment request
after editing it. However, the non-local profile will be shown when
starting a new payment request. In that case, the frequency based
selection will select the complete local one. In addition,
https://cs.chromium.org/chromium/src/components/autofill/core/browser/personal_data_manager.cc?rcl=0&l=505
makes sure identical copy of the non-local profile can not be added.

So this change is small and good enough to be merged into M56 without
hurting future work.

BUG=666452

Review-Url: https://codereview.chromium.org/2507163004
Cr-Commit-Position: refs/heads/master@{#433400}
(cherry picked from commit 433ed6d)

Review URL: https://codereview.chromium.org/2517803002 .

Cr-Commit-Position: refs/branch-heads/2924@{#10}
Cr-Branched-From: 3a87aec-refs/heads/master@{#433059}
GnorTech pushed a commit that referenced this pull request Jan 29, 2017
@twifkak
Disable precache on svelte.
dd98737 
Precache was enabled for svelte in http://crrev.com/c8e7c272, when the
experiment was only on dev, in the interest in seeing the maximum percent of
users that we could impact.

There is an unconfirmed possibility that the background service may slow down
phones with low RAM/CPU. Until we verify that it does not, we would like to
avoid launching on svelte devices, in order to eliminate any potential for
harm.

This change re-disables the service on svelte devices, by checking
PrivacyPreferencesManager#shouldPrerender() instead of
PrefServiceBridge#getNetworkPredictionEnabled().

BUG=683259

Review-Url: https://codereview.chromium.org/2642733004
Cr-Commit-Position: refs/heads/master@{#445110}
(cherry picked from commit 5fe1163)

Review-Url: https://codereview.chromium.org/2643393003 .
Cr-Commit-Position: refs/branch-heads/2987@{#10}
Cr-Branched-From: ad51088-refs/heads/master@{#444943}
rogerwang pushed a commit that referenced this pull request Mar 11, 2017
Incrementing VERSION to 58.0.3029.5
268cf0f 
Cr-Commit-Position: refs/branch-heads/3029@{#10}
Cr-Branched-From: 939b32e-refs/heads/master@{#454471}
GnorTech pushed a commit that referenced this pull request Apr 26, 2017
Incrementing VERSION to 59.0.3071.8
d96d57b 
Cr-Commit-Position: refs/branch-heads/3071@{#10}
Cr-Branched-From: a106f0a-refs/heads/master@{#464641}
rogerwang pushed a commit that referenced this pull request Jul 20, 2017
Revert "Listen to changes to touch input devices"
6b860e9 
This reverts commit 1b60006.

Reason for revert:
Causes a startup crash with chrome --mash, possibly because mash does not have a DeviceDataManager. You might want to check with sadrul@ or rjkroege@ about whether there's a good way to do this under mash.

Failing build (chromeos-side waterfall):
https://luci-milo.appspot.com/buildbot/chromeos.chrome/tricky-tot-chrome-pfq-informational/5205

Stack (from running manually with chrome --mash on Linux):

[60089:60089:0717/114019.863351:FATAL:device_data_manager.cc(84)] Check failed: instance_. DeviceDataManager was not created.
#0 0x7f06a03468bc base::debug::StackTrace::StackTrace()
#1 0x7f06a036a121 logging::LogMessage::~LogMessage()
#2 0x7f069aeb08ff ui::DeviceDataManager::GetInstance()
#3 0x55f183402a41 chromeos::LoginDisplayHostImpl::LoginDisplayHostImpl()
#4 0x55f1834066ad chromeos::ShowLoginWizard()
#5 0x55f1833e4bf7 chromeos::ChromeSessionManager::Initialize()
#6 0x55f1832f9cb4 chromeos::ChromeBrowserMainPartsChromeos::PostProfileInit()
#7 0x55f1837e7aa2 ChromeBrowserMainParts::PreMainMessageLoopRunImpl()
#8 0x55f1837e709d ChromeBrowserMainParts::PreMainMessageLoopRun()
#9 0x55f1832f8f4a chromeos::ChromeBrowserMainPartsChromeos::PreMainMessageLoopRun()
#10 0x7f069d9e5081 content::BrowserMainLoop::PreMainMessageLoopRun()
#11 0x7f069dde6407 content::StartupTaskRunner::RunAllTasksNow()
#12 0x7f069d9e353b content::BrowserMainLoop::CreateStartupTasks()
#13 0x7f069d9e7a72 content::BrowserMainRunnerImpl::Initialize()
#14 0x7f069d9e0b57 content::BrowserMain()
#15 0x7f069e1e8462 content::ContentMainRunnerImpl::Run()
#16 0x7f06a0890d39 service_manager::Main()
#17 0x7f069e1e7384 content::ContentMain()
#18 0x55f182e8132f ChromeMain
#19 0x7f069454af45 __libc_start_main
#20 0x55f182e81194 <unknown>

Original change's description:
> Listen to changes to touch input devices
>
> In https://codereview.chromium.org/2964823002 the OobeDisplayChooser
> started using the DeviceDataManager to look for touchscreen devices when
> searching for a good primary display to use during OOBE.
>
> On device cold boot the DeviceDataManager has not yet found any
> touchscreen devices at the time OobeUi::ShowOobeUI() is called (likely
> due to lower level systems not being fully initialized).
>
> This CL make LoginDisplayHostImpl an observer of changes to connected
> touchscreen devices, re-triggering the OobeDisplayChooser when the
> DeviceDataManager is notified of the connected touchscreens. This
> overcomes the timing issues on cold boot.
>
> Bug: 738885
> Change-Id: Iae488ddc9428b7c5e74d36cf18e35ba3d1235bbd
> Reviewed-on: https://chromium-review.googlesource.com/569958
> Reviewed-by: Jacob Dufault <jdufault@chromium.org>
> Commit-Queue: Felix Ekblom <felixe@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#487007}

TBR=alemate@chromium.org,jdufault@chromium.org,felixe@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

(cherry picked from commit 0cd134a)

Bug: 738885
Change-Id: If31322734e679bbb1f4eef0a9aa802d34263cba4
Reviewed-on: https://chromium-review.googlesource.com/574731
Reviewed-by: James Cook <jamescook@chromium.org>
Commit-Queue: James Cook <jamescook@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#487191}
Signed-off-by: Bernie Thompson <bhthompson@google.com>
Reviewed-on: https://chromium-review.googlesource.com/575149
Reviewed-by: Bernie Thompson <bhthompson@chromium.org>
Cr-Commit-Position: refs/branch-heads/3112@{#623}
Cr-Branched-From: b6460e2-refs/heads/master@{#474897}
GnorTech pushed a commit that referenced this pull request Aug 5, 2017
@stevenjb
Settings: Network: Send only correct Static IP properties
39d27c4 
TBR=stevenjb@chromium.org

(cherry picked from commit d416df5)

Bug: 741574
Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
Change-Id: Icc1a265948cb90c72ee9b9e2fd4447220b5f9f0f
Reviewed-on: https://chromium-review.googlesource.com/580369
Commit-Queue: Steven Bennetts <stevenjb@chromium.org>
Reviewed-by: Michael Giuffrida <michaelpg@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#488744}
Reviewed-on: https://chromium-review.googlesource.com/583294
Reviewed-by: Steven Bennetts <stevenjb@chromium.org>
Cr-Commit-Position: refs/branch-heads/3163@{#10}
Cr-Branched-From: ff259ba-refs/heads/master@{#488528}
GnorTech pushed a commit that referenced this pull request Aug 5, 2017
@achuith
Revert of Add deduplication logic to .pak files (patchset #10 id:1800…
1595ed4 
…01 of https://codereview.chromium.org/2969123002/ )

Reason for revert:
https://bugs.chromium.org/p/chromium/issues/detail?id=747171

Original issue's description:
> Add deduplication logic to .pak files
>
> Now, when multiple entries contain the same content, multiple
> table-of-contents entries will be created, but only one data region.
>
> As of now, en-US.pak has ~3200 entries, and 350 of them are duplicates.
>
> For MonochromePublic.apk, shrinks uncompressed .pak size by ~130kb, and
> compressed .pak size by 32kb.
>
> BUG=738566
>
> Review-Url: https://codereview.chromium.org/2969123002
> Cr-Commit-Position: refs/heads/master@{#488215}
> Committed: https://chromium.googlesource.com/chromium/src/+/ade347f539a378fb37500f6d17e8835edc1d8ec0

TBR=flackr@chromium.org,sadrul@chromium.org,agrieve@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=738566

Review-Url: https://codereview.chromium.org/2989443002
Cr-Original-Commit-Position: refs/heads/master@{#488554}
Change-Id: I33eff508d4177907d050424bee967d643fe022e4
Reviewed-on: https://chromium-review.googlesource.com/583542
Reviewed-by: Bernie Thompson <bhthompson@chromium.org>
Cr-Commit-Position: refs/branch-heads/3163@{#13}
Cr-Branched-From: ff259ba-refs/heads/master@{#488528}
GnorTech pushed a commit that referenced this pull request Sep 14, 2017
Incrementing VERSION to 62.0.3202.4
e772a95 
TBR=dimu@chromium.org

Change-Id: Iba53f18d62acd07f511c2abaef3ffa0d0820f819
Reviewed-on: https://chromium-review.googlesource.com/647967
Reviewed-by: chrome-release-bot@chromium.org <chrome-release-bot@chromium.org>
Cr-Commit-Position: refs/branch-heads/3202@{#10}
Cr-Branched-From: fa6a5d8-refs/heads/master@{#499098}
GnorTech pushed a commit that referenced this pull request Oct 27, 2017
Build Cronet for iOS with ARC enabled
d20475e 
BUG=774225

Cq-Include-Trybots: master.tryserver.chromium.android:android_cronet_tester;master.tryserver.chromium.mac:ios-simulator-cronet
Change-Id: I7ca92a5f81520bcd7f7736a43181de79031fb9e5
Reviewed-on: https://chromium-review.googlesource.com/716777
Reviewed-by: Misha Efimov <mef@chromium.org>
Commit-Queue: Andrei Kapishnikov <kapishnikov@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#508731}(cherry picked from commit bd67093)
Reviewed-on: https://chromium-review.googlesource.com/721459
Cr-Commit-Position: refs/branch-heads/3239@{#10}
Cr-Branched-From: adb61db-refs/heads/master@{#508578}
rogerwang pushed a commit that referenced this pull request Jan 29, 2018
@jm318
Enable UserActivityEventLogging
11a7483 
Bug: 784232
Change-Id: I72a9f20cbacba3a9dfc6b914094da573d61c6153
Reviewed-on: https://chromium-review.googlesource.com/874975
Reviewed-by: Scott Violet <sky@chromium.org>
Commit-Queue: Jia Meng <jiameng@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#530387}(cherry picked from commit 39db6ef)
Reviewed-on: https://chromium-review.googlesource.com/877199
Reviewed-by: Jia Meng <jiameng@chromium.org>
Cr-Commit-Position: refs/branch-heads/3325@{#10}
Cr-Branched-From: bc084a8-refs/heads/master@{#530369}
GnorTech pushed a commit that referenced this pull request Mar 20, 2018
[Merge to M66] Cros splitscreen: Ignore the window bounds change tran…
548da54 
…sition transform if the window is in overview mode.

TBR=oshima@chromium.org
(cherry picked from commit 3004868)

Bug: 817557
Change-Id: Ibb1a048261a97fb9265e9b4330b3bbf9f21a65c8
Reviewed-on: https://chromium-review.googlesource.com/942090
Commit-Queue: Xiaoqian Dai <xdai@chromium.org>
Reviewed-by: Mitsuru Oshima <oshima@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#540386}
Reviewed-on: https://chromium-review.googlesource.com/947926
Reviewed-by: Xiaoqian Dai <xdai@chromium.org>
Cr-Commit-Position: refs/branch-heads/3359@{#10}
Cr-Branched-From: 66afc5e-refs/heads/master@{#540276}
rogerwang pushed a commit that referenced this pull request Apr 25, 2018
Fix an issue when fetching policy without local cache of token policy.
4736c59 
Because the first policy cache will be loaded synchronously before local_state
creation. We'll miss its OnStoreLoaded/Error event as CloudPolicyService
has to be created after |local_state|. It means we won't know the result of
cache loading.

To resolve this, check the initialization status once the CloudPolicyService
has been created. Fetch policy from server if cache is not loaded properly.

Bug: 832694
Change-Id: Idd0b9e35ea2afded586b73c765197b5574ba3900
Reviewed-on: https://chromium-review.googlesource.com/1011211
Commit-Queue: Owen Min <zmin@chromium.org>
Reviewed-by: Roger Tawa <rogerta@chromium.org>
Reviewed-by: Julian Pastarmov <pastarmovj@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#550684}(cherry picked from commit bcf5d8e)
Reviewed-on: https://chromium-review.googlesource.com/1013342
Reviewed-by: Owen Min <zmin@chromium.org>
Cr-Commit-Position: refs/branch-heads/3396@{#10}
Cr-Branched-From: 9ef2aa8-refs/heads/master@{#550428}
rogerwang pushed a commit that referenced this pull request Jun 19, 2018
Incrementing VERSION to 68.0.3440.6
5e39f7c 
TBR=govind@chromium.org

Change-Id: I00a703f2d0462825e77ab095662066fe067929c9
Reviewed-on: https://chromium-review.googlesource.com/1074539
Reviewed-by: chrome-release-bot@chromium.org <chrome-release-bot@chromium.org>
Cr-Commit-Position: refs/branch-heads/3440@{#10}
Cr-Branched-From: 010ddcf-refs/heads/master@{#561733}
GnorTech pushed a commit that referenced this pull request Aug 4, 2018
Incrementing VERSION to 69.0.3497.6
3ca6d16 
TBR=govind@chromium.org

Change-Id: Ic3f33af62326a32c0375ffb7f4b4755000d44886
Reviewed-on: https://chromium-review.googlesource.com/1146211
Reviewed-by: chrome-release-bot@chromium.org <chrome-release-bot@chromium.org>
Cr-Commit-Position: refs/branch-heads/3497@{#10}
Cr-Branched-From: 271eaf5-refs/heads/master@{#576753}
rogerwang pushed a commit that referenced this pull request Sep 15, 2018
Incrementing VERSION to 70.0.3538.5
515c981 
TBR=amineer@chromium.org

Change-Id: I7377cefbd9d7d29b18c0520bc9f0ae7472f619b7
Reviewed-on: https://chromium-review.googlesource.com/1201405
Reviewed-by: chrome-release-bot@chromium.org <chrome-release-bot@chromium.org>
Cr-Commit-Position: refs/branch-heads/3538@{#10}
Cr-Branched-From: 79f7c91-refs/heads/master@{#587811}
rogerwang pushed a commit that referenced this pull request Oct 31, 2018
@nico
win/32-bit: copy courgette64.exe.pdb and gcp_portmon64.dll.pdb to the…
416144e 
… root build dir.

The binary itself was already being copied over, and since the binaries
now contain only the basename of the pdb, the pdb must be next to it
for the symbol upload scripts to work.

TBR=pastarmovj,wfh

Bug: 894725
Change-Id: If57fda6a8e4610994b948a0e628dac750a3ff7ad
Reviewed-on: https://chromium-review.googlesource.com/c/1279373
Reviewed-by: Nico Weber <thakis@chromium.org>
Commit-Queue: Nico Weber <thakis@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#599513}(cherry picked from commit c13a10b)
Reviewed-on: https://chromium-review.googlesource.com/c/1279951
Reviewed-by: Michael Moss <mmoss@chromium.org>
Cr-Commit-Position: refs/branch-heads/3578@{#10}
Cr-Branched-From: 4226ddf-refs/heads/master@{#599034}
rogerwang pushed a commit that referenced this pull request Dec 18, 2018
@mitoshima
Accessibility shortcuts to access PIP window
9dcb878 
Make PIP window non activatable by default on ChromeOS.

Bug: 910323
Test: Manual.  unittest T.B.D.
Change-Id: Ibd444a182c731c4e585c428938bbc4cc0d03d9a2
Reviewed-on: https://chromium-review.googlesource.com/c/1354410
Reviewed-by: David Tseng <dtseng@chromium.org>
Reviewed-by: Mounir Lamouri <mlamouri@chromium.org>
Reviewed-by: Brian White <bcwhite@chromium.org>
Reviewed-by: Eliot Courtney <edcourtney@chromium.org>
Commit-Queue: Mitsuru Oshima <oshima@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#612905}(cherry picked from commit 7353b9b)
Reviewed-on: https://chromium-review.googlesource.com/c/1358920
Reviewed-by: Mitsuru Oshima <oshima@chromium.org>
Cr-Commit-Position: refs/branch-heads/3626@{#10}
Cr-Branched-From: d897fb1-refs/heads/master@{#612437}
rogerwang pushed a commit that referenced this pull request Dec 18, 2018
Offer users an option to delete card from local if uploading failed
bbb07a2 
If uploading of a card failed, in the feedback dialog, we will show
a string 'invalid' and a trash can button. If the user clicks the button,
that card will be deleted from browser and will disappear in the
feedback dialog. If all invalid cards are deleted in the dialog, the
dialog will be updated to the 'finished' state.

If all cards failed, we will not show the "View cards button".

Uploaded screenshots in the bug (comment #10 and comment #26).

Using TBR because this merge had a conflict and needed to fix manually:
TBR=estade@chromium.org,tobiasjs@chromium.org,bsep@chromium.org,mahmadi@chromium.org

(cherry picked from commit 26874dc)

Bug: 913150
Change-Id: Iae7780027932ac530bcb2f0c643be1ec94d1f334
Reviewed-on: https://chromium-review.googlesource.com/c/1314129
Reviewed-by: Tobias Sargeant <tobiasjs@chromium.org>
Reviewed-by: Moe Ahmadi <mahmadi@chromium.org>
Reviewed-by: Evan Stade <estade@chromium.org>
Reviewed-by: Bret Sepulveda <bsep@chromium.org>
Reviewed-by: Jared Saul <jsaul@google.com>
Commit-Queue: Siyu An <siyua@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#614193}
Reviewed-on: https://chromium-review.googlesource.com/c/1369941
Cr-Commit-Position: refs/branch-heads/3626@{#234}
Cr-Branched-From: d897fb1-refs/heads/master@{#612437}
rogerwang pushed a commit that referenced this pull request Feb 10, 2019
Incrementing VERSION to 73.0.3683.5
9b46870 
TBR=mmoss@chromium.org

Change-Id: I765487351612c5883f37d99e063adff4ecfd627c
Reviewed-on: https://chromium-review.googlesource.com/c/1437533
Reviewed-by: chrome-release-bot@chromium.org <chrome-release-bot@chromium.org>
Cr-Commit-Position: refs/branch-heads/3683@{#10}
Cr-Branched-From: e510299-refs/heads/master@{#625896}
rogerwang pushed a commit that referenced this pull request Mar 24, 2019
Incrementing VERSION to 74.0.3729.4
6c8a43f 
TBR=cmasso@chromium.org

Change-Id: I36fa4bd264d26a24f936ad6c327a98fc3e8a23a3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1513733
Reviewed-by: chrome-release-bot@chromium.org <chrome-release-bot@chromium.org>
Cr-Commit-Position: refs/branch-heads/3729@{#10}
Cr-Branched-From: d4a8972-refs/heads/master@{#638880}
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@ghostoy @rogerwang