GitLab

We use the same CSS style for both now and don't need an independent CSS for the demo dialog.

Bug: b:172388847
Change-Id: Id1f0510c30a09806d0d8487b5e7287bf435c0ae7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2533393Reviewed-by: Denis Kuznetsov [CET] <antrim@chromium.org>
Reviewed-by: Yves Arrouye <drcrash@chromium.org>
Reviewed-by: Aga Wronska <agawronska@chromium.org>
Commit-Queue: Jackson Tadie <jacksontadie@google.com>
Cr-Commit-Position: refs/heads/master@{#828339}

We don't use the Service Manager anymore and the relevant bits here
(e.g. download manager) no longer have anything to do with the Service
Manager. To avoid confusion as Service Manager code is removed, symbol
names and documentation have been renamed here.

A few symbols have not been renamed despite having potentially
misleading names now, because they correspond to feature flag strings
which may need to retain their existing values.

Bug: 977637
Change-Id: I017c02f026e52f68e844012883b0d3856c518524
Tbr: carlosk@chromium.org
Tbr: cduvall@chromium.org
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2541662Reviewed-by: David Trainor <dtrainor@chromium.org>
Reviewed-by: Ted Choc <tedchoc@chromium.org>
Commit-Queue: Ken Rockot <rockot@google.com>
Cr-Commit-Position: refs/heads/master@{#828338}

This reverts commit 269f7161.

Reason for revert: Tests are failing on MSAN
https://ci.chromium.org/p/chromium/builders/ci/Linux%20MSan%20Tests/26262

Original change's description:
> cc: Set up a Flag for Displaying Performance Metrics
>
> Set up a feature flag and corresponding state inside cc to enable
> using HUD for displaying performance metrics. Currently when we enable
> the show performance metrics flag we only add WebVitals metrics, which
> comes from Blink. We might want to add other metrics in the future.
>
> R=​sadrul
>
> Bug: 1149385
> Change-Id: I437e113a5fc4f44c6fbaa542c92d1f2da6cbb393
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2540570
> Commit-Queue: weiliangc <weiliangc@chromium.org>
> Reviewed-by: Sadrul Chowdhury <sadrul@chromium.org>
> Reviewed-by: David Bokan <bokan@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#828221}

TBR=sadrul@chromium.org,bokan@chromium.org,weiliangc@chromium.org

Change-Id: Ie5b290290078f669f487f8792020fe4e822798fe
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1149385
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2545250Reviewed-by: Marijn Kruisselbrink <mek@chromium.org>
Commit-Queue: Marijn Kruisselbrink <mek@chromium.org>
Cr-Commit-Position: refs/heads/master@{#828337}

This cl moves the logic for Signin Promo from SignInPreference to
SyncPromoPreference. Briefly the main changes in this cl are:

1. SignInPreference no longer has reference to SigninPromoController.
2. Introduce a new state in SignInPreference to hide it when promos are
   shown by SyncPromoPreference.
3. setChangedCallBack() in SignInPreference has been moved to
   SyncPromoPreference. This callback is used by the MainSettings page
   to hide "Account" category section when signin promo is shown.

Bug: 1110889
Change-Id: I5c0805c30f5bde04cde79d9135aef4fdaf382df1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2505144Reviewed-by: Boris Sazonov <bsazonov@chromium.org>
Commit-Queue: Tanmoy Mollik <triploblastic@chromium.org>
Cr-Commit-Position: refs/heads/master@{#828336}

Pass in a base::GUID in lieu of a std::string GUID.

Bug: 1026195
Change-Id: Ia7b6395c044e527c8a064cea973bc8bd0b4452e5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2527853
Commit-Queue: Daniel Hosseinian <dhoss@chromium.org>
Reviewed-by: Mikel Astiz <mastiz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#828335}

This change re-enables testImmediateAddition and
testImmediateAdditionAfterReload with LegacyTestParams so that the old
code continues being covered.

Bug: 1116744
Change-Id: If46d9dc9fe0e7bef22c987b8da1c2e8c9d711fb1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2542942Reviewed-by: Richard Coles <torne@chromium.org>
Commit-Queue: Oksana Zhuravlova <oksamyt@chromium.org>
Cr-Commit-Position: refs/heads/master@{#828334}

Generate DIR_METADATA files and remove metadata from OWNERS
files for directories under //chrome.

Bug: 1113033
Change-Id: I169f0d89b0b94559cef80c9fde4d17d49f568433
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2545024
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Auto-Submit: Edward Lesmes <ehmaldonado@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#828333}

Use local variables to store the title for action injected to the
action menu controller and use "using" clause to reduce length of
the lines in order to improve formatting of the file.

Bug: none
Change-Id: Ia9a46cc8f666757097dd1adf49e8054d3bb74578
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2544724
Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>
Commit-Queue: Sebastien Lalancette <seblalancette@chromium.org>
Auto-Submit: Sylvain Defresne <sdefresne@chromium.org>
Reviewed-by: Sebastien Lalancette <seblalancette@chromium.org>
Cr-Commit-Position: refs/heads/master@{#828332}

Bug: 1150014
Change-Id: I39a8506b15e8c966da1c8746724663cd7baf1fd9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2544922Reviewed-by: Justin Cohen <justincohen@chromium.org>
Commit-Queue: Javier Flores <javierrobles@chromium.org>
Cr-Commit-Position: refs/heads/master@{#828331}

Use testdriver Action API to simulate mouse actions in
html/user-activation/no-activation-thru-escape-key.html.

Bug: 1145677
Change-Id: Id37bbe39be94b096939fe81d0c8053306accecb3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2537132Reviewed-by: Mustaq Ahmed <mustaq@chromium.org>
Commit-Queue: Lan Wei <lanwei@chromium.org>
Cr-Commit-Position: refs/heads/master@{#828330}

Run ambient mode UI on each connected display.
RootWindowController construction handles adding ambient widgets
to new displays while ambient mode is running, and destructing them
on display removed.

BUG=b:139953389

Cq-Include-Trybots: luci.chrome.try:linux-chromeos-chrome
Change-Id: Ic57c33491098b66c7c0e90ef1f3d12c71f1fc303
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2516968
Commit-Queue: Jeffrey Young <cowmoo@chromium.org>
Reviewed-by: Mitsuru Oshima <oshima@chromium.org>
Reviewed-by: Xiaohui Chen <xiaohuic@chromium.org>
Reviewed-by: Tao Wu <wutao@chromium.org>
Cr-Commit-Position: refs/heads/master@{#828329}

This change introduces a DiagnosticsUI::BindInterface specialization
for SystemRoutineController

Bug: 1128204
Change-Id: I29edfe0df33a53dcae131e1941c45576f217d5a9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2541572
Auto-Submit: Bailey Berro <baileyberro@chromium.org>
Reviewed-by: Zentaro Kavanagh <zentaro@chromium.org>
Commit-Queue: Bailey Berro <baileyberro@chromium.org>
Cr-Commit-Position: refs/heads/master@{#828328}

The thread cache was enabled only the DCHECK() builds, because it might
regress memory usage. Enable it unconditionally.

Note to sheriffs: If there is a PartitionAlloc memory regression in
range, this is the likely culprit.

Bug: 998048
Change-Id: Ie7b267cd26dbefee15962d36deb59644562701bf
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2544550Reviewed-by: Kentaro Hara <haraken@chromium.org>
Commit-Queue: Benoit L <lizeb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#828327}

Bug: 1141099
Change-Id: Ia236c2e838a38fddb7764fe62195e6d59ee1aeb4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2540609Reviewed-by: Brian White <bcwhite@chromium.org>
Commit-Queue: Erik Språng <sprang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#828326}

This CL is making consistent the encoding of the unicode literals in
RenderText unitests.

The use of \uXXXX is preferred.

R=msw@chromium.org

Bug: 1085014
Change-Id: Idda342dd8e88b6b748a0b0ac4cb7c6bbbe11d62f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2543376Reviewed-by: Michael Wasserman <msw@chromium.org>
Commit-Queue: Etienne Bergeron <etienneb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#828325}

If CheckedPtr is used in logging.h, we hit an error "logging.h should not include check.h"

Change-Id: I5192d713b67fc14634a879312d86667c22a3976a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2543525
Commit-Queue: Keishi Hattori <keishi@chromium.org>
Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Reviewed-by: Bartek Nowierski <bartekn@chromium.org>
Reviewed-by: Łukasz Anforowicz <lukasza@chromium.org>
Cr-Commit-Position: refs/heads/master@{#828324}

Generate DIR_METADATA files and remove metatada from OWNERS files for
//components/download

Bug: 1113033
Change-Id: Iafaaa6b893eeef1bf2add1033bf2b12fd39a56e6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2542947Reviewed-by: David Trainor <dtrainor@chromium.org>
Commit-Queue: Norman Rosas <normando@google.com>
Cr-Commit-Position: refs/heads/master@{#828323}

Generate DIR_METADATA files and remove metatada from OWNERS files for
//components/embedder_support

Bug: 1113033
Change-Id: Ic5f956d9dfc0adb6dba6d7d74f858c86cd3ba03b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2542771Reviewed-by: Colin Blundell <blundell@chromium.org>
Commit-Queue: Norman Rosas <normando@google.com>
Cr-Commit-Position: refs/heads/master@{#828322}

After I finish the ETW event logging impl, the host will log to
the Windows event log from two locations (one for general host
status changes and the other for logging events).  The code used
to register/deregister/trace is the same so I've refactored it
into a common class that can be used by both loggers.

Change-Id: Id61afc67ab528a59d63d98d1c4e82a14fdc3b6bb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2544075
Commit-Queue: Joe Downing <joedow@chromium.org>
Reviewed-by: Jamie Walch <jamiewalch@chromium.org>
Cr-Commit-Position: refs/heads/master@{#828321}

ScopedObserver is being deprecated in favor of two new classes:
- base::ScopedObservation for observers that only ever observe
  a single source.
- base::ScopedMultiSourceObservation for observers that do or may
  observe more than a single source.

This CL was uploaded by git cl split.

R=melandory@chromium.org

Bug: 1145565
Change-Id: I88db09e58a1913cd84214c8179801fd254b9c6c0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2533133Reviewed-by: Marc Treib <treib@chromium.org>
Commit-Queue: Sigurður Ásgeirsson <siggi@chromium.org>
Auto-Submit: Sigurður Ásgeirsson <siggi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#828320}

This change handles the cases of brand new IDL files added to a build,
or cases where files under third_party\win_build_output\midl are
(unexpectedly) missing. This change also has some minor refactoring of
the |writes_tlb| midl.gni option.

Bug: 1149764
Change-Id: If2e608f2e986bd3fbc13a3a7b699801660c2ffa1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2543367
Commit-Queue: S. Ganesh <ganesh@chromium.org>
Reviewed-by: Nico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#828319}

Bug: 1146151
Change-Id: I854913ca3604768684c100b17abdf25b7766e2b6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2542804
Commit-Queue: Sophie Chang <sophiechang@chromium.org>
Reviewed-by: Michael Crouse <mcrouse@chromium.org>
Cr-Commit-Position: refs/heads/master@{#828318}

This reverts commit 5f42b6c7.

Reason for revert: Causing test failures in https://ci.chromium.org/p/chromium/builders/ci/Linux%20ASan%20Tests%20%28sandboxed%29/72608

../../content/browser/renderer_host/navigation_controller_impl_browsertest.cc:10961: Failure
Expected equality of these values:
  root->child_at(0)->current_frame_host()->GetLastCommittedURL()
    Which is: http://another-site.com:35903/title2.html
  GURL("http://another-site.com:0/title2.html#someRef")
    Which is: http://another-site.com:0/title2.html#someRef

Original change's description:
> blink: Bring SecurityOrigin port=0 handling in line with //url
>
> SecurityOrigin currently returns identical objects when constructed from
> KURLs with ports explicitly set to 0 and KURLs with ports equal to their
> schemes' defaults. This is inconsistent with the //url implementation
> (and the HTML spec!).
>
> This CL makes two changes to ensure that
>   AreSameOrigin(KURL("https://a.com:0"), KURL("https://a.com"))
> starts returning false.
>
> (1)  It updates SecurityOrigin(KURL) to set the origin's "effective
> port" field to the given URL's protocol's default port when the URL's
> parsed port is empty.
> (2)  It updates SecurityOrigin::IsSameOriginWith to use
> SecurityOrigin::effective_port_ for comparison rather than
> SecurityOrigin::port_.
>
> (SecurityOrigin::effective_port_ and SecurityOrigin::port_ differ in
> that `effective_port_` takes into account empty/default ports, and
> `port_` doesn't; prior to this change, `effective_port_` was being
> initialized incorrectly to the default port for SecurityOrigins
> constructed from URLs with port explicitly set to 0.)
>
> This CL adds serialization behavior for port-0 origins that is incorrect
> but matches url::Origin's. Port-0 origins' serializations should include
> the port, but they currently don't (crbug.com/1136966). A subsequent
> change will implement this fix for both SecurityOrigin and url::Origin.
> (Doing one at a time is tricky because some tests check equality of
> origins' serializations.)
>
> Test: Adds unit tests covering same-originness and effective_port_.
> Change-Id: I5f9b4478d28d2892abb31ea9e12ab7d3bcaa8077
> Fixed: 1136678, 1138540, 1100794
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2472460
> Auto-Submit: David Van Cleve <davidvc@chromium.org>
> Reviewed-by: Charlie Reis <creis@chromium.org>
> Reviewed-by: Andy Paicu <andypaicu@chromium.org>
> Reviewed-by: Mike West <mkwst@chromium.org>
> Reviewed-by: Łukasz Anforowicz <lukasza@chromium.org>
> Commit-Queue: David Van Cleve <davidvc@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#828240}

TBR=creis@chromium.org,lukasza@chromium.org,mkwst@chromium.org,andypaicu@chromium.org,davidvc@chromium.org

Change-Id: I008878ca4412715e6bbaab611307cdd6178b50b2
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2545227Reviewed-by: Marijn Kruisselbrink <mek@chromium.org>
Commit-Queue: Marijn Kruisselbrink <mek@chromium.org>
Cr-Commit-Position: refs/heads/master@{#828317}

Generate DIR_METADATA files and remove metadata from OWNERS
files for directories under //chrome.

Bug: 1113033
Change-Id: Ifef310c71f90479e7c0ab615e4c9066ad7ebeb9e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2545242
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Auto-Submit: Edward Lesmes <ehmaldonado@chromium.org>
Cr-Commit-Position: refs/heads/master@{#828316}

Replace uses of "blacklistDomains" with "excludedDomains". This matches
the terminology already used on the C++ side of the bridge.

Bug: 1149433
Change-Id: If9addd57f589613d1094c3d1dc4c8848f32fe85b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2541064
Auto-Submit: Natalie Chouinard <chouinard@chromium.org>
Reviewed-by: Christian Dullweber <dullweber@chromium.org>
Commit-Queue: Natalie Chouinard <chouinard@chromium.org>
Cr-Commit-Position: refs/heads/master@{#828315}

With this change we introduce a ErrorInfo struct that has the Error enum
and optional integer argument that can be used to format the error
message.

BUG=b:166322619
TEST=unit_tests  --gtest_filter='*ProvisioningErrorDisplay*'

Change-Id: I6aecddf325e9b350c057f93b1f22784cff3ba0cc
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2532908Reviewed-by: Hidehiko Abe <hidehiko@chromium.org>
Commit-Queue: Muhammad Hasan Khan <mhasank@chromium.org>
Cr-Commit-Position: refs/heads/master@{#828314}

* Reduces the intensity of the ambient/environment map
* Adds a directional light from the information provided by the probe
* Only creates a light probe of the requested texture type due to a bug
  in the implementation that always uses the texture type of the first
  light probe.

Change-Id: I6e798f64b92ae903c8931eee07af981981cea42b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2542651
Auto-Submit: Alexander Cooper <alcooper@chromium.org>
Commit-Queue: Brandon Jones <bajones@chromium.org>
Reviewed-by: Brandon Jones <bajones@chromium.org>
Cr-Commit-Position: refs/heads/master@{#828313}

Adds a new toggle in Privacy settings to enable incognito authentication
which prompts the user for face/touch/code-ID before allowing to enable.
Adds some code to SceneAgent to authenticate through the same mechanism
as settings.

Bug: 1138892
Change-Id: Ic34f51a09b0049e37a2a4e2619b862369ae71688
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2527201Reviewed-by: Gauthier Ambard <gambard@chromium.org>
Commit-Queue: Stepan Khapugin <stkhapugin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#828312}

https://imgur.com/a/75Ct7RK

Bug: 1070910
Change-Id: Ia511037f01012fa75a17ab88a92bda606974849a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2543043Reviewed-by: dpapad <dpapad@chromium.org>
Commit-Queue: John Lee <johntlee@chromium.org>
Cr-Commit-Position: refs/heads/master@{#828311}

This CL has no behavior changes.

TBR=futhark@chromium.org

No-Try: true
Change-Id: I212e00963ddb9636c6ab754bd28b4dcce2ad03a0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2545322
Commit-Queue: Kent Tamura <tkent@chromium.org>
Reviewed-by: Kent Tamura <tkent@chromium.org>
Cr-Commit-Position: refs/heads/master@{#828310}

KeyedServiceBaseFactory::service_name_ is used in decltype() to check that the types match.

Bug: 1073933
Change-Id: I8b3380c0c4e33e937d7da817b892dd86b530e4a8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2542937Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Reviewed-by: Bartek Nowierski <bartekn@chromium.org>
Reviewed-by: Łukasz Anforowicz <lukasza@chromium.org>
Commit-Queue: Keishi Hattori <keishi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#828309}

In accordance with current deprecation schedule.

Bug: 1149472
Bug: 1149473
Bug: 1149474
Bug: 1149475
Bug: 1149476
Bug: 1149477
Bug: 1149478
Bug: 1149479
Bug: 1149480
Bug: 1149481
Bug: 1149482
Bug: 1149483
Bug: 1149484
Bug: 1149485
Change-Id: I2a33c92b31613dfe18822715c1363108737e814b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2542731Reviewed-by: Jesse Doherty <jwd@chromium.org>
Reviewed-by: Anthony LaForge <laforge@chromium.org>
Commit-Queue: Derek Schuff <dschuff@chromium.org>
Cr-Commit-Position: refs/heads/master@{#828308}

Updates the expires_after attribute for 9 histograms that have
been used to generate alerts in the past 90 days and do not already have
a date later than or within 60 days of 2021-02-15.

TBR=chromium-metrics-reviews@google.com

Change-Id: Id403ba81739b1fe3472679211a1c5ef2a5cec2d6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2543453Reviewed-by: Chrome Metrics Logs <chrome-metrics-team+robot@google.com>
Commit-Queue: Chrome Metrics Logs <chrome-metrics-team+robot@google.com>
Cr-Commit-Position: refs/heads/master@{#828307}

ScopedObserver is being deprecated in favor of two new classes:
- base::ScopedObservation for observers that only ever observe
  a single source.
- base::ScopedMultiSourceObservation for observers that do or may
  observe more than a single source.

This CL was uploaded by git cl split.

R=tom.cassiotis@gmail.com

Bug: 1145565
Change-Id: I8c5915322326c6ed819025f922af9432aabc08be
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2532660
Auto-Submit: Sigurður Ásgeirsson <siggi@chromium.org>
Commit-Queue: Cait Phillips <caitkp@chromium.org>
Reviewed-by: Cait Phillips <caitkp@chromium.org>
Cr-Commit-Position: refs/heads/master@{#828306}

Bug: 1149987
Change-Id: Ia5c7842e90c3f757912aec993b504c4388617757
Tbr: yhirano@chromium.org
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2544844Reviewed-by: Marijn Kruisselbrink <mek@chromium.org>
Commit-Queue: Marijn Kruisselbrink <mek@chromium.org>
Cr-Commit-Position: refs/heads/master@{#828305}

See https://skia-review.googlesource.com/c/skia/+/335593

Bug: skia:7650
Change-Id: Ie8237e3fb62ba95a0b1ccfd582dc04ce45885aac
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2544804Reviewed-by: Florin Malita <fmalita@chromium.org>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Cr-Commit-Position: refs/heads/master@{#828304}

This CL records state of the EduCoexistence flow when it is closed.
This will allow us to understand the user drop off rate.

Bug: 1140250
Change-Id: I4f3e7ff6324746b964644b7c6f24e8eeeadf7c70
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2523522
Commit-Queue: Yilkal Abe <yilkal@chromium.org>
Reviewed-by: Aga Wronska <agawronska@chromium.org>
Reviewed-by: Kush Sinha <sinhak@chromium.org>
Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Reviewed-by: Jesse Doherty <jwd@chromium.org>
Cr-Commit-Position: refs/heads/master@{#828303}

This reverts commit a3bfafb1.

Reason for revert: Breaks compilation, for example on https://ci.chromium.org/p/chromium/builders/ci/Deterministic%20Linux%20%28dbg%29/19608

[14678/62398] ACTION //tools/privacy_budget/blink_apis:blink_apis(//build/toolchain/linux:clang_x64)
FAILED: blink_apis.textpb 
python ../../tools/privacy_budget/blink_apis/generate_blink_api_db.py --web_idl_database gen/third_party/blink/renderer/bindings/web_idl_database.pickle --output blink_apis.textpb --path ../../third_party/blink/renderer/bindings/scripts:../../third_party/blink/renderer/build/scripts:pyproto/tools/privacy_budget/blink_apis/proto:pyproto:pyproto/google/third_party/six
Traceback (most recent call last):
  File "../../tools/privacy_budget/blink_apis/generate_blink_api_db.py", line 74, in <module>
    main()
  File "../../tools/privacy_budget/blink_apis/generate_blink_api_db.py", line 66, in main
    from blink_api_proto import BlinkApiProto
  File "/b/s/w/ir/cache/builder/src/tools/privacy_budget/blink_apis/blink_api_proto.py", line 10, in <module>
    import blink_apis_pb2 as pb
  File "pyproto/tools/privacy_budget/blink_apis/proto/blink_apis_pb2.py", line 22, in <module>
    create_key=_descriptor._internal_create_key,
AttributeError: 'module' object has no attribute '_internal_create_key'

Original change's description:
> [third_party] Uprev protobuf to v3.13.0.1+
>
> Followed process in //third_party/protobuf/README.chromium
> Highlights:
> * Some protobuf APIs started being deprecated. Moved sources in
> //chromecast and //components to start using the non-deprecated
> versions.
> * Removed most of the patches and updated the ones that are still
> needed. No new patches.
> * //components/subresource_filter/core/common/unindexed_ruleset.h:
> HadError is not const anymore.
>
> Size increase is caused by protobuf mainlining 2
> functions to Serialize and Parse inside each *pb.cc file. This new
> methods are now the way protobuf serializes and deserializes messages
> so no way to avoid those without substantially changing protobuf
> internals.
>
> Binary-Size: Unavoidable. Increase intrinsic to new protobuf.
> Bug: 1144985
> Change-Id: I23ce43f07da82fdda60575934a4b039200164f48
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2518036
> Commit-Queue: Andres Medina <medinaandres@chromium.org>
> Auto-Submit: Andres Medina <medinaandres@chromium.org>
> Reviewed-by: Colin Blundell <blundell@chromium.org>
> Reviewed-by: Peter Kasting <pkasting@chromium.org>
> Reviewed-by: Luke Halliwell (slow) <halliwell@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#828263}

TBR=pkasting@chromium.org,caitkp@chromium.org,blundell@chromium.org,halliwell@chromium.org,medinaandres@chromium.org

Change-Id: I856a83d283bcf9453cfdd604a4ee7dba539d2b68
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1144985
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2544866Reviewed-by: Marijn Kruisselbrink <mek@chromium.org>
Commit-Queue: Marijn Kruisselbrink <mek@chromium.org>
Cr-Commit-Position: refs/heads/master@{#828302}

Now that bookmarks::BookmarkNode stores a base::GUID instead of a
std::string, return a base::GUID. Modify the code around callers to make
them compatible with the new API.

Bug: 1026195
Change-Id: I68968cda23ae48c2c45413ad752e50330c9869df
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2523745
Commit-Queue: Daniel Hosseinian <dhoss@chromium.org>
Reviewed-by: Mikel Astiz <mastiz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#828301}

These methods are only called from the browser and we can assert
they are executed for subframes.

BUG=1097816

Change-Id: I152102fc55360769ebec3594aed03d3d452ccbfa
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2537574Reviewed-by: Avi Drissman <avi@chromium.org>
Reviewed-by: danakj <danakj@chromium.org>
Commit-Queue: Dave Tapuska <dtapuska@chromium.org>
Cr-Commit-Position: refs/heads/master@{#828300}