GitLab

This CL removes the following test steps:
- not_site_per_process_content_browsertests
- not_site_per_process_content_unittests
- not_site_per_process_components_browsertests
- not_site_per_process_components_unittests
- not_site_per_process_extensions_browsertests
- not_site_per_process_extensions_unittests

These test steps are not needed as explained in
https://crbug.com/870761#c6 (it is sufficient to test with the default
mode: site-per-process on desktop, and not-site-per-process on Android,
Cast).

Bug: 870761
Bug: 852442
Change-Id: I120057abbe85e425fb141d35dcea8045db881234
Reviewed-on: https://chromium-review.googlesource.com/1194335
Commit-Queue: Łukasz Anforowicz <lukasza@chromium.org>
Reviewed-by: Dirk Pranke <dpranke@chromium.org>
Reviewed-by: Charlie Reis <creis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#587648}

This CL updates JavaScriptDialogTestCase to use embedded test servers
rather than the deprecated HttpServer.

The flake in the referenced bugs are not reproducible locally; this
CL is a speculative fix that is meant to reduce flake by using non-
deprecated testing fixtures.

Bug: 871679, 871685
Cq-Include-Trybots: luci.chromium.try:ios-simulator-cronet;luci.chromium.try:ios-simulator-full-configs
Change-Id: I0c5c32c1420c5f7da70951d108de96bde8df893a
Reviewed-on: https://chromium-review.googlesource.com/1196230
Commit-Queue: Kurt Horimoto <kkhorimoto@chromium.org>
Reviewed-by: Justin Cohen <justincohen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#587647}

This cl changes the fling scheduler mac to get the root view for oopifs so
that it has BrowserCompositor. Without this change fling|autoscroll inside
an oopif on mac would not work when viz is enabled.

On Non-mac platforms GetNativeView() in GetCompositor() takes care of going
through the nested oopifs.

The added browsertests will fail without this patch when viz is enabled.

Bug: 249063
Test: BrowserSideFlingBrowserTest.(Touchpad|Touchscreen)FlingInOOPIF
Change-Id: I3ccf3fc4356c6c467bb5714110e88d284b0d559a
Reviewed-on: https://chromium-review.googlesource.com/1195655
Commit-Queue: Sahel Sharify <sahel@chromium.org>
Reviewed-by: Navid Zolghadr <nzolghadr@chromium.org>
Reviewed-by: Ken Buchanan <kenrb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#587646}

First in a series of changes to the interstitial pages bringing
them in line with the Google Material styling.

- Button styling update for mobile devices.
- Formatting of error code.

Bug: 871861
Change-Id: I34c4063559746fd99680b30d228e842fb2c5b9a5
Reviewed-on: https://chromium-review.googlesource.com/1194125Reviewed-by: Mustafa Emre Acer <meacer@chromium.org>
Commit-Queue: Edward Jung <edwardjung@chromium.org>
Cr-Commit-Position: refs/heads/master@{#587645}

This was caused by the webRequest code when an extension redirected from https to http. The referrer member of network::ResourceRequest was not updated.

Bug: 878417
Cq-Include-Trybots: luci.chromium.try:linux_mojo
Change-Id: I7a494e4a326164e4814193f5bea2bc8d71d1c112
Reviewed-on: https://chromium-review.googlesource.com/1196232
Commit-Queue: John Abd-El-Malek <jam@chromium.org>
Reviewed-by: Clark DuVall <cduvall@chromium.org>
Cr-Commit-Position: refs/heads/master@{#587644}

- Remove unused var kNoDatabaseId
- Port constants to Mojo file
- Update WATCHLISTS to remove old paths / add new paths

Bug: 717812
Change-Id: I706d4df3c38cbc95b68d59fefa3632d9e1438f13
Reviewed-on: https://chromium-review.googlesource.com/1194877Reviewed-by: Reilly Grant <reillyg@chromium.org>
Reviewed-by: John Abd-El-Malek <jam@chromium.org>
Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
Reviewed-by: Victor Costan <pwnall@chromium.org>
Commit-Queue: Chase Phillips <cmp@chromium.org>
Cr-Commit-Position: refs/heads/master@{#587643}

https://skia.googlesource.com/skia.git/+log/cd7907b57d76..7ed0eae0cd13


git log cd7907b57d76..7ed0eae0cd13 --date=short --no-merges --format='%ad %ae %s'
2018-08-30 brianosman@google.com Revert "Remove lazy image color space hacks for gray"


Created with:
  gclient setdep -r src/third_party/skia@7ed0eae0cd13

The AutoRoll server is located here: https://autoroll.skia.org/r/skia-autoroll

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md

If the roll is causing failures, please contact the current sheriff, who should
be CC'd on the roll, and stop the roller if necessary.

CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_trusty_blink_rel;luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel
TBR=stephana@chromium.org

Change-Id: I9730c925dc160ece9bc03f6ae2e246e3d81a4600
Reviewed-on: https://chromium-review.googlesource.com/1196768Reviewed-by: skia-chromium-autoroll <skia-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Cr-Commit-Position: refs/heads/master@{#587642}

Global search and replace of "Copyright (c) 2018" with "Copyright 2018"
to match the style guide.

R=csharp

Bug: 830892
Change-Id: I9db77f6b26b7639499b82690360b26805588d304
Reviewed-on: https://chromium-review.googlesource.com/1195718Reviewed-by: Chris Sharp <csharp@chromium.org>
Commit-Queue: Joe Mason <joenotcharles@chromium.org>
Cr-Commit-Position: refs/heads/master@{#587641}

This CL fix the way that of considering that HTTP credentials have
no match, equivalent and conflicting HTTPS credentials added in
https://crrev.com/c/1163243/.

Starting with this CL we consider HTTP credential as no match,
HTTP credentials for which no HTTPS credential for the same
signon-realm (excluding the protocol), PasswordForm::Scheme
(i.e. HTML, BASIC etc.) and username exists in Password Store.

We consider HTTP credentials as having equivalent HTTPS credentials
if they have same signon-realm (excluding the protocol),
PasswordForm::Scheme, username and password.

We consider HTTP credentials as having conflicting HTTPS credentials
if they have same signon-realm (excluding the protocol),
PasswordForm::Scheme and username but different password.

Bug: 871140
Change-Id: If28c60f0a42f288c1f20a61f35c848978da39b49
Reviewed-on: https://chromium-review.googlesource.com/1196342
Commit-Queue: Narcis Gemene <gemene@google.com>
Reviewed-by: Jan Wilken Dörrie <jdoerrie@chromium.org>
Cr-Commit-Position: refs/heads/master@{#587640}

Removed slide animation from location_icon_view and changed it so it
uses the animation in its parent class, this fixes a bug where after
hiding the security chip it wouldn't be shown again.

Bug: 875182
Change-Id: I75a7eec4168d80684a11e335639d0a278b8391e5
Reviewed-on: https://chromium-review.googlesource.com/1187658
Commit-Queue: Carlos IL <carlosil@chromium.org>
Reviewed-by: Justin Donnelly <jdonnelly@chromium.org>
Cr-Commit-Position: refs/heads/master@{#587639}

This CL fixes the cc-side logic for computing the clip rect to
pay attention to the scroller padding. Unlike in Blink we do
not need to adjust for the border, since it isn't included in the
cc-side scroll bounds[0].

Tests are added for both scroller padding and border; the latter is
important as per crbug.com/753124 we may someday change the cc bounds
to include the border. If/when that happens we will need to offset
for the border size as well.

[0]: https://cs.chromium.org/chromium/src/third_party/blink/renderer/platform/graphics/compositing/paint_artifact_compositor.cc?l=203&rcl=3ad6465f517124e8a23434c21f1c543ad47b1d5a

Bug: 814141
Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_layout_tests_slimming_paint_v2;master.tryserver.blink:linux_trusty_blink_rel
Change-Id: Ie5371198fee3710150c24d077fc31a7da1d037d2
Reviewed-on: https://chromium-review.googlesource.com/1180071Reviewed-by: Philip Rogers <pdr@chromium.org>
Reviewed-by: Tien-Ren Chen <trchen@chromium.org>
Reviewed-by: Yi Gu <yigu@chromium.org>
Commit-Queue: Stephen McGruer <smcgruer@chromium.org>
Cr-Commit-Position: refs/heads/master@{#587638}

For consistency across platforms, the file has been renamed.

Bug: 707030
Test: Local
Change-Id: I18eb37e562a4b3d9946152b0f1153ba113cb340a
Reviewed-on: https://chromium-review.googlesource.com/1196890
Commit-Queue: Fabrice de Gans-Riberi <fdegans@chromium.org>
Commit-Queue: Kevin Marshall <kmarshall@chromium.org>
Reviewed-by: Kevin Marshall <kmarshall@chromium.org>
Cr-Commit-Position: refs/heads/master@{#587637}

Bug: 877163
Change-Id: I9f1b221bbbfbfb34d4a796c109ef7595e17bbc40
Reviewed-on: https://chromium-review.googlesource.com/1195928
Commit-Queue: Weidong Guo <weidongg@chromium.org>
Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#587636}

This avoids the following jumbo build error:

./../../chrome/browser/extensions/api/content_settings/content_settings_api.cc:255:36: error: no member named 'kPermissionDelegation' in namespace 'extensions::features'; did you mean '::features::kPermissionDelegation'?

      base::FeatureList::IsEnabled(features::kPermissionDelegation)) {
                                   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
                                   ::features::kPermissionDelegation
../../chrome/common/chrome_features.h:301:28: note: '::features::kPermissionDelegation' declared here
extern const base::Feature kPermissionDelegation;
                           ^

Followup to https://chromium-review.googlesource.com/1173192

Change-Id: I6b6c39ed99f17a48bf7625aecf36ae3a23052ef0
Reviewed-on: https://chromium-review.googlesource.com/1193935Reviewed-by: Devlin <rdevlin.cronin@chromium.org>
Commit-Queue: Mostyn Bramley-Moore <mostynb@vewd.com>
Cr-Commit-Position: refs/heads/master@{#587635}

Bug: 865500
Change-Id: I3216ff4dc97661409597740a613c5947bc4e09e2
Reviewed-on: https://chromium-review.googlesource.com/1143705Reviewed-by: Theresa <twellington@chromium.org>
Reviewed-by: Michael Martis <martis@chromium.org>
Reviewed-by: Becky Zhou <huayinz@chromium.org>
Commit-Queue: anthonyvd <anthonyvd@chromium.org>
Cr-Commit-Position: refs/heads/master@{#587634}

Change-Id: I2e7443a02e3bb6f46e1065b9164af72393912344
Reviewed-on: https://chromium-review.googlesource.com/1196103Reviewed-by: Patrick Hulce <phulce@chromium.org>
Reviewed-by: Dmitry Gozman <dgozman@chromium.org>
Commit-Queue: Paul Irish <paulirish@chromium.org>
Cr-Commit-Position: refs/heads/master@{#587633}

Check that normal response is parsed correctly with some edge cases.

Change-Id: Id8ad7e31f4055ffab611e9cd7f1e2d977c96b717
Reviewed-on: https://chromium-review.googlesource.com/1184909
Commit-Queue: Valeriya Sinevich <valeriyas@google.com>
Reviewed-by: David Roger <droger@chromium.org>
Cr-Commit-Position: refs/heads/master@{#587632}

Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:linux_vr;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel
Change-Id: Ib63a081c119789a29f6c0c4e1906ca52e4c12315
Reviewed-on: https://chromium-review.googlesource.com/1195891Reviewed-by: Christopher Grant <cjgrant@chromium.org>
Commit-Queue: Aldo Culquicondor <acondor@chromium.org>
Cr-Commit-Position: refs/heads/master@{#587631}

Bug: 856516
Cq-Include-Trybots: luci.chromium.try:ios-simulator-cronet;luci.chromium.try:ios-simulator-full-configs
Change-Id: I793838671588db112b478e9d7e936dea3b430426
Reviewed-on: https://chromium-review.googlesource.com/1197082Reviewed-by: John Budorick <jbudorick@chromium.org>
Commit-Queue: Justin Cohen <justincohen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#587630}

GetWindowForPoint() is only called from GetEventHandlerForPoint() and
two parameters passed to GetEventHandlerForPoint() are always true.

BUG=none
TEST=none

Change-Id: Ib107abaa6223dfa1ce8f9fad0505ffed9c6a9784
Reviewed-on: https://chromium-review.googlesource.com/1194788Reviewed-by: Sadrul Chowdhury <sadrul@chromium.org>
Commit-Queue: Scott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#587629}

A number of changes have landed recently that may eliminate the
flakieness seen in this test. This CL re-enables the test, but feel
free to revert this if the flakes continue.

Bug: 83380
Change-Id: I0fb587a394bcaaae54a8bdc85ec6861a775f3d31
Reviewed-on: https://chromium-review.googlesource.com/1196767Reviewed-by: Ken Buchanan <kenrb@chromium.org>
Commit-Queue: James MacLean <wjmaclean@chromium.org>
Cr-Commit-Position: refs/heads/master@{#587628}

A number of changes have landed recently that may eliminate the
flakieness seen in this test. This CL re-enables the test, but feel
free to revert this if the flakes continue.

Bug: 833380
Change-Id: I79216b82cf1c14e4c857430d742ddb3933a7dcc9
Reviewed-on: https://chromium-review.googlesource.com/1196766Reviewed-by: Ken Buchanan <kenrb@chromium.org>
Commit-Queue: James MacLean <wjmaclean@chromium.org>
Cr-Commit-Position: refs/heads/master@{#587627}

This change adds a summary card to the dino page that can be presented
to the user if they have offline content available. When this
experimental feature is enabled the page has other elements also
presented in a different way.

In addition to that it also adds localized strings for presenting
offline content on the error page, supporting the summary and the list
(still in development) presentation options.

Bug: 852872
Change-Id: I27cc07a41591b086fc0c9783ce8a4dd657182c57
Reviewed-on: https://chromium-review.googlesource.com/1192692Reviewed-by: Edward Jung <edwardjung@chromium.org>
Reviewed-by: Matt Menke <mmenke@chromium.org>
Commit-Queue: Carlos Knippschild <carlosk@chromium.org>
Cr-Commit-Position: refs/heads/master@{#587626}

This is being moved into webrtc directly where it will actually
have an effect on the compiler.

See https://webrtc-review.googlesource.com/c/src/+/96623

BUG=588506

Change-Id: I23b7495424fa03ab6ee1c616f14f610f2850940e
Reviewed-on: https://chromium-review.googlesource.com/1195750
Commit-Queue: Will Harris <wfh@chromium.org>
Reviewed-by: Tommi <tommi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#587625}

BUG=None

Change-Id: Ia67696cab13d502f8473ea4d4bc18cdc94a30d6c
Reviewed-on: https://chromium-review.googlesource.com/1196028Reviewed-by: Scott Violet <sky@chromium.org>
Commit-Queue: Will Harris <wfh@chromium.org>
Cr-Commit-Position: refs/heads/master@{#587624}

Previously, the contrib/orderfile/ tests depended on system health
benchmark names. This meant the test broke any time the system health
benchmarks were changed. As we now believe the orderfile generation is
not sensitive to the exact partition of benchmark, the test is changed
to just do counting.

Bug: 878390
Change-Id: Idff912eaef63f4687ab1b3f3946160a57f57aa02
Reviewed-on: https://chromium-review.googlesource.com/1196889
Commit-Queue: Matthew Cary <mattcary@chromium.org>
Reviewed-by: Ulan Degenbaev <ulan@chromium.org>
Reviewed-by: Juan Antonio Navarro Pérez <perezju@chromium.org>
Cr-Commit-Position: refs/heads/master@{#587623}

We are using the value of the property
BottomToolbarModel.PRIMARY_COLOR before it has ever been set. The
default value of the property key is 0 and is not correct. This CL sets
the property to the normal modern color. This should be correct since
the app never starts off in incognito mode.

Bug: 878564, 879076
Change-Id: Icb310e93bd2aa12d99ea8644ea559565ece7aa07
Reviewed-on: https://chromium-review.googlesource.com/1196167
Commit-Queue: Pedro Amaral <amaralp@chromium.org>
Reviewed-by: Matthew Jones <mdjones@chromium.org>
Cr-Commit-Position: refs/heads/master@{#587622}

Add dialog sheets and the underlying logic to enable turning the BLE
adapter on automatically/manually in the WebAuthn dialogs.

This also necessitated adding some plumbing to:
 1) Allow sheet models to be mutable, as well as add notifications to
    trigger updating the dialog view state when the model changes.

 2) Notify sheet models when the Bluetooth adapter state changes.

Bug: 849323
Change-Id: Id93b3d2fbae70daa0d8ff3609c4cca3c9d33d098
Reviewed-on: https://chromium-review.googlesource.com/1196371
Commit-Queue: Balazs Engedy <engedy@chromium.org>
Reviewed-by: Martin Kreichgauer <martinkr@google.com>
Cr-Commit-Position: refs/heads/master@{#587621}

Feed component adds a significant amount of code that's not used yet
for users. See Feed DEPS rolls for current size impact.

Change-Id: I2c77f9f8d640b46c58602b29a3f79357f7cb1140
Reviewed-on: https://chromium-review.googlesource.com/1188596Reviewed-by: Filip Gorski <fgorski@chromium.org>
Commit-Queue: Sky Malice <skym@chromium.org>
Cr-Commit-Position: refs/heads/master@{#587620}

This CL uses ScopedBlockingCall to mark blocking calls in /ios/chrome/browser/browser_state.

This CL was created by replacing calls to AssertBlockingAllowed()
with instantiations of ScopedBlockingCall(MAY_BLOCK).
I kindly ask the reviewer to make sure of the following:
  - ScopedBlockingCall is instantiated in a scope with minimal CPU usage.
    If this is not the case, ScopedBlockingCall should be instantiated
    closer to the blocking call. See scoped_blocking_call.h for more
    info. Please let me know when/where the blocking call happens if this needs
    to be changed.
  - Parameter |blocking_type| matches expectation (MAY_BLOCK/WILL_BLOCK). See
    BlockingType for more info. While I assumed MAY_BLOCK by default, that might
    not be the best fit if we know that this callsite is guaranteed to block.
  - The ScopedBlockingCall's scope covers the entirety of the blocking operation
    previously asserted against by the AssertBlockingAllowed().

This CL was uploaded by git cl split.

R=sdefresne@chromium.org

Bug: 874080
Cq-Include-Trybots: luci.chromium.try:ios-simulator-cronet;luci.chromium.try:ios-simulator-full-configs
Change-Id: I84da700fb1fc68393c2f5483c96895e8cc6b4d63
Reviewed-on: https://chromium-review.googlesource.com/1191141Reviewed-by: Sylvain Defresne <sdefresne@chromium.org>
Commit-Queue: Etienne Pierre-Doray <etiennep@chromium.org>
Cr-Commit-Position: refs/heads/master@{#587619}

Makes sure all toggles are hidden for ALL_SITES and USE_STORAGE.

Bug: 854737
Test: Add one test case.
Change-Id: I1a174246a79bcefdc63489a7f6997e0bc3c8eace
Reviewed-on: https://chromium-review.googlesource.com/1188494
Commit-Queue: Xiaohan Wang <xhwang@chromium.org>
Reviewed-by: Finnur Thorarinsson <finnur@chromium.org>
Cr-Commit-Position: refs/heads/master@{#587618}

This queues a report through the Reporting API whenever
navigator.requestMIDIAccess is invoked from a frame in which the 'midi`'
feature is not allowed according to feature policy.

Bug: 867471
Change-Id: Ib7966a3721067fcf7a325d75377178caaa4b327a
Reviewed-on: https://chromium-review.googlesource.com/1195703
Commit-Queue: Ian Clelland <iclelland@chromium.org>
Reviewed-by: Takashi Toyoshima <toyoshim@chromium.org>
Cr-Commit-Position: refs/heads/master@{#587617}

- Vertically center the radio button
- Use android:textAppearance for text properties

For the record, here's the instruction to test "confirm import sync
data" dialog:
0) Make sure you have at least two accounts on the device.
1) Go to Chrome settings.
2) Click on your Account name.
3) Click on "Sync (Syncing to peter@example.com)"
3) Click on "Sync to (peter@example.com)"
4) Pick a different account.

Screenshots on the change on "confirm import sync data" can be found
at https://photos.app.goo.gl/hriUs5o8ZKBrqiQ28

Bug: 854737
Test: Manually checked all use cases of RadioButtonWithDescription
Change-Id: I93d3a40d55811dc43a7a0191870e85d01735dcff
Reviewed-on: https://chromium-review.googlesource.com/1187652
Commit-Queue: Xiaohan Wang <xhwang@chromium.org>
Reviewed-by: Peter Conn <peconn@chromium.org>
Reviewed-by: Theresa <twellington@chromium.org>
Cr-Commit-Position: refs/heads/master@{#587616}

https://chromium.googlesource.com/angle/angle.git/+log/f0d0408a355e..80aa5592d9dd


git log f0d0408a355e..80aa5592d9dd --date=short --no-merges --format='%ad %ae %s'
2018-08-30 oetuaho@nvidia.com Clean up TextureD3D_2DMultisample


Created with:
  gclient setdep -r src/third_party/angle@80aa5592d9dd

The AutoRoll server is located here: https://autoroll.skia.org/r/angle-chromium-autoroll

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md

If the roll is causing failures, please contact the current sheriff, who should
be CC'd on the roll, and stop the roller if necessary.

CQ_INCLUDE_TRYBOTS=luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel
TBR=geofflang@chromium.org

Change-Id: Ic9e7dad2f8d3035c0ed4dc2b767b227b0cc9450b
Reviewed-on: https://chromium-review.googlesource.com/1196843Reviewed-by: angle-chromium-autoroll <angle-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Commit-Queue: angle-chromium-autoroll <angle-chromium-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Cr-Commit-Position: refs/heads/master@{#587615}

If everything is zero, we can save some work. This accounts for 2-3% of
the total time of the flexbox-with-stretch-layout.html perf test.

R=eae@chromium.org

Cq-Include-Trybots: luci.chromium.try:linux_layout_tests_layout_ng
Change-Id: Ie1a1f0df9a79aedd9e526b58e62a5f3b2b716a12
Reviewed-on: https://chromium-review.googlesource.com/1196585
Commit-Queue: Christian Biesinger <cbiesinger@chromium.org>
Commit-Queue: Emil A Eklund <eae@chromium.org>
Reviewed-by: Emil A Eklund <eae@chromium.org>
Reviewed-by: Morten Stenshorne <mstensho@chromium.org>
Cr-Commit-Position: refs/heads/master@{#587614}

Sets the value of the new Autofill prefs "once" to the value of the now
deprecated Autofill master pref once all profile prefs are registered.
This is required for those users who had Autofill disabled before
introduction of the new prefs.

Bug: 870328,877801
Cq-Include-Trybots: luci.chromium.try:ios-simulator-cronet;luci.chromium.try:ios-simulator-full-configs
Change-Id: Iac4c1f7325c3a058b3d0fda0af0500a0ff23106a
Reviewed-on: https://chromium-review.googlesource.com/1194598
Commit-Queue: Moe Ahmadi <mahmadi@chromium.org>
Reviewed-by: Peter Lee <pkl@chromium.org>
Reviewed-by: Dominic Battré <battre@chromium.org>
Reviewed-by: Mathieu Perreault <mathp@chromium.org>
Reviewed-by: Sebastien Seguin-Gagnon <sebsg@chromium.org>
Cr-Commit-Position: refs/heads/master@{#587613}

Cq-Include-Trybots: luci.chromium.try:ios-simulator-cronet;luci.chromium.try:ios-simulator-full-configs
Change-Id: Ie1fe2de0b618f042fcd3c0cc6d332fa6759cf689
Reviewed-on: https://chromium-review.googlesource.com/1196242Reviewed-by: John Budorick <jbudorick@chromium.org>
Commit-Queue: Justin Cohen <justincohen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#587612}

Add support for the key derivation method field in the NigoriSpecifics
proto in SyncEncryptionHandlerImpl. Persist the key derivation method
chosen for new passphrases in NigoriSpecifics. If updating from a remote
NigoriSpecifics, respect the key derivation method stored there. The
change is limited to cases when the passphrase type is
CUSTOM_PASSPHRASE.

A rationale for the change follows.

Prerequisite: if the custom passphrase key derivation method is set to
PBKDF2 (or UNSPECIFIED), the behavior of all decryption is exactly the
same as in previous versions.

Let "happy paths" be the encryption and decryption code paths which a
keystore-enabled client (referring to a client released after the
support for keystore migrations was introduced) will be able to hit
starting from a fresh account, if only other keystore-enabled clients
are syncing to that account.  Since legacy encryption methods are out of
scope for the change, we need to change the behavior only in these
"happy paths", and keep the behavior identical in others.

In ApplyNigoriUpdateImpl, we will read the key derivation method from
Nigori and save it in the class member.

In "happy paths", we will always know what key derivation method will be
used, and we will always know when we'll end up in a CUSTOM_PASSPHRASE
state. We will remember the key derivation method in the class as a
member when applicable. In particular, there are two such paths. Both
are short-circuits that are much easier to follow than the alternative,
legacy code paths:

1. |IsNigoriMigratedToKeystore() == true| case in
SetEncryptionPassphrase(), which calls SetCustomPassphrase() (only call
site). Here, it is us who are making the decision, so this is obvious.

2. |IsNigoriMigratedToKeystore() == true && ...| case in
SetDecryptionPassphrase(), which calls
DecryptPendingKeysWithExplicitPassphrase() (only call site). Here, we
will use the key derivation method from the member. Since we can't reach
this path in SetDecryptionPassphrase() without a valid Nigori node, we
assume that ApplyNigoriUpdateImpl() was called and has saved the key
derivation method from Nigori in the member.

Since we write the passphrase type to Nigori *only* in
AttemptToMigrateNigoriToKeystore, we will also write the custom
passphrase key derivation method *only* there. If the key derivation
method member is not set at that point (but the passphrase type we are
writing is CUSTOM_PASSPHRASE), that means we have reached the
CUSTOM_PASSPHRASE state through some other, non-"happy" path. In this
case, we will write PBKDF2 as the key derivation method. This will
ensure that decryption for these cases works the same way as in older
versions, no matter what.

The only thing that remains is converting an UNSPECIFIED key derivation
method in Nigori to PBKDF2. We will also do this in
ApplyNigoriUpdateImpl(), which is called when we receive a remote
Nigori. Because we expect to set the key derivation method explicitly
whenever we decide what it is, this will ensure that we use every chance
we can to set an explicit (rather than UNSPECIFIED) key derivation
method in Nigori.

Bug: 876408
Change-Id: Ia793f53f8777ed61af5edda9d8fa21090ad6da43
Reviewed-on: https://chromium-review.googlesource.com/1187148
Commit-Queue: David Davidović <davidovic@google.com>
Reviewed-by: Marc Treib <treib@chromium.org>
Reviewed-by: vitaliii <vitaliii@chromium.org>
Cr-Commit-Position: refs/heads/master@{#587611}

Before this patch, if a user attempted to open a second PaymentRequest
UI in a separate tab or window, the .show() promise would be rejected
with "AbortError: Request cancelled." This generic error message created
confusion about the reason why the PaymentRequest UI could not be
opened.

This patch keeps the AbortError, but makes the web developer visible
error message more specific to this error condition.

After this patch, if a user attempts to open a second PaymentRequest UI
in a separate tab or window, the .show() promise is rejected with
"AbortError: Another PaymentRequest UI is already showing in a
different tab or window."

Bug: 878453
Change-Id: I5d27171e21b69cfd5fc95a0a72cb6efce343ea5d
Reviewed-on: https://chromium-review.googlesource.com/1195650
Commit-Queue: Rouslan Solomakhin <rouslan@chromium.org>
Reviewed-by: Mike West <mkwst@chromium.org>
Reviewed-by: Ganggui Tang <gogerald@chromium.org>
Cr-Commit-Position: refs/heads/master@{#587610}

This CL uses ScopedBlockingCall to mark blocking calls in /chrome/browser/android/shortcut_helper.cc.

This CL was created by replacing calls to AssertBlockingAllowed()
with instantiations of ScopedBlockingCall(MAY_BLOCK).
I kindly ask the reviewer to make sure of the following:
  - ScopedBlockingCall is instantiated in a scope with minimal CPU usage.
    If this is not the case, ScopedBlockingCall should be instantiated
    closer to the blocking call. See scoped_blocking_call.h for more
    info. Please let me know when/where the blocking call happens if this needs
    to be changed.
  - Parameter |blocking_type| matches expectation (MAY_BLOCK/WILL_BLOCK). See
    BlockingType for more info. While I assumed MAY_BLOCK by default, that might
    not be the best fit if we know that this callsite is guaranteed to block.
  - The ScopedBlockingCall's scope covers the entirety of the blocking operation
    previously asserted against by the AssertBlockingAllowed().

This CL was uploaded by git cl split.

R=dominickn@chromium.org

Bug: 874080
Change-Id: I4555e73ef3bfcb18745bb578d495198908c88609
Reviewed-on: https://chromium-review.googlesource.com/1191789Reviewed-by: Dominick Ng <dominickn@chromium.org>
Commit-Queue: Etienne Pierre-Doray <etiennep@chromium.org>
Cr-Commit-Position: refs/heads/master@{#587609}