GitLab

This reverts commit 547fd06b.

Reason for revert:

This breaks bots.

This broke WebRtcGetUserMediaBrowserTest.RenderVideoTrackInMultipleTagsAndPause
WebRtcGetUserMediaOldConstraintsBrowserTest.RenderVideoTrackInMultipleTagsAndPause

on Mac, Cast, and Win bots.

Original change's description:
> Roll src/third_party/skia/ 8fe24272f..8d1fc16ba (1 commit)
> 
> https://skia.googlesource.com/skia.git/+log/8fe24272fa6d..8d1fc16ba616
> 
> $ git log 8fe24272f..8d1fc16ba --date=short --no-merges --format='%ad %ae %s'
> 2017-07-07 fmalita More SkColorSpaceXformer caching
> 
> Created with:
>   roll-dep src/third_party/skia
> 
> 
> 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.blink:linux_trusty_blink_rel;master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel;master.tryserver.chromium.android:android_optional_gpu_tests_rel
> TBR=csmartdalton@chromium.org
> 
> Change-Id: Ia00a6af7af62f499770090fceafc447a31dd812c
> Reviewed-on: https://chromium-review.googlesource.com/564538
> Reviewed-by: Skia Deps Roller <skia-deps-roller@chromium.org>
> Commit-Queue: Skia Deps Roller <skia-deps-roller@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#485152}

TBR=skia-deps-roller@chromium.org,csmartdalton@chromium.org

Change-Id: Ic06e1988d0ba10593dd777b1420f8aa285a15c8d
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Cq-Include-Trybots: master.tryserver.blink:linux_trusty_blink_rel;master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel;master.tryserver.chromium.android:android_optional_gpu_tests_rel
Reviewed-on: https://chromium-review.googlesource.com/563983Reviewed-by: Avi Drissman <avi@chromium.org>
Commit-Queue: Avi Drissman <avi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#485156}

Revert of [LayoutNG] Set InlineBoxWrapper when copying fragments to LayoutBox (patchset #3 id:40001 of https://codereview.chromium.org/2975663002/ )

Reason for revert:
WebKit layout bots all started failing after this commit.

webkit_tests webkit_tests

Total tests: 66971
* Passed: 56304 (56144 expected, 160 unexpected)
* Skipped: 9131 (9131 expected, 0 unexpected)
* Failed: 1447 (1446 expected, >>>1 unexpected<<<)
* Flaky: 89 (89 expected, 0 unexpected)

Unexpected Failures:
* virtual/layout_ng/fast/block/float/rubybase-children-moved-crash.html

Original issue's description:
> [LayoutNG] Set InlineBoxWrapper when copying fragments to LayoutBox
>
> This patch fixes to set InlineBoxWrapper when copying fragments to
> LayoutBox.
>
> To create InlineBox'es, NGInlineNode::CopyFragmentDataToLayoutBox()
> calls LayoutBlockFlow::ConstructLine(), but it does not set
> InlineBoxWrapper.
>
> LayoutBlockFlow::ComputeBlockDirectionPositionsForLine() sets
> InlineBoxWrapper but LayoutNG does not call this function. It does
> several other things, but SetInlineBoxWrapper() is the only thing needed
> for CopyFragmentDataToLayoutBox().
>
> BUG=636993, 739365
>
> Review-Url: https://codereview.chromium.org/2975663002
> Cr-Commit-Position: refs/heads/master@{#485142}
> Committed: https://chromium.googlesource.com/chromium/src/+/981fa39e2dde70f5933ea2db88123582ab955632

TBR=eae@chromium.org,ikilpatrick@chromium.org,kojii@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=636993, 739365

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

Bug: 740176
Change-Id: I128f10379ad8deb240f260b139a6a795bb611d76
Reviewed-on: https://chromium-review.googlesource.com/563468
Commit-Queue: Jeff Carpenter <jeffcarp@chromium.org>
Reviewed-by: Quinten Yearsley <qyearsley@chromium.org>
Cr-Commit-Position: refs/heads/master@{#485154}

This brings the raster backend into line with ganesh, which never had this hack.

(moved from https://chromium-review.googlesource.com/c/562677)

Bug=skia:6835
TBR=reed@google.com

Change-Id: I2f0e3a1be03cccc8b1436a290b0b80dde0419aa1
Reviewed-on: https://chromium-review.googlesource.com/563783Reviewed-by: Florin Malita <fmalita@chromium.org>
Commit-Queue: Florin Malita <fmalita@chromium.org>
Cr-Commit-Position: refs/heads/master@{#485153}

https://skia.googlesource.com/skia.git/+log/8fe24272fa6d..8d1fc16ba616

$ git log 8fe24272f..8d1fc16ba --date=short --no-merges --format='%ad %ae %s'
2017-07-07 fmalita More SkColorSpaceXformer caching

Created with:
  roll-dep src/third_party/skia


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.blink:linux_trusty_blink_rel;master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel;master.tryserver.chromium.android:android_optional_gpu_tests_rel
TBR=csmartdalton@chromium.org

Change-Id: Ia00a6af7af62f499770090fceafc447a31dd812c
Reviewed-on: https://chromium-review.googlesource.com/564538Reviewed-by: Skia Deps Roller <skia-deps-roller@chromium.org>
Commit-Queue: Skia Deps Roller <skia-deps-roller@chromium.org>
Cr-Commit-Position: refs/heads/master@{#485152}

Make ServerGpuMemoryBufferManager a MemoryDumpProvider, so that it can
report the gpu memory usage by various clients.

BUG=733482

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

TBR=perezju@chromium.org

Bug: 728464
Change-Id: Ifb2b77d3f5a8700d7b5d2f9ea45d80ab6a428e50
Reviewed-on: https://chromium-review.googlesource.com/564331Reviewed-by: Ned Nguyen <nednguyen@google.com>
Commit-Queue: Ned Nguyen <nednguyen@google.com>
Cr-Commit-Position: refs/heads/master@{#485150}

Now that we have dedicated key for the assistant, let's start using it,
in addition to Meta-A.

BUG=b:36735408

Change-Id: Ide16328acd1725b36e82016eba14a320c83acd3a
Reviewed-on: https://chromium-review.googlesource.com/550414
Commit-Queue: Dmitry Torokhov <dtor@chromium.org>
Reviewed-by: Dan Erat <derat@chromium.org>
Cr-Commit-Position: refs/heads/master@{#485149}

The number of cookies deleted will always be zero or a positive number,
so should be represented by an unsigned.  This is being done to bring
the CookieStore interface into alignment with the Mojo cookie service.

BUG=721395
R=mmenke@chromium.org
TBR=sgurun@chromium.org
TBR=mkwst@chromium.org
TBR=sky@chromium.org
TBR=jam@chromium.org
TBR=rohitrao@chromium.org

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

https://chromium.googlesource.com/external/github.com/catapult-project/catapult.git/+log/256098db1e09..00b0c16c9708

$ git log 256098db1..00b0c16c9 --date=short --no-merges --format='%ad %ae %s'
2017-07-08 perezju Revert of [System Health] Extend dump time to 5 seconds (patchset #2 id:20001 of https://codereview.chromium.org/2946013004/ )

Created with:
  roll-dep src/third_party/catapult
BUG=734853


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: I767d74467eecdddcc223be036d7ae68a6eb9c1e6
Reviewed-on: https://chromium-review.googlesource.com/564312
Reviewed-by: <catapult-deps-roller@chromium.org>
Commit-Queue: <catapult-deps-roller@chromium.org>
Cr-Commit-Position: refs/heads/master@{#485147}

Make internal::TaskQueueImpl a member of TaskQueue instead of
inheriting. This will allow us to easily subclass TaskQueue for
different parts of the code.

This patch does not change behaviour.

Notable changes:
* TaskQueue::Observer mechanism changed (we can't issue a callback from
  the internals of the scheduler due to not having TaskQueue reference.
  Instead TaskQueueImpl::OnNotification are introduced and TaskQueue passes
  necessary handlers to underlying TaskQueueImpl). These notifications include
  queue wake-up changes and completed tasks for metric purposes.

Bug: 
Change-Id: I61ebcdfb45d02bb44e856de3cc3caf25ab26763b
Reviewed-on: https://chromium-review.googlesource.com/559148
Commit-Queue: Alexander Timin <altimin@chromium.org>
Reviewed-by: Kentaro Hara <haraken@chromium.org>
Reviewed-by: Alex Clarke <alexclarke@chromium.org>
Cr-Commit-Position: refs/heads/master@{#485146}

BUG=686770

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

Things are moving out of core/html/shadow and having files consolidated
in media/ will help with ownership.

Bug: None
Change-Id: I0b9cbced78f3a3a0ba1501e2a242a3c2f17ef3bd
Reviewed-on: https://chromium-review.googlesource.com/563213Reviewed-by: Philip Jägenstedt <foolip@chromium.org>
Commit-Queue: Mounir Lamouri <mlamouri@chromium.org>
Cr-Commit-Position: refs/heads/master@{#485144}

This is moving the remaining three classes and enum to modules as none
of these are now used outside of modules/media_controls/ and
modules/accessibility/.

Bug: 662761
Change-Id: I6e89ae252e6f6a10c25a7650cb8a88f90d798880
Reviewed-on: https://chromium-review.googlesource.com/563300Reviewed-by: Philip Jägenstedt <foolip@chromium.org>
Reviewed-by: Anton Vayvod <avayvod@chromium.org>
Commit-Queue: Mounir Lamouri <mlamouri@chromium.org>
Cr-Commit-Position: refs/heads/master@{#485143}

This patch fixes to set InlineBoxWrapper when copying fragments to
LayoutBox.

To create InlineBox'es, NGInlineNode::CopyFragmentDataToLayoutBox()
calls LayoutBlockFlow::ConstructLine(), but it does not set
InlineBoxWrapper.

LayoutBlockFlow::ComputeBlockDirectionPositionsForLine() sets
InlineBoxWrapper but LayoutNG does not call this function. It does
several other things, but SetInlineBoxWrapper() is the only thing needed
for CopyFragmentDataToLayoutBox().

BUG=636993, 739365

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

Following bot results are included.
675

The InlineBoxWrapper fix[1] changes the result too much for Rietveld to
handle, and thus moving to Gerrit.

3848 new passes, and 964 crashes turn to failures/timeouts.

[1] https://codereview.chromium.org/2975663002

BUG=591099
TBR=eae@chromium.org
NOTRY=true

Change-Id: I9cce7a01bdacb6bb0f21542344bee1800e7a62ff
Reviewed-on: https://chromium-review.googlesource.com/563768
Commit-Queue: Koji Ishii <kojii@chromium.org>
Reviewed-by: Koji Ishii <kojii@chromium.org>
Reviewed-by: Emil A Eklund <eae@chromium.org>
Cr-Commit-Position: refs/heads/master@{#485141}

Extracting the launching code that will go to base from
ChildProcessLauncherHelper (CPLH) to ChildProcessLauncher (CPL).
CPLH now creates a CPL that takes care of creating the connection and
setting it up and delegates back to the CPLH for content specific behavior.

Adding tests to validate the CPL API and moving some existing tests to
use CPL instead of CPLH. The new tests use a new test service
(TestChildProcessService) that echoes back the delegate calls called
on it.  
Also removing the CPLH tests validating strong binding connections as
this is already tested in ChildConnectionAllocatorTest.

Bug: 702316
Change-Id: Ic2bda3f621530616cacc60e22007ca36464a0159
Reviewed-on: https://chromium-review.googlesource.com/557890
Commit-Queue: Jay Civelli <jcivelli@chromium.org>
Reviewed-by: Bo Liu <boliu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#485140}

This CL removes BluetoothLowEnergyExtensionFunctionDeprecated and
migrate the subclasses to use BluetoothLowEnergyExtensionFunction
instead, which is based on UIThreadExtensionFunction.

BUG=737211

Change-Id: Ibd3781973582dbd339ccf021604f44de04ad6bba
Reviewed-on: https://chromium-review.googlesource.com/560780
Commit-Queue: Sonny Sasaka <sonnysasaka@chromium.org>
Reviewed-by: Toni Barzic <tbarzic@chromium.org>
Cr-Commit-Position: refs/heads/master@{#485139}

This fixes how we handle matrix attributes to properly take into account
all the locations that they use instead of just the first one.

Bug: 736639, 738228
Cq-Include-Trybots: master.tryserver.chromium.android:android_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel
Change-Id: I0ca7d9b8a962d7de13016f5c04d5ab1d7348f514
Reviewed-on: https://chromium-review.googlesource.com/553746Reviewed-by: Antoine Labour <piman@chromium.org>
Reviewed-by: Kenneth Russell <kbr@chromium.org>
Commit-Queue: Antoine Labour <piman@chromium.org>
Cr-Commit-Position: refs/heads/master@{#485138}

BUG=739941

Change-Id: I385237e7643707381109879908bf5d493bf62345
Reviewed-on: https://chromium-review.googlesource.com/563542
Commit-Queue: Brian White <bcwhite@chromium.org>
Reviewed-by: Robert Kaplow <rkaplow@chromium.org>
Cr-Commit-Position: refs/heads/master@{#485137}

TBR=thakis@chromium.org

Change-Id: I3fbceeb755e372c2b436d41f7be9c8f55a21c4bc
Reviewed-on: https://chromium-review.googlesource.com/563781Reviewed-by: chrome-release-bot@chromium.org <chrome-release-bot@chromium.org>
Cr-Commit-Position: refs/heads/master@{#485136}

Patch thanks to kylixrd@chromium.org!

BUG=593874
R=thestig@chromium.org
TBR=rdevlin.cronin@chromium.org
CC=kylixrd@chromium.org

Change-Id: If554b0e1ed1d40386e7a639dc9b8869225500b51
Reviewed-on: https://chromium-review.googlesource.com/564284
Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#485135}

The text button has a fixed height, so it doesn't need vertical padding.
The padding caused the text to be not centered on Windows.

BUG=none

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

Also includes type mapping for media::EncryptionScheme.

Bug: 611224
Change-Id: I151aacd4ea2dfe9e02ff7c82c922bc5a982e1fd4
Reviewed-on: https://chromium-review.googlesource.com/544913Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Reviewed-by: Dan Sanders <sandersd@chromium.org>
Commit-Queue: Chrome Cunningham <chcunningham@chromium.org>
Cr-Commit-Position: refs/heads/master@{#485133}

This CL touches up some typos, mostly in the settings internet code. Not
a big deal, but I wanted something low risk yet helpful to do late on a
Friday.

TBR=stevenjb@chromium.org
(code health)

Bug: None
Change-Id: I76616bc258d9fb92323d37c57341de2575ee72d8
Reviewed-on: https://chromium-review.googlesource.com/564203Reviewed-by: Hector Carmona <hcarmona@chromium.org>
Reviewed-by: Dave Schuyler <dschuyler@chromium.org>
Commit-Queue: Dave Schuyler <dschuyler@chromium.org>
Cr-Commit-Position: refs/heads/master@{#485132}

This CL causes Chrome to show the same client-generated placeholders for
both Server LoFi and Client LoFi, so that all LoFi images have a
consistent appearance.

BUG=680645

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

This CL moves the on startup settings off of the main settings page and
into a subpage.

Bug: 653376
Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
Change-Id: I46dd91fbd3e1bc4b28b6465ad0a3a08b7bee1927
Reviewed-on: https://chromium-review.googlesource.com/557971Reviewed-by: Hector Carmona <hcarmona@chromium.org>
Commit-Queue: Dave Schuyler <dschuyler@chromium.org>
Cr-Commit-Position: refs/heads/master@{#485130}

Moves pausing of the vsync estimator into onPause rather than onStop.

Bug: 740161
Change-Id: I4a8c3b9ecfd60bc43ed3499761cc6b0391f47082
Reviewed-on: https://chromium-review.googlesource.com/563858Reviewed-by: Biao She <bshe@chromium.org>
Commit-Queue: Michael Thiessen <mthiesse@chromium.org>
Cr-Commit-Position: refs/heads/master@{#485129}

This allows us to test how power consumption is affected by reducing
the framerate.

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

This CL creates a TouchSelectionControllerClientManager for Android to
allow multiple TouchSelectionControllerClients (one top-level, and zero
or more child-frame clients) to share the TouchSelectionController.

Bug: 470662
Cq-Include-Trybots: master.tryserver.chromium.linux:linux_site_isolation
Change-Id: Ia7517e72a7fddae349f121943421cee0bafc356c
Reviewed-on: https://chromium-review.googlesource.com/523062
Commit-Queue: James MacLean <wjmaclean@chromium.org>
Reviewed-by: Charlie Reis <creis@chromium.org>
Reviewed-by: Ken Buchanan <kenrb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#485127}

BUG=739150
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:closure_compilation

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

If a random access point doesn't have the earliest presentation time of
other frames that depend on it (eg, other frames in later decode time up
until the next random access point), the MSE spec was not designed to
support processing and buffering it well. With the change to managing
and reporting buffered ranges by PTS intervals instead of DTS intervals,
this could impact interop. This change detects this general case and
logs once per track to chrome://media-internals. Later changes might
include telemetry collection to assist removing or fixing support for
at least SAP Type 2 in the MSE ISOBMFF bytestream spec.

To verify the new log is emitted by the new test, this change also
upgrades FrameProcessorTest's |media_log_| to a StrictMock<MockMediaLog>
and includes new strict verification of logs emitted during
FrameProcessorTests.

See also related spec issue https://github.com/w3c/media-source/issues/187

BUG=739931,718641

Change-Id: I361177dee6a5c70edf17bdbde2f3ea643977e6ec
Reviewed-on: https://chromium-review.googlesource.com/563017
Commit-Queue: Chrome Cunningham <chcunningham@chromium.org>
Reviewed-by: Chrome Cunningham <chcunningham@chromium.org>
Cr-Commit-Position: refs/heads/master@{#485125}

This has the advantage of moving the file writing off the main thread.

BUG=716570

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

Bug: 
Change-Id: I6378477249aecff89035c3c9297ba59ecdd86a4f
Reviewed-on: https://chromium-review.googlesource.com/548983
Commit-Queue: Menglu Huang <huangml@chromium.org>
Reviewed-by: Mark Cogan <marq@chromium.org>
Cr-Commit-Position: refs/heads/master@{#485123}

These two new files are mostly a copy of json_response_fetcher.cc and
json_response_fetcher.h from chrome/browser/ui/app_list/search/common/ 
(https://cs.chromium.org/chromium/src/chrome/browser/ui/app_list/search/common/?q=chrome/browser/ui/app_list/search/common&sq=package:chromium&dr).
The main differences are that 1) The namespace is changed from app_list to
payment_request_util 2) Instead of using SafeJsonParser, a basic parser is used
instead since iOS does not currently support SafeJsonParser.

Bug: 602666
Change-Id: Ibf619f1c53a32eb53654e00959fbcba61720c8a5
Reviewed-on: https://chromium-review.googlesource.com/562581
Commit-Queue: Randall Raymond <rayraymond@google.com>
Reviewed-by: Jean-François Geyelin <jif@chromium.org>
Reviewed-by: mahmadi <mahmadi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#485122}

Includes basic support for plaintext read/write.

See https://w3c.github.io/clipboard-apis/

BUG=677564

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

https://chromium.googlesource.com/external/github.com/catapult-project/catapult.git/+log/9a5b75ed3609..256098db1e09

$ git log 9a5b75ed3..256098db1 --date=short --no-merges --format='%ad %ae %s'
2017-07-07 benjhayden Reland Fix _GetSelectedTestPathsForDict in /list_tests handler.
2017-07-07 erikchen Use json.dumps instead of json.dump in symbolize_trace.py.
2017-07-07 benjhayden Clean up MERGED_FROM in histogram.py.
2017-07-07 mikecase Decrease iter_timeout for logcat_monitor by factor of 10.

Created with:
  roll-dep src/third_party/catapult
BUG=740263


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: I2137321803b52e544fd47074a13225e63faf5e7b
Reviewed-on: https://chromium-review.googlesource.com/564066
Reviewed-by: <catapult-deps-roller@chromium.org>
Commit-Queue: <catapult-deps-roller@chromium.org>
Cr-Commit-Position: refs/heads/master@{#485120}

BUG=512916

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

This CL updates the options html from the old i18n-content to $i18n{}
replacements.

TBR=stevenjb@chromium.org

Bug: 677338
Change-Id: I7c129d792910a2196cf2701a750258d49fe0b33b
Reviewed-on: https://chromium-review.googlesource.com/564137
Commit-Queue: Dave Schuyler <dschuyler@chromium.org>
Reviewed-by: Tommy Li <tommycli@chromium.org>
Cr-Commit-Position: refs/heads/master@{#485118}

The changes mirror those in the logging system.  Additional info in crbug.com/740225

Bug: 725739, 740225
Change-Id: I5426da5065b1de2943ec8130e364769d5853affe
Reviewed-on: https://chromium-review.googlesource.com/563607Reviewed-by: Steven Holte <holte@chromium.org>
Commit-Queue: Sean Kau <skau@chromium.org>
Cr-Commit-Position: refs/heads/master@{#485117}