1. Publish DEPS for Chromium 42.0.2311.38
    
  2. Incrementing VERSION to 42.0.2311.38
    
    Cr-Commit-Position: refs/branch-heads/2311@{#191}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  3. Handle a case that View's size becomes empty unexpectedly
    
    BUG=458280
    
    Review URL: https://codereview.chromium.org/926573002
    
    Cr-Commit-Position: refs/heads/master@{#317889}
    
    Review URL: https://codereview.chromium.org/989363002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#190}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  4. Incrementing VERSION to 42.0.2311.37
    
    Cr-Commit-Position: refs/branch-heads/2311@{#189}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  5. Fix CapsLock remapping.
    
    Emulates the ChromeOS/X11 method of using F16 and Mod3 to
    represent the caps lock key before remapping.
    
    BUG=461485
    TEST=On device with external keyboard
    TBR=spang
    
    Review URL: https://codereview.chromium.org/959923002
    
    Cr-Commit-Position: refs/heads/master@{#318321}
    (cherry picked from commit c786931969cce37492bd97c82138a35540b19a3f)
    
    Review URL: https://codereview.chromium.org/995563002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#188}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  6. Whispernet CRC and padding fixes (M42 merge)
    
    BUG=463218
    [email protected],[email protected]
    
    Review URL: https://codereview.chromium.org/963013003
    
    Cr-Commit-Position: refs/heads/master@{#319217}
    (cherry picked from commit 4e580f27e4566e820e80fdc67b11a04d4cc421b5)
    
    Review URL: https://codereview.chromium.org/990333003
    
    Cr-Commit-Position: refs/branch-heads/2311@{#187}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  7. Whispernet concurrent initialization fix (M42 merge)
    
    BUG=460731
    [email protected],[email protected]
    
    Review URL: https://codereview.chromium.org/949373002
    
    Cr-Commit-Position: refs/heads/master@{#318510}
    (cherry picked from commit 852b1bb39998902b70db9b19936f5ac3e8322386)
    
    Review URL: https://codereview.chromium.org/995543002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#186}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  8. Fix for MIME handler bug. The bug resulted from a previous bugfix (https://codereview.chromium.org/939443002/) that added a conversion from logical to physical units to fix a similar sizing bug with other guestviews. However, MIME handler guests never use logical pixels, so this conversion broke their sizing when they are created in a zoomed embedder.
    
    This patch adds a more robust method of checking whether sizes are provided in logical or physical units, and all cases are handled appropriately.
    
    BUG=462194
    
    Review URL: https://codereview.chromium.org/972193003
    
    (cherry picked from commit 18f5a136e4ab830a3303c6a6f1d87c7f34eb7fd9)
    
    Cr-Original-Commit-Position: refs/heads/master@{#318948}
    Cr-Commit-Position: refs/branch-heads/2311@{#185}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  9. Updating XTBs based on .GRDs from branch 2311
    
    Cr-Commit-Position: refs/branch-heads/2311@{#184}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  10. Merge: Support plugin version mid-portions with leading zeros.
    
    Now supported: 1.02.3.4
    Remains unsupported: 01.2.3.4
    
    BUG=460642
    
    Review URL: https://codereview.chromium.org/949573002
    
    Cr-Commit-Position: refs/heads/master@{#317524}
    (cherry picked from commit f15124923f9da90592b84573cb4299b4b8ddc11c)
    
    Review URL: https://codereview.chromium.org/991883003
    
    Cr-Commit-Position: refs/branch-heads/2311@{#183}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  11. Remove all remaining traces of chrome.infobars
    
    And re-enable ExtensionApiTest.WindowOpen, to verify that the new test
    is effective. This test was introduced by crbug.com/52298, but disabled
    by crbug.com/64899. The test is supposed to check whether a tab that is
    opened via window.open() from an extension process associated with a
    particular Browser is opened in a non-incognito browser when 'incognito'
    is not set to 'split' (but the default, 'spanning').
    
    BUG=458325,64899
    [email protected],[email protected]
    
    Review URL: https://codereview.chromium.org/942873003
    
    Cr-Commit-Position: refs/heads/master@{#317509}
    (cherry picked from commit f8cd8ced6c6681a5e161a476f3cd5ecb8568cb19)
    
    Review URL: https://codereview.chromium.org/988303004
    
    Cr-Commit-Position: refs/branch-heads/2311@{#182}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  12. Style fixes for very narrow viewports less than 320px (height / width), such as when zoomed in at specific zoom levels on network error interstitial.
    
    + Improve overflow content scrolling, remove the internal scroll.
    + Increase bottom margin of content area to fix cut off content.
    + Allow the anchored fixed nav from 240px
    + Remove button height and fix issue where the buttons stick together
    
    BUG=463838,463070
    
    Review URL: https://codereview.chromium.org/979243002
    
    (cherry picked from commit 5b0ae92049f0d58d2d0f405b0f0fa13dcc6da3e0)
    
    Cr-Original-Commit-Position: refs/heads/master@{#319433}
    Cr-Commit-Position: refs/branch-heads/2311@{#181}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  13. Merge for M42 beta.
    
    If the scheduler's closure is synchronous it can wind up popping its
    callback from the queue (causing the closure to be deleted if it's the
    last reference) while the callback is running. If the closure holds a
    refptr that owns the scheduler, bad things happen.
    
    The fix is to hold a reference to the closure while it's running.
    
    To make the scheduler a bit easier to read, rather than pop the queue
    after the operation completes, it now pops it before running the
    operation.
    
    BUG=463782
    [email protected]
    Review URL: https://codereview.chromium.org/978383003
    
    Cr-Commit-Position: refs/heads/master@{#319381}
    (cherry picked from commit 9f1cb7cdbfae306b800095b5e3ab322796728092)
    
    Review URL: https://codereview.chromium.org/990213002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#180}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  14. Remove check of security origin of all ancestors when getUserMedia is called. This cl reverts back to the behaviour prior to https://codereview.chromium.org/795703003/. Ie, the security origin of the ancestors of a requesting iframe does not have to match in order to allow or deny a request.
    
    BUG=448378, 456628
    TBR=tommi
    
    Review URL: https://codereview.chromium.org/969773002
    
    Cr-Commit-Position: refs/heads/master@{#318872}
    (cherry picked from commit 13e3803e300d13372e4032c1f036aab15f24223f)
    
    Review URL: https://codereview.chromium.org/992663002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#179}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  15. Delete PasswordManagerBrowserTest.NoPromptOnBack from 2311
    
    PasswordManagerBrowserTest.NoPromptOnBack got merged into 2311 by accident in https://codereview.chromium.org/978363004/. That CL merged https://codereview.chromium.org/944163003 into 2311, but 944163003 did not add NoPromptOnBack to trunk. NoPromptOnBack was added in https://codereview.chromium.org/902893003, which is not present in 2311.
    
    As a result, the mis-merged NoPromptOnBack started failing immediately (lacking some support files, as well as the actual fix for the tested issue).
    
    [email protected],[email protected]
    
    BUG=465219
    
    Review URL: https://codereview.chromium.org/990853002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#178}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  16. Fix crash in ServiceWorkerDispatcherHost
    
    This fixes the browser crash that happens when ServiceWorkerContextCore
    has no live registration corresponding to the live version.
    This is a quick fix intended to be mergeable.
    
    BUG=459916
    
    Review URL: https://codereview.chromium.org/982743002
    
    Cr-Commit-Position: refs/heads/master@{#319214}
    (cherry picked from commit d8905bf21dcb6979b07da39f017bb72659fc3041)
    
    [email protected]
    
    Review URL: https://codereview.chromium.org/991633003
    
    Cr-Commit-Position: refs/branch-heads/2311@{#177}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  17. Files.app: Remove focus from toolbar buttons on click.
    
    BUG=461669
    TEST=manually tested
    [email protected]
    
    Review URL: https://codereview.chromium.org/984823002
    
    Cr-Commit-Position: refs/heads/master@{#319419}
    (cherry picked from commit f2e381ea2b19d065c4a9911074411ce958200630)
    
    Review URL: https://codereview.chromium.org/983383002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#176}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  18. Files.app: Truncate breadcrumbs on the toolbar properly based on available width.
    
    BUG=463853
    TEST=Confirm that the breadcrumbs is properly truncated when window is narrowed or the number of toolbar buttons is changed.
    [email protected]
    
    Review URL: https://codereview.chromium.org/984873002
    
    Cr-Commit-Position: refs/heads/master@{#319430}
    (cherry picked from commit 2e51b8942f8341df530b0fef8dc9df70dffe0b86)
    
    Review URL: https://codereview.chromium.org/983363002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#175}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  19. Incrementing VERSION to 42.0.2311.36
    
    Cr-Commit-Position: refs/branch-heads/2311@{#174}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  20. Allow middle-click scrolling to work for PDFs and print preview
    
    This tells the plugin not to handle middle-click events so that they are
    properly handled by the container page and allows middle-click scrolling
    to work.
    
    BUG=463399
    
    Review URL: https://codereview.chromium.org/976123002
    
    Cr-Commit-Position: refs/heads/master@{#319366}
    (cherry picked from commit 78a82c836b6025a7d78753237a1b269927c90c9d)
    
    Review URL: https://codereview.chromium.org/990043002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#173}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  21. Incrementing VERSION to 42.0.2311.35
    
    Cr-Commit-Position: refs/branch-heads/2311@{#172}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  22. Mac: Fix crashes related to LocationBarViewMac::GetPageInfoBubblePoint
    
    There are 2 different crash stacks, both ends up with a null LocationBarViewMac.
    The first one involves showing a permission bubble while in immersive
    fullscreen. Fix it by telling PermissionBubbleCocoa when the parent window
    should change.
    The second one involves animating an infobar while dragging a tab. I was not
    able to reproduce this one, but I think it can be fixed by removing the need
    for InfoBarContainerController to find the LocationBarMac through the window
    controller. It is not a good idea anyway for InfobarContainerController to
    have a direct dependency on BrowserWindowController.
    
    BUG=461541
    [email protected]
    
    Review URL: https://codereview.chromium.org/978723003
    
    Cr-Commit-Position: refs/heads/master@{#319368}
    (cherry picked from commit bfd680f92427ceb16c4deaa355a4a590f6d77227)
    
    Review URL: https://codereview.chromium.org/986623005
    
    Cr-Commit-Position: refs/branch-heads/2311@{#171}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  23. Merge fix to M42 (2311): SanitizeProxyAuth: Whitelist all hop-by-hop headers
    
    We were discarding "Proxy-Authenticate: keep-alive" headers in HTTP/1.0 responses, which broke multi-step connection-level authentication methods for proxies that sent HTTP/1.0 responses.
    
    BUG=463937
    
    Review URL: https://codereview.chromium.org/982733002
    
    Cr-Commit-Position: refs/heads/master@{#319219}
    (cherry picked from commit 34f63b55b51e8fc46ad86334783a665d5f487738)
    
    Review URL: https://codereview.chromium.org/983233002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#170}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  24. Fix bump scrolling doesn't work if the app is in fullscreen mode before connecting.
    
    With the change, https://codereview.chromium.org/875583002, it is
    possible to start a remote connection in fullscreen mode, we simply
    need to notify the DesktopConnectedView that we are in fullscreen upon connecting.
    
    BUG=461609
    
    Review URL: https://codereview.chromium.org/958693002
    TBR=jamiewalch
    
    Cr-Commit-Position: refs/heads/master@{#318130}
    (cherry picked from commit a219cf273369cc6ff1ed2187d56b46f663f54ef0)
    
    Review URL: https://codereview.chromium.org/989683003
    
    Cr-Commit-Position: refs/branch-heads/2311@{#169}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  25. Disable chrome://local-state on Chrome OS.
    
    BUG=464752
    
    Review URL: https://codereview.chromium.org/982363002
    
    Cr-Commit-Position: refs/heads/master@{#319488}
    (cherry picked from commit 5d3b2dd5e8de1075cf081c3779d62610b923bb03)
    
    Review URL: https://codereview.chromium.org/990433002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#168}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  26. Fix bug where |i| was reused in a nested loop.
    
    BUG=463794
    NOTRY=true
    
    Review URL: https://codereview.chromium.org/976173003
    
    Cr-Commit-Position: refs/heads/master@{#319206}
    (cherry picked from commit ad9e147af655ac1fa09cb3bc12af9de22f15e4b1)
    
    Review URL: https://codereview.chromium.org/986693002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#167}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  27. Merge to branch 2311 [Password Manager] Fix password saving on Macys registration page
    
    This requires a few changes to how we evaluate pages during the saving process.
    
    1) Instead of ignoring forms where there are more than 3 password fields, assume that those fields are not related to actual passwords. Also change the case of 3 passwords to assume that if the first and second password match, that the third is not related. I don't have statistics on this, but I have seen security questions that are entered into password fields much more often than I have seen a new password entered before and old password (which was the previous assumption).
    
    2) Move change password detection to work on the submitted password form instead of the observed form. The submitted form is more likely to be identified correctly because we have additional data after submission. This failed on Macy's because we incorrectly assume that, given the number of password fields, one of them is a current password field during parsing.
    
    3) Don't require HTML field attributes to match for signup forms. This is normally required because otherwise we can't fill the password we have just saved. However in the case of signup forms this doesn't matter because we don't want to fill on the same form again anyway.
    
    BUG=452306, 451631
    
    Review URL: https://codereview.chromium.org/944163003
    
    Cr-Commit-Position: refs/heads/master@{#318850}
    (cherry picked from commit 33138a0083999ed6ca80ddf789756c25e6cac93a)
    
    Review URL: https://codereview.chromium.org/978363004
    
    Cr-Commit-Position: refs/branch-heads/2311@{#166}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  28. Error code: + Reinstate the error code to main content as important for debugging when screen shots are sent + Remove the 'Error code:' prefix on the net error for consistency.
    
    Fixes related to browsing scaling:
    + Remove fixed button height to fix cropped button
    + Fix to incorrectly scaled T-rex
    
    Design:
    + Make the faint tick in checkbox have 0 opacity
    + Fix cropped padlock icon
    
    BUG=460116,459510,459126,458484
    
    Review URL: https://codereview.chromium.org/952563003
    
    Cr-Commit-Position: refs/heads/master@{#318712}
    (cherry picked from commit b907b0c9264e74fa890318a36bbbe947badda192)
    
    Review URL: https://codereview.chromium.org/984093002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#165}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  29. Web Notifications: close persistent notifications when dismissed by user
    
    BUG=463465
    
    Review URL: https://codereview.chromium.org/979453005
    
    Cr-Commit-Position: refs/heads/master@{#319248}
    (cherry picked from commit 9423bea0545e32b298e4121892da0a5ddb4070f1)
    
    [email protected]
    
    Review URL: https://codereview.chromium.org/986603003
    
    Cr-Commit-Position: refs/branch-heads/2311@{#164}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  30. Files.app: Hide close button of share dialog.
    
    BUG=461629
    TEST=None
    [email protected]
    
    Review URL: https://codereview.chromium.org/975883003
    
    Cr-Commit-Position: refs/heads/master@{#319022}
    (cherry picked from commit 819733888747e5f22e776e4e960100ec11cf5296)
    
    Review URL: https://codereview.chromium.org/987603004
    
    Cr-Commit-Position: refs/branch-heads/2311@{#163}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  31. Wait until a new profile has been created before deleting the active profile.
    
    Previous review URL:
    https://codereview.chromium.org/953453002
    
    BUG=460859
    [email protected]
    
    Review URL: https://codereview.chromium.org/962143002
    
    Cr-Commit-Position: refs/heads/master@{#318775}
    (cherry picked from commit 447f6430eebb4d233ca2aa16db89e30d9a1f8705)
    
    Review URL: https://codereview.chromium.org/984883002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#162}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  32. [cros] Don't reset 'parent screen' for network UI
    
    BUG=462453
    TEST=manual, go through oobe and disconnect network during update
    
    Review URL: https://codereview.chromium.org/980843004
    
    Cr-Commit-Position: refs/heads/master@{#319309}
    (cherry picked from commit 3b53888c71b8eb36138f40f3ec3865bdc340c80a)
    
    [email protected]
    
    Review URL: https://codereview.chromium.org/985653002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#161}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  33. Implement ErrorScreenHandler::Hide method
    
    Also make sure that default hide callback does nothing
    if parent screen was not set.
    
    Follow up to a refactoring
    https://codereview.chromium.org/872633008/
    
    BUG=462453
    TEST=manually, existing browser tests
    
    Review URL: https://codereview.chromium.org/982823004
    
    Cr-Commit-Position: refs/heads/master@{#319282}
    (cherry picked from commit ddb237aaffbd04829c285d994089092ef128d6fb)
    
    [email protected]
    
    Review URL: https://codereview.chromium.org/987693002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#160}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  34. Incrementing VERSION to 42.0.2311.34
    
    Cr-Commit-Position: refs/branch-heads/2311@{#159}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  35. Fix Launcher crash in ChromeOS guest mode.
    
    The CHECK-fail was introduced in r315272 (64121b7), which switched the
    app list to run with the "original profile" rather than the incognito
    profile. Partially reverted that CL so that the app list runs with the
    incognito profile, and fixed StartPageService to correctly use the
    incognito profile (rather than being null when the app list profile is
    incognito), which addresses the original issue
    (http://crbug.com/440484).
    
    Had to work around DCHECK on shutdown in StartPageService due to
    crbug.com/463419.
    
    Added a DCHECK to catch use of non-incognito profiles in guest mode
    early (without having to select a search result to trigger the crash).
    Added AppListControllerGuestModeBrowserTest to test opening the app list
    in guest mode.
    
    BUG=460437,440484
    
    Review URL: https://codereview.chromium.org/976553003
    
    Cr-Commit-Position: refs/heads/master@{#319036}
    (cherry picked from commit 3bbe0ce70d70451c7af6a29beea198d2bcd06305)
    
    [email protected]
    
    Review URL: https://codereview.chromium.org/987623002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#158}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  36. Merging fix for crbug/456228
    
    Use external ID to match native model nodes during bookmark association.
    
    Original description:
    ---------------------
    
    This is a resubmit of https://codereview.chromium.org/904083002
    which was reverted due to an unrelated flaky test. There are no
    changes compared to the original patch, hence skipping the code
    review (zea@ was the original reviewer).
    
    Original patch description:
    
    The fix improves matching of nodes in BookmarkModelAssociator in
    situations where there are multiple bookmarks or folders with the
    same titles or URLs.
    This will address one particular scenario leading to bookmark
    duplication (see crbug.com/118105).
    
    1) In BookmarkModelAssociator::BuildAssociations, when there are
    multiple native model nodes with matching title / URL, a secondary
    match on external ID is used to pick a preferred one; otherwise
    the first matching node is returned.
    The preferred match on external ID should be applicable in most
    situations except when the native model has been rebuilt from scratch.
    Picking a wrong folder during the association process results in
    duplicating the entire subtree within the wrong folder. This issue
    should be addressed now.
    2) In BookmarkModelAssociator::ApplyDeletesFromSyncJournal the external
    ID match is now the primary criteria for selecting a native model
    node to be deleted. The previous implementation would pick an arbitrary
    native model node based on just the title / URL match anywhere in the
    node hierarchy. That would happen every time after deleting a bookmark
    or folder and recreating it in another place.
    Since external IDs might be reused, there is a secondary match on
    title and URL to ensure that the right node gets deleted. To avoid
    costly O(N*M) algorithm (where N is number of bookmarks and M is
    number of entries in delete journal), the implementation uses a set
    of external IDs to reduce the cost to O(N*logM).
    
    BUG=456228
    [email protected]
    
    Review URL: https://codereview.chromium.org/912693002
    
    Cr-Commit-Position: refs/heads/master@{#317688}
    (cherry picked from commit 8fab3e6090c48042d3d6810c1ef900e39bcc730c)
    
    Review URL: https://codereview.chromium.org/984713002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#157}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  37. Don't relaunch app for non-auth errors.
    
    BUG=464020
    [email protected]
    
    Review URL: https://codereview.chromium.org/968193006
    
    Cr-Commit-Position: refs/heads/master@{#319151}
    (cherry picked from commit e5afa2379bb90d162a2a14b27262b0e8fec73329)
    
    Review URL: https://codereview.chromium.org/982193002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#156}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  38. Setting version to 42.0.2311.33
    
    Cr-Commit-Position: refs/branch-heads/2311@{#155}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  39. Mac: Fix bookmark button drawing regression
    
    When the bookmark bar is hidden, BookmarkBarToolbarView's height
    is set to 0.
    Before https://crrev.com/924143002/, when BookmarkButton calls its
    drawRect through cr_drawUsingAncestor, it was filling its bounds,
    effectively drawing nothing.
    After the change, it was filling |dirtyRect|, so it was drawing the SHOW
    state even though its bounds has 0 height.
    The whole thing is fragile and can probably be done better, but we should
    not ask the ancestor to draw outside its bounds anyway, thus this fix.
    
    BUG=459992
    [email protected]
    
    Review URL: https://codereview.chromium.org/951063002
    
    Cr-Commit-Position: refs/heads/master@{#317693}
    (cherry picked from commit 489df883d4431e11e72d5007eda8f8de7f129f46)
    
    Review URL: https://codereview.chromium.org/980973004
    
    Cr-Commit-Position: refs/branch-heads/2311@{#154}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  40. Fix crash on certain devices when showing week and month picker.
    
    This skips a method call on devices where it would cause a crash.
    
    BUG=463719
    
    Review URL: https://codereview.chromium.org/969413003
    
    Cr-Commit-Position: refs/heads/master@{#319020}
    (cherry picked from commit 1913989366feb0af91fc6bf5bc211a012eda955d)
    
    Review URL: https://codereview.chromium.org/982963002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#153}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  41. Fix bug that AddBookmarks returns partner bookmark node
    
    BookmarkNode::getType() and BookmarkID::Type are not the same things.
    The previous implementation confused them, which caused a bug that
    adding a folder will return a partner bookmark.
    
    BUG=458703
    
    Review URL: https://codereview.chromium.org/950033002
    
    Cr-Commit-Position: refs/heads/master@{#317820}
    (cherry picked from commit 63aa2f732a03ce5f1a930179609d7a4573f289f6)
    
    [email protected]
    
    Review URL: https://codereview.chromium.org/980993002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#152}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  42. [Contextual Search] Add more node checks before triggering.
    
    Now showUnhandledTapUIIfNeeded makes an additional check to see if it is appropriate to trigger: if the tapped node is an ARIA widget or not, according to the accessibility code in Blink.
    
    This CL is dependent on a Blink CL: 885163002
    
    BUG=451096
    
    Review URL: https://codereview.chromium.org/868933002
    
    Cr-Commit-Position: refs/heads/master@{#318275}
    (cherry picked from commit 57e54f55650add38970fe4b4e48cf3010a4a12fe)
    
    Review URL: https://codereview.chromium.org/980973002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#151}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  43. Transfer v8 snapshot files as file descriptors to child processes on Posix.
    
    An update on Chrome could replace the V8 snapshot files with newer version.
    For zygoted processes this is OK because the zygote will have already mapped
    the V8 snapshot and thus child processes will use the correct version of the
    snapshot.  However, for processes which don't use the zygote (such as
    unsandboxed plugin processes) base::LaunchProcess will launch the old
    version of he Chrome binary (via /proc/self/exe on Linux), but the child will
    read the new version of the V8 snapshot, thus causing a crash due to a
    version mismatch.
    
    The fix is to load V8 snapshot file in the browser and pass a file descriptor to
    the child processes (much like Android already did, but for different reasons).
    This ensures that the child process always sees the correct version of the
    snapshot file.
    
    BUG=457656,461057
    [email protected]
    
    Review URL: https://codereview.chromium.org/944913002
    
    Cr-Commit-Position: refs/heads/master@{#317790}
    (cherry picked from commit 3fb072718b5ff38aa9c34d8d5160404aa2ad50a5)
    
    Review URL: https://codereview.chromium.org/981963003
    
    Cr-Commit-Position: refs/branch-heads/2311@{#150}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  44. Incrementing VERSION to 42.0.2311.23
    
    Cr-Commit-Position: refs/branch-heads/2311@{#149}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  45. [Android WebView] Synthesize a fake page loading event on page source modification (Re-land)
    
    When a script modifies page source of a non-committed page, we need to
    notify clients, so they can update the URL bar to avoid confusion.
    
    New logic since the last attempt (https://codereview.chromium.org/924833003/):
    distinguish between a "vanilla" WebView state (basically, a newly created
    WebView, where no loading attempts have been made) and an "attempted to
    navigate" state. In the "vanilla" state, don't fire synthesized page loading
    events to avoid confusing clients. This is safe, as WebView is guaranteed to be
    on a blank page.
    
    Implementation note: we detect navigation attempts using
    didStartProvisionalLoadForFrame WebContentsObserver event on the Java side. As
    for popups AwWebContentsObserver gets re-attached from the original popup
    WebView to the one provided by the client, notifications issued inbetween can be
    missed on the Java side. To work around this, we assume that WebViews opened as
    popups can never be in "vanilla" state (as they are anyway opened as a result of
    navigation).
    
    BUG=458569,462213
    [email protected],[email protected]
    
    Review URL: https://codereview.chromium.org/970883002
    
    Cr-Commit-Position: refs/heads/master@{#319061}
    (manually cherry picked from commit b2803fd408c3709889645061fad42d3371024b93)
    Excluded changes to:
      android_webview/javatests/src/org/chromium/android_webview/test/AwTestBase.java
      android_webview/javatests/src/org/chromium/android_webview/test/PopupWindowTest.java
    because in trunk PopupWindowTest got a heavy refactoring, and the change can't
    be applied as is (and the changes in AwTestBase are exclusively for the changes in
    PopupWindowTest). But we don't run these tests on release branches anyway.
    
    Review URL: https://codereview.chromium.org/969943005
    
    Cr-Commit-Position: refs/branch-heads/2311@{#148}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  46. Merge "kiosk: Ensure launching latest version."
    
    > - Add a install_immediately flag to ExternalProviderImpl;
    > - Set install_immediately flag to true for kiosk app provider
    >   so that updated app install is not delayed;
    > - Set auto acknowledge since kiosk should not show external
    >   install alert;
    >
    > BUG=461419
    >
    > Review URL: https://codereview.chromium.org/974713002
    >
    > Cr-Commit-Position: refs/heads/master@{#319005}
    > (cherry picked from commit 4d82f7b69b1058e9af2696c568fe051d2b22a213)
    
    [email protected]
    
    Review URL: https://codereview.chromium.org/983553003
    
    Cr-Commit-Position: refs/branch-heads/2311@{#147}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  47. Fix hiding behavior when creating app windows.
    
    This ensures that re-creating a window with the same id shows that
    window if it already exists. This was broken in:
    https://codereview.chromium.org/417433002
    
    BUG=461081
    
    Review URL: https://codereview.chromium.org/958923004
    
    Cr-Commit-Position: refs/heads/master@{#319013}
    (cherry picked from commit 0e3bba803a97b1a649fd9359c19fc0356e2da684)
    
    [email protected]
    
    Review URL: https://codereview.chromium.org/980773002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#146}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  48. Handle sync changes on the Start Page tiles while context menus are showing.
    
    This handles the case where
    SearchResultTileItemView::SetSearchResult(SearchResult*) may be called
    from a nested run loop while its context menu is showing. This cancels
    the menu (it's for the old item).
    
    BUG=462470
    TEST=Right-click on a start page app to get its context menu. On another
    machine (with the same profile), uninstall the app. Context menu should
    disappear. Chrome shouldn't crash.
    [email protected]
    
    Review URL: https://codereview.chromium.org/969953002
    
    Cr-Commit-Position: refs/heads/master@{#318844}
    (cherry picked from commit b7f4866c0a046daf3d836ee058edddf4905d30af)
    
    Review URL: https://codereview.chromium.org/977333002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#145}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  49. Allow mimeHandlerViewGuestInternal on stable channel.
    
    BUG=462507
    
    Review URL: https://codereview.chromium.org/972893003
    
    Cr-Commit-Position: refs/heads/master@{#319014}
    (cherry picked from commit 33b30e7b260bd2eaa101e132f4b00c5415fc04c7)
    
    [email protected]
    
    Review URL: https://codereview.chromium.org/980083002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#144}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  50. Delete all uses of SpeechManager from the app list start page.
    
    Constructing the SpeechManager creates a WebAudio instance which creates
    an audio output stream that prevents ChromeOS from suspending. This
    code is supposed to be dead and is slated for removal. This change gets
    rid of the usage and is intended to be mergable into the M42 branch.
    
    BUG=450081
    
    Review URL: https://codereview.chromium.org/966983003
    
    Cr-Commit-Position: refs/heads/master@{#318969}
    (cherry picked from commit c329228bc8fdba3d907a0735dc1a916083cdb7b5)
    
    [email protected]
    
    Review URL: https://codereview.chromium.org/978043002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#143}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  51. Incrementing VERSION to 42.0.2311.22
    
    Cr-Commit-Position: refs/branch-heads/2311@{#142}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  52. ozone: evdev: Sync caps lock LED state to evdev
    
    Update LED state in kernel in InputControllerEvdev::SetCapsLockEnabled.
    This is currently the only way to toggle caps lock.
    
    BUG=463242
    TEST=plug in external keyboard on link_freon & press caps lock. Light on
      keyboard should turn on.
    
    Review URL: https://codereview.chromium.org/971753006
    
    Cr-Commit-Position: refs/heads/master@{#318934}
    (cherry picked from commit fc0faf53d30d331094b79fc77339184854169421)
    
    Review URL: https://codereview.chromium.org/982593004
    
    Cr-Commit-Position: refs/branch-heads/2311@{#141}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  53. Incrementing VERSION to 42.0.2311.21
    
    Cr-Commit-Position: refs/branch-heads/2311@{#140}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  54. Remove HRD butterbar and disable HRD background service
    
    BUG=462072
    
    Review URL: https://codereview.chromium.org/964723003
    
    Cr-Commit-Position: refs/heads/master@{#318921}
    
    (cherry picked from commit bad02d28065cbabb8d79a0804343cd2af93a7a37)
    
    [email protected]
    
    Review URL: https://codereview.chromium.org/976083004
    
    Cr-Commit-Position: refs/branch-heads/2311@{#139}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  55. Add support for direct download of the SRT.
    
    Fallsback to the DL page if necessary.
    
    BUG=440407
    
    Review URL: https://codereview.chromium.org/926983002
    
    (cherry picked from commit 526f4a51d0746ed91d98fd10b9c34a29136554fa)
    
    Cr-Original-Commit-Position: refs/heads/master@{#317954}
    Cr-Commit-Position: refs/branch-heads/2311@{#138}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  56. Show AboutChromePreferences "updates no longer supported" warning
    
    Display the "updates no longer supported" warning for devices
    < JELLY_BEAN on the About Chrome settings page.
    
    BUG=438861
    
    Committed: https://crrev.com/9a920de9d96d789023d807ee40f91509f5e8bab6
    Cr-Commit-Position: refs/heads/master@{#318967}
    
    [email protected]
    
    Review URL: https://codereview.chromium.org/964873004
    
    Cr-Commit-Position: refs/branch-heads/2311@{#137}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  57. Exit HTML Fullscreen when browser fullscreen is active.
    
    Ensure web contents exit fullscreen state by sending a resize message, which includes the fullscreen state. This is required for the situation of the browser moving the view into a fullscreen state "browser fullscreen" and then the contents entering "tab fullscreen". Exiting the contents "tab fullscreen" then won't have the side effect of the view resizing, hence the explicit call here is required.
    
    Fixes a regression caused in the refactoring
     Fullscreen: make fullscreen requests come from RenderFrame
     https://codereview.chromium.org/789533002
     https://crrev.com/7a78d6fd7dc3241a91a614a09f9c59a0e4454135
    where the previous implementation's call to WasResized in
    RenderViewHostImpl::OnToggleFullscreen was not brought forward to
    WebContentsImpl::ExitFullscreenMode().
    
    BUG=458013
    TEST=Open http://scheib.github.io/HTMLMisc/PointerLockAndFullscreen.html, enter Browser Fullscreen with F11 key, press Toggle Fullscreen button, press ESC key, expect content to exit fullscreen.
    
    Review URL: https://codereview.chromium.org/928673002
    
    (cherry picked from commit 3dcb6c931a974f4e825f5383e98ed5b958819b56)
    
    Cr-Original-Commit-Position: refs/heads/master@{#317562}
    Cr-Commit-Position: refs/branch-heads/2311@{#136}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  58. QUIC - Add a field trial not to load QUIC server information from the
    disk cache.
    
    [email protected]
    
    Review URL: https://codereview.chromium.org/948143004
    
    Cr-Commit-Position: refs/heads/master@{#317916}
    (cherry picked from commit 34dffe756274e6ddf7c8b6b0d2edbebe69c837f7)
    
    BUG=463992
    
    Review URL: https://codereview.chromium.org/982563005
    
    Cr-Commit-Position: refs/branch-heads/2311@{#135}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  59. Incrementing VERSION to 42.0.2311.20
    
    Cr-Commit-Position: refs/branch-heads/2311@{#134}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  60. Disable VideoDecoder renderer in M42 chrome.
    
    There are some issues with the VideoDecoder renderer in M42 chrome,
    particularly on ARM. Don't use it there.
    
    BUG=459103,463577
    
    Review URL: https://codereview.chromium.org/967733006
    
    Cr-Commit-Position: refs/heads/master@{#318966}
    (cherry picked from commit 5b546a437eabff7aaa420ad3f17bbd6397dc3666)
    
    [email protected]
    
    Review URL: https://codereview.chromium.org/979733003
    
    Cr-Commit-Position: refs/branch-heads/2311@{#133}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  61. Cherry pick HarfBuzz reverse_range fix
    
    Cherry pick the HarfBuzz commit 8ac345e5c0ed0aad6547592ea0839aabfb4ba980
    as it fixes a set of serious shaping regressions in the core text shaper
    on Mac OS. Cherry picking as opposed to rolling to allow for a clean DI.
    
    BUG=459043
    [email protected]
    
    Review URL: https://codereview.chromium.org/971153002
    
    Cr-Commit-Position: refs/heads/master@{#318901}
    (cherry picked from commit 36504aa38b58939d103253524f2b9620ce998507)
    
    Review URL: https://codereview.chromium.org/983433003
    
    Cr-Commit-Position: refs/branch-heads/2311@{#132}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  62. Revert "[Android] Fix a flicker in stopping Chrome"
    
    This reverts commit e4b1990c9d49fd9734940fa863513ad43b82c6e7.
    
    BUG=434401
    
    Review URL: https://codereview.chromium.org/969533003
    
    Cr-Commit-Position: refs/branch-heads/2311@{#131}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  63. [Android] Cache function templates in GinJavaBridgeObject to avoid memory leak
    
    V8 caches all function templates internally for the lifetime of a web page in an
    unbounded cache. Thus, creating a new function template for each call to a
    method of injected object caused JS heap memory to grow linearly.
    
    This is similar to a fix for Pepper Plugin objects (https://codereview.chromium.org/785213002/)
    
    BUG=462664
    
    Review URL: https://codereview.chromium.org/969353004
    
    Cr-Commit-Position: refs/heads/master@{#318890}
    (cherry picked from commit 8f8de9cf6f95d27dd01b834f2fabcc8389315d37)
    
    Review URL: https://codereview.chromium.org/979843002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#130}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  64. Make combined native/manual JNI registration work for clang.
    
    Since clang has trouble with aliases for static functions, go back to
    using a trivial wrapper function instead of an alias. Since there is
    only one caller of the wrapped, static function, and its address is no
    longer taken to generate the manual JNI registration table (the
    wrapper's address is already being taken instead), there's no actual
    benefit to using an alias anyway, since the compiler will simply inline
    the static function into the wrapper.
    
    BUG=442327,460857
    [email protected]
    
    Review URL: https://codereview.chromium.org/953523003
    
    Cr-Commit-Position: refs/heads/master@{#317787}
    (cherry picked from commit cab875835ac9e39183ba0ac4fe30e96d1bdfec45)
    
    Review URL: https://codereview.chromium.org/977043002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#129}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  65. Kiosk mode: SetFirstLoginPrefs() should be called for kiosk sessions.
    
    SetFirstLoginPrefs() should be called for kiosk sessions.
    
    BUG=445544
    TEST=manual
    
    [email protected]
    
    Review URL: https://codereview.chromium.org/954033003
    
    Cr-Commit-Position: refs/heads/master@{#318239}
    (cherry picked from commit e66a496041854c832b7de03184fe445ed3314613)
    
    Review URL: https://codereview.chromium.org/968193005
    
    Cr-Commit-Position: refs/branch-heads/2311@{#128}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  66. Don't show request dialog for active permissions.
    
    BUG=456633
    TEST=manual
    
    Review URL: https://codereview.chromium.org/952773004
    
    Cr-Commit-Position: refs/heads/master@{#318419}
    (cherry picked from commit dee660df002733a4d826b245847cf6a9fb103c1a)
    
    Review URL: https://codereview.chromium.org/979703002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#127}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  67. Fix typo in histogram name.
    
    The CL https://codereview.chromium.org/943823002/ introduced a new
    histogram for whether web pages are assumed to be mobile friendly.
    
    However, there was a typo in recording the histogram name.
    
    This fixes the recording part to match the histogram.
    
    BUG=462721
    [email protected]
    
    Review URL: https://codereview.chromium.org/965883002
    
    Cr-Commit-Position: refs/heads/master@{#318532}
    (cherry picked from commit b2faf29ec6489d144d047191168cee463dd0710e)
    
    Review URL: https://codereview.chromium.org/972153007
    
    Cr-Commit-Position: refs/branch-heads/2311@{#126}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  68. Refactor codes to run only the bitmap converting logic in background
    
    This is to fix regression of https://codereview.chromium.org/913033002.
    
    BUG=455996
    
    Review URL: https://codereview.chromium.org/972293003
    [email protected]
    
    Cr-Commit-Position: refs/heads/master@{#319010}
    (cherry picked from commit fb9b01d202733f2ab696c3718fc32fee17d91cf5)
    
    Review URL: https://codereview.chromium.org/974903007
    
    Cr-Commit-Position: refs/branch-heads/2311@{#125}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  69. Correctly handle tab navigation in the app list.
    
    This CL causes the app list tab navigation to correctly cycle to and from
    the custom launcher page. This has been fixed by adding a SearchBoxFocusHost
    which directs the focus search to the search box.
    
    BUG=462079
    
    Review URL: https://codereview.chromium.org/960133005
    
    Cr-Commit-Position: refs/heads/master@{#318814}
    (cherry picked from commit a4e2242b75647b641e6d2190b01cde7c9c5233c8)
    
    [email protected]
    
    Review URL: https://codereview.chromium.org/981453003
    
    Cr-Commit-Position: refs/branch-heads/2311@{#124}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  70. Fix sort order of unlaunched apps on app list start page.
    
    This CL fixes an issue with the app list start page sort order for
    unlaunched apps. Folder items were being weighted too highly, causing
    them to appear first. The items that are not in a folder will now
    appear first in the recommendations, in app list order.
    
    BUG=455338
    
    Review URL: https://codereview.chromium.org/954363002
    
    Cr-Commit-Position: refs/heads/master@{#318642}
    (cherry picked from commit 0f1ee572dcbbd4a283bccafe07ac071092003357)
    
    [email protected]
    
    Review URL: https://codereview.chromium.org/977823002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#123}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  71. ServiceWorker: Use scheduler's default task queue for posting tasks on main thread
    
    This fixes a task ordering bug between WebMessagePortChannelImpl and
    ServiceWorkerScriptContext. The former posts tasks via the Blink
    scheduler's default task queue, and the latter was using the MessageLoop
    directly. This patch makes tasks from service worker to the main thread
    go through the scheduler.
    
    BUG=460833
    TEST=http/tests/serviceworker/postmessage-msgport-to-client.html
    
    Review URL: https://codereview.chromium.org/958523002
    
    Cr-Commit-Position: refs/heads/master@{#318022}
    (cherry picked from commit a7fe515e3ca07e260b58ebf460f842601266ed87)
    
    [email protected]
    
    Review URL: https://codereview.chromium.org/973823004
    
    Cr-Commit-Position: refs/branch-heads/2311@{#122}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  72. Files.app: Introduce check-select mode.
    
    Check-select mode spec is here: https://docs.google.com/document/d/1kCG0AFtZSlxlkuipNHlKLY2nvjPdDCViG6RKhMI5-dc/edit
    
    Mode transition rules:
     + Entering check-select mode
       - When two or more items are selected.
       - When checkmark area is clicked.
     + Leaving check-select mode
       - When all items are unselected.
       - When non-checkmark area on an item is clicked.
       - When direction key(UP,LEFT,etc...) results in single selection.
    
    BUG=460220
    TEST=manually tested
    [email protected]
    
    Review URL: https://codereview.chromium.org/962103002
    
    Cr-Commit-Position: refs/heads/master@{#318658}
    (cherry picked from commit e144d30232209034b82d544926070bb8dc62f6ec)
    
    Review URL: https://codereview.chromium.org/979433003
    
    Cr-Commit-Position: refs/branch-heads/2311@{#121}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  73. Leave ImportantFileWriter::WriteFileAtomically argument info in the stack
    
    Leave some info in the stack so that it gets included in the crash reports.
    
    BUG=418627
    
    Review URL: https://codereview.chromium.org/963443002
    
    Cr-Commit-Position: refs/heads/master@{#318398}
    (cherry picked from commit e2df4a5855965e022f2899bde122b4b46ce230fd)
    
    BUG=462487
    [email protected]
    
    Review URL: https://codereview.chromium.org/977813002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#120}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  74. Incrementing VERSION to 42.0.2311.19
    
    Cr-Commit-Position: refs/branch-heads/2311@{#119}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  75. Use own GLHelper for surfaceless, the default one is on a different context
    
    BUG=461401
    
    TBR=danakj
    
    Review URL: https://codereview.chromium.org/959463002
    
    Cr-Commit-Position: refs/heads/master@{#317912}
    (cherry picked from commit 87d563ec44a9657a0c77b5d2a8ad1cc85376cac4)
    
    Review URL: https://codereview.chromium.org/972313003
    
    Cr-Commit-Position: refs/branch-heads/2311@{#118}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  76. Make sure content offset gets updated
    
    On Webapp, touch gestures are offset by the size of the toolbar, even when
    the toolbar is hidden. This occurs because we assume that the previous
    content offset can never be 0, ending up not calling
    onVisibleContentOffsetChanged() callback.
    
    We can fix it by initializing previous content offset as NaN.
    
    BUG=459275
    
    Review URL: https://codereview.chromium.org/970813003
    
    Cr-Commit-Position: refs/heads/master@{#318974}
    (cherry picked from commit 19f04a05b39e5586cba79eaba009ae675ca6aad1)
    
    Review URL: https://codereview.chromium.org/973413002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#117}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  77. Merge: Fix aborting in throttled file system (FSP).
    
    The previous logic was causing a memory corruption when aborting was not
    invoked with the callback, but due to unmounting the file system.
    
    As there are multiple paths for aborting, this CL adds a method IsAborted on
    the Queue class so it's possible to check if a task has been aborted before.
    
    [email protected]  # For merge.
    TEST=unit_tests: *FileSystemProviderQueue*
    BUG=454310
    
    Review URL: https://codereview.chromium.org/968763002
    
    Cr-Commit-Position: refs/heads/master@{#318652}
    (cherry picked from commit d3126d1fbaec8f9cbf513ac436ae634e2d12b093)
    
    Review URL: https://codereview.chromium.org/975243002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#116}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  78. Incrementing VERSION to 42.0.2311.18
    
    Cr-Commit-Position: refs/branch-heads/2311@{#115}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  79. [Ozone-Dri] Set DPMS when configuring displays and remove ForceDPMSOn
    
    We're forcing DPMS to on since some drivers may not perform it
    themselves. We also want to only do it on displays that are modeset
    otherwise we may be putting disabled displays in a higher power
    state.
    
    BUG=chrome-os-partner:36664
    
    Review URL: https://codereview.chromium.org/958933003
    
    Cr-Commit-Position: refs/heads/master@{#318490}
    (cherry picked from commit 0866c10f7a2cbcd909c354999c9ba5d021c909a1)
    
    Review URL: https://codereview.chromium.org/978663002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#114}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  80. [GCM] Fixing the problem of passing linked_ptr across threads
    
    This is a merge to 2311 M42
    
    BUG=461936
    [email protected]
    
    Review URL: https://codereview.chromium.org/958133004
    
    Cr-Commit-Position: refs/heads/master@{#318368}
    (cherry picked from commit 50b5f9adbfc882750c45eedde5f192e8c930f7f5)
    
    Review URL: https://codereview.chromium.org/979583002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#113}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  81. Add WiMAX to ONC validation list
    
    Currently type WiMAX fails ONC validation so any property
    changes from Settings are ignored.
    
    This also fixes the Cellular translation and adds both Cellular and WiMAX to the validation tests.
    
    BUG=460829
    [email protected]
    
    Review URL: https://codereview.chromium.org/949783003
    
    Cr-Commit-Position: refs/heads/master@{#318162}
    (cherry picked from commit b1754c5c8b5b939aac67e1e43b71a70c50e64bac)
    
    Review URL: https://codereview.chromium.org/975103002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#112}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  82. Incrementing VERSION to 42.0.2311.17
    
    Cr-Commit-Position: refs/branch-heads/2311@{#111}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  83. Use a stable device-user identifier for CryptAuth enrollments.
    
    This id should not change if the same user is removed and added to the same
    device.
    
    BUG=455515
    TEST=removed account, added account back and id is still the same
    
    Review URL: https://codereview.chromium.org/877033005
    
    Cr-Commit-Position: refs/heads/master@{#318001}
    (cherry picked from commit 7df5c5cf5459cf393fe775a6bf508b801ef19fe1)
    [email protected], [email protected]
    
    Review URL: https://codereview.chromium.org/972983004
    
    Cr-Commit-Position: refs/branch-heads/2311@{#110}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  84. Merge M-42: Move device-log UI strings to generated_resources
    
    BUG=462044
    
    Review URL: https://codereview.chromium.org/956623010
    
    Cr-Commit-Position: refs/heads/master@{#318173}
    
    [email protected]
    
    Review URL: https://codereview.chromium.org/961203002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#109}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  85. ChannelMojo should use PID from the bootstrap Channel.
    
    The original naive implementation ignores sandboxing limitation.
    It should ask underlying channel to do it correctly.
    
    TEST=IPCChannelMojoTest.VerifyGlobalPid
    [email protected], [email protected]
    [email protected]
    BUG=451553
    
    Review URL: https://codereview.chromium.org/942933005
    
    Cr-Commit-Position: refs/heads/master@{#318099}
    (cherry picked from commit 0bd20bd071b18f094999263b377ee58173347567)
    
    Review URL: https://codereview.chromium.org/976763002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#108}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  86. ChannelMojo: Reduce the number of dup() call
    
    Some crash reports suggest that dup() occasionally fails in the wild.
    It is used to simplify the code presuming that dup() doesn't fail
    there, but apparently that isn't true.
    
    This change skips dup() when the PlatformFileAttachment owns the
    file. It helps decreasing the number of dup() calls.
    
    BUG=457869
    [email protected], [email protected]
    [email protected]
    
    Review URL: https://codereview.chromium.org/959533002
    
    Cr-Commit-Position: refs/heads/master@{#317957}
    (cherry picked from commit 98ac98f2e5ab1766c9850b5d9a424f47bdf10205)
    
    Review URL: https://codereview.chromium.org/975853002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#107}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  87. gpu: Avoid detaching images with glTexSubImage2D
    
    Avoid optimization of using glTexImage2D over glTexSubImage2D when there
    are EGLImages attached to the texture, as glTexImage2D will orphan the
    EGLImage. Orphaning and reattachment is probably more expensive than the
    win of using glTexImage2D over glTexSubImage2D.
    
    BUG=460344
    
    Review URL: https://codereview.chromium.org/954053002
    
    Cr-Commit-Position: refs/heads/master@{#318141}
    (cherry picked from commit 45dc77a1ea86f69cce11e72bf5782310b5cb084b)
    [email protected]
    
    Review URL: https://codereview.chromium.org/975843002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#106}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  88. Fix the Fast User Switcher in the Windows Native frame.
    
    BUG=457462
    [email protected]
    [email protected]
    TEST=
    1. Disable #enable-fast-user-switcher and enable #new-avatar-menu flags in chrome://flags
    2. Relaunch Chrome
    3. Right click on the Avatar Button, the fast user switcher should be shown
    4. Command+Click on the Avatar Button, nothing should happen
    5. Test the functionality with and without custom themes active
    
    Review URL: https://codereview.chromium.org/950293003
    
    Cr-Commit-Position: refs/heads/master@{#317917}
    (cherry picked from commit dabd39abad0a01181dd6617199b9f2d9e606f065)
    
    Review URL: https://codereview.chromium.org/972233002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#105}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  89. Added isSyncingUrlsWithKeystorePassphrase.
    
    This determines if sync is initialized and syncing URLs with the
    appropriate keystore passphrase type to support contextual searches.
    
    BUG=460786
    
    Review URL: https://codereview.chromium.org/946273002
    
    Cr-Commit-Position: refs/heads/master@{#317610}
    (cherry picked from commit a68bc5fc4270c417e758a5b5b4e094b1d8b97c1c)
    
    Review URL: https://codereview.chromium.org/976743002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#104}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  90. Merge to M42: Fix a case where AXTreeSerializer didn't handle reparenting.
    
    Additional unit tests that caught this case are forthcoming. This is a
    simple and safe patch for merging.
    
    BUG=452607
    
    Review URL: https://codereview.chromium.org/966833002
    
    Cr-Commit-Position: refs/heads/master@{#318660}
    (cherry picked from commit 7a6d7e70755232d232916d78ca8ae94a5ca14dea)
    
    Review URL: https://codereview.chromium.org/976733002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#103}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  91. Fix crashes on ICS.
    
    We were using several APIs introduced after API level 14. Fix that.
    
    BUG=462802
    [email protected]
    
    Review URL: https://codereview.chromium.org/963993002
    
    Cr-Commit-Position: refs/heads/master@{#318731}
    (cherry picked from commit bbc424dd379ed9e75f133da50e313e814105a327)
    
    Review URL: https://codereview.chromium.org/967633004
    
    Cr-Commit-Position: refs/branch-heads/2311@{#102}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  92. [Document mode] Keep tab ID list in sync with Tab entries
    
    It is possible to have one DocumentActivity create a Tab and add its ID to the
    DocumentTabModel, but get interrupted (somehow) before the Tab Entry is added
    to the DocumentTabModel.  This results in getCount() returning the correct number
    of Tabs that exist but fail to have any information about the new Tab, resulting
    in getTabAt() returning |null|.  We should instead keep the ID list and the Entry
    list be as in sync as possible, adding the Entry directly to the DocumentTabModel
    as soon as we let the DocumentTabModel know about the Tab's existence.
    
    Add new methods to tie the addTabId and updateEntry functions together via addTab,
    deprecate the old ones, and assert that we should never get into a bad state.
    Deprecated methods will be culled when the downstream patch lands.
    
    BUG=457427
    Original commit: https://crrev.com/7710ef5ff57f581f66dbbaad2dffe8c4a9048add
    Original review: https://codereview.chromium.org/969443003
    
    [email protected]
    
    Review URL: https://codereview.chromium.org/973123002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#101}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  93. Merge: Fix unit tests on official bots.
    
    Some of the tests weren't properly instantiating a PrefService. It's now being
    done in the ExtensionServiceTestBase class and its subclasses were modified
    where needed.
    
    BUG=461484
    
    Review URL: https://codereview.chromium.org/965803003
    
    Cr-Commit-Position: refs/heads/master@{#318552}
    (cherry picked from commit 404d6107e0215a5c3914b8d3b18f4851e9551a07)
    
    Conflicts:
    	chrome/browser/extensions/extension_service_test_base.cc
    
    Review URL: https://codereview.chromium.org/978453002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#100}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  94. Fix favicon padding in Site Settings on pre-L devices.
    
    The problem was that the preference layout is quite different between L
    and pre-L devices, so adjusting the padding of the icon's parent view
    had very different effects in those two cases. Now, we simply set the
    padding of the icon view itself to get the favicon where we want it.
    
    BUG=454850
    
    Review URL: https://codereview.chromium.org/956303003
    
    Cr-Commit-Position: refs/heads/master@{#318749}
    (cherry picked from commit aa788c1cf0f961541a7806460948eb01f3ea0147)
    
    Review URL: https://codereview.chromium.org/975753003
    
    Cr-Commit-Position: refs/branch-heads/2311@{#99}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  95. Remove one pixel line in the fast user switcher appearance when there are no profiles to display.
    
    BUG=458355
    [email protected]
    [email protected]
    TEST=
    Make sure the new avatar menu flag is enabled.
    1. Open a Chrome instance with 0 or 1 available profiles.
    2. Right click on the User Menu button.
    3. Nothing should be displayed.
    4. Open the User Manager and add some profiles until there are at least 2.
    5. Right click on the User Menu button
    6. The fast user switcher should display a list of profiles that can be switched to.
    
    Review URL: https://codereview.chromium.org/944563002
    
    Cr-Commit-Position: refs/heads/master@{#318063}
    (cherry picked from commit 3803191395efc35ca1dc288e16d47987a2bf4176)
    
    Review URL: https://codereview.chromium.org/978443003
    
    Cr-Commit-Position: refs/branch-heads/2311@{#98}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  96. Bring up fast user switcher on right-click of the avatar menu on Mac.
    
    Change the behavior of fast user switching on Mac from Command click to right
    click to be consistent with Windows and Linux.
    
    BUG=458755
    [email protected]
    [email protected]
    
    TEST=
    1. Disable #enable-fast-user-switcher and enable #new-avatar-menu flags in chrome://flags
    2. Relaunch Chrome
    3. Right click on the Avatar Button, the fast user switcher should be shown
    4. Command+Click on the Avatar Button, nothing should happen
    
    Review URL: https://codereview.chromium.org/916523003
    
    Cr-Commit-Position: refs/heads/master@{#317631}
    (cherry picked from commit 95b89c2672ce7b0ed1a6803b59acee369b232a3c)
    
    Review URL: https://codereview.chromium.org/961993005
    
    Cr-Commit-Position: refs/branch-heads/2311@{#97}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  97. Merge: Only take basename of default_file_name when starting a File Chooser.
    
    Validate no ViewHostMsg_RunFileChooser messages received in the browser contain no path elements.
    
    BUG=444198
    TEST=content_browsertests
    
    Review URL: https://codereview.chromium.org/817103002
    
    Cr-Commit-Position: refs/heads/master@{#318111}
    (cherry picked from commit 815c487fa677cf5413ed22e181437c1107300d49)
    
    Review URL: https://codereview.chromium.org/977593002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#96}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  98. Settings: Make the manage-profile overlay wider to fit the icons in it.
    
    BUG=460835
    TEST=manually check the repro steps on the issue
    [email protected]
    
    Review URL: https://codereview.chromium.org/954913003
    
    Cr-Commit-Position: refs/heads/master@{#318513}
    (cherry picked from commit dcaf85760480be9dd9a085544d193a3997e1556a)
    
    Review URL: https://codereview.chromium.org/967423004
    
    Cr-Commit-Position: refs/branch-heads/2311@{#95}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  99. Incrementing VERSION to 42.0.2311.16
    
    Cr-Commit-Position: refs/branch-heads/2311@{#94}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  100. Force glFinish for page flips on a UDL device.
    
    This is a temporary workaround. TODO: crbug.com/462360
    replace with a per-surface flush as it gets implemented
    in GL drivers.
    
    BUG=457898
    TEST=verify that UDL+i915 extended desktop has no artifacts
    
    Review URL: https://codereview.chromium.org/942113006
    [email protected],[email protected],[email protected]
    
    Cr-Commit-Position: refs/heads/master@{#318408}
    (cherry picked from commit e0b8b9dfff8f5fa19aa0d039c6d1fecc96d113e6)
    
    Review URL: https://codereview.chromium.org/968263004
    
    Cr-Commit-Position: refs/branch-heads/2311@{#93}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  101. Merge: Allow offsets in blobs larger than 2GB on 32 bit Chromium builds.
    
    The recent patch crrev.com/895933007 introduced a regression by using size_t
    for offsets, which on 32bit builds is sizeof(size_t) = 4 which was causing
    broken offset values due to assigning a uint64_t variable to such variables.
    
    This CL fixes that by simply converting the types to uint64_t.
    
    [email protected]  # For merge.
    TEST=*FileSystemProvider*BigFile* on a 32 bit build Chromium build with
        chromeos=1.
    BUG=375297, 458122
    
    Review URL: https://codereview.chromium.org/959113002
    
    Cr-Commit-Position: refs/heads/master@{#318808}
    (cherry picked from commit f6629637feb3bbf186de75da8fe4028a5244389f)
    
    Review URL: https://codereview.chromium.org/973723002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#92}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  102. Merge: content: Disable ChildDiscardableSharedMemoryManager browser tests.
    
    These tests are failing on some machines. The failures seem to be
    test setup related rather than failures related to the specific
    logic that these tests are trying to test.
    
    BUG=459703
    
    Review URL: https://codereview.chromium.org/928903004
    
    Cr-Commit-Position: refs/heads/master@{#317913}
    (cherry picked from commit c2b8ddd55bc67bce06171337275f66b99e72be12)
    
    Review URL: https://codereview.chromium.org/969113003
    
    Cr-Commit-Position: refs/branch-heads/2311@{#91}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  103. Incrementing VERSION to 42.0.2311.15
    
    Cr-Commit-Position: refs/branch-heads/2311@{#90}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  104. Fix Virtual Keyboard not being deployed in TouchView mode on Ozone.
    
    Ozone includes the internal keyboard in the active keyboard devices
    even if the TV mode disables it due to the fact that the volume keys
    can still be pressed. We now explicitly check the state of maximized
    mode when deciding to show the keyboard.
    
    TEST=VirtualKeyboardControllerAutoTest.EnabledDuringMaximizeMode, VirtualKeyboardControllerAutoTest.SuppressedInMaximizedMode
    BUG=462666
    TBR=pkotwicz
    
    Review URL: https://codereview.chromium.org/970983003
    
    Review URL: https://codereview.chromium.org/970853003
    
    Cr-Commit-Position: refs/branch-heads/2311@{#89}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  105. Revert "ui: Move software fallback decisions to GpuProcessTransportFactory."
    
    This reverts commit f33abd3a962521385f6d8f94eb77055ca2c8ef68.
    
    > ui: Move software fallback decisions to GpuProcessTransportFactory.
    >
    > This moves software fallback decisions to GpuProcessTransportFactory
    > from the ui::Compositor, where it was already making decisions like
    > "can I fallback to software compositing on this OS". Now it will not
    > return an OutputSurface to ui::Compositor until it has successfully
    > bound/initialized one.
    >
    > TBR=jbauman, [email protected]
    > BUG=461396
    > Review URL: https://codereview.chromium.org/953803005
    >
    > Cr-Commit-Position: refs/heads/master@{#318135}
    > (cherry picked from commit 13d970853c63df742f471b1b4c4a66e36a831c6d)
    >
    > Committed: https://chromium.googlesource.com/chromium/src/+/24368a36b813500c001cdeb92891c2f56e032f38
    
    TBR=jbauman, [email protected]
    BUG=461396
    
    Review URL: https://codereview.chromium.org/972843002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#88}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  106. ui: Always set layer bounds when changing to show texture content.
    
    When calling ui::Layer::SetTextureMailbox, it changes the underlying
    layer type to be a cc::TextureLayer. If the ui::Layer was previously
    showing a texture, then it will have a cached frame_size_in_dip_ value.
    When the value is the same, it was causing an early out making the new
    cc::TextureLayer never have its bounds set. This prevented the
    cc::TextureLayer from appearing.
    
    One way to manifest this was to lost context while mirroring the
    display. Then the mirror changes to solid color and back to texture,
    with the same texture size.
    
    TBR=oshima, [email protected]
    BUG=461521
    
    Review URL: https://codereview.chromium.org/957543002
    
    Cr-Commit-Position: refs/heads/master@{#317924}
    (cherry picked from commit 2ec13e9fb3ee8d7b8b8a44e217f388fb350ee5b0)
    
    Review URL: https://codereview.chromium.org/971953003
    
    Cr-Commit-Position: refs/branch-heads/2311@{#87}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  107. ui: Move software fallback decisions to GpuProcessTransportFactory.
    
    This moves software fallback decisions to GpuProcessTransportFactory
    from the ui::Compositor, where it was already making decisions like
    "can I fallback to software compositing on this OS". Now it will not
    return an OutputSurface to ui::Compositor until it has successfully
    bound/initialized one.
    
    TBR=jbauman, [email protected]
    BUG=461396
    
    Review URL: https://codereview.chromium.org/953803005
    
    Cr-Commit-Position: refs/heads/master@{#318135}
    (cherry picked from commit 13d970853c63df742f471b1b4c4a66e36a831c6d)
    
    Review URL: https://codereview.chromium.org/972653004
    
    Cr-Commit-Position: refs/branch-heads/2311@{#86}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  108. Merge: Flip Win32k lockdown to enabled by default.
    
    In-process plugins that try and create a skia::canvas don't work under Win32k lockdown.  Since NPAPI is already behind a flag and in-process NPAPI is even more unsupported, it's not worth the time to try and fix these.
    
    However, the out-of-process PPAPI tests really should be working and are supported, so re-enable them.
    
    BUG=365160,308949
    
    Review URL: https://codereview.chromium.org/942473002
    
    Cr-Commit-Position: refs/heads/master@{#318327}
    (cherry picked from commit 1a36ac64dcdaef6b29644b25051f7f03f5af216e)
    
    Review URL: https://codereview.chromium.org/971963002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#85}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  109. Merge: Allow CC HUD font to be created before sandbox on Windows
    
    Similar to https://codereview.chromium.org/900063002, but instead of
    having the SkTypeface* directly in LayerTreeSettings, defer to a
    function. This avoids creating the font until it used on platforms
    other than Windows so that we don't incur a startup penalty when the
    hud isn't being used.
    
    On Windows, we replace a previous arbitrary font that was getting
    warmed up with the monospace one we want here to hopefully avoid
    perf regression there.
    
    [email protected]
    BUG=453731, 455104, 457248
    TEST=run chrome with --enable-win32k-renderer-lockdown --show-fps-counter --ui-show-fps-counter on Win8
    
    Review URL: https://codereview.chromium.org/932243004
    
    Cr-Commit-Position: refs/heads/master@{#318297}
    (cherry picked from commit 04015b275eb5c775a5740722fd0805994dde8d2c)
    
    Review URL: https://codereview.chromium.org/969923002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#84}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  110. [Ozone-Gbm] Explicitly crash if trying software rendering on GBM
    
    Software rendering isn't supported on the GBM platform. Rather than
    allow callers to crash due to nullptr accesses, crash explicitly so we
    get more meaningfull crash reports.
    
    BUG=461396
    
    Review URL: https://codereview.chromium.org/958403004
    
    Cr-Commit-Position: refs/heads/master@{#318728}
    (cherry picked from commit 3e658b23710143f92286bca571d883a1f161c15d)
    
    Review URL: https://codereview.chromium.org/976433002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#83}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  111. Update column focus in chrome://downloads so it's not lost
    
    A link or button may no longer be visible after it's pressed in a row in
    chrome://downloads. This change will focus the equivalent element to
    make the focus behave in a more expected way.
    
    BUG=455538
    NOTRY=true
    
    Review URL: https://codereview.chromium.org/953653002
    
    Cr-Commit-Position: refs/heads/master@{#318499}
    (cherry picked from commit b9949d00d33a530eca4b391b72c7bfeba4040b32)
    
    Review URL: https://codereview.chromium.org/975533003
    
    Cr-Commit-Position: refs/branch-heads/2311@{#82}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  112. QUIC - Added a histogram to collect the elapsed time between the end of
    resolving the DNS name of the server for a QUIC connection, and
    receiving crypto handshake confirmation from the server. Logged after
    crypto handshake is confirmed.
    
    [email protected], [email protected]
    BUG=462462
    
    Review URL: https://codereview.chromium.org/967463003
    
    Cr-Commit-Position: refs/heads/master@{#318477}
    (cherry picked from commit f4f08853be1d252c97a67662399bb05aab4e84fe)
    
    Review URL: https://codereview.chromium.org/969163002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#81}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  113. [New Tab Page] Remove title iframe 1px dead zone.
    
    Material Design tile titles are 15px high, but on some (if not all)
    platforms the natural height of title content is 14px high. This creates
    a click "dead zone" on the tile. This CL forces content height to be
    100% to remove the dead zone.
    
    BUG=459301
    TBR=mathp
    
    Review URL: https://codereview.chromium.org/938473002
    
    Cr-Commit-Position: refs/heads/master@{#317633}
    (cherry picked from commit 63731566d0d8e2e44e3dc0618c17f2403d99668d)
    
    Review URL: https://codereview.chromium.org/960233006
    
    Cr-Commit-Position: refs/branch-heads/2311@{#80}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  114. ozone: evdev: Release pressed keys when event filtering starts
    
    This prevents filtering out key release events, resulting in stuck keys.
    
    BUG=449162
    TEST=Fully rotate glimmer while holding spacebar. No spurious
      key repeats.
    
    Review URL: https://codereview.chromium.org/958403003
    
    Cr-Commit-Position: refs/heads/master@{#318535}
    (cherry picked from commit df407c56b6491906362df48f228b8a2d972192b8)
    
    Review URL: https://codereview.chromium.org/967403004
    
    Cr-Commit-Position: refs/branch-heads/2311@{#79}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  115. Use RenderText directly to draw tooltip to imporove format and performance.
    
    This replaces the old CL (https://codereview.chromium.org/340543004/). This runs faster and doesn't require the label caching CL. (for the example in 370226, this is 20x faster on arm. ~60ms total vs ~3ms total)
    
    I'll look into switching to label once I get the performance data with label after label caching is enabled.
    
    This depends on two CLs
    1) https://codereview.chromium.org/916423002/  Tooltip Cleanup
    2) https://codereview.chromium.org/915383003/  RTL format problem.
    
    but this can be reviewed independently.
    
    BUG=370226,451853
    
    Review URL: https://codereview.chromium.org/924433002
    
    Cr-Commit-Position: refs/heads/master@{#317590}
    (cherry picked from commit 3e0cc51a03d65bf057742ac0f1f5e0c8b633bda5)
    
    Review URL: https://codereview.chromium.org/973573003
    
    Cr-Commit-Position: refs/branch-heads/2311@{#78}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  116. Throttle script request incidents to one per user.
    
    BUG=461979
    TEST=NONE
    
    Review URL: https://codereview.chromium.org/961483003
    
    Cr-Commit-Position: refs/heads/master@{#318192}
    (cherry picked from commit 91b055f0066d0d0078a8d241d8f7a26a5c0e0597)
    [email protected]
    
    Review URL: https://codereview.chromium.org/960203003
    
    Cr-Commit-Position: refs/branch-heads/2311@{#77}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  117. Fix alignment format in multiline mode
    
    BUG=461182
    TEST=covered by RenderTextTest.Multiline_HorizontalAlignemnt
    
    Review URL: https://codereview.chromium.org/915383003
    
    Cr-Commit-Position: refs/heads/master@{#317750}
    (cherry picked from commit 403e56062fff5bdbca47745201e075b2916152ba)
    
    Review URL: https://codereview.chromium.org/974573002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#76}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  118. Pepper: Allow DidCreate to safely delete the plugin instance
    
    If the plugin instance gets deleted during DidCreate, we should not access it any further. See the bug for more context.
    
    BUG=461980
    
    Review URL: https://codereview.chromium.org/965523002
    
    Cr-Commit-Position: refs/heads/master@{#318369}
    (cherry picked from commit f88b95a2c9037e4329168f951130c49bb60f703a)
    Merge to 2311
    
    Review URL: https://codereview.chromium.org/969803003
    
    Cr-Commit-Position: refs/branch-heads/2311@{#75}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  119. Fix MetricsServicesManagerTest
    
    BUG=460575
    
    Review URL: https://codereview.chromium.org/944123002
    
    Cr-Commit-Position: refs/heads/master@{#317488}
    (cherry picked from commit 24a0dbfef4cece28d811df1982aa9d03c8401622)
    
    [email protected]
    
    Review URL: https://codereview.chromium.org/961093002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#74}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  120. Avoid starting RapporService during tests
    
    BUG=461046
    
    Review URL: https://codereview.chromium.org/951113002
    
    Cr-Commit-Position: refs/heads/master@{#317866}
    (cherry picked from commit 276245305215f75165593c8fde6d77c024969073)
    
    [email protected]
    
    Review URL: https://codereview.chromium.org/965613004
    
    Cr-Commit-Position: refs/branch-heads/2311@{#73}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  121. App banner requires image/png icon. Really.
    
    This is fixing the stupid mistake and also adding some unit tests.
    
    BUG=462551
    [email protected]
    
    Review URL: https://codereview.chromium.org/961313002
    
    Cr-Commit-Position: refs/heads/master@{#318505}
    (cherry picked from commit 1a015c984eedb167733f84dd9623a3d02f467784)
    
    Review URL: https://codereview.chromium.org/971853002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#72}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  122. 2311: Remove Incognito notification when closeAllTabs() called
    
    Because of Android wonkiness, we can end up with a Tab that
    doesn't close itself until the user backgrounds Chrome.  In
    these cases, the notification about incognito tabs existing
    won't go away, and selecting it won't do anything since the
    Tabs are all technically closing.  Just hide it if
    DocumentTabModel.closeAllTabs() is ever called.
    
    BUG=455763
    Committed: https://crrev.com/a787e8948af4de2958f1aed4af7414610ce00b6a
    Cr-Commit-Position: refs/heads/master@{#318382}
    [email protected]
    
    Review URL: https://codereview.chromium.org/967363002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#71}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  123. Push API: Workaround for GCM lowercasing subtypes
    
    Temporary workaround for a bug in GCM where it converts subtypes to
    lowercase.
    
    BUG=461867
    
    Review URL: https://codereview.chromium.org/953423003
    
    Cr-Commit-Position: refs/heads/master@{#318102}
    (cherry picked from commit 8cd63f8bbe79dc47df8ddf60b8c9e09d0e96ca42)
    
    [email protected]
    
    Review URL: https://codereview.chromium.org/970753003
    
    Cr-Commit-Position: refs/branch-heads/2311@{#70}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  124. Add UMA to track permission changes from the content settings menu
    
    Update the descriptions for the equivalent OriginSettings UMA.
    
    TBR=jhawkins
    BUG=433774
    
    Review URL: https://codereview.chromium.org/952463002
    
    Cr-Commit-Position: refs/heads/master@{#318223}
    (cherry picked from commit 1fc158a1ecea9f282362d9958a150303b3a0dd94)
    
    Review URL: https://codereview.chromium.org/967333002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#69}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  125. Js fixed for proper status setting on HID screen. To merge into M42.
    
    BUG=461076
    [email protected]
    Review URL: https://codereview.chromium.org/960133002
    
    Cr-Commit-Position: refs/heads/master@{#318225}
    (cherry picked from commit 9ba382d13df47c67e1128614279a1ff01c28aae6)
    
    Review URL: https://codereview.chromium.org/968853002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#68}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  126. Rename for js pod description to LegacySupervisedUser finished. To merge into M42
    
    BUG=461621
    [email protected]
    
    Review URL: https://codereview.chromium.org/960403003
    
    Cr-Commit-Position: refs/heads/master@{#318430}
    (cherry picked from commit 39298c1b6afc66ea755d5292456d3f1fa5b38c48)
    
    Review URL: https://codereview.chromium.org/968843002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#67}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  127. Files.app: Stop reusing items' DOM in grid view.
    
    Previously the image DOM in the list is removed for reusing for another item
    unintentionally. Thanks to ListThumbnailLoader we no longer need to reuse DOM.
    
    BUG=461338
    TEST=None
    [email protected]
    
    Review URL: https://codereview.chromium.org/955933002
    
    Cr-Commit-Position: refs/heads/master@{#318003}
    (cherry picked from commit 3d8d4115aa6c0f1a34081e1553a724c5f4247c6c)
    
    Review URL: https://codereview.chromium.org/968083002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#66}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  128. Files.app: Use <button> instead of <paper-button> to make ENTER and SPACE effective on them.
    
    <paper-button> does not handle ENTER and SPACE by default, so this CL change
    the buttons to <button>s.
    <button>s on the footer already have style similar to paper-button, so the
    visual style for each button is not changed.
    
    BUG=461758
    TEST=manually check the response for ENTER/SPACE
    [email protected]
    
    Review URL: https://codereview.chromium.org/944683003
    
    Cr-Commit-Position: refs/heads/master@{#318036}
    (cherry picked from commit aab6df45d814cd913a0401af812f8ac89d6017b4)
    
    Review URL: https://codereview.chromium.org/965313002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#65}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  129. Files.app: Make delete button on the toolbar standard button instead of CommandButton.
    
    The period "Delete button should be shown" is not exactly same as "Delete command can be executed."
    For example: While a confirm dialog overlays Files.app, the dialog consumes all input event so the delete command cannot be executed, but still the delete button should be shown under the overlaying dialog.
    
    BUG=459402,457113
    TEST=manually checked the repro steps on each issue.
    [email protected]
    
    Review URL: https://codereview.chromium.org/951443002
    
    Cr-Commit-Position: refs/heads/master@{#317569}
    (cherry picked from commit 2b5fc4b664d47828d4e999a0fb17b22038318864)
    
    Review URL: https://codereview.chromium.org/968093002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#64}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  130. Files.app: Let MetadataCacheSet#hasFreashCache return true for empty names.
    
    BUG=462495
    TEST=FileManagerJsTest.MetadataCacheSet
    [email protected]
    
    Review URL: https://codereview.chromium.org/966453003
    
    Cr-Commit-Position: refs/heads/master@{#318411}
    (cherry picked from commit c8a7a361d36717ece923671e7150e3138b7d8f68)
    
    Review URL: https://codereview.chromium.org/972453003
    
    Cr-Commit-Position: refs/branch-heads/2311@{#63}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  131. Gallery: Stop to create EXIF thumbanil if the original images are enough small.
    
    Previously Gallery.app generates thumbnails always and its size is limited to
    1/4 of orignal size. Then Files.app tries to show the small thumbnail. It looks
    bluer.
    
    BUG=458025
    TEST=None
    [email protected]
    
    Review URL: https://codereview.chromium.org/948233003
    
    Cr-Commit-Position: refs/heads/master@{#317770}
    (cherry picked from commit 0a99c64e6420858bcb14b5accfc5ee1c608adfd6)
    
    Review URL: https://codereview.chromium.org/972603002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#62}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  132. Fix JS errors of FileTransferController.
    
    Previously Files.app does not preapre container object of AsyncData if the
    selection includes directory. Thus it raises exceptions when it tries to
    store data to the container object. The CL let Files.app prepares the container
    object always.
    
    BUG=461726
    TEST=None
    [email protected]
    
    Review URL: https://codereview.chromium.org/956853002
    
    Cr-Commit-Position: refs/heads/master@{#318187}
    (cherry picked from commit 42e39712923bd4ae01458124e9183492adb099a6)
    
    Review URL: https://codereview.chromium.org/964263002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#61}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  133. Add new demo applications to the public session white list.
    
    They are demo applications introducing popular apps/services. The new demos use
    the same template with existing demo apps. Text/images are replaced for each new
    application.
    
    BUG=446429
    TEST=None
    [email protected]
    
    Review URL: https://codereview.chromium.org/941273002
    
    Cr-Commit-Position: refs/heads/master@{#318401}
    (cherry picked from commit 4f26a767e6da1ea224665b400f28a0f1bde81cad)
    
    Review URL: https://codereview.chromium.org/966333002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#60}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  134. Revert "Gallery: Remove 2x mouse cursor assets temporary."
    
    This reverts commit 603236c7d52a2a57b989ed1d2439538e35a8c6f6.
    The issue of 2x assets has been solved.
    
    BUG=460430
    TEST=checked on link
    [email protected]
    
    Review URL: https://codereview.chromium.org/962483002
    
    Cr-Commit-Position: refs/heads/master@{#318201}
    (cherry picked from commit b509e763ee11364194152e80a4143b2a0693729c)
    
    Review URL: https://codereview.chromium.org/965303002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#59}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  135. Blacklist GPU raster and canvas on all PowerVR SGX.
    
    Unfortunately, an OEM Lollipop build on an SGX 544 shipped without
    fixing the driver bug causing GPU raster to be incorrect, so
    unconditionally blacklist PowerVR SGX GPUs.
    
    BUG=461456
    
    Review URL: https://codereview.chromium.org/949423002
    
    Cr-Commit-Position: refs/heads/master@{#317980}
    (cherry picked from commit 7c0ab504690f30bee790361f9dc376c13adb4646)
    
    Review URL: https://codereview.chromium.org/967183002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#58}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  136. Incrementing VERSION to 42.0.2311.14
    
    Cr-Commit-Position: refs/branch-heads/2311@{#57}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  137. Fixed launcher prompting for "Ok Google" when hotwording disabled.
    
    Previously, the launcher state failed to update when disabling
    hotwording, so while the prompt would eventually be correct, it would
    incorrectly display the "Search, or say "Ok Google"" prompt until it was
    refreshed.
    
    BUG=462084
    TEST=Enable hotwording, open launcher. Disable hotwording, open
    launcher. Should not say "or say Ok Google".
    
    Review URL: https://codereview.chromium.org/960753002
    
    Cr-Commit-Position: refs/heads/master@{#318371}
    (cherry picked from commit 6274399b9a1e29985f9604e01e8e7d28c9def596)
    
    [email protected]
    
    Review URL: https://codereview.chromium.org/964253002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#56}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  138. Fix crash on app list start page contents not existing.
    
    This CL adds a null check around an access to the app list web contents.
    
    BUG=460388
    
    Review URL: https://codereview.chromium.org/949823002
    
    Cr-Commit-Position: refs/heads/master@{#317546}
    (cherry picked from commit 386f2bcf06d5fb74c176de864190a1c555ad618f)
    
    [email protected]
    
    Review URL: https://codereview.chromium.org/964243002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#55}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  139. Incrementing VERSION to 42.0.2311.13
    
    Cr-Commit-Position: refs/branch-heads/2311@{#54}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  140. Ensure the destination url reported to ImportHistory is correctly encoded. Eliminates a bug where files will spaces in name were not being marked as synced.
    
    Also:
    1) Remove an unused method (with a TODO body) in ImportTask.
    
    BUG=461174
    TEST=browser_test: FileManagerJsTest.*
    
    Review URL: https://codereview.chromium.org/954943006
    
    Cr-Commit-Position: refs/heads/master@{#318197}
    (cherry picked from commit 4cf03c77e61e92b6bf84955b006422b41927d23a)
    
    Files.app: Fix js exceptions in table rendering.
    
    The status column isn't always visible.  Account for that when attempting to update table elements.
    
    BUG=461723
    
    Review URL: https://codereview.chromium.org/952893008
    
    Cr-Commit-Position: refs/heads/master@{#318060}
    (cherry picked from commit 4e9ddaa032693230d5ad4ce35b6eb089772ee05f)
    
    TBR=mtomasz
    
    Review URL: https://codereview.chromium.org/961403002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#53}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  141. Files.app: Disable the cloud import notification for active g+ photos app users.
    
    If a user has auto-import enabled in the g+ photos app, don't enable cloud import, and don't pop up notifications for it yet.  We'll re-enable these notifications when the transition path has been smoothed a bit more.
    
    BUG=462110
    
    Review URL: https://codereview.chromium.org/955313002
    
    Cr-Commit-Position: refs/heads/master@{#318237}
    (cherry picked from commit 56c9dc7cb83ecb9fea6eeeefb2d7d401a3cda919)
    
    Files.app: Fix a bug where messages from G+ photos app aren't properly handled.
    
    Fix test.util.registerRemoteTestUtils so external messages get propagated to all listeners.
    Fix notification callback code to open files app in the right location when an import is initiated from a notification click.
    
    BUG=459359
    
    Review URL: https://codereview.chromium.org/959493004
    
    Cr-Commit-Position: refs/heads/master@{#317987}
    (cherry picked from commit 169cabf37ffed527dc5338f345c99392e0386d6b)
    
    TBR=mtomasz
    
    Review URL: https://codereview.chromium.org/965003002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#52}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  142. Autofill: Disable autofill for fields outside of forms.
    
    BUG=462375
    
    Review URL: https://codereview.chromium.org/964453004
    
    Cr-Commit-Position: refs/heads/master@{#318406}
    (cherry picked from commit eb9e20d80c31c2842509e5213d4864eadf84baa1)
    
    Review URL: https://codereview.chromium.org/967613002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#51}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  143. Handle the notification settings intent.
    
    This intent comes from two places. Since Android L there is a settings
    cog on two UI surfaces:
    (1) On the rear side (after long press) of notifications.
    (2) In the "App notifications" screen in Android Settings.
    
    Touching the cog on a flipped notification takes the user to the site
    specific preferences screen which displays (among others) the notification
    preference for the site origin.
    
    Touching he cog on the App notifications screen takes the user to
    Chrome's notifications preferences list for all sites.
    
    BUG=436594,461885
    [email protected],[email protected]
    
    Review URL: https://codereview.chromium.org/942103003
    
    Cr-Commit-Position: refs/heads/master@{#318097}
    (cherry picked from commit efff60a90b8eb97bdb9697e8bb59de22745be1a1)
    
    Review URL: https://codereview.chromium.org/967593002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#50}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  144. Plugin Power Saver: Fix PluginPreroller outliving the PluginInstanceThrottler
    
    Merge to M42.
    
    This fixes a use-after-destroy bug leading to crashes.
    
    Object Lifetimes:
    blink::WebPlugin >= PluginInstanceThrottler >= PluginPreroller.
    
    The PluginPreroller is supposed to observe the Throttler and destroy itself when the Throttler gets destroyed.
    
    Previously, the WebPlugin would sometimes destroy the Throttler before the PluginPreroller was ever created. The PluginPreroller would then try to observe a non-existent throttler, and crash.
    
    This patch now attaches the PluginPreroller to the Throttler before the blink::WebPlugin has a chance to destroy the Throttler.
    
    BUG=459920, 458326, 403800
    
    Review URL: https://codereview.chromium.org/941803003
    
    Cr-Commit-Position: refs/heads/master@{#317837}
    (cherry picked from commit 260ce7214bf5e2299efd4797a7833dddbb7ebb55)
    
    Review URL: https://codereview.chromium.org/962313002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#49}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  145. [android] Handle unknown country codes.
    
    Don't show "Kosovo" (country code "XK") as an autofill country name
    option on K devices, because K devices are not aware of it.
    
    Add "XK" to the list of autofill countries to enable saving autofill
    profiles with country name "Kosovo."
    
    BUG=456246
    [email protected], [email protected]
    
    Review URL: https://codereview.chromium.org/952993003
    
    Cr-Commit-Position: refs/heads/master@{#318103}
    (cherry picked from commit 6dbf9a7fd446cff4c478df2396e1b6b57d96ac77)
    
    Review URL: https://codereview.chromium.org/963803002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#48}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  146. QUIC - Cache the connection type and connection description. Make the
    expensive calls if connection type has changed or if connection
    description was null.
    
    Defined a new class to cache the connection
    description and this class is owned by QuicStreamFactory.
    
    This fixes the Jank on IO thread and avoids call to GetWifiPHYLayerProtocol
    (which takes around 40ms).
    
    BUG=422516
    [email protected]
    
    Review URL: https://codereview.chromium.org/944883003
    
    Cr-Commit-Position: refs/heads/master@{#317674}
    (cherry picked from commit 041b299d0a6476be730bfbc100b33f3184279339)
    
    Review URL: https://codereview.chromium.org/962983003
    
    Cr-Commit-Position: refs/branch-heads/2311@{#47}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  147. Incrementing VERSION to 42.0.2311.12
    
    Cr-Commit-Position: refs/branch-heads/2311@{#46}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  148. Merge 317490 "Handle 'cenc' Initialization Data Type in Clear Key."
    
    > Handle 'cenc' Initialization Data Type in Clear Key.
    >
    > Initialization data is provided as concatentated PSSH boxes. Parse the
    > PSSH boxes and extract the keys, if present. Only process the PSSH
    > boxes that contain the Clear Key SystemID, all other PSSH boxes are
    > skipped.
    >
    > This handles both version 0 and version 1 PSSH boxes.
    >
    > BUG=459850
    > TEST=new tests pass
    >
    > Review URL: https://codereview.chromium.org/936953005
    
    Cr-Commit-Position: refs/heads/master@{#317490}
    (cherry picked from commit 0961c42c5a18859d6b4b5202f816c6a1304b3ac5)
    
    [email protected]
    
    Review URL: https://codereview.chromium.org/958183003
    
    Cr-Commit-Position: refs/branch-heads/2311@{#45}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  149. Files.app: Fix a bug in content hash computation.
    
    Break a circular reference which was causing FileManagerPrivateComputeChecksumFunction to never be cleaned up.  This, in turn, was holding open one file stream for every file for which a content checksum was requested.
    
    BUG=458624
    
    Review URL: https://codereview.chromium.org/950423003
    
    Cr-Commit-Position: refs/heads/master@{#317997}
    (cherry picked from commit 78bb0f4b1c59602c67281bcbafb96eae90367040)
    
    TBR=mtomasz
    
    Review URL: https://codereview.chromium.org/955313003
    
    Cr-Commit-Position: refs/branch-heads/2311@{#44}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  150. Compile shader upon deletion if attached.
    
    [email protected], [email protected]
    BUG=459778
    TEST=chromote locally with enableVideoDecodeRenderer
    
    Review URL: https://codereview.chromium.org/954073002
    
    Cr-Commit-Position: refs/heads/master@{#317985}
    
    NOTRY=true
    
    Review URL: https://codereview.chromium.org/957403004
    
    Cr-Commit-Position: refs/branch-heads/2311@{#43}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  151. Shrink space required by history log file
    
    1) Use seconds-since-epoch in log record keys, instead of full date strings.
    2) Add support for inflating/deflating urls.
    3) Deflate URLS prior to storaing in log file.
    4) Remove obsolete code for reloading history after remote changes.
    
    BUG=461176
    TEST=browser_test: FileManagerJsTest.*
    
    Review URL: https://codereview.chromium.org/954583004
    
    Cr-Commit-Position: refs/heads/master@{#317965}
    (cherry picked from commit 1f0ca0da1b05c4ac1781063fcf7cfbb195e2a606)
    
    TBR=mtomasz
    
    Review URL: https://codereview.chromium.org/963593004
    
    Cr-Commit-Position: refs/branch-heads/2311@{#42}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  152. Report Promise error-context strings to GA.
    
    Cleanup log record formatting (added missing spaces, remove redundant info).
    Move machine id to from of log file names so they read better (really).
    
    BUG=460614
    TEST=None  // Well, you can start import, then yank the card to see if you can't force an error to happen, then check the network tab to see that a GA "exception" was sent with JUST the static error-context string from the related promise.
    
    Review URL: https://codereview.chromium.org/953483003
    
    Cr-Commit-Position: refs/heads/master@{#317833}
    (cherry picked from commit 15a10b61c1b5e031e627803bd0580e85069da2d4)
    
    Add support for log file rotation. Clean up error logging (more consistent formatting). Log stack traces. Ensure most substantial Promise chains used in importer code have catch clause hooked up to logger.
    
    BUG=460614
    BUG=449034
    TEST=browser_test: FileManagerJsTest.*
    
    Review URL: https://codereview.chromium.org/945933003
    
    Cr-Commit-Position: refs/heads/master@{#317547}
    (cherry picked from commit 4b600b552c6a611827539237270ce3f5eea17999)
    
    TBR=mtomasz
    
    Review URL: https://codereview.chromium.org/964643002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#41}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  153. Making Chromoting use no GPO provider in PolicyLoaderWin.
    
    The old Chromoting code (policy_hack before crrev.com/830193002) used to
    always read Chromoting policies from the registry.  The new code (using
    components/policy) ignores contents of the registry on non-domain-joined
    machines.  This old-vs-new difference in behavior was unintentional.
    The current changelist ensures that Chromoting's old behavior is preserved.
    
    BUG=460734
    TEST=1) components_unittests.exe, 2) remoting_unittests.exe, 3) remoting_unittests.exe --gtest_filter=*PolicyWatcher*Real* -v=1 copied and run from a non-domain-joined, test VM to verify that Chromoting gets its policies from the registry (HKLM\SOFTWARE\Policies\Google\Chrome) in this scenario.
    
    Review URL: https://codereview.chromium.org/947353002
    
    Cr-Commit-Position: refs/heads/master@{#317865}
    (cherry picked from commit bccb49e3a1864e703a01beabaf9961f215956dea)
    
    TBR=dcaiafa
    
    Review URL: https://codereview.chromium.org/959033002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#40}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  154. Updating XTBs based on .GRDs from branch 2311
    
    Cr-Commit-Position: refs/branch-heads/2311@{#39}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  155. Files.app: Fix task cancellation.
    
    - Fix the task queue so that cancelling a task doesn't leave it hanging out in the queue, which then will jam everything up.
    - Fix the error code so that errors are handled consistently (and are non-terminal, as they should be)
    - Rename UpdateType.SUCCESS to UpdateType.COMPLETE.  This better reflects the fact that errors can occur during an import task but the task still runs to completion.
    
    BUG=460597
    
    Review URL: https://codereview.chromium.org/947583002
    
    Cr-Commit-Position: refs/heads/master@{#317538}
    (cherry picked from commit fb5551a709a997209e1504d0eacc8562c1740f03)
    
    TBR=mtomasz
    
    Review URL: https://codereview.chromium.org/964533003
    
    Cr-Commit-Position: refs/branch-heads/2311@{#38}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  156. ozone: evdev: Keep track of settings & apply to new devices
    
    This closes two large holes in the settings code:
    
    (1) Any changes made before the input device thread starts are lost.
    (2) Settings are not internally applied to new devices on hotplug.
    
    In theory these problems should not have mattered because there is a
    DeviceChangeHandler class to watch for new devices & reapply settings
    whenever a new device appears. However, in practice that class is not
    actually instantiated. We've had several reports of settings not being
    properly applied.
    
    To fix (1) build up desired settings state on the UI thread in
    InputControllerEvdev, and push it to InputDeviceFactoryEvdev once the
    thread starts.
    
    To fix (2) keep the desired settings state on InputDeviceFactoryEvdev,
    and reapply settings on hotplug.
    
    BUG=451743
    TEST=Turned on australian scrolling & ran "sudo restart udev" on
         link_freon. Verified scrolling is still australian.
    
    Review URL: https://codereview.chromium.org/951063004
    
    Cr-Commit-Position: refs/heads/master@{#317851}
    (cherry picked from commit 8ec6aaa574230d326a602f1cd719cfff227e4279)
    
    Review URL: https://codereview.chromium.org/956793002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#37}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  157. Add F13 - F24 for evdev/xkb to scan code table.
    
    F13 - F15 in particular are needed for lock, key help, and diamond
    keys on extended ChromeOS keyboards.
    
    BUG=454865
    
    Review URL: https://codereview.chromium.org/934003002
    
    Cr-Commit-Position: refs/heads/master@{#317902}
    (cherry picked from commit 5ee26afb9b37dcc594dfb42ffd98a08d63b7631e)
    
    TBR=Wez,spang
    
    Review URL: https://codereview.chromium.org/961843002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#36}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  158. Make ChromeBookmarkClient::CanSetPermanentNodeTitle say true for the supervised node.
    
    The title can actually change when switching to a different translation, which would trigger a NOTREACHED in BookmarkModel::SetTitle.
    
    BUG=459448
    
    Review URL: https://codereview.chromium.org/946363002
    
    Cr-Commit-Position: refs/heads/master@{#317587}
    (cherry picked from commit 2d81cac8f27f6b05c77757e3f1959b29d9d39875)
    
    TBR=amineer
    
    Review URL: https://codereview.chromium.org/961613002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#35}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  159. Proper focus input field instead of whole pod
    
    This CL fixes focus regression introduced in https://codereview.chromium.org/908033005
    
    BUG=450465
    TEST=manual
    
    Review URL: https://codereview.chromium.org/951783003
    
    Cr-Commit-Position: refs/heads/master@{#317777}
    (cherry picked from commit 2672bd90ba63cb8b19e1b44b9512e52f036bd813)
    
    Review URL: https://codereview.chromium.org/962523004
    
    Cr-Commit-Position: refs/branch-heads/2311@{#34}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  160. Restore L3 support on CrOS when the media permission is denied.
    
    BUG=446263,457482
    
    Review URL: https://codereview.chromium.org/945063002
    
    Cr-Commit-Position: refs/heads/master@{#317483}
    (cherry picked from commit cd52b1d018b5464584771f756d8f8ec37302421d)
    
    Review URL: https://codereview.chromium.org/960793002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#33}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  161. Merge: Update the Drive state in Files app when the refresh token is fetched.
    
    Before, we were not notifying Files app about such fact, so it was still
    thinking that Drive is not available, and showing the banner.
    
    [email protected]  # For merge.
    TEST=Tested manually when logging to an empty profile.
    BUG=461247
    
    Review URL: https://codereview.chromium.org/953273002
    
    Cr-Commit-Position: refs/heads/master@{#317995}
    (cherry picked from commit eaffcdbc813caebe3160789ed9ecc503b5276926)
    
    Review URL: https://codereview.chromium.org/961593002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#32}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  162. Merge "cros: Fix EasyUnlockServiceSignin::OnUserDataLoaded crash."
    
    > BUG=461408
    >
    > Review URL: https://codereview.chromium.org/952833005
    >
    > Cr-Commit-Position: refs/heads/master@{#317882}
    > (cherry picked from commit a1f4fa340e8f240b60d991984c058e748e7e914d)
    
    [email protected]
    
    Review URL: https://codereview.chromium.org/960093002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#31}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  163. Correctly whitelist the PDF plugin in the PDF extension.
    
    For plugins listed in
    chrome/browser/resources/plugin_metadata/plugins_*.json, the resource
    identifier for that plugin becomes the key used in those JSON files.
    Previously, the PDF plugin filename was used as the resource identifier
    to whitelist the PDF plugin within the PDF extension. This caused the
    whitelisting to be ineffective for official builds and also other builds
    after r316957 added an entry for the Chromium PDF Viewer plugin. This CL
    fixes this by using the keys from the plugin metadata files as the
    resource identifiers for whitelisting the PDF plugin.
    
    BUG=459998
    
    Review URL: https://codereview.chromium.org/946293002
    
    Cr-Commit-Position: refs/heads/master@{#317556}
    (cherry picked from commit 2c8ef923fc3a440aa99b09372fde8f3d0893f551)
    
    [email protected]
    
    Review URL: https://codereview.chromium.org/956163002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#30}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  164. Fix left/right keyboard scrolling in PDFs
    
    Non-existent dictionary members were trying to be accessed.
    
    BUG=461587
    
    Review URL: https://codereview.chromium.org/959443003
    
    Cr-Commit-Position: refs/heads/master@{#317935}
    (cherry picked from commit 7593306a8770d5fd7d884532a6dd012df55b4d7f)
    
    Review URL: https://codereview.chromium.org/958763002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#29}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  165. Incrementing VERSION to 42.0.2311.11
    
    Cr-Commit-Position: refs/branch-heads/2311@{#28}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  166. Ensure streams aren't intercepted unless their associated plugin is enabled
    
    Previously streams would be intercepted even if the MimeHandlerView plugin
    associated with them was disabled which would prevent the resource
    from being download if a plugin wasn't being enabled to handle it.
    
    BUG=459383
    
    Review URL: https://codereview.chromium.org/933093002
    
    Cr-Commit-Position: refs/heads/master@{#317673}
    (cherry picked from commit 553cec8b3c449a02a69a1663f5fb077f3abefba2)
    
    Review URL: https://codereview.chromium.org/957703005
    
    Cr-Commit-Position: refs/branch-heads/2311@{#27}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  167. Merge "Update the notification status-bar icons."
    
    The new icons are slightly larger than the previous version, per the
    feedback we received from various reviews.
    
    [email protected], [email protected]
    BUG=460042
    
    Review URL: https://codereview.chromium.org/946673002
    
    Cr-Commit-Position: refs/heads/master@{#317576}
    (cherry picked from commit e7a4e695a3298e2e960f6bcc19679df89fc85565)
    
    Review URL: https://codereview.chromium.org/950903005
    
    Cr-Commit-Position: refs/branch-heads/2311@{#26}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  168. Revert of Fixes for two different HUD issues related to win32k lockdown (patchset #9 id:350001 of https://codereview.chromium.org/900063002/)
    
    Reason for revert:
    Causes regression in cold start on Android and maybe Mac.
    
    Details in http://crbug.com/457248.
    
    Original issue's description:
    > Fixes for two different HUD issues related to win32k lockdown
    >
    > 1. Using a GDI bitmap -- switch to SkSurface instead
    >
    > 2. Lazily loading a font. This breaks for two different reasons.
    > The first is a DCHECK for doing IO on the Compositor thread. This
    > could have been just ignored in general since it's only for debug
    > usage, the drawbacks of minor jank are limited.
    >
    > However, once lockdown is on, the font load hard fails from the
    > renderer. So, load the typeface before lockdown and pass it into
    > CC and the hud via LayerTreeSettings.
    >
    > [email protected]
    > BUG=453731,455104
    > TEST=run chrome with --enable-win32k-renderer-lockdown --show-fps-counter --ui-show-fps-counter on Win8
    >
    > Committed: https://crrev.com/616a8e656b2d923ed393bde86adc150e555ba799
    > Cr-Commit-Position: refs/heads/master@{#314929}
    
    [email protected],[email protected],[email protected]
    BUG=453731,455104,457248
    
    Review URL: https://codereview.chromium.org/922293006
    
    Cr-Commit-Position: refs/heads/master@{#317648}
    (cherry picked from commit 1793e0467bb34d2545c0493a557bb038cc2ac6f0)
    
    Review URL: https://codereview.chromium.org/951423003
    
    Cr-Commit-Position: refs/branch-heads/2311@{#25}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  169. aw: Fix selection handle hit testing
    
    Return the y coordinate of the PopupTouchHandleDrawable position when
    it is requested. Turns out, returning the x coordinate is bad.
    
    BUG=461598
    
    Review URL: https://codereview.chromium.org/931283008
    
    Cr-Commit-Position: refs/heads/master@{#317936}
    (cherry picked from commit 048b41f6da21aa71b2f00dd41d695d362f046af1)
    
    Review URL: https://codereview.chromium.org/952263002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#24}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  170. [Push] Enable PushManager.hasPermission() in browser tests.
    
    Enables PushManager.hasPermission() as a transition until the Permissions API
    can be used in order to get that information. It will save a lot of trouble in
    changing the current test in order to no longer use hasPermission() then change
    them again to use the Permissions API.
    
    This is a three sided CL:
    1- https://codereview.chromium.org/926793004
    2- <this>
    3- https://codereview.chromium.org/936873002
    
    BUG=449178
    [email protected],[email protected]
    
    Review URL: https://codereview.chromium.org/937563004
    
    Cr-Commit-Position: refs/heads/master@{#317512}
    (cherry picked from commit 6aa612689f8f19153c0ee3a6b1befa5650226a6f)
    
    Review URL: https://codereview.chromium.org/950723003
    
    Cr-Commit-Position: refs/branch-heads/2311@{#23}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  171. Android Chromoting: Remove title and add navigation button to disconnect
    
    BUG=430328
    
    Review URL: https://codereview.chromium.org/943103002
    
    Cr-Commit-Position: refs/heads/master@{#317489}
    (cherry picked from commit 01f8886bebfb9eab8dfb370db065a81a613feee1)
    
    Review URL: https://codereview.chromium.org/955843002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#22}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  172. Hide Autofill/Wallet preferences on Android.
    
    Simply hide the Autofill/Wallet preferences. The correct fix will involve checking the state of the sync experiment, but for M42 it's enough to just disable this preference page.
    
    Will require merge to m42.
    
    BUG=460900
    [email protected]
    
    Review URL: https://codereview.chromium.org/947253002
    
    Cr-Commit-Position: refs/heads/master@{#317699}
    (cherry picked from commit 652772cfbf2ccf99d63b13f606cbaed035efdf88)
    
    Review URL: https://codereview.chromium.org/947333003
    
    Cr-Commit-Position: refs/branch-heads/2311@{#21}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  173. Disable the autofill/wallet settings in chrome://settings/autofill
    
    Will merge this to M42, then revert on trunk.
    
    BUG=460900
    
    Review URL: https://codereview.chromium.org/949753006
    
    Cr-Commit-Position: refs/heads/master@{#317638}
    (cherry picked from commit 0d59aeae3e815c53b10fb0ffc1199be524c62f86)
    
    Review URL: https://codereview.chromium.org/948343005
    
    Cr-Commit-Position: refs/branch-heads/2311@{#20}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  174. Disable alpha, translate animations in the app menu for ICS.
    
    The performance is horrendous, so let's disable the animations for each of the
    menu items for now as it looks 90% as good as a well performing animation on
    newer builds of android.
    
    BUG=428477
    
    Review URL: https://codereview.chromium.org/948183003
    
    Cr-Commit-Position: refs/heads/master@{#317692}
    
    Review URL: https://codereview.chromium.org/927103003
    
    Cr-Commit-Position: refs/branch-heads/2311@{#19}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  175. Merge 317853 - Make BackgroundContentsService start up BackgroundContents with a delay, as for ExtensionHosts.
    
    extensions::ProcessManager starts ExtensionHosts asynchronously with a queue to avoid using too much resources at startup; make BackgroundContentsService use the same queue implementation. (ExtensionHostQueue now accepts an interface that both BackgroundContentsService and ExtensionHost share.)
    
    This significantly reduces the time BackgroundContentsService contributes to ExtensionService startup (75th percentile was ~300ms, according to Extensions.BackgroundContentsServiceStartupTime).
    
    BUG=47236
    
    Review URL: https://codereview.chromium.org/933423003
    
    Cr-Commit-Position: refs/heads/master@{#317480}
    (cherry picked from commit d61dfe19ab3188101e511f633eeaaef3dc689e41)
    
    Review URL: https://codereview.chromium.org/955713004
    
    Cr-Commit-Position: refs/branch-heads/2311@{#18}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  176. Work around bug in generate_policy_source.py to fix several policies.
    
    [email protected]
    TBR=tnagel
    NOTREECHECKS=true
    BUG=451073
    
    Review URL: https://codereview.chromium.org/949173004
    
    Cr-Commit-Position: refs/branch-heads/2311@{#17}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  177. Context menu to view original image when Data Saver is being used.
    
    Show menu item to view original image if the request could go over
    the data reduction proxy.
    
    BUG=456247
    
    Review URL: https://codereview.chromium.org/944533002
    
    Cr-Commit-Position: refs/heads/master@{#317720}
    (cherry picked from commit f28021f2f6547ae1aef2bf350caab24edd656732)
    
    Review URL: https://codereview.chromium.org/953053003
    
    Cr-Commit-Position: refs/branch-heads/2311@{#16}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}