Publish DEPS for Chromium 41.0.2272.41
Incrementing VERSION to 41.0.2272.41
Cr-Commit-Position: refs/branch-heads/2272@{#176}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}
This is the necessary change in the upstream to fix the issue.
Pipe DidStartNavigationToPendingEntry to WebContentsObserver and TabObserver.
BUG=442726
Review URL: https://codereview.chromium.org/877163005
Cr-Commit-Position: refs/heads/master@{#313866}
(cherry picked from commit 4bd261aa366bb94978366d0081b289b92648b810)
Review URL: https://codereview.chromium.org/890223002
Cr-Commit-Position: refs/branch-heads/2272@{#175}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}
Merge "cros: Restrict gaiaURL to be http and https only."
> BUG=453994
>
> Review URL: https://codereview.chromium.org/888173002
>
> Cr-Commit-Position: refs/heads/master@{#314070}
> (cherry picked from commit 86076330c0bb161d7660555c4f514200ca897218)
TBR=xiyuan@chromium.org
Review URL: https://codereview.chromium.org/893893002
Cr-Commit-Position: refs/branch-heads/2272@{#174}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}
Incrementing VERSION to 41.0.2272.40
Cr-Commit-Position: refs/branch-heads/2272@{#173}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}
[Search] Identity check for New Tab Page should use canonicalized form
Was causing a bug where identities were slightly different.
BUG=453792
Review URL: https://codereview.chromium.org/864223006
Cr-Commit-Position: refs/heads/master@{#313955}
(cherry picked from commit ed8d517fc97a8b0c3542669279b0482727255a32)
Review URL: https://codereview.chromium.org/886233003
Cr-Commit-Position: refs/branch-heads/2272@{#172}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}
VP8Decoder: Drop references to reference frames earlier.
Drop references to reference frames before requesting new surfaces to
ensure we don't hold onto them while the Accelerator is changing resolution,
risking reusing a stale buffer.
BUG=chrome-os-partner:35539
TEST=Hangouts, vdatest
Review URL: https://codereview.chromium.org/880773009
Cr-Commit-Position: refs/heads/master@{#313679}
(cherry picked from commit 0f47fc976b37b54583a061b0628f994bf727ba30)
Review URL: https://codereview.chromium.org/892783002
Cr-Commit-Position: refs/branch-heads/2272@{#171}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}
Update icon.
The 256x256 and 512x512 pngs are not used anywhere, so I deleted them.
BUG=453510
TBR=jamiewalch@chromium.org
Review URL: https://codereview.chromium.org/890883005
Cr-Commit-Position: refs/heads/master@{#314025}
(cherry picked from commit f53150c7287e14d357dd2671ab5a0bacae443b82)
Review URL: https://codereview.chromium.org/891513003
Cr-Commit-Position: refs/branch-heads/2272@{#170}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}
Incrementing VERSION to 41.0.2272.39
Cr-Commit-Position: refs/branch-heads/2272@{#169}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}
Autofill: Set requirements for number of recognized fields in an autofillable form
BUG=447332
Review URL: https://codereview.chromium.org/853523004
Cr-Commit-Position: refs/heads/master@{#313551}
(cherry picked from commit 97338dbd9d3367fec22d2f690156df85c0b2572b)
Review URL: https://codereview.chromium.org/886183002
Cr-Commit-Position: refs/branch-heads/2272@{#168}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}
Add Errors to user_story_runner to avoid benchmarks staying green when there are archive errors.
BUG=442738
Review URL: https://codereview.chromium.org/799543006
Cr-Commit-Position: refs/heads/master@{#312997}
(cherry picked from commit f420ae317381ca52bf1b1548d1a661b80b0facca)
[Telemetry] Fix WPR files not being downloaded when required.
BUG=
Review URL: https://codereview.chromium.org/834173006
Cr-Commit-Position: refs/heads/master@{#311496}
(cherry picked from commit 672e7140315568e9bfc442770a23fee66e045cb2)
BUG=452247
TBR=mussa@chromium.org
NOTRY=true
Review URL: https://codereview.chromium.org/887123002
Cr-Commit-Position: refs/branch-heads/2272@{#167}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}
Merge M41: Observe UsbService from the FILE thread in DevicePermissionsManager.
As in the UsbEventRouter the UsbService must be observed from the FILE
thread (until bug 427985 is resolved, which will be soon). This change
fixes a DCHECK(CalledOnValidThread()) in UsbService::AddObserver when
permission to access an ephemeral (no serial number) device is added and
the DevicePermissionsManager starts listening for disconnection of that
device.
BUG=452652
NOTRY=true
Review URL: https://codereview.chromium.org/882813002
(cherry-picked from commit 897bbc219ac773a8a6c5799bc323b9fa8eea0989)
Cr-Commit-Position: refs/heads/master@{#313548}
Review URL: https://codereview.chromium.org/872313004
Cr-Commit-Position: refs/branch-heads/2272@{#166}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}
Fix black background in website settings dropdown.
The permission spinner in the website settings popup had a black
background on certain devices. The bug was that the background was a
defined using a <shape> element that didn't have a <solid> element
inside of it (and certain devices default to a black fill color if
<solid> isn't specified).
Rather than fixing the immediate problem, this rewrites the code a bit:
The line under the Spinner is now a View with 1dp height rather than the
background of the Spinner's TextView. As a side-benefit, the underline
now extends all the way to the right edge of the spinner.
BUG=449643
Review URL: https://codereview.chromium.org/870143003
Cr-Commit-Position: refs/heads/master@{#313833}
(cherry picked from commit 168e275c4b6a6f0eb34cea473474fdeb997f588d)
Review URL: https://codereview.chromium.org/888043004
Cr-Commit-Position: refs/branch-heads/2272@{#165}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}
Move referrer policy to a different field when serializing.
Also try to fix old entries when possible and play nice with older
versions
BUG=450589
R=mkwst@chromium.org,marja@chromium.org,atwilson@chromium.org
Review URL: https://codereview.chromium.org/869613006
Cr-Commit-Position: refs/heads/master@{#313742}
(cherry picked from commit 31d74bdc6a4b3c9e766ae8fc9297f1db8fedff49)
Review URL: https://codereview.chromium.org/885923005
Cr-Commit-Position: refs/branch-heads/2272@{#164}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}
Add missig referrer policies to sanitization code
BUG=450589
R=mkwst@chromium.org
Review URL: https://codereview.chromium.org/890473003
Cr-Commit-Position: refs/heads/master@{#313689}
(cherry picked from commit a7a95bebc8874f3cfba15c2ebb6912f6384a106b)
Review URL: https://codereview.chromium.org/887063002
Cr-Commit-Position: refs/branch-heads/2272@{#163}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}
Fix referrer policy handling in service workers
BUG=450589
R=mkwst@chromium.org,jkarlin@chromium.org
Review URL: https://codereview.chromium.org/862053002
Cr-Commit-Position: refs/heads/master@{#313072}
(cherry picked from commit 73fc00d1a4a2006dafc077cdde45a0a69d4c1d13)
Review URL: https://codereview.chromium.org/890973002
Cr-Commit-Position: refs/branch-heads/2272@{#162}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}
Merge 313687: Cryptohome: Notify about error in async calls if cryptohome is not ready yet.
BUG=451148
Review URL: https://codereview.chromium.org/880303003
Cr-Commit-Position: refs/heads/master@{#313687}
(cherry picked from commit 7df6f9fc7fcd1c02babf89548ce967bf8605b7f3)
Review URL: https://codereview.chromium.org/887003002
Cr-Commit-Position: refs/branch-heads/2272@{#161}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}
[Video Player] Remove the default id of the video player
Setting the default id causes the regression crbug.com/450095, so this patch removes it.
BUG=450095
TEST=manually tested
TBR=yoshiki@chromium.org
Review URL: https://codereview.chromium.org/810483005
Cr-Commit-Position: refs/heads/master@{#312182}
(cherry picked from commit f97f8f3fb09375cf82874a96e5ce45b8c8838182)
Review URL: https://codereview.chromium.org/893533004
Cr-Commit-Position: refs/branch-heads/2272@{#160}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}
Insert in-process GPU switches on UI thread
For in-process gpu, the CommandLine of the current process is a shared
resource and cannot be safely manipulated on the IO thread.
This moves inserting the gpu command line switches to the UI thread, and
slightly start up. Although still need additional fixes to start up code
to ensure it's safe to manipulate it on UI thread.
This also fixes the bug of inserting gpu switches when GpuProcessHost is
not used, for example in android webview.
BUG=450396
Review URL: https://codereview.chromium.org/865063002
Cr-Commit-Position: refs/heads/master@{#313177}
(cherry picked from commit 6d695e6f5b99b8631e06788d2f9f9f9ed12c057e)
TBR=boliu@chromium.org
Review URL: https://codereview.chromium.org/889703005
Cr-Commit-Position: refs/branch-heads/2272@{#159}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}
Incrementing VERSION to 41.0.2272.38
Cr-Commit-Position: refs/branch-heads/2272@{#158}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}
Fix infobar scrolling.
The infobar container became non-scrollable because InfoBarContainer now
ignores all touch events in InfoBarContainer.onTouch(). These touch
events need to be swallowed to prevent them from reaching the webpage,
but they should be swallowed in ContentWrapperView, not in
InfoBarContainer, so that InfoBarContainer (which extends ScrollView)
can be scrolled.
The offending CL: https://codereview.chromium.org/824763002
BUG=453103
Review URL: https://codereview.chromium.org/872113003
Cr-Commit-Position: refs/heads/master@{#313668}
(cherry picked from commit 7ef78075948121486f0061d3f75418d0dfda284c)
Review URL: https://codereview.chromium.org/878393003
Cr-Commit-Position: refs/branch-heads/2272@{#157}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}
Improve apps v2 upgrade UX
The current v1 web-app allows users to sign in as any user. Some users may
be signed in using a different account than their chrome profile.
When these users upgrade to the v2 app, their host list will be empty and
it is not straightforward why.
This CL shows a migration tip to inform the users to sign-in to their
previous account if necessary.
BUG=369835
TBR=jamiewalch
Review URL: https://codereview.chromium.org/848993002
Cr-Commit-Position: refs/heads/master@{#312549}
(cherry picked from commit ef56d877133d43c368ba50cf3ced6c39ec2f9c6c)
Review URL: https://codereview.chromium.org/883363002
Cr-Commit-Position: refs/branch-heads/2272@{#156}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}
PepperVideoSourceHost: Set timestamp of intermediate scaled frame.
TBR=bbudge
BUG=451021
Review URL: https://codereview.chromium.org/868703002
Cr-Commit-Position: refs/heads/master@{#312626}
(cherry picked from commit 8dbe088dee9122e5db470ff10ca2fbbb73bfca15)
Review URL: https://codereview.chromium.org/886603005
Cr-Commit-Position: refs/branch-heads/2272@{#155}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}
Hide pinch viewport scrollbars when near minimum scale.
This patch prevents the overlay scrollbars from showing up when we're near the
minimum scale. The threshold can be set per-platform; by default it's 0 so the
scrollbars will be visible regardless of the scale. On Windows/Linux/CrOS we'd
like to prevent the scrollbars from overlaying over the window scrollbars so
we set a small non-0 threshold.
BUG=446411
Review URL: https://codereview.chromium.org/877863002
Cr-Commit-Position: refs/heads/master@{#313431}
(cherry picked from commit c784a6f02ed8f2cffe131c2c067c4805cd752610)
Review URL: https://codereview.chromium.org/885063002
Cr-Commit-Position: refs/branch-heads/2272@{#154}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}
Add metric for navigation starting from the time an intent was received
This CL adds two metrics that measure the time between receiving an Android
intent and the commit and completion of a navigation.
BUG=436955
Review URL: https://codereview.chromium.org/809043002
Cr-Commit-Position: refs/heads/master@{#312861}
(cherry picked from commit 8451aa6c32e3d0236266445aa10fab9424b1ac42)
Review URL: https://codereview.chromium.org/887703002
Cr-Commit-Position: refs/branch-heads/2272@{#153}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}
Fix controlled setting indicators on network settings page.
This is intentionally not touching IPConfig or DNS, to not change the behavior of these when merging to old branches.
BUG=450787
NOPRESUBMIT=true
TBR=stevenjb@chromium.org
Review URL: https://codereview.chromium.org/862263003
Cr-Commit-Position: refs/heads/master@{#312806}
(cherry picked from commit 58b1dd3f0b4ed01d9ceb13f65e7ed2a3fd0370ae)
Review URL: https://codereview.chromium.org/867363005
Cr-Commit-Position: refs/branch-heads/2272@{#152}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}
Incrementing VERSION to 41.0.2272.37
Cr-Commit-Position: refs/branch-heads/2272@{#151}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}
[Merge into M41 branch 2272] Handle Caps Lock for Ozone.
BUG=447277
Review URL: https://codereview.chromium.org/878673004
Cr-Commit-Position: refs/heads/master@{#313341}
(cherry picked from commit 8a5ce90e69b39e9e5a0decb278008dc3e7a85cb7)
Review URL: https://codereview.chromium.org/884903002
Cr-Commit-Position: refs/branch-heads/2272@{#150}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}
Merge to M41: Make Windows accessibility event firing aware of guest / child frames.
Windows-specific fixes for accessibility of out-of-process iframes
and guest frames (e.g. <webview>):
1. When firing an event or doing a bounds calculation, we need to
call functions on the root BrowserAccessibilityManager's delegate
(not on the child frame's delegate).
2. When a MSAA client tries to look up an MSAA object by child ID,
we need to search child frames as well.
BUG=330307, 368298
Review URL: https://codereview.chromium.org/799633007
Cr-Commit-Position: refs/heads/master@{#312080}
(cherry picked from commit 28060a875c0a7fb9bbfe06a0057b4321518599a7)
Review URL: https://codereview.chromium.org/877323007
Cr-Commit-Position: refs/branch-heads/2272@{#149}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}
Merge to M41: Fix focus and bounds calculations for guest frames.
Two fixes for accessibility of out-of-process iframes and guest frames
(e.g. <webview>):
1. BrowserAccessibilityManager::GetFocus should return the focused node
from a child frame.
2. BrowserAccessibilityManager::GetLocalBoundsRect and
BrowserAccessibilityCocoa::pointInScreen need to correctly take
child frames into account.
This is sufficient for correct spoken feedback and UI element bounding
rects in VoiceOver when tabbing into and out of an out-of-process iframe
or <webview> guest frame. There may be other bugs, but simple examples
work in VoiceOver now.
BUG=330307,368298
Review URL: https://codereview.chromium.org/849143003
Cr-Commit-Position: refs/heads/master@{#311777}
(cherry picked from commit e8091802505a507bb6c11683fe77cf7b1d455e6d)
Review URL: https://codereview.chromium.org/887503002
Cr-Commit-Position: refs/branch-heads/2272@{#148}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}
aura: Fix event dispatch when a 'held' event triggers a menu.
A 'held' event can trigger a menu (and a nested message loop), e.g. when
right-clicking while a menu is already showing. In such scenario, the subsequent
events that come in while the latest menu is up are not transformed correctly,
because the WindowEventDispatcher notices that a held event is in the process of
being dispatched. As a result, the events have incorrect coordinates (especially
when device scale factor is not 1, or when the display is rotated). To fix this,
instead of simply tracking whether a 'held' event is being dispatched or not, we
track the 'held' event itself, and transform all the non-held events.
BUG=425407
R=sky@chromium.org
TBR=sadrul@chromium.org [since merge]
Review URL: https://codereview.chromium.org/829353005
Cr-Commit-Position: refs/heads/master@{#311651}
(cherry picked from commit 9af9ccd01bb33f591fa6dcdc94393ff0377c4a3a)
Review URL: https://codereview.chromium.org/882253003
Cr-Commit-Position: refs/branch-heads/2272@{#147}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}
Incrementing VERSION to 41.0.2272.36
Cr-Commit-Position: refs/branch-heads/2272@{#146}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}
Disabled animation in indeterminate progress bar.
The animation caused high CPU usage at OOBE, even when progress bar was hidden.
<indeterminate-progress> is used only in Hotrod pairing flow, which is not
released yet, so the animation could be safely disabled for now. <indeterminate-
progress> will be completely replaced by <paper-progress indeterminate> in
scope of http://crbug.com/423363
BUG=450758
NOTRY=true
Review URL: https://codereview.chromium.org/874923003
Cr-Commit-Position: refs/heads/master@{#313262}
(cherry picked from commit ddacbb0e77f0350fe9e832bb36e33267b4918ed5)
Review URL: https://codereview.chromium.org/882153002
Cr-Commit-Position: refs/branch-heads/2272@{#145}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}
Only report exit funnels for canary and dev channels.
BUG=442526
Review URL: https://codereview.chromium.org/868163002
Cr-Commit-Position: refs/heads/master@{#312911}
Review URL: https://codereview.chromium.org/883653003
Cr-Commit-Position: refs/branch-heads/2272@{#144}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}
[Merge] [PasswordManager] Do not save change password forms
This is a merge of https://crrev.com/312179, approved in http://crbug.com/447558#c11.
Original description:
********************************************
Change password forms are not yet supported in PasswordManager. But after adding pushState support recently, they could be offered to the user for saving.
This CL adds a check to avoid change password forms being saved.
Review URL: https://codereview.chromium.org/812033010
Cr-Commit-Position: refs/heads/master@{#312179}
********************************************
(cherry picked from commit 79a244fb1a52c5f3594e31113d606c80000e90dd)
BUG=447558, 448351
TBR=gcasto@chromium.org
Review URL: https://codereview.chromium.org/884093002
Cr-Commit-Position: refs/branch-heads/2272@{#143}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}
[content]: Cancel in-flight EndIdlePeriod tasks in Blink Scheduler.
The scheduler will post a delayed EndIdlePeriod task to end the idle period
at the expected time of the next frame draw. If the next WillBeginFrame
is called before this task has been run, then it is possible for the task
to end the next frames idle period. Prevent this by cancelling the in-flight
tasks when EndIdlePeriod is called.
BUG=447478
TBR=skyostil@chromium.org
Review URL: https://codereview.chromium.org/847903004
Cr-Commit-Position: refs/heads/master@{#313038}
(cherry picked from commit c16cee51c7e2fe59896c5883d6c24b1fa67bf752)
Review URL: https://codereview.chromium.org/884053002
Cr-Commit-Position: refs/branch-heads/2272@{#142}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}
Incrementing VERSION to 41.0.2272.35
Cr-Commit-Position: refs/branch-heads/2272@{#141}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}
[android_webview] Add the apk resources to the Android build.
This adds the resources from the apk/ folder to the Android build
to enable removing the downstream resources.
BUG=None
TESTS=android_aosp bot
R=torne@chromium.org
TBR=torne@chromium.org
Review URL: https://codereview.chromium.org/828153004
Cr-Commit-Position: refs/heads/master@{#311268}
(cherry picked from commit 56a8804fce1b48fbf0e02e8ba40536563c3ad349)
Review URL: https://codereview.chromium.org/882843004
Cr-Commit-Position: refs/branch-heads/2272@{#140}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}
[Win] Fix black screen when min/maximizing hidden app window.
On Windows, an app window that is initialized with hidden:true and
state:'maximized' will start visible and maximized, but its content is
all black. This is because maximizing a hidden window on Windows causes
the window to be shown, but this path does not also trigger the content
to show.
This CL is a temporary fix to prevent the above state without changing
the current behavior. App windows that are initially hidden will not
also be maximized, minimized, or fullscreen. On Windows, maximizing or
minimizing hidden app windows will cause them to be shown.
In the long term, we want the behavior on Windows to match CrOS where
calling maximize() on a hidden window does nothing, and the next show()
will show the window maximized.
BUG=436867
Review URL: https://codereview.chromium.org/851233002
Cr-Commit-Position: refs/heads/master@{#312061}
(cherry picked from commit 3d1fd029975c325129474b9d4e262940d99ab375)
TBR=benwells@chromium.org
Review URL: https://codereview.chromium.org/876413004
Cr-Commit-Position: refs/branch-heads/2272@{#139}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}
Fix Security Key proxying.
Gnubby was added a a Capbility in https://codereview.chromium.org/787033003,
but since it is not negotiated between host and client, that's not the right
way to make it configurable.
BUG=448131
TBR=jamiewalch@chromium.org
Review URL: https://codereview.chromium.org/878573006
Cr-Commit-Position: refs/heads/master@{#313181}
(cherry picked from commit fba61916fc0618e7ed05ccfc7b846311d499c6d2)
Review URL: https://codereview.chromium.org/877243002
Cr-Commit-Position: refs/branch-heads/2272@{#138}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}
Only release the result of a register request to a tab if it's still the foreground tab when the result is received.
BUG=451165
R=arnarb@chromium.org,reillyg@chromium.org
NOTRY=true
Review URL: https://codereview.chromium.org/866473009
Cr-Commit-Position: refs/branch-heads/2272@{#137}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}
Fix the bookmanager page display issue on MacOS.
This issue has something to do with the splitter button since this button is only used for height matching. But without content in the button, sometime it won't occupy the correct amount of vertical space.
This CL does the fix by putting some content inside the splitter button.
BUG=448007
TBR=dbeam@chromium.org
Review URL: https://codereview.chromium.org/865743002
Cr-Commit-Position: refs/heads/master@{#312708}
Review URL: https://codereview.chromium.org/879023002
Cr-Commit-Position: refs/branch-heads/2272@{#136}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}
[Merge][Win] The tab strip's opaque background overlaps the avatar button.
The tab strip is actually about 4 px taller than the drawn tab, so when
applying an alpha to make the inactive tabs slightly transparent, this
alpha "leaks" onto the avatar button and adds a transparency to its
bottom border.
I set the background to red to demonstrate this, so here are some screenshots:
Before the CL:
https://drive.google.com/open?id=0B1B1Up4p2NRMRXRJRjN2MG41Y0k&authuser=1
After the CL:
https://drive.google.com/open?id=0B1B1Up4p2NRMRzJJUmluT2QwSDA&authuser=1
Finally, how the tab strip actually looks like with normal colours:
Before the CL:
https://drive.google.com/open?id=0B1B1Up4p2NRMd0F0dWZnby12T0k&authuser=1
After the CL:
https://drive.google.com/open?id=0B1B1Up4p2NRMa2o0aUNxaE12ZGs&authuser=1
BUG=430380
TBR=noms@chromium.org
TEST=Start Chrome with --enable-new-avatar-menu. The bottom of the avatar
button should look the same throughout (and not have any random transparencies)
Review URL: https://codereview.chromium.org/859303008
Cr-Commit-Position: refs/heads/master@{#312721}
(cherry picked from commit 298156be041512f6d4a78bdba5c90454d3d2dfdb)
Review URL: https://codereview.chromium.org/882723004
Cr-Commit-Position: refs/branch-heads/2272@{#135}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}
Revert of Roll DEPS for trace-viewer in m41 to a chrome_m41 branch in google/trace-viewer (patchset #1 id:1 of https://codereview.chromium.org/871313003/)
Reason for revert:
Wrong file changed for DEPS (should be chrome-internal/trunk/tools/buildspec/branches/2272/DEPS). And the new revision 0d5dd07fc24e9ef68772648ed3e9d28533908263 is not mirrored into appropriate chromium trace-viewer repo.
Original issue's description:
> Roll DEPS for trace-viewer in m41 to a chrome_m41 branch in google/trace-viewer
>
> DEPS roll for trace-viewer
> from https://github.com/google/trace-viewer/commit/2e06625efecbc76efa79e7ea5481dabf05daf5cd
> to https://github.com/google/trace-viewer/commit/0d5dd07fc24e9ef68772648ed3e9d28533908263
>
> BUG=448167
> R=pennymac@google.com
> TBR=nduca, pennymac
>
> Committed: https://chromium.googlesource.com/chromium/src/+/366a69983f0965a77fe95229e04f60745aa32963
TBR=nduca@chromium.org,loislo@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=448167
Review URL: https://codereview.chromium.org/878763004
Cr-Commit-Position: refs/branch-heads/2272@{#134}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}
Make manual zoom mode capable of showing zoom bubble.
Up until now, using ZOOM_MODE_MANUAL would never trigger the zoom bubble
when the zoom level changed. This CL makes the value of can_show_bubble
configurable by the owner of the ZoomController.
BUG=451102
Review URL: https://codereview.chromium.org/841863004
(cherry picked from commit 9595db00572df9284517da710a414f909c0e0c1f)
Cr-Original-Commit-Position: refs/heads/master@{#312679}
Cr-Commit-Position: refs/branch-heads/2272@{#133}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}
Incrementing VERSION to 41.0.2272.34
Cr-Commit-Position: refs/branch-heads/2272@{#132}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}
GLHelper::CopySubBufferDamage doesn't restore the old framebuffer
This fixes a problem in SW mirror mode where it attempts to copy
out of the temporary framebuffer
NOTRY=true
BUG=434115
Review URL: https://codereview.chromium.org/850543003
Cr-Commit-Position: refs/heads/master@{#312859}
(cherry picked from commit 8371fd8f9c6e15bb2af70da84e2e99005be86564)
Review URL: https://codereview.chromium.org/874763004
Cr-Commit-Position: refs/branch-heads/2272@{#131}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}
compositor: Fix texture flipping for SW mirroring with surfaceless
Ozone-surfaceless renders the scene flipped, so the texture contents are
inverted from what they should be. This fixes the mirroring logic to
un-flip the texture when needed, and also to send the right sub-buffer
update rect.
NOTRY=true
BUG=434115
Review URL: https://codereview.chromium.org/846063002
Cr-Commit-Position: refs/heads/master@{#312979}
(cherry picked from commit c6a481fe79e0c4851a576495105edf2600bfe5be)
Review URL: https://codereview.chromium.org/874353004
Cr-Commit-Position: refs/branch-heads/2272@{#130}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}
Add the ability for test contexts to generate unique render & framebuffer IDs
Also, adds tests for that and a test to make sure a non-zero framebuffer
is preserved throughout DrawFrame. This is needed for a new render path
using overlays instead of using the default surface.
NOTRY=true
BUG=434115
Review URL: https://codereview.chromium.org/384053002
Cr-Commit-Position: refs/heads/master@{#312687}
(cherry picked from commit b937bfa4d5eaca4c9ac6ec13715792238cef1b98)
Review URL: https://codereview.chromium.org/881523002
Cr-Commit-Position: refs/branch-heads/2272@{#129}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}
Remove omnibox watcher.
This is effectively a revert of commit positions 308378 and 307774.
BUG=451173
TBR=bauerb@chromium.org,rogerta@chromium.org
Review URL: https://codereview.chromium.org/872433003
Cr-Commit-Position: refs/heads/master@{#312943}
(cherry picked from commit 9d291627a0309ab645d1bc9dab4646bf2a9119ac)
Review URL: https://codereview.chromium.org/876013002
Cr-Commit-Position: refs/branch-heads/2272@{#128}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}
Fix athena compilation on 2272
Port https://codereview.chromium.org/874943002 to the meanwhile delete
athena/
BUG=452396,450547
R=marja@chromium.org
Review URL: https://codereview.chromium.org/882623002
Cr-Commit-Position: refs/branch-heads/2272@{#127}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}
Roll DEPS for trace-viewer in m41 to a chrome_m41 branch in google/trace-viewer
DEPS roll for trace-viewer
from https://github.com/google/trace-viewer/commit/2e06625efecbc76efa79e7ea5481dabf05daf5cd
to https://github.com/google/trace-viewer/commit/0d5dd07fc24e9ef68772648ed3e9d28533908263
BUG=448167
R=pennymac@google.com
TBR=nduca, pennymac
Review URL: https://codereview.chromium.org/871313003
Cr-Commit-Position: refs/branch-heads/2272@{#126}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}
Incrementing VERSION to 41.0.2272.33
Cr-Commit-Position: refs/branch-heads/2272@{#125}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}
Merge: Prevent UAF of RenderFrames from GuestViewContainer
Current the RenderFrame a GuestViewContainer is associated with can be
accessed even after it is destroyed. We should track the destruction with
a RenderFrameObserver and avoid accesses in that case.
BUG=449574
Committed: https://crrev.com/4d29dd615212c539463a4e4a02188aa34d06e96f
Cr-Commit-Position: refs/heads/master@{#312143}
Review URL: https://codereview.chromium.org/822483007
Cr-Commit-Position: refs/heads/master@{#312216}
(cherry picked from commit 569ce1bcb696473c117b8afdc15871183c0052ef)
TBR=raymes@chromium.org
Review URL: https://codereview.chromium.org/876983002
Cr-Commit-Position: refs/branch-heads/2272@{#124}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}
Fix to the GCM Account Tracker flooding on a stale refresh token
As a solution to a problem the Account Tracker will assume a stale
refresh token when it cannot get access token. Backoff logic in
token fetcher handles the case where service might not be reachale
and situations like that.
If the user signs in properly the account will be re-added.
BUG=452131
R=dimich@chromium.org
TBR=dimich@chromium.org, zea@chromium.org
Review URL: https://codereview.chromium.org/878713002
Cr-Commit-Position: refs/heads/master@{#313136}
(cherry picked from commit be981e7796e29eba1ab9c6e7c65d1c56b0840b5f)
Review URL: https://codereview.chromium.org/863173006
Cr-Commit-Position: refs/branch-heads/2272@{#123}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}
V4L2SVDA: Don't drop an input buffer on Reset if a frame is pending.
H264Decoder has to wait for the next frame NALUs to be able to discover
frame boundaries, so decode submission is always delayed. If we Reset
while such a frame is pending decode, we will never send it to hardware,
so even though we reclaim the pending output V4L2 buffer, we lose the input.
Fix this by resetting the input queue when finalizing reset.
TEST=vdatests, seektests
BUG=chrome-os-partner:35616
Review URL: https://codereview.chromium.org/865393002
Cr-Commit-Position: refs/heads/master@{#312816}
(cherry picked from commit a795a5a89e7fe776a3f071e635cc6fd1948069e1)
Review URL: https://codereview.chromium.org/879443005
Cr-Commit-Position: refs/branch-heads/2272@{#122}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}
Remove hardware check that enables always-on hotwording.
BUG=448859
Review URL: https://codereview.chromium.org/805943005
Cr-Commit-Position: refs/heads/master@{#311797}
(cherry picked from commit e014345eab81e39c48956f9dae0cc0c66e170f08)
TBR=amistry@chromium.org,rlp@chromium.org
Review URL: https://codereview.chromium.org/876793003
Cr-Commit-Position: refs/branch-heads/2272@{#121}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}
Merge: Remove tcmalloc on Windows. Restore 2Gb limit and NULL checks.
CLs cherry-picked in this CL are:
74a449cac1340e85b3ef06be59a91fdd29110454
bc1bb9d28de48fe3dd339ed1948bbba9addc4bd9
f0a9f088fb28f4beb0229e599b99c9fdce8de17f
c324546cf857bae485efb9a2d80eec6d50d18ed5
BUG=169327,434397,448456
TEST=base_unittests allocator_unittests
Details:
Restore debug allocator functions.
These are needed for Debug builds when using allocator_shim.
These were accidently removed in r312720.
BUG=451663
TEST=base_unittests, allocator_unittests (Debug, component=static_library)
Review URL: https://codereview.chromium.org/872153002
Cr-Commit-Position: refs/heads/master@{#313108}
(cherry picked from commit c324546cf857bae485efb9a2d80eec6d50d18ed5)
Remove optimize max for allocator shim on Windows. This optimization is no longer needed as we are not using tcmalloc.
LTCG was inlining all the new() operators causing a bloat in mini_installer.exe.
mini_installer.exe:
Before: 40,541,184
After: 40,401,408
courgette patch from 40.0.2214.85 (uncompressed):
Before: 19,846,729
After: 19,714,831
BUG=448456,434397
Review URL: https://codereview.chromium.org/860083002
Cr-Commit-Position: refs/heads/master@{#312777}
(cherry picked from commit f0a9f088fb28f4beb0229e599b99c9fdce8de17f)
Tidy up the allocator shim, which is now Windows only.
Only re-implement the functions that we really need to re-implement to perform our additional checks. Let the CRT do the rest. Mark specifically which functions from which CRT files we are re-implementing. Add missing ones like _query_new_mode.
Fold generic_allocators.cc into allocator_shim_win.cc as this code is now very Windows specific and no point being generic any more.
This is a dependent CL to let ffmpegsumo start using the allocator shims, since it needs _aligned_realloc which the allocator shim never implemented. Instead, let the CRT do this for us, since it just calls our malloc().
BUG=434397,450676,446032,444533
TEST=base_unittests --gtest_filter=SecurityTest.*
TEST=allocator_unittests
Review URL: https://codereview.chromium.org/868533003
Cr-Commit-Position: refs/heads/master@{#312720}
(cherry picked from commit bc1bb9d28de48fe3dd339ed1948bbba9addc4bd9)
Restore the allocator shim on Windows. Add 2Gb limit on allocations via the shim. Remove tcmalloc from Windows.
Restore working tcmalloc_unittests on Linux and allocator_unittests on other platforms. Add Death tests to base_unittests SecurityTests. Fix prep_libc.py to actually strip the objects correctly.
BUG=169327,434397
TEST=base_unittests --gtest_filter=SecurityTest.*
TEST=allocator_unittests, tcmalloc_unittest
Review URL: https://codereview.chromium.org/774683003
Cr-Commit-Position: refs/heads/master@{#311194}
(cherry picked from commit 74a449cac1340e85b3ef06be59a91fdd29110454)
Review URL: https://codereview.chromium.org/873403003
Cr-Commit-Position: refs/branch-heads/2272@{#120}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}
Fix accessibility for Switches.
TalkBack doesn't recognize the SwitchCompat class, so it reads events
with that classname as "Checkbox". This works around the bug by marking
accessibility events from SwitchCompat with the Switch class name, which
TalkBack recognizes.
BUG=441702
NOTRY=true
Review URL: https://codereview.chromium.org/868803004
Cr-Commit-Position: refs/heads/master@{#312690}
(cherry picked from commit a9d1caa91d4a8da898c891093845bdd5180ee37e)
Review URL: https://codereview.chromium.org/875193003
Cr-Commit-Position: refs/branch-heads/2272@{#119}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}
Merge "kiosk: Close on the last window of kiosk app."
> Helper extension/app could have hidden windows created. Kiosk
> app session should only be bound with the kiosk app's window and
> not affected by them.
>
> BUG=449313
>
> Review URL: https://codereview.chromium.org/873873002
>
> Cr-Commit-Position: refs/heads/master@{#312980}
> (cherry picked from commit 7538ed2a80a3ecbb66527957a2cf2a4af75e3e99)
TBR=xiyuan@chromium.org
Review URL: https://codereview.chromium.org/879663002
Cr-Commit-Position: refs/branch-heads/2272@{#118}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}
Merge M41: Fix Android USB debugging through DevTools.
First, change 13cf2cfcb5325ecfff98ee8ccde723f22e606d22 introduced a
logic error into AndroidUsbDevice::EnumerateOnFileThread that caused
enumerations to never complete because the BarrierClosure was not
called the correct number of times.
Second, this change may have also exposed an issue (investigated
before) where a libusb_transfer can be cancelled twice, once in
ReleaseInterface and again in CloseInternal. The second cancellation
occurs after the interface has been released and so an invalid handle
is passed to AbortPipe. A cancelled_ member has been added to Transfer
to prevent this from happening.
Some conversions to C++11 range loops (added during debugging to make
the loops clearer) are preserved in this change.
BUG=450007
NOTRY=true
Review URL: https://codereview.chromium.org/864183002
Cr-Commit-Position: refs/heads/master@{#312796}
(cherry picked from commit 6c300b4621621d3154a4606414d4f67fc70b23a9)
Review URL: https://codereview.chromium.org/877853002
Cr-Commit-Position: refs/branch-heads/2272@{#117}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}
Reject vp8 video having alpha and image planes of different sizes.
Previously we would accept malformed vp8 video files that had alpha and
image planes with different dimensions. Now they result in a decode error.
Also use the alpha image stride when copying the alpha plane, because it
technically doesn't have to be the same as the image stride.
BUG=449958
TEST=ffmpeg_regression_tests
Review URL: https://codereview.chromium.org/858303002
Cr-Commit-Position: refs/heads/master@{#312420}
(cherry picked from commit c1a91a8a6a7132c47a174054f0fb56cc3dc8c069)
R=dalecurtis@chromium.org
Review URL: https://codereview.chromium.org/881533002
Cr-Commit-Position: refs/branch-heads/2272@{#116}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}
gpu: Update nvidia workaround to cover Android 5.0.2
Once again, issue remains in Android version 5.0.2.
BUG=438657
Review URL: https://codereview.chromium.org/867893002
Cr-Commit-Position: refs/heads/master@{#312930}
(cherry picked from commit 087a476f516ebbf7461cb8976b5e48e08e19cfcb)
TBR=boliu@chromium.org
Review URL: https://codereview.chromium.org/865393006
Cr-Commit-Position: refs/branch-heads/2272@{#115}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}
Merge: BrowserCdmManager: Use weak pointer for MediaDrmBridge callbacks.
Currently we are simply using |this| which is refcounted. This causes circular
referencs and BrowserCdmManager is leaked.
TBR=ddorwin@chromium.org
BUG=449608
TEST=Manually tested.
Review URL: https://codereview.chromium.org/855113002
Cr-Commit-Position: refs/heads/master@{#312031}
(cherry picked from commit 89edced64726b7c9776a070a01a07c2d92f9d7a8)
Review URL: https://codereview.chromium.org/878663002
Cr-Commit-Position: refs/branch-heads/2272@{#114}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}
[Android] Temporarily suppress shift modifiers for detected tap gestures
Android's UiAutomator unintentionally bundles the shift modifier with
all accessibliity click MotionEvents. The side-effect is that
accessibility clicks (derived from the MotionEvents) are interpreted
as shift+click, which is not meaningfully implemented on Android.
As a temporary workaround, suppress the standalone shift modifier for
touch-derived tap gestures.
BUG=443247
Review URL: https://codereview.chromium.org/865463002
Cr-Commit-Position: refs/heads/master@{#312385}
(cherry picked from commit 0d264850d7d8b98386db36ca928f99c6418b512d)
Review URL: https://codereview.chromium.org/873973004
Cr-Commit-Position: refs/branch-heads/2272@{#113}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}
linux: Exclude size-based configs for Fontconfig defaults.
When querying Fontconfig for default FontRenderParams,
exclude point-size- or pixel-size-based configs.
Family-based configs were already excluded.
BUG=423056
TBR=behdad@chromium.org
Review URL: https://codereview.chromium.org/810403005
Cr-Commit-Position: refs/heads/master@{#311110}
(cherry picked from commit cacdbdf1c5824614ca13c6af5e99db95f509bde2)
Review URL: https://codereview.chromium.org/871373006
Cr-Commit-Position: refs/branch-heads/2272@{#112}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}
Fix anchoring of app modal dialogs on views
We first have to activate the contents before we can query its parent
window. However, we also want to store the currently active window
before activating the contents. Shuffle the code around a bit to achieve
this.
BUG=450547
TBR=marja@chromium.org
TEST=as described in the bug
Review URL: https://codereview.chromium.org/871933002
Cr-Commit-Position: refs/heads/master@{#312827}
(cherry picked from commit a2afdec49795431c735f668ed8d93129b155d995)
Review URL: https://codereview.chromium.org/874943002
Cr-Commit-Position: refs/branch-heads/2272@{#111}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}
[Merge] password_manager::metrics_util::LogUMAHistogramBoolean should upload
This is a merge of https://crrev.com/312395, approved in http://crbug.com/450394#c8.
Original description:
********************************************
Currently, LogUMAHistogramBoolean (unlike LogUMAHistogramEnumeration) does not upload any histograms, because it does not set the kUmaTargetedHistogramFlag.
We need it to upload the histograms, as the very name of the method implies, so this CL adds that flag.
Review URL: https://codereview.chromium.org/790413003
Cr-Commit-Position: refs/heads/master@{#312395}
(cherry picked from commit 063efcf45e7d9ea6eb65ace73220b380d47a591a)
********************************************
BUG=450394
TBR=engedy@chromium.org
Review URL: https://codereview.chromium.org/877653002
Cr-Commit-Position: refs/branch-heads/2272@{#110}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}
Fix the logic for using an HTTP proxy without a tunnel
The logic for determining whether HttpNetworkTransaction was using an HTTP proxy but not tunneled was incorrect for the case of WebSockets. Fix it.
BUG=446459
TEST=net_unittests
TBR=mmenke@chromium.org, tyoshino@chromium.org
Review URL: https://codereview.chromium.org/836993002
Cr-Commit-Position: refs/heads/master@{#312073}
(cherry picked from commit 425cf12869fd826d1fceeb5071d3747e88406e6b)
Review URL: https://codereview.chromium.org/870403002
Cr-Commit-Position: refs/branch-heads/2272@{#109}
Cr-Branched-From: 827a380cfdb31aa54c8d56e63ce2c3fd8c3ba4d4-refs/heads/master@{#310958}