GitLab

This reverts commit 28c8676d.

Reason for revert: Linux TSanTests found a ThreadSanitizer warning that
appears to likely be associated with this change.

TBR: mattcary
Bug: 742533
Change-Id: I5a9f462a89b11ec7c4d5106ae2407505ab017960
Reviewed-on: https://chromium-review.googlesource.com/571359Reviewed-by: Quinten Yearsley <qyearsley@chromium.org>
Commit-Queue: Quinten Yearsley <qyearsley@chromium.org>
Cr-Commit-Position: refs/heads/master@{#486623}

Those buttons will eventually be used both in a Keyboard Accessory View (KAV)
(on iPhone) and as UITextInputAssistantItems (on iPad).

The toolbar_assistive_keyboard_views.* files are in their own directory.
A follow up CL will move all the code for the KAV in that directory.

Bug: None
Change-Id: I430791e16aaab98e1dce92f311e85f600370f420
Reviewed-on: https://chromium-review.googlesource.com/567509
Commit-Queue: Jean-François Geyelin <jif@chromium.org>
Reviewed-by: Justin Cohen <justincohen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#486622}

For testing, we want to validate that OriginTrials is actually the cause
of the feature being enabled, not that a feature might be enabled by
RuntimeEnabledFeatures (early out).

RuntimeEnabledFeatures::SetOriginTrialControlledFeaturesEnabled allows
you to turn off all the features that can be turned on by OriginTrials.

BUG=685788

Change-Id: I7d18673db24b5b90d139b171e3094b66566b693c
Reviewed-on: https://chromium-review.googlesource.com/568368Reviewed-by: Ian Clelland <iclelland@chromium.org>
Reviewed-by: Jason Chase <chasej@chromium.org>
Commit-Queue: Alex Vallee <avallee@chromium.org>
Cr-Commit-Position: refs/heads/master@{#486621}

https://chromium.googlesource.com/webm/libvpx.git/+log/4e16f7070354..b578d59623dd

$ git log 4e16f7070..b578d5962 --date=short --no-merges --format='%ad %ae %s'
2017-07-11 johannkoenig sad4d neon: 64x[32,64]
2017-07-11 johannkoenig sad4d neon: 32x[16,32,64]
2017-07-11 johannkoenig sad4d neon: 16x[8,16,32]
2017-07-11 johannkoenig sad4d neon: 8x[4,8,16]
2017-07-11 johannkoenig sad4d neon: 4x4, 4x8
2017-07-07 jzern remove vp9_firstpass.c w/CONFIG_REALTIME_ONLY
2017-07-11 urvang Remove the token state array from greedy optimize_b.
2017-07-11 jimbankoski Reintroduce fix for max qindex calculation of a gf interval
2017-07-10 marpan vp9: Fix to SVC and denoising for fixed pattern case.
2017-07-10 jianj vp9: Move skinmap computation into multithreading loop.
2017-07-10 johannkoenig avg_neon: fix 4x4, update 8x8
2017-07-07 johannkoenig neon: consolidate horizontal adds
2017-07-07 johannkoenig remove vp9_full_sad_search
2017-06-30 jianj vp9: Remove alt-ref from denoiser.

Created with:
  roll-dep src/third_party/libvpx/source/libvpx
R=johannkoenig@google.com

Bug: 
Change-Id: I858f7fabcce1491f8930f609fec6ad1d9aea001c
Reviewed-on: https://chromium-review.googlesource.com/570188Reviewed-by: Johann Koenig <johannkoenig@google.com>
Commit-Queue: Marco Paniconi <marpan@google.com>
Cr-Commit-Position: refs/heads/master@{#486620}

Android Signin Manager already has the functionality to delete all data
when a managed user signs out.

This CL reuses that functionality to delete service worker caches when
any user signs out.

BUG=739982

Review-Url: https://codereview.chromium.org/2966763003
Cr-Commit-Position: refs/heads/master@{#486619}

Bug: 695939
Change-Id: I4f3ad7e06d44db7534a8750f3a344ad27bb4f460
Reviewed-on: https://chromium-review.googlesource.com/569328Reviewed-by: Takeshi Yoshino <tyoshino@chromium.org>
Commit-Queue: Yutaka Hirano <yhirano@chromium.org>
Cr-Commit-Position: refs/heads/master@{#486618}

BUG=709244

Review-Url: https://codereview.chromium.org/2970463002
Cr-Original-Commit-Position: refs/heads/master@{#483877}
Committed: https://chromium.googlesource.com/chromium/src/+/30815d143e71eb731bea80ba5fbd236d628ee9f3
Review-Url: https://codereview.chromium.org/2970463002
Cr-Commit-Position: refs/heads/master@{#486617}

Bug: 739389, 739384
Change-Id: I8637ce1ad693f566f738058e7fef07d025109d72
Reviewed-on: https://chromium-review.googlesource.com/563884
Commit-Queue: Bryan McQuade <bmcquade@chromium.org>
Reviewed-by: Robert Kaplow <rkaplow@chromium.org>
Reviewed-by: Charlie Harrison <csharrison@chromium.org>
Reviewed-by: Matt Falkenhagen <falken@chromium.org>
Cr-Commit-Position: refs/heads/master@{#486616}

This CL adds queuing capability to the download service.
DownloadServiceImpl would queue all the requests such as StartDownload,
Pause/Resume/CancelDownload requests from the client as well as
OnStartScheduledTask calls from the system. After the controller is
ready, the service will execute the tasks in the same order as received.
If init failed, it will drop all the client requests, but will let the
scheduled tasks run which will be handled in the Controller
appropriately i.e. the finished callback will be invoked to notify the
OS of completion/rescheduling of the task.

This CL also ensures that the task finished callbacks will be invoked
only after the task to run is complete.

BUG=736229

Change-Id: I139ab0e0345be49c5e0351eb7d0533767ad8ff65
Reviewed-on: https://chromium-review.googlesource.com/550516
Commit-Queue: Shakti Sahu <shaktisahu@chromium.org>
Reviewed-by: David Trainor <dtrainor@chromium.org>
Cr-Commit-Position: refs/heads/master@{#486615}

Since the backends for downloads and offline pages load asynchrously,
the DownloadHistoryAdapter waits for items from both backends to be
ready. There was a bug where this was not happening and which resulted
in download items shifting down when offline pages are added.
This CL fixes the bug.

Bug: 741201
Change-Id: I45b58179721b79adc93bf2018dae3698babe2f17
Reviewed-on: https://chromium-review.googlesource.com/571187Reviewed-by: Theresa <twellington@chromium.org>
Commit-Queue: Shakti Sahu <shaktisahu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#486614}

cc must send the computed whitelisted touch action to the browser. A
new IPC Message (|InputHostMsg_SetWhiteListedTouchAction|) has been
added to complete this communication. The reasoning for this is to
keep |InputHostMsg_SetTouchAction| as the means of communicating
effective touch actions.

Bug: 727855
Cq-Include-Trybots: master.tryserver.blink:linux_trusty_blink_rel
Change-Id: Ida9e27b4fe222474292f786ea5ab36d799ec3bad
Reviewed-on: https://chromium-review.googlesource.com/562376
Commit-Queue: Xida Chen <xidachen@chromium.org>
Reviewed-by: Xida Chen <xidachen@chromium.org>
Reviewed-by: Ken Buchanan <kenrb@chromium.org>
Reviewed-by: Antoine Labour <piman@chromium.org>
Reviewed-by: Dave Tapuska <dtapuska@chromium.org>
Cr-Commit-Position: refs/heads/master@{#486613}

We would stop drawing ChromeVR once we entered WebVR mode. In additon to this,
we would start the timer to show the transient URL bar when we entered WebVR
mode, but the splash screen would stay visible until WebVR frames would draw.
The transient url bar timer would time out and as a result the user would see it
for a very short period of time or not at all.

This CL disables WebVR rendering until submit frame is called in cases where
we expect auto-presentation.

Bug: 740262
Change-Id: I119d3e528d403735c93a757f2be061bb8999cf43
Reviewed-on: https://chromium-review.googlesource.com/568998
Commit-Queue: Yash Malik <ymalik@chromium.org>
Reviewed-by: Michael Thiessen <mthiesse@chromium.org>
Cr-Commit-Position: refs/heads/master@{#486612}

Migrate ExecuteCodeFunction away from BrowserThread::PostTask to post a
task to the FILE thread and instead use base::PostTask with MayBlock
traits. Also avoid a double post and instead just use PostTask*AndReply.

BUG=689520

Review-Url: https://codereview.chromium.org/2978843002
Cr-Commit-Position: refs/heads/master@{#486611}

This CL removes the usage of MessageLoop and TestBrowserThread in
ExtensionUserScriptLoaderTest, both of which should not be used directly in
tests, and replaces them with a TestBrowserThreadBundle instance. This also
gives (implicitly) ExtensionUserScriptLoaderTest a TaskScheduler instance.

BUG=272091

Change-Id: I7fc45c0d6bf30b25aa4b5029abfec013f29e4c0b
Reviewed-on: https://chromium-review.googlesource.com/571182
Commit-Queue: Karan Bhatia <karandeepb@chromium.org>
Reviewed-by: Devlin <rdevlin.cronin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#486610}

This ancient API has several Chrome dependencies, which have been moved
into a FileSystemDelegate class that performs the Chrome-specific work.

I also made a delegate for apps::SavedFilesService which is only
implemented in //apps, but allows //extensions to invoke this
apps-specific code without adding a hard dependency.

Since so much of the code was shuffled around anyway, I also ran
`git cl format` on everything.

Future work includes creating an AppShellFileSystemDelegate to make
certain functionality available in app_shell.

BUG=729713
R=benwells@chromium.org,rdevlin.cronin@chromium.org

Review-Url: https://codereview.chromium.org/2934143002
Cr-Commit-Position: refs/heads/master@{#486609}

GCC gets a bit confused by libc++'s map headers, and including <map>
after <set> can cause problems under certain conditions [1].

[1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81347

BUG=webrtc:7922
R=pkasting@chromium.org,dpranke@chromium.org

Review-Url: https://codereview.chromium.org/2974603002
Cr-Commit-Position: refs/heads/master@{#486608}

The previous set of changes introduced a bug where clicking
on the 'old' (current) image would discard it since that is
the desired keyboard action for that item.

Bug: 730031
Change-Id: I8cf0b715b6183cd313e63005c8e2460181bad549
Reviewed-on: https://chromium-review.googlesource.com/569022
Commit-Queue: Steven Bennetts <stevenjb@chromium.org>
Reviewed-by: Tommy Li <tommycli@chromium.org>
Cr-Commit-Position: refs/heads/master@{#486607}

Bug: 737802
Change-Id: I95d347a34665f8ec1273fa0b3bd7d9eecc25cfad
Reviewed-on: https://chromium-review.googlesource.com/568566Reviewed-by: Yuzhu Shen <yzshen@chromium.org>
Commit-Queue: Sergey Ulanov <sergeyu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#486606}

Bug: 602666
Change-Id: I7d21288a1ec457267d213aad8c0b0c0d001203e5
Reviewed-on: https://chromium-review.googlesource.com/567438Reviewed-by: mahmadi <mahmadi@chromium.org>
Reviewed-by: Mathieu Perreault <mathp@chromium.org>
Commit-Queue: Randall Raymond <rayraymond@google.com>
Cr-Commit-Position: refs/heads/master@{#486605}

- Adds tests for existing implementation.
- Minor code change to reject certain invalid messages.

NOTE: The existing code just ignored the target name field if it
had length and/or offset outside the bounds of the message. This
change explicitly rejects that case in order to test that the
behavior is correct.

BUG=chromium:22532
TEST=builds and tests pass

Review-Url: https://codereview.chromium.org/2873673002
Cr-Commit-Position: refs/heads/master@{#486604}

Add two histograms to track in which range the color temperature is
mostly selected, and the type of the schedule.

BUG=740759

Change-Id: I978a02bcfe84bf770a3db93a0727e90b91ec36fd
Reviewed-on: https://chromium-review.googlesource.com/569002
Commit-Queue: Ahmed Fakhry <afakhry@chromium.org>
Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Reviewed-by: James Cook <jamescook@chromium.org>
Reviewed-by: Mark Pearson <mpearson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#486603}

Bug: 740301
Change-Id: I6a644c7a37af699dde3ac964143f42db3437ed3c
Reviewed-on: https://chromium-review.googlesource.com/571478Reviewed-by: smut <smut@google.com>
Commit-Queue: John Budorick <jbudorick@chromium.org>
Cr-Commit-Position: refs/heads/master@{#486602}

This method is only used for test.
And caller should inherit DownloadItem::Observer to monitor a download item,
Rahther than listening to the DownloadManager to get download item state.
So the functionality provided by this method is already covered by other calls.

BUG=726487

Change-Id: I7f9f5fd223093faf5643eb3f8d5f0255b7ca8c15
Reviewed-on: https://chromium-review.googlesource.com/568906Reviewed-by: Jochen Eisinger <jochen@chromium.org>
Reviewed-by: David Trainor <dtrainor@chromium.org>
Commit-Queue: Min Qin <qinmin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#486601}

Bug: 740858
Change-Id: Idd363c00328603f20c4bb916fc83be8bea6ee5c3
Reviewed-on: https://chromium-review.googlesource.com/570626Reviewed-by: Andrey Kosyakov <caseq@chromium.org>
Commit-Queue: Alexei Filippov <alph@chromium.org>
Cr-Commit-Position: refs/heads/master@{#486600}

https://chromium.googlesource.com/external/github.com/catapult-project/catapult.git/+log/6daeed6d7311..2569648cdd4f

$ git log 6daeed6d7..2569648cd --date=short --no-merges --format='%ad %ae %s'
2017-07-13 simonhatch Pinpoint - First pass new job dialog
2017-07-13 benjhayden Fix CSVBuilder.
2017-07-13 benjhayden Reserve names for split diagnostics.
2017-07-13 dtu [pinpoint] Correct device affinity when multiple executions are started together.
2017-07-13 eakuefner [Catapult] Fix bin_checks PRESUBMIT not allowing deletions in bin/
2017-07-13 nednguyen Revert of Add logging to debug battor not running (patchset #1 id:1 of https://codereview.chromium.org/2869913002/ )
2017-07-13 sullivan Add support for additional flag-specified tracing categories.
2017-07-13 eakuefner [Dashboard] Make add_histograms an ApiRequestHandler
2017-07-13 etienneb Validate code-identifiers from traces/modules when available
2017-07-13 eakuefner [Tracing] Fix bin/run_tests
2017-07-13 kbr Fix run_browser_tests.py on Android.
2017-07-13 sullivan Add APIs to list the timeseries for a benchmark, and download them.
2017-07-13 sullivan Add alert timestamps, bisect start, and convert bug timestamps to ISO format.
2017-07-13 nednguyen Add smoke test for webpagereplay_go_server

Created with:
  roll-dep src/third_party/catapult
BUG=719447,739783,740769


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

If the roll is causing failures, see:
http://www.chromium.org/developers/tree-sheriffs/sheriff-details-chromium#TOC-Failures-due-to-DEPS-rolls


CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.android:android_optional_gpu_tests_rel
TBR=sullivan@chromium.org

Change-Id: I44b1b5541e2c258f061e3138318a8c1af9cdcbc1
Reviewed-on: https://chromium-review.googlesource.com/570836
Reviewed-by: <catapult-deps-roller@chromium.org>
Commit-Queue: <catapult-deps-roller@chromium.org>
Cr-Commit-Position: refs/heads/master@{#486599}

These calls are no longer needed after r485461
(https://crrev.com/2478803003) which has made the
domAutomationController.setAutomationId call a no-op.

BUG=662543
This CL was uploaded by git cl split.

R=mattm@chromium.org

Review-Url: https://codereview.chromium.org/2979773002
Cr-Commit-Position: refs/heads/master@{#486598}

This reverts commit 139a79ec.

Reason for revert: This is instacrashing one of my test devices when I
try to load a webpage. See crbug.com/742056

Original change's description:
> [Suggestions] Remove CTAs when feature is disabled
> 
> Stops showing the Sign in Promo and the All Dismissed item when remote
> suggestions are disabled and performing the advertised actions would not
> provide the user with new suggestions.
> 
> Part of this CL involves making the SuggestionsSources notifies a list
> of observer rather than a single one.
> 
> Bug: 738872
> Change-Id: I16c300fb14a1d5780578387d48d848570339befe
> Reviewed-on: https://chromium-review.googlesource.com/567182
> Reviewed-by: Bernhard Bauer <bauerb@chromium.org>
> Commit-Queue: Nicolas Dossou-Gbété <dgn@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#486034}

TBR=bauerb@chromium.org,dgn@chromium.org

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

Bug: 738872
Change-Id: I9c3c7724215e59f6988c84e95fc7422c40872d72
Reviewed-on: https://chromium-review.googlesource.com/570806Reviewed-by: Ryan Landay <rlanday@chromium.org>
Commit-Queue: Ryan Landay <rlanday@chromium.org>
Cr-Commit-Position: refs/heads/master@{#486597}

BUG=737448

Change-Id: I493919ce2ed8c4263b6b54684243b54bd38a2120
Reviewed-on: https://chromium-review.googlesource.com/567107Reviewed-by: Fernando Serboncini <fserb@chromium.org>
Commit-Queue: Justin Novosad <junov@chromium.org>
Cr-Commit-Position: refs/heads/master@{#486596}

VC++ 2017 has had several _MSC_VER values which has required updating
the code that displays what compiler Chrome is built with. This change
future-proofs those checks to handle all future versions of VC++ 2017,
based on information from Microsoft.

BUG=683729

Change-Id: Icc3ddb14534a16fed7ab4f54a71ee175974658ba
Reviewed-on: https://chromium-review.googlesource.com/570124Reviewed-by: Pam Greene <pam@chromium.org>
Commit-Queue: Bruce Dawson <brucedawson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#486595}

Bug: 739920
Change-Id: I3a58618b410acd1ae66811af0a5688187279dbd5
Reviewed-on: https://chromium-review.googlesource.com/567233
Commit-Queue: Scott Chen <scottchen@chromium.org>
Reviewed-by: Demetrios Papadopoulos <dpapad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#486594}

|XcodeWriter::CreateProductsProject| in xcode_writer.cc has evolved
into a giant function, so this CL makes it smaller by refactoring the
logics that add XCTest files for indexing and target dependencies into
two separate functions.

Bug: 709289
Change-Id: Icd2fd1cc5f925b680e25f488a42cbea3d2b53e9a
Reviewed-on: https://chromium-review.googlesource.com/568253
Commit-Queue: Yuke Liao <liaoyuke@chromium.org>
Reviewed-by: Sylvain Defresne <sdefresne@chromium.org>
Reviewed-by: Dirk Pranke <dpranke@chromium.org>
Cr-Commit-Position: refs/heads/master@{#486593}

BUG=

Change-Id: I43b40cc7c84b8896f4da7be43ee20ad95fe44d33
Reviewed-on: https://chromium-review.googlesource.com/571196
Commit-Queue: Theresa <twellington@chromium.org>
Reviewed-by: Ted Choc <tedchoc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#486592}

Also rename Chromium Win 10 GCE Tests to Chromium Win 10 GCE Tests (Win 7 Build).

Bug: 738255
Change-Id: I6fd66ad6ed7a141bbcd252e61228e93d2656acb2
Reviewed-on: https://chromium-review.googlesource.com/570984Reviewed-by: Dirk Pranke <dpranke@chromium.org>
Commit-Queue: smut <smut@google.com>
Cr-Commit-Position: refs/heads/master@{#486591}

This is part 3 of 6 for FieldTrial refactoring for WebView

Part 1: https://chromium-review.googlesource.com/c/562098/
Part 2: https://chromium-review.googlesource.com/c/561920/
Part 3: https://chromium-review.googlesource.com/c/561922/
Part 4: https://chromium-review.googlesource.com/c/561980/
Part 5: https://chromium-review.googlesource.com/c/562417/
Part 6: https://chromium-review.googlesource.com/c/562021/

This CL creates the VariationsFieldTrialCreator class. This class
contains the code previously in VariationsService that
is needed by both Chrome and WebView, mainly the portions
needed to call CreateTrialsFromSeed.  The VariationsService
class now contains an instance of this new class.

BUG=678288

Change-Id: Ic4340d5a0396cca56892a3b541e4cf6115bb8afb
Reviewed-on: https://chromium-review.googlesource.com/561922
Commit-Queue: Kyle Milka <kmilka@google.com>
Reviewed-by: Alexei Svitkine (slow) <asvitkine@chromium.org>
Cr-Commit-Position: refs/heads/master@{#486590}

In QUIC, add data producer to framer and stop passing producer from creator to framer. Protected by existing gfe2_reloadable_flag_quic_stream_owns_data.

Framer asks producer to save and write stream frame data. Packet
creator's delegate saves data code path is completely removed.

Merge internal change 161583716.

R=rch@chromium.org

Bug: 
Change-Id: I0d9b2d5be70e74a75a597c373e7acd3ea233c81e
Reviewed-on: https://chromium-review.googlesource.com/570004Reviewed-by: Zhongyi Shi <zhongyi@chromium.org>
Commit-Queue: Fan Yang <fayang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#486589}

Have the IndexedDBContextImpl create its own sequenced task runner
(via the task scheduler), rather than having it injected on creation.

Unit tests needed updating to ensure objects (factory, backing store,
transactions, etc) are created on the appropriate sequences and that
operations (e.g. blob writes) do correct thread hopping. This
makes the tests more correct, but also more complicated.

BUG=552552

Review-Url: https://codereview.chromium.org/2930183002
Cr-Commit-Position: refs/heads/master@{#486588}

The various process launcher classes in base (ChildProcessLauncher,
ChildProcessConnection, ChildConnectionAllocator...) do no have to
depend on ChildProcessCreationParams.
Removing that dependency and moving ChildProcessCreationParams to
content.

TBR=tedchoc

Bug: 740341
Change-Id: Ic1a4cb08ca60f88b60d619fef22c9761de0f9a36
Reviewed-on: https://chromium-review.googlesource.com/563721
Commit-Queue: Jay Civelli <jcivelli@chromium.org>
Reviewed-by: Tommy Nyquist <nyquist@chromium.org>
Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Reviewed-by: Bo Liu <boliu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#486587}

If surface contents scale changes, draw transforms are no longer valid.
Invalidates the draw transform cache and updates the clip for the
surface.

TEST=manual && LayerTreeHostCommonTest.SurfaceContentsScaleChangeWithCopyRequestTest

Bug: 739547
Change-Id: I8e67ebf13c576f64474716d3d7b1db17641c4672
Reviewed-on: https://chromium-review.googlesource.com/562316Reviewed-by: Ali Juma <ajuma@chromium.org>
Reviewed-by: David Reveman <reveman@chromium.org>
Commit-Queue: wutao <wutao@chromium.org>
Cr-Commit-Position: refs/heads/master@{#486586}

For defense in depth, we cannot trust data coming from the renderer
processes.  This change hardens the mojo API surface by validating
parameters before using them.

frame_index on SubmitFrame and UpdateLayerBounds could be used to
read/write undesired memory locations (by passing in negative indices),
but aren't obviously attackable.

Viewports could contain NANs or invalid rectangles, and the desired size
could be too large/small.

BUG=729852

Review-Url: https://codereview.chromium.org/2950233002
Cr-Commit-Position: refs/heads/master@{#486585}

Bug: 
Change-Id: Ie7899c25dde4b83c2ad7c756d5bb9e00ca32b74e
Reviewed-on: https://chromium-review.googlesource.com/567326
Commit-Queue: Steven Valdez <svaldez@chromium.org>
Reviewed-by: Alexei Svitkine (slow) <asvitkine@chromium.org>
Reviewed-by: Bernhard Bauer <bauerb@chromium.org>
Reviewed-by: David Benjamin <davidben@chromium.org>
Cr-Commit-Position: refs/heads/master@{#486584}