- 14 Dec, 2017 40 commits
-
-
Katie Dektar authored
This fixes a bug where in gmail selecting text in an open draft also selected text behind that pop up window. The bug was occuring because the hittest was returning a node that was behind the open dialog/window, and select-to-speak walked up its tree to find a higher level root with which to build the nodes to speak. The bug only showed up on high density screens because then DIP and PX were significantly different. On 1:1 screens it could not be found. A test is added which fails without this one-line change but passes with it. Bug: 792545 Change-Id: I21519b6cfaae97cb11c711b11b7a6b3e4b6fe017 Reviewed-on: https://chromium-review.googlesource.com/826043 Commit-Queue: Katie D <katie@chromium.org> Reviewed-by:
Alice Boxhall <aboxhall@chromium.org> Cr-Commit-Position: refs/heads/master@{#523992}
-
John Z Wu authored
If you quit the app in iOS multitasking, it DCHECKs in a few places. This makes it impossible to write integration tests. This happens because, in our current setup, ObjC classes stay around longer than C++ classes. More specifically, CWVWebViewConfiguration stays around longer than WebViewWebMainParts. Since any client may retain CWVWebViewConfiguration for any reason, we cannot rely on dealloc to clean things up. Instead, a |shutDown| method is used to tear things down in the proper order. Bug: 733452 Cq-Include-Trybots: master.tryserver.chromium.mac:ios-simulator-cronet;master.tryserver.chromium.mac:ios-simulator-full-configs Change-Id: I5c7b3e2f5fc81ee9d67e3a8a499301e4c814726e Reviewed-on: https://chromium-review.googlesource.com/825444 Commit-Queue: John Wu <jzw@chromium.org> Reviewed-by:
Mike Dougherty <michaeldo@chromium.org> Cr-Commit-Position: refs/heads/master@{#523991}
-
Zhuoyu Qian authored
This patch makes ItemPosition and ItemPositionType to be enum classes for better type safety. Bug: 684966 Signed-off-by:
Zhuoyu Qian <zhuoyu.qian@samsung.com> Change-Id: Idd1a687d1e8bb07cdf12398fd84045ab7ef3ede3 Reviewed-on: https://chromium-review.googlesource.com/821801Reviewed-by:
nainar <nainar@chromium.org> Reviewed-by:
Darren Shen <shend@chromium.org> Cr-Commit-Position: refs/heads/master@{#523990}
-
Darren Shen authored
As per [1], CSSVariableReferenceValue now has a constructor. We can get rid of our hacky helper to create CSSVariableReferenceValues. [1] https://github.com/w3c/css-houdini-drafts/issues/514 Bug: 545318 Change-Id: I1f540514e9a75fb315dc7db16bc99e70ffe911ef Reviewed-on: https://chromium-review.googlesource.com/822318Reviewed-by:
nainar <nainar@chromium.org> Commit-Queue: Darren Shen <shend@chromium.org> Cr-Commit-Position: refs/heads/master@{#523989}
-
Weidong Guo authored
Bug: 781747 Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation Change-Id: I128f64943031087f08bdf3f64c743bcbb7784694 Reviewed-on: https://chromium-review.googlesource.com/820094 Commit-Queue: Weidong Guo <weidongg@chromium.org> Reviewed-by:
Mitsuru Oshima <oshima@chromium.org> Reviewed-by:
Steven Bennetts <stevenjb@chromium.org> Cr-Commit-Position: refs/heads/master@{#523988}
-
Tetsui Ohkubo authored
By using policy settings, administrator can enforce devices to allow or disallow notifications from specified URL origins. The enforced permissions are properly shown on chrome://settings, however, they were not reflected in notification center settings of Chrome OS. This CL changes the view to show disabled icon and make the row dim for such notifier sources, making it clear for users that they can't change the setting. Screenshot: http://screen/gTg2H5OWxaK UX Mock: https://crbug.com/771269#c11 TEST=manual BUG=771269 Change-Id: Iee0032ef85a4c132860f15c0f926551810543466 Reviewed-on: https://chromium-review.googlesource.com/810248 Commit-Queue: Tetsui Ohkubo <tetsui@chromium.org> Reviewed-by:
Steven Bennetts <stevenjb@chromium.org> Reviewed-by:
Tom Sepez <tsepez@chromium.org> Reviewed-by:
Evan Stade <estade@chromium.org> Cr-Commit-Position: refs/heads/master@{#523987}
-
Erik Luo authored
Today's previews might not always wrap when they should. Example: `Object.keys(window.performance.timing.__proto__)` Bug: 781498 Change-Id: I763f55a8802773811b67c2f91eee96b3cb7e003b Reviewed-on: https://chromium-review.googlesource.com/818079 Commit-Queue: Erik Luo <luoe@chromium.org> Reviewed-by:
Joel Einbinder <einbinder@chromium.org> Reviewed-by:
Andrey Lushnikov <lushnikov@chromium.org> Cr-Commit-Position: refs/heads/master@{#523986}
-
Pedro Amaral authored
Removing unused metric Bug: 794038 Change-Id: I53c4c6cfd09db60946bd4e02119ba0363c77b266 Reviewed-on: https://chromium-review.googlesource.com/823174Reviewed-by:
Ilya Sherman <isherman@chromium.org> Reviewed-by:
Bo <boliu@chromium.org> Commit-Queue: Pedro Amaral <amaralp@chromium.org> Cr-Commit-Position: refs/heads/master@{#523985}
-
Yafei Duan authored
Adding the following UMAs to OfflinePageModelTaskified: - SavePageCount, recorded when a page is saved. - AccessPageCount, recorded when a page is accessed. - DeletePageCount, recorded when a page gets deleted. (not including deletions made during clearing temporary pages and consistency check). The samples of these UMAs are enums of the Offline Pages namespaces. Also added corresponding tests in the existing unit tests. Bug: 772204 Change-Id: I25cda79b7986f37ec5b4d1663868aac7b022912a Reviewed-on: https://chromium-review.googlesource.com/815937Reviewed-by:
Filip Gorski <fgorski@chromium.org> Reviewed-by:
Steven Holte <holte@chromium.org> Commit-Queue: Yafei Duan <romax@chromium.org> Cr-Commit-Position: refs/heads/master@{#523984}
-
Mitsuru Oshima authored
* Add bounds_change_animation_type to ClientControlledState. * Use cross fade if the window is maximized/fullscreen-ed or restored. * Moved WindowStateObserver to ShellSurface because it's not necessary for ClientControlledShellSurface. * Cleanups: - Remove UpdateBackdrop virtual method and moved to ClientControlledShellSurface - Moved ScopedAnimationsDisabled to ShellSurface. - Removed CanAnimateWindowStateTransition. BUG=b:29406058, crbug.com/762816 TEST=updated unit tests. tested on device. Change-Id: I87a0d27d0edb7a7ce1d8fbefc35a584692cf159c Reviewed-on: https://chromium-review.googlesource.com/820972 Commit-Queue: Mitsuru Oshima <oshima@chromium.org> Reviewed-by:
David Reveman <reveman@chromium.org> Cr-Commit-Position: refs/heads/master@{#523983}
-
Sidney San Martín authored
NSDisableScreenUpdates() is advertised for making visually atomic changes that affect multiple windows, but it it's also effective when multiple processes have layers in the same window. macOS uses it to synchronize resizing of out-of-process views like NSOpenPanel. Leaving screen updates disabled for too long can create funky visual artifacts within and behind Chrome windows if left on for too long. This waits to flip it until a frame has been produced of the new size, and it's only on during the (very brief) compositor swap. Bug: 617824, 741478 Change-Id: Id6ddfb8848342d6e4b148207a3f76125774081d6 Reviewed-on: https://chromium-review.googlesource.com/798774 Commit-Queue: Sidney San Martín <sdy@chromium.org> Reviewed-by:
ccameron <ccameron@chromium.org> Cr-Commit-Position: refs/heads/master@{#523982}
-
Xiyuan Xia authored
Update "continue" url for /samlredirect: /o/oauth2/programmatic_auth => /programmatic_auth_chromeos to SAML_INTERSTITIAL can sign-in normally. Bug: b/63865968 Test: Manual. Domains with LoginAuthenticationBehavior policy set Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation Change-Id: I38ca3dcab9c449c8dff29ecf4037dbd397d5b4b4 Reviewed-on: https://chromium-review.googlesource.com/825883Reviewed-by:
Achuith Bhandarkar <achuith@chromium.org> Commit-Queue: Xiyuan Xia <xiyuan@chromium.org> Cr-Commit-Position: refs/heads/master@{#523981}
-
Weiyong Yao authored
Currently Chrome on Android can only advise BaseLine H264 for HW H264 encoder, while some third party peers only expect ConstrainedBaseLine during negotiation. This will break down the intercommunication with others a lot. Changing the profile id in SDP to CBP can solve this problem, which means the peer can actually decode the stream from Android HW H264. So the easiest solution is to fake the H264 profile id to CBP on Android, which will violate the spec a bit, but can solve major intercommunication compatibility issues right now. Bug: 793038 Change-Id: I8480aa624c445f30c5defe75bdc378dca63e130a Reviewed-on: https://chromium-review.googlesource.com/815294Reviewed-by:
Pawel Osciak <posciak@chromium.org> Commit-Queue: Weiyong Yao <braveyao@chromium.org> Cr-Commit-Position: refs/heads/master@{#523980}
-
kylechar authored
VizProcessTransportFactory::GetFrameSinkManager() has a NOTREACHED() that is intentional. This is likely to be where other teams see crashes originating from in viz_content_browsertests, so add a better comment to give some context for why it's happening. Bug: none Change-Id: Ib4eb4ff9d71a86d04359d6d20a30f6c819e49126 Reviewed-on: https://chromium-review.googlesource.com/824985Reviewed-by:
James MacLean <wjmaclean@chromium.org> Commit-Queue: kylechar <kylechar@chromium.org> Cr-Commit-Position: refs/heads/master@{#523979}
-
Dirk Pranke authored
This is a long-overdue change that removes all of the code from //tools/mb for invoking GYP instead of GN. This also updates the docs to remove most of the references to GYP. The docs can probably be updated even more to talk about other things that have been added, but I'll leave that for a separate CL. R=jbudorick@chromium.org Change-Id: Ic03c43189ec6fe0cc567d84480a27bc969a4477d Reviewed-on: https://chromium-review.googlesource.com/825586Reviewed-by:
John Budorick <jbudorick@chromium.org> Commit-Queue: Dirk Pranke <dpranke@chromium.org> Cr-Commit-Position: refs/heads/master@{#523978}
-
Sergey Ulanov authored
The new version replaces asm() with __asm__() which allows compilation with --std=c11 Bug: 750940 Change-Id: I62e3603b3e969d046cf707fcfde756fa71fe9abc Reviewed-on: https://chromium-review.googlesource.com/825982Reviewed-by:
Raymond Toy <rtoy@chromium.org> Commit-Queue: Sergey Ulanov <sergeyu@chromium.org> Cr-Commit-Position: refs/heads/master@{#523977}
-
Jared Saul authored
Credit card upload save always asks Google payments if save is possible, provides metadata on detected values Bug: 789645 Change-Id: I4c4709d9a4bd08134893dc64aa5a07e188bc2388 Reviewed-on: https://chromium-review.googlesource.com/816078 Commit-Queue: Jared Saul <jsaul@google.com> Reviewed-by:
Mathieu Perreault <mathp@chromium.org> Cr-Commit-Position: refs/heads/master@{#523976}
-
Dave Tapuska authored
Fix minor shadowing issues. BUG=794619 Change-Id: I0656c25c13be3e7652122e1b1b1ded282f352da1 Reviewed-on: https://chromium-review.googlesource.com/825903Reviewed-by:
Daniel Cheng <dcheng@chromium.org> Reviewed-by:
Kentaro Hara <haraken@chromium.org> Commit-Queue: Dave Tapuska <dtapuska@chromium.org> Cr-Commit-Position: refs/heads/master@{#523975}
-
Xianzhu Wang authored
If there is no ScrollingLayer, ForegroundLayer is in the same coordinates as the main graphics layer, so it should use the container state instead of the contents state. Bug: 771643 Cq-Include-Trybots: master.tryserver.chromium.linux:linux_layout_tests_slimming_paint_v2 Change-Id: Ie28ab43803f1ffb3a4bacb80c9bea9c71e19068c Reviewed-on: https://chromium-review.googlesource.com/825442 Commit-Queue: Xianzhu Wang <wangxianzhu@chromium.org> Reviewed-by:
Chris Harrelson <chrishtr@chromium.org> Cr-Commit-Position: refs/heads/master@{#523974}
-
Scott Chen authored
Originally, everytime you select a different error in the error console, the code-section rerenders the text content entirely. This causes extreme lag (2s+ for 10k line of code) everytime you click an error. This CL changes the way code-highlighting is done by using the native text selection API. This allows us to prevent rerenders when inspecting errors from the same file. The side effect of this change is that the highlight now does not persist. If the user clicks somewhere else on the page or ctrl+f for something, then the highlight will be removed. But the original goal to catch the user's attention is still retained. Bug: 793394 Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation Change-Id: I8effb44d62f9c2897767a3c9f9ae92e86400afc9 Reviewed-on: https://chromium-review.googlesource.com/821511 Commit-Queue: Scott Chen <scottchen@chromium.org> Reviewed-by:
Demetrios Papadopoulos <dpapad@chromium.org> Cr-Commit-Position: refs/heads/master@{#523973}
-
Luciano Pacheco authored
This is part of the gradual process of putting all types that derive from CSSValue into blink::cssvalue:: namespace. Bug: 667961 Change-Id: I6ea5a93ba53d08f6c006874eebd82d93a3fb5758 Reviewed-on: https://chromium-review.googlesource.com/816476Reviewed-by:
Noel Gordon <noel@chromium.org> Reviewed-by:
meade_UTC10 <meade@chromium.org> Commit-Queue: Luciano Pacheco <lucmult@chromium.org> Cr-Commit-Position: refs/heads/master@{#523972}
-
Erik Luo authored
Screenshot: https://imgur.com/a/HvEpQ Bug: 670883 Change-Id: Ife7c85f35e4ead089c7251931db033f1afa1f9dd Reviewed-on: https://chromium-review.googlesource.com/821595 Commit-Queue: Erik Luo <luoe@chromium.org> Reviewed-by:
Dmitry Gozman <dgozman@chromium.org> Cr-Commit-Position: refs/heads/master@{#523971}
-
Jinsuk Kim authored
Resizing should not propagate if there has been no actual size change. This was accidentally allowed, and caused the bug by disturbing the popup zoomer. This CL fixes that. Bug: 794451 Change-Id: I2eb7e17be8aa63901eb050e27cc0acb7955191e7 Reviewed-on: https://chromium-review.googlesource.com/825182 Commit-Queue: Jinsuk Kim <jinsukkim@chromium.org> Reviewed-by:
Bo <boliu@chromium.org> Cr-Commit-Position: refs/heads/master@{#523970}
-
James Cook authored
Crash was introduced in commit 8f1e606d More than one part of chrome calls mojo methods in NewWindowController, so there can be more than one binding. I've audited the other changes in the above CL and they should be OK, so keeping this change small for easier backport. Bug: 794581 Test: ash_unittests, chrome unit_tests and browser_tests, manually open keyboard shortcut overlay from webui settings > keyboard section Change-Id: I6b274ecd7b8e6c0c366c36a398e9094b4c361dd9 Reviewed-on: https://chromium-review.googlesource.com/826026Reviewed-by:
Michael Wasserman <msw@chromium.org> Commit-Queue: James Cook <jamescook@chromium.org> Cr-Commit-Position: refs/heads/master@{#523969}
-
Dmitry Gozman authored
Bug: none Change-Id: I6f8401e344ade64abb0cff4282c9cf5f84082662 Reviewed-on: https://chromium-review.googlesource.com/825949 Commit-Queue: Dmitry Gozman <dgozman@chromium.org> Commit-Queue: Pavel Feldman <pfeldman@chromium.org> Reviewed-by:
Pavel Feldman <pfeldman@chromium.org> Cr-Commit-Position: refs/heads/master@{#523968}
-
Peter Collingbourne authored
Bug: 794506 Change-Id: I0f608a3cd56fac963a5bb225f6e7096a6677e850 Reviewed-on: https://chromium-review.googlesource.com/826242Reviewed-by:
agrieve <agrieve@chromium.org> Commit-Queue: Peter Collingbourne <pcc@chromium.org> Cr-Commit-Position: refs/heads/master@{#523967}
-
Pavel Feldman authored
Bug: none Change-Id: I13e6afbd86a7c6bcdedbf0645183194b9de7cfb4 Reviewed-on: https://chromium-review.googlesource.com/809759 Commit-Queue: Pavel Feldman <pfeldman@chromium.org> Reviewed-by:
Lei Zhang <thestig@chromium.org> Reviewed-by:
Tom Sepez <tsepez@chromium.org> Reviewed-by:
Jianzhou Feng <jzfeng@chromium.org> Cr-Commit-Position: refs/heads/master@{#523966}
-
Joel Einbinder authored
A follow up patch will convert chromedriver to use dispatchTouchEvent. Bug: chromedriver:2144 Change-Id: Ib6b04791bb46f1d09dc1fc92de257f8160d5a4f8 Reviewed-on: https://chromium-review.googlesource.com/818086 Commit-Queue: Joel Einbinder <einbinder@chromium.org> Reviewed-by:
Dmitry Gozman <dgozman@chromium.org> Reviewed-by:
Dave Tapuska <dtapuska@chromium.org> Cr-Commit-Position: refs/heads/master@{#523965}
-
Dmitry Skiba authored
VariationsFieldTrialCreator::CreateTrialsFromSeed() function takes ~100ms on Android Go devices (see the bug). This CL adds TRACE_EVENT to the function to make it visible in startup traces. Bug: 761684 Change-Id: I339de72e6e04cfa2ba30e65ce8d5888d467fead2 Reviewed-on: https://chromium-review.googlesource.com/825647Reviewed-by:
Ilya Sherman <isherman@chromium.org> Commit-Queue: Ilya Sherman <isherman@chromium.org> Cr-Commit-Position: refs/heads/master@{#523964}
-
Andrey Lushnikov authored
This patch starts resetting the InspectorResourceContainer storage for the externally changed style tags so that old content doesn't stuck. BUG=758600 R=dgozman Change-Id: I655be7269a2d2b502bbbe6967a3849696d619b28 Reviewed-on: https://chromium-review.googlesource.com/826023Reviewed-by:
Dmitry Gozman <dgozman@chromium.org> Commit-Queue: Andrey Lushnikov <lushnikov@chromium.org> Cr-Commit-Position: refs/heads/master@{#523963}
-
David Jacobo authored
- Adding an horizontal Separator between the list of apps and the "Rememeber my choice" checkbox. - Adjusting the row size for app candidates from 40 to 32, reducing the icon from 20 to 16 pt. - Changing the color of the InkDrop from black to gray. Bug: 678141 Test: Manually checked the UI. Build Change-Id: I5697d0aa3e0aa2b2f2b2e9cb627061c43c74f587 Reviewed-on: https://chromium-review.googlesource.com/825963Reviewed-by:
Yusuke Sato <yusukes@chromium.org> Reviewed-by:
Scott Violet <sky@chromium.org> Commit-Queue: David Jacobo <djacobo@chromium.org> Cr-Commit-Position: refs/heads/master@{#523962}
-
Joel Einbinder authored
Change-Id: Ic856f6d5c20ab05ca566c18b8e0490f792f472ef Reviewed-on: https://chromium-review.googlesource.com/825763 Commit-Queue: Joel Einbinder <einbinder@chromium.org> Reviewed-by:
Andrey Lushnikov <lushnikov@chromium.org> Cr-Commit-Position: refs/heads/master@{#523961}
-
Dmitry Gozman authored
It supports transforming attributes into css values. Bug: none Change-Id: I67c2b67807ceed0ad3d5872aa019d1e59ef3b724 Reviewed-on: https://chromium-review.googlesource.com/826129 Commit-Queue: Dmitry Gozman <dgozman@chromium.org> Reviewed-by:
Andrey Lushnikov <lushnikov@chromium.org> Cr-Commit-Position: refs/heads/master@{#523960}
-
David Vallet authored
Modify GetShmemTempDir to check for a runtime switch to always use the temp dir Changes tests in shared_memory_unittest.cc to be parameterized and test also for when /dev/shm is disabled. Bug: 736452,792117 Change-Id: Id930ea525980e97c4ab70e37689301370776fc79 Reviewed-on: https://chromium-review.googlesource.com/810325Reviewed-by:
Robert Sesek <rsesek@chromium.org> Reviewed-by:
Lei Zhang <thestig@chromium.org> Commit-Queue: David Vallet <dvallet@chromium.org> Cr-Commit-Position: refs/heads/master@{#523959}
-
danakj authored
This adds some NOTREACHED() on ChromeOS to figure out why tests are disabling gpu compositing. R=zmo@chromium.org Bug: 793303 Change-Id: I6ee99fc334c34c292bcb1e3568108e422d43da4c Reviewed-on: https://chromium-review.googlesource.com/826382Reviewed-by:
Zhenyao Mo <zmo@chromium.org> Commit-Queue: danakj <danakj@chromium.org> Cr-Commit-Position: refs/heads/master@{#523958}
-
Yutaka Hirano authored
As a preparation step to deprecate resource_messages.h, this change migrates ResourceDispatcherHostTest to LoadingWithMojo. This change also removes some tests that are no longer needed. Bug: 788241 Change-Id: I04ca5649fd621404a177d9c2571384a00a0d7741 Reviewed-on: https://chromium-review.googlesource.com/818925 Commit-Queue: Yutaka Hirano <yhirano@chromium.org> Reviewed-by:
Kinuko Yasuda <kinuko@chromium.org> Cr-Commit-Position: refs/heads/master@{#523957}
-
Xiaocheng Hu authored
As Blink-side maintenance of spellcheck enabled status will be removed, toggling the Blink-side status no longer makes sense. Hence, any test code toggling the Blink-side status should be removed. This patch: 1. Removes internals.setSpellCheckingEnabled() since it is the tool for toggling the Blink-side status 2. Removes all the callers from layout tests, most of which are redundant. Test cases that really depend on the removed function are also removed. 3. An Android test is temporarily disabled since it depends on the removed function. It will be re-enabled when the cleanup is finished. All-in-one patch: crrev.com/c/821496 Removal plan of Blink-side status: https://goo.gl/grtURZ Bug: 710097 Change-Id: I0ace095c3d082e9168a342164479a69b44813abc Reviewed-on: https://chromium-review.googlesource.com/825250Reviewed-by:
Emil A Eklund <eae@chromium.org> Reviewed-by:
Ryan Landay <rlanday@chromium.org> Reviewed-by:
Changwan Ryu <changwan@chromium.org> Commit-Queue: Xiaocheng Hu <xiaochengh@chromium.org> Cr-Commit-Position: refs/heads/master@{#523956}
-
Steven Bennetts authored
There are a few cases where a user might open a SystemWebDialogDelegate while NetworkConfigView is open. NetworkConfigView uses SystemTrayClient::CreateUnownedDialogWidget which does not interact well with SystemWebDialogDelegate (see issue). Since NetworkConfigView will soon be deprecated, the simplest short term fix is to not show any SystemWebDialogDelegate instance while NetworkConfigView is shown. This will not seem to strange to a user since NetworkConfigView is a modal dialog. Bug: 791955 Change-Id: Ibe37ff737df69d5d02670c435124e2837ddb0bab Reviewed-on: https://chromium-review.googlesource.com/825626Reviewed-by:
Xiyuan Xia <xiyuan@chromium.org> Reviewed-by:
Mitsuru Oshima <oshima@chromium.org> Commit-Queue: Steven Bennetts <stevenjb@chromium.org> Cr-Commit-Position: refs/heads/master@{#523955}
-
Vadim Tryshev authored
It was replaced by setting actual focus. To avoid a huge CL start with hardcoding the flag as true and some small obvious cleanups. Bug: 766807 Change-Id: I3d16523e276ad4bddc772f516fc3ff1d5d5d8e5f Reviewed-on: https://chromium-review.googlesource.com/804685 Commit-Queue: Vadim Tryshev <vadimt@chromium.org> Reviewed-by:
Yury Khmel <khmel@chromium.org> Cr-Commit-Position: refs/heads/master@{#523954}
-
James Cook authored
Some of these were from the old enable_mash_packaged_app flag (which no longer exists) and from when the test_chrome telemetry binary had separate dependencies (it doesn't anymore). Bug: none Test: compiles Change-Id: I15dc5fb447302d4ff86c0819595092067f3c71ba Reviewed-on: https://chromium-review.googlesource.com/823078Reviewed-by:
Ken Rockot <rockot@chromium.org> Commit-Queue: James Cook <jamescook@chromium.org> Cr-Commit-Position: refs/heads/master@{#523953}
-