- 03 Nov, 2018 11 commits
-
-
James Cook authored
For lock screen app windows the window manager needs to specify the initial show state of the window. Ensure the client (chrome) does not overwrite the aura window show-state property in ash if the client window has ui::SHOW_STATE_DEFAULT. Fixes LockScreenNoteTakingTest.Launch pass under SingleProcessMash The reland changes FirstAppRunToastManager to use a WidgetObserver to watch for app window bounds changes. Mash tears down aura::Windows similarly to aura on MS Windows and Linux. The aura::Window for the app window can be destroyed before AppWindowRegistry notifies StateController and FirstAppRunToastManager that the app has been closed, so it's not safe for FirstAppRunToastManager::Reset() to manipulate the aura::Window to remove the ScopedObserver. See bug. TBR=sky@chromium.org TBR=tsepez@chromium.org Bug: 899055 Test: added to views_mus_unittests Change-Id: I886dbe45fe53708beb4441c1d9da2587a2352997 Reviewed-on: https://chromium-review.googlesource.com/c/1312972Reviewed-by:
James Cook <jamescook@chromium.org> Reviewed-by:
Scott Violet <sky@chromium.org> Reviewed-by:
Toni Baržić <tbarzic@chromium.org> Commit-Queue: James Cook <jamescook@chromium.org> Cr-Commit-Position: refs/heads/master@{#605110}
-
Ken Rockot authored
Updates the mojo_core shared library so that it is actually suitable for production IPC use. Namely: - MojoInitialize now spins up a background thread for I/O and gives it to the core impl. - A flag is added to Initialize(), allowing shared library consumers to initialize themselves as a broker process. - The thunks helper correctly loads the mojo_core library with RTLD_DEEPBIND set, avoiding heap crossover within the core impl due to e.g. malloc and free lazy-binding to different heaps - Fixes the thunks header to compile as C once again, as it was missing some struct keywords. - Adds MojoShutdown to the core ABI as a necessary call for shared library consumers who want clean shutdown. This also adds a new multiprocess test consuming the shared library to tie together and validate all of the above changes. Bug: 809320 Change-Id: Ic1c56d99c86fd4a2dc7f812ee152994ced35ece6 Reviewed-on: https://chromium-review.googlesource.com/c/1306347 Commit-Queue: Ken Rockot <rockot@google.com> Reviewed-by:
Reilly Grant <reillyg@chromium.org> Cr-Commit-Position: refs/heads/master@{#605109}
-
Sophie Chang authored
Bug: 898982 Change-Id: I37d2006abe68282d9d068f7a19d7d501bd4ee5bd Reviewed-on: https://chromium-review.googlesource.com/c/1299919 Commit-Queue: Sophie Chang <sophiechang@chromium.org> Reviewed-by:
Kinuko Yasuda <kinuko@chromium.org> Reviewed-by:
Steven Holte <holte@chromium.org> Reviewed-by:
Tarun Bansal <tbansal@chromium.org> Cr-Commit-Position: refs/heads/master@{#605108}
-
Hao Zhang authored
[Autofill] create editableExpirationDate flag and determine when to request expiration date correctly Change-Id: I231263dece7fbb2a1a0eefdebb30a29c48e27d6b Bug: 899057 Reviewed-on: https://chromium-review.googlesource.com/c/1297696Reviewed-by:
Sebastien Seguin-Gagnon <sebsg@chromium.org> Reviewed-by:
Jared Saul <jsaul@google.com> Commit-Queue: Hao Zhang <hozhng@google.com> Cr-Commit-Position: refs/heads/master@{#605107}
-
Regan Hsu authored
Add metrics for when DeviceSync succeeds or fails upon retrieving supported devices. Bug: 870138 Change-Id: I270d35effa7de2161544ead77929e2913d2b2108 Reviewed-on: https://chromium-review.googlesource.com/c/1313565 Commit-Queue: Regan Hsu <hsuregan@chromium.org> Reviewed-by:
Ryan Hansberry <hansberry@chromium.org> Reviewed-by:
-
Elly Fong-Jones authored
This change has ViewTreeValidator account for the changed interior structure of NSButton on 10.14. This fixes FirstRunDialogControllerTest's LayoutWithLongStrings. Bug: 892176 Change-Id: Icc9e977034a98fbb587719770c326d082adb3743 Reviewed-on: https://chromium-review.googlesource.com/c/1316113 Commit-Queue: Elly Fong-Jones <ellyjones@chromium.org> Commit-Queue: Avi Drissman <avi@chromium.org> Reviewed-by:
Avi Drissman <avi@chromium.org> Cr-Commit-Position: refs/heads/master@{#605105}
-
Will Harris authored
This changes the default version of tcmalloc used by Chrome on Linux from a modified tcmalloc 2.0 to a modified tcmalloc 2.7. See discussion at http://shortn/_db7vovHkbm for benchmarks and analysis. BUG=724399 Change-Id: I75b89fcb0e22c2ca627634a6581c937608f4ce6f Reviewed-on: https://chromium-review.googlesource.com/c/1278949 Commit-Queue: Will Harris <wfh@chromium.org> Reviewed-by:
Scott Graham <scottmg@chromium.org> Cr-Commit-Position: refs/heads/master@{#605104}
-
Jesse McKenna authored
Bug: 889029 Change-Id: I189f7a33aec070d882712f7360223cdc804b0fbf Reviewed-on: https://chromium-review.googlesource.com/c/1312929 Commit-Queue: Jesse McKenna <jessemckenna@google.com> Reviewed-by:
François Doray <fdoray@chromium.org> Cr-Commit-Position: refs/heads/master@{#605103}
-
Lukasz Anforowicz authored
Why remove DoesSiteRequireDedicatedProcess ========================================== This CL removes ShellContentBrowserClient::DoesSiteRequireDedicatedProcess. We plan to remove 2 other overrides of this ContentBrowserClient method in other CLs. We want to remove this ContentBrowserClient method altogether, because 1) it is currently the only reason SiteInstanceImpl::DetermineProcessLockURL needs to take BrowserContext* as an argument (and therefore is problematic on threads other than UI thread) 2) the method was initially introduced to support --isolate-extensions which has been obsolete since shipping --site-per-process in M67. Removal mechanics ================= agl@ (original author of the test) suggested to simply remove WebAuthJavascriptClientBrowserTest.RegisterDuringUnload for now. Change-Id: I5aeb3b113de642ef96d7a9abc35d0e9c42c45f86 Bug: 898281 Reviewed-on: https://chromium-review.googlesource.com/c/1308256 Commit-Queue: Łukasz Anforowicz <lukasza@chromium.org> Reviewed-by:
Charlie Reis <creis@chromium.org> Reviewed-by:
Adam Langley <agl@chromium.org> Cr-Commit-Position: refs/heads/master@{#605102}
-
Regan Hsu authored
Add metrics for: (1) MultiDevice.DeviceSyncService.ForceEnrollmentNow.Result, and (2) MultiDevice.DeviceSyncService.ForceSyncNow.Result. Both currently are enumerated histograms with 2 buckets: (1) Success (2) Service not ready. Bug: 870138 Change-Id: I78acaea600885c1e44be249d37237a49f8b81e9f Reviewed-on: https://chromium-review.googlesource.com/c/1312569Reviewed-by:
-
Ryan Hansberry authored
Bug: 899100 Change-Id: I96193d431fc13ea80068e0b44b7826a31a8e6003 Reviewed-on: https://chromium-review.googlesource.com/c/1316650Reviewed-by:
Jeremy Klein <jlklein@chromium.org> Commit-Queue: Ryan Hansberry <hansberry@chromium.org> Cr-Commit-Position: refs/heads/master@{#605100}
-
- 02 Nov, 2018 29 commits
-
-
Mike Wittman authored
TBR=nhiroki@chromium.org Bug: 901317 Change-Id: I9f510e73e29d11e52e830b1ef63326e10ba257dc Reviewed-on: https://chromium-review.googlesource.com/c/1315936 Commit-Queue: Mike Wittman <wittman@chromium.org> Reviewed-by:
Mike Wittman <wittman@chromium.org> Cr-Commit-Position: refs/heads/master@{#605099}
-
chromium-autoroll authored
https://chromium.googlesource.com/angle/angle.git/+log/6ba22ee13768..1590fcc4d3ee git log 6ba22ee13768..1590fcc4d3ee --date=short --no-merges --format='%ad %ae %s' 2018-11-02 geofflang@chromium.org Add a spec and tests for GL_ANGLE_memory_size. 2018-11-02 syoussefi@chromium.org Implement missing posix utils Created with: gclient setdep -r src/third_party/angle@1590fcc4d3ee The AutoRoll server is located here: https://autoroll.skia.org/r/angle-chromium-autoroll Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+/master/autoroll/README.md If the roll is causing failures, please contact the current sheriff, who should be CC'd on the roll, and stop the roller if necessary. CQ_INCLUDE_TRYBOTS=luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel BUG=chromium:892288 TBR=ynovikov@chromium.org Change-Id: I16ef2d3941c7b7fcbac1020513e265aaa2b06197 Reviewed-on: https://chromium-review.googlesource.com/c/1315814Reviewed-by:
chromium-autoroll <chromium-autoroll@skia-public.iam.gserviceaccount.com> Commit-Queue: chromium-autoroll <chromium-autoroll@skia-public.iam.gserviceaccount.com> Cr-Commit-Position: refs/heads/master@{#605098}
-
Devlin Cronin authored
Flip the RuntimeHostPermissions feature to be enabled by default on ToT. Remove the entry in the testing config. Bug: 869996 Change-Id: Ic76c4a018c6bc0140069bd2730ff5591cd293bda Reviewed-on: https://chromium-review.googlesource.com/c/1294010Reviewed-by:
-
Stephen Martinis authored
The bug it relied on is fixed now. Bug: 794764 Change-Id: Ifb52b474590966e19768a122a042fa708569a2d2 Reviewed-on: https://chromium-review.googlesource.com/c/1308907Reviewed-by:
John Budorick <jbudorick@chromium.org> Commit-Queue: Stephen Martinis <martiniss@chromium.org> Cr-Commit-Position: refs/heads/master@{#605096}
-
Reid Kleckner authored
The DisableDeferralReason enum is not scoped, so its members should have relatively unique names. Without this change, the next version of clang emits -Wshadow warnings about other enumerators that shadow this enumerator. The UMA_HISTOGRAM_ENUMERATION macro supports taking a count argument, so revert to the kDisableDeferralReasonCount name from before https://crrev.com/604711 and use it to create the histogram. BUG=894043 TBR=asvitkine@chromium.org, davidqu@chromium.org Change-Id: Ie7a1f1106393b3c1408d7d1f277db16f8cbbb60f Reviewed-on: https://chromium-review.googlesource.com/c/1316106 Commit-Queue: Reid Kleckner <rnk@chromium.org> Reviewed-by:
Reid Kleckner <rnk@chromium.org> Cr-Commit-Position: refs/heads/master@{#605095}
-
v8-ci-autoroll-builder authored
Summary of changes available at: https://chromium.googlesource.com/v8/v8/+log/04108353..19502fd6 Please follow these instructions for assigning/CC'ing issues: https://github.com/v8/v8/wiki/Triaging%20issues Please close rolling in case of a roll revert: https://v8-roll.appspot.com/ This only works with a Google account. CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_trusty_blink_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel;luci.chromium.try:android_optional_gpu_tests_rel TBR=hablich@chromium.org,v8-waterfall-sheriff@grotations.appspotmail.com Change-Id: I510dd3958acbc42fc7cedd4d14a6cbe7d3c18844 Reviewed-on: https://chromium-review.googlesource.com/c/1315928Reviewed-by:
v8-ci-autoroll-builder <v8-ci-autoroll-builder@chops-service-accounts.iam.gserviceaccount.com> Commit-Queue: v8-ci-autoroll-builder <v8-ci-autoroll-builder@chops-service-accounts.iam.gserviceaccount.com> Cr-Commit-Position: refs/heads/master@{#605094}
-
Chris Thompson authored
This adds a |DidFinishNavigation| method to InsecureInputTabHelper, which clears the SSL user data for committed navigations that aren't same-document (where form input is still retained). When a user enters text in a form on an HTTP page, the security state is downgraded to the "dangerous triangle" icon -- clearing the SSL user data causes this state to correctly reset on when reloading the page. Bug: 810374 Change-Id: I95456131689de9653688ab5d4061d338f92fa4e3 Reviewed-on: https://chromium-review.googlesource.com/c/1292055 Commit-Queue: Christopher Thompson <cthomp@chromium.org> Reviewed-by:
Eugene But <eugenebut@chromium.org> Cr-Commit-Position: refs/heads/master@{#605093}
-
James Cook authored
It had some logic for counting window under observation, but CheckedObserver is a better way of catching use-after-free errors. Bug: none Test: bots Change-Id: I21020c194a848c21e434ad0e8583684053b1f663 Reviewed-on: https://chromium-review.googlesource.com/c/1315991 Commit-Queue: James Cook <jamescook@chromium.org> Reviewed-by:
-
Danyao Wang authored
PurgeCachedWebViews() restores session history and wait for the first navigation after restore to stop loading before returning. However, if the first loading event happens asynchronously in the web view, PurgeCachedWebViews() would return before session restore is finished. This CL changes it to wait for the navigation finish event to handle this situation. This fixes NavigationTestCase//testRestoreHistoryToNTPAndNavigateForward when #slim-navigation-manager is used. Bug: 890385 Cq-Include-Trybots: luci.chromium.try:ios-simulator-cronet;luci.chromium.try:ios-simulator-full-configs Change-Id: I86913ed64ac0c6982fae48b71f0561f071b4db30 Reviewed-on: https://chromium-review.googlesource.com/c/1252850 Commit-Queue: Danyao Wang <danyao@chromium.org> Reviewed-by:
-
Caleb Rouleau authored
NOTRY=true TBR=nednguyen@google.com CC=mythria@chromium.org,ulan@chromium.org Bug: 901534 Change-Id: Idab52de9422024e48d51cfa4fe9eb16c5835e0b7 Reviewed-on: https://chromium-review.googlesource.com/c/1316655 Commit-Queue: Caleb Rouleau <crouleau@chromium.org> Reviewed-by:
Caleb Rouleau <crouleau@chromium.org> Cr-Commit-Position: refs/heads/master@{#605090}
-
Daniel Cheng authored
Change-Id: Iece94f3a3b8d94cf0bf12b07967bfd34d11a5fd0 Reviewed-on: https://chromium-review.googlesource.com/c/1315691Reviewed-by:
Ken Rockot <rockot@google.com> Commit-Queue: Daniel Cheng <dcheng@chromium.org> Cr-Commit-Position: refs/heads/master@{#605089}
-
Tao Bai authored
This patch is straightforward, but it is hard to write test. We land this patch first, and check the result in dashboard. This feature is behind flag, disabled by default. Bug: 839646 Change-Id: Id81843640f28416da440eb3d44f0933121bc67a3 Reviewed-on: https://chromium-review.googlesource.com/c/1306514 Commit-Queue: Tao Bai <michaelbai@chromium.org> Reviewed-by:
Alexei Svitkine <asvitkine@chromium.org> Reviewed-by:
Paul Miller <paulmiller@chromium.org> Reviewed-by:
Changwan Ryu <changwan@chromium.org> Cr-Commit-Position: refs/heads/master@{#605088}
-
Adam Yi authored
Change-Id: I317fb5b20ec0d69f1d090ec0e1fb44ca8943e6de Reviewed-on: https://chromium-review.googlesource.com/c/1309311 Commit-Queue: Mark Pearson <mpearson@chromium.org> Reviewed-by:
Mark Pearson <mpearson@chromium.org> Cr-Commit-Position: refs/heads/master@{#605087}
-
Jun Mukai authored
Fixed by crrev.com/604972 and crrev.com/604715 BUG=900363, 890071 TEST=trybot Change-Id: I726db69c603595a2f4ec4f49a6976b9f57c737c8 Reviewed-on: https://chromium-review.googlesource.com/c/1314598Reviewed-by:
-
chromium-autoroll authored
https://skia.googlesource.com/skia.git/+log/d029c0e83734..d6db27cfd2f7 git log d029c0e83734..d6db27cfd2f7 --date=short --no-merges --format='%ad %ae %s' 2018-11-02 fmalita@chromium.org Observe SkFont::textToGlyphs() maxGlyphCount 2018-11-02 brianosman@google.com Remove SkPM4f.h, fold contents into SkColorData.h 2018-11-02 mtklein@google.com remove unused SkImageEncoderFns bits 2018-11-02 herb@google.com Move unused fields to bottom 2018-11-02 reed@google.com add pvg experiment Created with: gclient setdep -r src/third_party/skia@d6db27cfd2f7 The AutoRoll server is located here: https://autoroll.skia.org/r/skia-autoroll Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+/master/autoroll/README.md If the roll is causing failures, please contact the current sheriff, who should be CC'd on the roll, and stop the roller if necessary. CQ_INCLUDE_TRYBOTS=luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux-chromeos-compile-dbg;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel;master.tryserver.blink:linux_trusty_blink_rel TBR=herb@chromium.org Change-Id: I97c66610c3b6e9980c8ade49d7acc61bcb50ea9f Reviewed-on: https://chromium-review.googlesource.com/c/1315334Reviewed-by:
-
Bo Liu authored
AddVSyncCompleteCallback is meant to be called from inside BeginFrame and to be called immediately after all observers have been notified. * Make sure all BeginFrame calls are followed by Complete callbacks, not just ones from VSync. * Rename it to AddBeginFrameCompletionCallback to clarify this. * Release CHECK that AddVSyncCompleteCallback is only called from with BeginFrame Bug: 885124 Change-Id: Ib2c5c8e7870a4876da2d3d2742ed396e3e87d941 Reviewed-on: https://chromium-review.googlesource.com/c/1315970 Commit-Queue: Bo <boliu@chromium.org> Reviewed-by:
Dave Tapuska <dtapuska@chromium.org> Cr-Commit-Position: refs/heads/master@{#605084}
-
Fredrik Hubinette authored
Change-Id: I8ef53be026771a2c0674b6e5cce522b9dce05190 Reviewed-on: https://chromium-review.googlesource.com/c/1309214Reviewed-by:
Bill Budge <bbudge@chromium.org> Reviewed-by:
Kenneth MacKay <kmackay@chromium.org> Reviewed-by:
Tom Sepez <tsepez@chromium.org> Reviewed-by:
Frank Liberato <liberato@chromium.org> Commit-Queue: Fredrik Hubinette <hubbe@chromium.org> Cr-Commit-Position: refs/heads/master@{#605083}
-
Caleb Rouleau authored
NOTRY=true TBR=nednguyen@google.com CC=vmiura@chromium.org,sadrul@chromium.org Bug: 901526 Change-Id: I27a98ceea1fd4a007a3ba99e7799584a91053cfb Reviewed-on: https://chromium-review.googlesource.com/c/1316651Reviewed-by:
-
Jenny Zhang authored
Bug: 901438 Change-Id: Ib56c7db734e9b6b85f077b53ab86cb95665063e4 Reviewed-on: https://chromium-review.googlesource.com/c/1316093Reviewed-by:
-
Harley Li authored
Add an event.target check in SW-from-other-domain's filter, so that an Enter or Space key input in the filter's editor box will not collapse the list of service workers from other domains. However, if the focus is on the div element of the "service worker from other domains" (instead of on the editor box inside the div), an Enter or Space key is still to expand/collapse the list. Bug: 855001 Change-Id: Iaeedd47fefe64bb081cd7cae66fd3eb53b4418b0 Reviewed-on: https://chromium-review.googlesource.com/c/1315356Reviewed-by:
Erik Luo <luoe@chromium.org> Commit-Queue: Haihong Li (Harley) <hhli@chromium.org> Cr-Commit-Position: refs/heads/master@{#605080}
-
Scott Violet authored
BUG=665965 TEST=none Change-Id: Icf59d9537180eeb11f572d66414e04808be23603 Reviewed-on: https://chromium-review.googlesource.com/c/1316105Reviewed-by:
Michael Wasserman <msw@chromium.org> Commit-Queue: Michael Wasserman <msw@chromium.org> Cr-Commit-Position: refs/heads/master@{#605079}
-
Tom Anderson authored
Some views have ink drop components that are shaped depending on the view size (eg. IconLabelBubbleView::CreateInkDrop{Ripple,Highlight,Mask}). For these views, it's easiest to just recreate the ink drop components instead of creating special views that adapt their shape depending on the view size. BUG=899104 R=pkasting,mohsen Change-Id: Icffd0d703cb49a366810846789cc22aac79f925e Reviewed-on: https://chromium-review.googlesource.com/c/1308099 Commit-Queue: Thomas Anderson <thomasanderson@chromium.org> Reviewed-by:Mohsen Izadi <mohsen@chromium.org> Reviewed-by:
Peter Kasting <pkasting@chromium.org> Cr-Commit-Position: refs/heads/master@{#605078}
-
Avi Drissman authored
BUG=none Change-Id: I5f6812ff98f8a54aae9f538b95c361dd184d25a5 Reviewed-on: https://chromium-review.googlesource.com/c/1311254 Commit-Queue: Sidney San Martín <sdy@chromium.org> Reviewed-by:
Sidney San Martín <sdy@chromium.org> Cr-Commit-Position: refs/heads/master@{#605077}
-
Christopher Cameron authored
Populate the method to send these events to the browser. Bug: 859152 Change-Id: I47f0ba77340eaa185ad2ac58670d9f9909c7a698 Reviewed-on: https://chromium-review.googlesource.com/c/1315705Reviewed-by:
Elly Fong-Jones <ellyjones@chromium.org> Reviewed-by:
ccameron <ccameron@chromium.org> Commit-Queue: ccameron <ccameron@chromium.org> Cr-Commit-Position: refs/heads/master@{#605076}
-
BUG=762641 TBR=derat@chromium.org Change-Id: I79e7f4adf116aa6c7f14a02fbe1534672d20076e Reviewed-on: https://chromium-review.googlesource.com/c/1316228Reviewed-by:
ChromeOS bot <3su6n15k.default@developer.gserviceaccount.com> Reviewed-by:
Dan Erat <derat@chromium.org> Commit-Queue: ChromeOS bot <3su6n15k.default@developer.gserviceaccount.com> Cr-Commit-Position: refs/heads/master@{#605075}
-
Jered Gray authored
Change-Id: I12818936e2ebd71c43e7ad42df4a3167f8a107b3 Reviewed-on: https://chromium-review.googlesource.com/c/1316249Reviewed-by:
-
Wenzhao Zang authored
Happened to see this code that's not used anywhere. Bug: None Change-Id: Iab81d9125bd191d62e8f756ecfa0b4421ce8e312 Reviewed-on: https://chromium-review.googlesource.com/c/1315710Reviewed-by:
Xiyuan Xia <xiyuan@chromium.org> Commit-Queue: Wenzhao (Colin) Zang <wzang@chromium.org> Cr-Commit-Position: refs/heads/master@{#605073}
-
Krishna Govind authored
R=cmasso@chromium.org Change-Id: I907098a48072853f16862e0a079d4db8aae2cefa Reviewed-on: https://chromium-review.googlesource.com/c/1316435Reviewed-by:
Krishna Govind <govind@chromium.org> Cr-Commit-Position: refs/heads/master@{#605072}
-
Tim Volodine authored
AcceptLanguageTests have been updated recently [1] to ensure expanded accept languages header. This patch ensure this also happens in the Network Service code path. Impacted tests (fixed by this patch): - org.chromium.android_webview.test.AcceptLanguageTest#testAcceptLanguage - org.chromium.android_webview.test.AcceptLanguageTest#testAcceptLanguagesWithenUS Note: - verified on android_mojo bot (see tryjobs this patch) - should also fix the [Mojo Android] fyi waterfall bot [2]. [1] https://crrev.com/c/1286936 [2] https://ci.chromium.org/p/chromium/builders/luci.chromium.ci/Mojo%20Android BUG=893561,841556 Change-Id: I638b8ce855fea1a60ccaf623c559f53c1408154d Reviewed-on: https://chromium-review.googlesource.com/c/1314594 Commit-Queue: Tim Volodine <timvolodine@chromium.org> Reviewed-by:
Nate Fischer <ntfschr@chromium.org> Cr-Commit-Position: refs/heads/master@{#605071}
-
