1. Publish DEPS for Chromium 42.0.2311.68
    
  2. Incrementing VERSION to 42.0.2311.68
    
    Cr-Commit-Position: refs/branch-heads/2311@{#395}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  3. Contextual Search] Update promo look.
    
    Cherry-pick of https://codereview.chromium.org/982643002 to M42
    
    This CL updates the asset for the promo's image, and updates
    the promo styles to conform with the new design spec.
    
    See bug report for complete design spec and mocks.
    
    BUG=441476
    [email protected],[email protected]
    
    Review URL: https://codereview.chromium.org/982643002
    
    Cr-Commit-Position: refs/heads/master@{#322045}
    
    Review URL: https://codereview.chromium.org/1044423002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#394}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  4. Merge to M42: Fix regression in Mac AX live region support
    
    As part of a refactoring, the code to detect if a new live region
    was added was accidentally modified to trigger if a live region
    was changed in any way. It should only trigger on a brand-new
    live region.
    
    BUG=469276
    
    Review URL: https://codereview.chromium.org/1030373003
    
    Cr-Commit-Position: refs/heads/master@{#322434}
    (cherry picked from commit 6f67a46b2822001d53d9df18d2f60b4f318c76e9)
    
    Review URL: https://codereview.chromium.org/1051493003
    
    Cr-Commit-Position: refs/branch-heads/2311@{#393}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  5. Update permission bubble anchor when omnibar is hidden
    
    The permission bubble is created once. It now chooses an appropriate
    anchor if the omnibar is not visible.
    
    The bubble's anchor is updated when fullscreen is toggled.
    
    Screenshots of change:
    http://imgur.com/a/PmEQz
    
    BUG=440403,440401
    NOTRY=true
    
    Review URL: https://codereview.chromium.org/962453002
    
    Cr-Commit-Position: refs/heads/master@{#321864}
    (cherry picked from commit 32a02419d38bf802329767c8bee375cc446e6756)
    
    Conflict resolved in:
      chrome/browser/ui/views/exclusive_access_bubble_views.cc
    
    Review URL: https://codereview.chromium.org/1037543002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#392}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  6. Increase tolerance for receiver's certificate expiry
    
    Increase the maximum allowed remaining lifetime for the
    receiver's self-signed cert to 4 days.
    
    This is being increased from 2 days because errors are
    being seen in the field because of sender clocks being off.
    
    In the future, we might find a way to warn the user that
    their clock might be off, but for now just changing the
    tolerance seems the right approach.
    
    BUG=467736
    
    [email protected]
    
    Review URL: https://codereview.chromium.org/1011133005
    
    (cherry picked from commit 7018ce63853e5e7464e6604015a76fe82886133e)
    
    Cr-Original-Commit-Position: refs/heads/master@{#322497}
    Cr-Commit-Position: refs/branch-heads/2311@{#391}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  7. Add a string to user agent to differentiate webview from clank.
    
    Add a string representing webview to the user agent string for webview
    to be able to differentiate between webview and clank.
    
    BUG=461383
    
    Review URL: https://codereview.chromium.org/1035973002
    
    Cr-Commit-Position: refs/heads/master@{#322834}
    (cherry picked from commit e98c5bb43c1f319a592dd7a4d9e113d644fb2fd6)
    
    Review URL: https://codereview.chromium.org/1043213002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#390}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  8. Set force_disk_read when live layer isn't valid
    
    When live layer isn't valid, we only use static layer.
    But sometimes static layer's thumbnail is available only in disk.
    So we need to set force_disk_read to read thumbnail into memory again.
    
    BUG=470594
    [email protected],[email protected]
    
    Review URL: https://codereview.chromium.org/1034103002
    
    Cr-Commit-Position: refs/heads/master@{#322912}
    (cherry picked from commit d3447258c7df438cbd8794395b49d887559ffba9)
    
    Review URL: https://codereview.chromium.org/1041423002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#389}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  9. Merge: Remove PluginInstallerInfoBarDelegate
    
    With the NPAPI deprecation, there is no point prompting to install plugins. Most of the guts is left in place for the out of date plugin infobar, which is still needed.
    
    BUG=459155
    TEST=Visit https://java.com/en/download/uninstallapplet.jsp and verify no install prompt appears.
    
    Review URL: https://codereview.chromium.org/1025303007
    
    Cr-Commit-Position: refs/heads/master@{#322031}
    (cherry picked from commit 24f192644365a0b235111754afe496d7026f089b)
    
    Review URL: https://codereview.chromium.org/1045903003
    
    Cr-Commit-Position: refs/branch-heads/2311@{#388}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  10. Use the outermost embedder WebContents in ConstrainedWindowMac.
    
    Currently, ConstrainedWindowMac uses the embedder WebContents of the
    GuestView if the WebContents is in a GuestView. However, with OOP PDF, a
    mime handler view can be embedded in a webview that is embedded in an
    app window; in this case, the webview WebContents is used instead of the
    app window WebContents. This CL changes ConstrainedWindowMac to use the
    outermost embedder WebContents.
    
    This is the same fix as http://crrev.com/321248, but for mac.
    
    BUG=457672
    
    Review URL: https://codereview.chromium.org/1029583007
    
    Cr-Commit-Position: refs/heads/master@{#322305}
    (cherry picked from commit 0a61f800e27e0e9a369d27a7e69dc8d9d90fccde)
    
    [email protected]
    
    Review URL: https://codereview.chromium.org/1040273002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#387}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  11. Handle an empty Intent
    
    If an empty Intent was returned with Activity.RESULT_OK, we assume that the
    camera saved the photo as a file that we had requested.
    
    BUG=470927
    [email protected],[email protected]
    
    Review URL: https://codereview.chromium.org/1035003003
    
    Cr-Commit-Position: refs/heads/master@{#322888}
    (cherry picked from commit 48a7a93a46f7e6acbd72cfa6196ae17d634b183f)
    
    Review URL: https://codereview.chromium.org/1049583002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#386}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  12. [Audio Player] Remove durationChanged hander in 'control-panel' element
    
    It's no longer necessary. And the handler is fired unexpected timing after unminimized and causes the issue (see the issue for detail). This patch removes it.
    
    BUG=462065
    TEST=browsertest passes
    [email protected]
    
    Review URL: https://codereview.chromium.org/1018953002
    
    Cr-Commit-Position: refs/heads/master@{#321357}
    (cherry picked from commit c6bb664d869cc9189e322c0b0a1bcf45d9f9adce)
    
    Review URL: https://codereview.chromium.org/1048673005
    
    Cr-Commit-Position: refs/branch-heads/2311@{#385}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  13. Merging to M42
    
    Remove the code which sorts and removes duplicates from the fallback font list
    
    This causes wrong fallback fonts to be picked leading to text displaying badly.
    
    To avoid duplicate fonts from being processed, the proposal is to use a set to track those
    and skip them.
    
    BUG=470397
    [email protected]
    TBR=msw
    
    Review URL: https://codereview.chromium.org/1037863002
    
    Cr-Commit-Position: refs/heads/master@{#322320}
    (cherry picked from commit 46b2013e68f391dc8c82c12cb26f1053b63c12ec)
    
    Review URL: https://codereview.chromium.org/1047823004
    
    Cr-Commit-Position: refs/branch-heads/2311@{#384}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  14. [Contextual Search] Prevent promo from not rendering properly when text is scaled.
    
    Cherry-pick of https://codereview.chromium.org/1005763002 to M42
    
    This CL changes the style of the promo so its text size does not
    increase when changing the text scaling preference in Chrome.
    This is not the ideal solution, since it might make the promo
    unreadable for visually impaired users. On the other hand, the
    real fix would be technically challenging, and this quick fix
    at least prevents the promo from looking completely broken
    in that case.
    
    BUG=466773,455307
    [email protected],[email protected]
    
    Review URL: https://codereview.chromium.org/1005763002
    
    Cr-Commit-Position: refs/heads/master@{#320583}
    
    Review URL: https://codereview.chromium.org/1042253006
    
    Cr-Commit-Position: refs/branch-heads/2311@{#383}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  15. Merging this to M42
    
    Don't add Segoe UI to the fallback font list if it is the system font.
    
    In this case Segoe UI and its linked fonts are already in the fallback list.
    This is an attempt to fix the perf regression caused on the page_cycler.intl_hi_ru bot caused by the change to
    remove duplicate fonts from the fallback list.
    
    BUG=469700
    [email protected]
    TBR=msw
    
    Review URL: https://codereview.chromium.org/999173008
    
    Cr-Commit-Position: refs/heads/master@{#322084}
    (cherry picked from commit 2cf99389793d41131db47185a28cc153d96a2bab)
    
    Review URL: https://codereview.chromium.org/1044043002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#382}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  16. Incrementing VERSION to 42.0.2311.67
    
    Cr-Commit-Position: refs/branch-heads/2311@{#381}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  17. Fix NPE in ApplicationStatus.
    
    The return line being outside the synchronized block allowed the cached
    state to be reset to null before it was calculated.
    
    BUG=470966
    
    Review URL: https://codereview.chromium.org/1031413005
    
    Cr-Commit-Position: refs/heads/master@{#322479}
    (cherry picked from commit 3b8ad9af169861a9dce1b1e4ee3644a9ec4daab4)
    
    [email protected]
    
    Review URL: https://codereview.chromium.org/1034293002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#380}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  18. Fixes clang warning in GLSurfaceOzone.
    
    Introduced in https://codereview.chromium.org/938873002/
    
    [email protected]
    BUG=None
    
    Review URL: https://codereview.chromium.org/967343003
    
    Cr-Commit-Position: refs/heads/master@{#318826}
    (cherry picked from commit 8d23afa1dee0d0eaa1ed0782963c3a6ac263ae97)
    
    Simplify FakeGpuProcess* video accelerator tests
    
    Make DispatchToGpuPlatformSupportTask and DispatchToGpuPlatformSupportHostTask
    statics, removing the weak ptrs (and failing DCHECKS in that code) altogether.
    
    BUG=447798
    
    Review URL: https://codereview.chromium.org/1017673003
    
    Cr-Commit-Position: refs/heads/master@{#321212}
    (cherry picked from commit 72b1eacd439fcb0bcf45ae7de2d8a9f578804ac6)
    
    Fix at_exit error in video_decode tests
    
    ui::OzoneGpuTestHelper needs to be uninstantiated in TearDown() since it
    creates a base::Thread which wants to register with the AtExitManager.
    However the AtExitManager runs out of scope before the
    testing::Environment.
    
    BUG=447798
    TEST=compile and run ./video_decode_accelerator_unittest (I had
    https://codereview.chromium.org/938873002/ applied as well to make sure
    tests succeed)
    
    Review URL: https://codereview.chromium.org/949183004
    
    Cr-Commit-Position: refs/heads/master@{#319148}
    (cherry picked from commit c7a207e106d84ac81344a7c7cef8394ed672f0a3)
    
    Add a new API to create a surfaceless GLSurface for Ozone
    
    Reverting CreateViewGLSurface to creating a surface that works as expected
    
    Chrome uses the new surfaceless API, all others use the old one
    
    BUG=447798
    
    Review URL: https://codereview.chromium.org/938873002
    
    Cr-Commit-Position: refs/heads/master@{#318786}
    (cherry picked from commit e86e411c3038fd5be67438da29f0ff17828f226f)
    
    ozone: dri: add synchronous SwapBuffers support on surfaceless
    
    BUG=447798
    TEST=ozone_unittests
    
    Review URL: https://codereview.chromium.org/960273003
    
    Cr-Commit-Position: refs/heads/master@{#318457}
    (cherry picked from commit 210577c2e1b7bb0462ccbb7905c800568ba3888e)
    
    Review URL: https://codereview.chromium.org/1041193002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#379}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  19. Merge M42:  Account for HTTP/2 padding in receive windows.
    
    Account for pad length field and padding in HTTP/2 session and stream receive
    windows, because they are part of the payload.
    
    This CL introduces a new method OnStreamPadding, calls it when processing
    padding, implements it to update the receive windows appropriately (both
    for session and for stream), and adds trivial implementations for all
    subclasses.
    
    This CL also lands internal changes 88830613 and 89327497 by bnc
    and 89034703 by mpw.
    
    BUG=353012
    
    Review URL: https://codereview.chromium.org/959743002
    
    Cr-Commit-Position: refs/heads/master@{#322137}
    (cherry picked from commit 43cdf67d11deda1a4ccca51e44a5183bda93b245)
    
    [email protected]
    
    Review URL: https://codereview.chromium.org/1041803003
    
    Cr-Commit-Position: refs/branch-heads/2311@{#378}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  20. GVD: Disable 4k HW decode for VPX formats for Intel platforms.
    
    This is temporary while we are adding runtime detection.
    
    BUG=458645
    TEST=4k and 1080p playback
    
    (cherry picked from commit 4dfa7be535e942df606cecdea4b4e875a916fc98)
    
    Review URL: https://codereview.chromium.org/1045673002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#377}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  21. Incrementing VERSION to 42.0.2311.66
    
    Cr-Commit-Position: refs/branch-heads/2311@{#376}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  22. Fix ctrl+shift+p for PDF
    
    Currentl we are intercepting ctrl+p on PDF to print, which is interfering
    with ctrl+shift+p. There is no need to intercept either of these commands
    anymore, the default handling should work correctly.
    
    BUG=466600
    
    Review URL: https://codereview.chromium.org/1031293004
    
    Cr-Commit-Position: refs/heads/master@{#322328}
    (cherry picked from commit 78b9904963a16d99dbb40e30d9a3dac6b25e6285)
    
    Review URL: https://codereview.chromium.org/1042683002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#375}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  23. x11: Reset the window handle after destroying it
    
    GLSurface::Destroy() could be called from outside the GLSurface
    implementation. Since it is also called in NativeViewGLSurfaceGLX's
    destructor, calling Destroy() twice will cause a BadWindow error.
    
    BUG=470004
    [email protected],[email protected]
    
    Review URL: https://codereview.chromium.org/1034173004
    
    Cr-Commit-Position: refs/heads/master@{#322494}
    (cherry picked from commit a7927193002ef9c5a79bd74582260acc9f1ef66d)
    
    Review URL: https://codereview.chromium.org/1043763002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#374}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  24. Incrementing VERSION to 42.0.2311.65
    
    Cr-Commit-Position: refs/branch-heads/2311@{#373}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  25. Merge: Convert CC HUD from GDI bitmap to SkSurface
    
    Part 1 of reland of https://codereview.chromium.org/900063002.
    
    [email protected], [email protected]
    BUG=453731,455104,457248
    
    Review URL: https://codereview.chromium.org/950923002
    
    Cr-Commit-Position: refs/heads/master@{#317675}
    (cherry picked from commit 536a54016bef88b8efb26fc59e29bfc8dcc36d94)
    
    Review URL: https://codereview.chromium.org/1045473002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#372}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  26. Incrementing VERSION to 42.0.2311.64
    
    Cr-Commit-Position: refs/branch-heads/2311@{#371}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  27. Merge: Consume EXCEPTION_INVALID_HANDLE on sandbox process shutdown.
    
    BUG=452613
    
    Review URL: https://codereview.chromium.org/944283002
    
    Cr-Commit-Position: refs/heads/master@{#318204}
    (cherry picked from commit 9428d09618bb28e6161f9d4d5159bdc47ba037a8)
    
    Review URL: https://codereview.chromium.org/1035353002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#370}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  28. [sqlite backport] Fix collation dequoting.
    
    Backport https://www.sqlite.org/src/info/eddc05e7bb31fae7
    "Fix a problem causing collation sequence names to be dequoted
    multiple times under some circumstances."
    
    BUG=469082
    [email protected]
    
    Review URL: https://codereview.chromium.org/1022423004
    
    Cr-Commit-Position: refs/heads/master@{#322165}
    (cherry picked from commit 3e13a01e946b7df16a5b3702ac016b5784945a90)
    
    Review URL: https://codereview.chromium.org/1037403003
    
    Cr-Commit-Position: refs/branch-heads/2311@{#369}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  29. Merge: Fix glGetActiveUniform/Attrib crashes due to state inconsistency
    
    between what Chrome thinks and what the driver is.
    
    This is caused by we intercept invalid program and generate an error on
    LinkProgram rather than passing it to the driver, so the driver still have
    a valid program if the previous link succeeds.
    
    BUG=463599
    TEST=test case in the bug
    [email protected]
    
    Review URL: https://codereview.chromium.org/978193003
    
    Cr-Commit-Position: refs/heads/master@{#319746}
    (cherry picked from commit 44ad5ecc3abf8f31d7e55a9ece5cea30a710fd77)
    
    Review URL: https://codereview.chromium.org/1039423002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#368}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  30. Add SeccompSupportDetector for Android.
    
    This class will report to UMA the Android kernel version and the level of kernel
    support for seccomp-bpf sandboxing.
    
    BUG=468455
    
    Review URL: https://codereview.chromium.org/1018953004
    
    Cr-Commit-Position: refs/heads/master@{#321451}
    (cherry picked from commit e59ea892a5fb3d9c0bfa97c8f1e567fd57a07130)
    
    Conflicts:
    	chrome/browser/chrome_browser_main_android.cc
    	chrome/utility/BUILD.gn
    
    Review URL: https://codereview.chromium.org/1040793002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#367}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  31. cc: Use layer_impls to compute content rect in target space
    
    This patch changes the way we get damage for a layer to instead use
    the layer itself to compute content bounds in target space.
    
    BUG=463424
    TBR=danakj, enne
    
    Review URL: https://codereview.chromium.org/1015433002
    
    Cr-Commit-Position: refs/heads/master@{#321041}
    (cherry picked from commit d46a7acfa02865f2ed8e5ff3aefa34a5263384e9)
    
    Review URL: https://codereview.chromium.org/1035253002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#366}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  32. Defer waiting for child account status until it is actually used. (This along with the downstream cl https://chrome-internal-review.googlesource.com/#/c/210178/ will fix the crash)
    Re-enable checking the "child-account-detection" flag on Android.
    
    BUG=467938
    NOTRY=true
    
    Review URL: https://codereview.chromium.org/1032183002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#365}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  33. Disable Screen Orientation API locking ability for WebView.
    
    This CL is adding a content switch that is used by WebView to not create
    a ScreenOrientationDelegate which will prevent locking to work on WebView
    and will correctly return that locking isn't supported to Javascript.
    
    BUG=466080
    [email protected], [email protected]
    
    Review URL: https://codereview.chromium.org/1037693003
    
    Cr-Commit-Position: refs/heads/master@{#322404}
    (cherry picked from commit 8ded9764c2691fc4682c6640beb410bebdc6b35e)
    
    Review URL: https://codereview.chromium.org/1035153002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#364}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  34. Proposed backoff scheme for kAudioUnitErr_TooManyFramesToProcess error handling.
    
    BUG=466046
    
    Review URL: https://codereview.chromium.org/1020863004
    
    Cr-Commit-Position: refs/heads/master@{#321751}
    (cherry picked from commit 6e5942ccb99b694d3d222f869b1b54d6025ad700)
    
    TBR=tommi
    
    Review URL: https://codereview.chromium.org/1039613002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#363}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  35. Incrementing VERSION to 42.0.2311.63
    
    Cr-Commit-Position: refs/branch-heads/2311@{#362}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  36. Use custom scrollbars for print preview on non-retina mac displays.
    
    This is a hack to workaround a blink bug where overlay scrollbars aren't
    rendered correctly in print preview. This bug is being looked at but
    until then we use custom scrollbars that imitate mac scrollbars only
    in this specific case.
    
    BUG=466039
    
    Review URL: https://codereview.chromium.org/1036943004
    
    Cr-Commit-Position: refs/heads/master@{#322331}
    (cherry picked from commit 6826023abd24c8aa8981f4f0fadcf98f0f962bba)
    
    Review URL: https://codereview.chromium.org/1038183002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#361}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  37. Revert "Revert "Revert "Refactor sudden termination"""
    
    This reverts commit 549f21ca85c825f3fccd4c74eaf2ccfbfacb982a. The fixes the
    compilation error that caused the first revert to be reverted.
    
    [email protected],[email protected]
    BUG=461530
    
    Review URL: https://codereview.chromium.org/1038893002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#360}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  38. Revert "Revert "Refactor sudden termination""
    
    This reverts commit f1feeda1e6968ab1cf9f698e3ee11ffeb41a4f7a. It broke
    compilation on the beta builders.
    
    [email protected],[email protected]
    BUG=461530
    
    Review URL: https://codereview.chromium.org/1017683008
    
    Cr-Commit-Position: refs/branch-heads/2311@{#359}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  39. Revert "Refactor sudden termination"
    
    This reverts commit df1975e5b02f1d53b35d7fceaa14c081a6097a03
    (https://codereview.chromium.org/857213003). This caused an issue with the
    flash video player stopping playing when going from fullscreen back to normal
    on certain pages.
    
    BUG=461530
    [email protected],[email protected]
    
    Review URL: https://codereview.chromium.org/1014623002
    
    Cr-Commit-Position: refs/heads/master@{#322017}
    (cherry picked from commit c0a2786729dea4f6ce245008435e4ebd83d02496)
    
    Review URL: https://codereview.chromium.org/1035923002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#358}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  40. Add the SHA-1 deprecation string for Android page info security summary phrase.
    
    This string will have an accompanying code change that we hope to have ready in time to merge into Chrome 42 for Android. The string needs to land early so we can kick off the translation process.
    
    BUG=469853
    
    Review URL: https://codereview.chromium.org/1034863003
    
    (cherry picked from commit 9ed27ee0b58b10934556bd27cf6037a8b5c11c50)
    
    Cr-Original-Commit-Position: refs/heads/master@{#322291}
    Cr-Commit-Position: refs/branch-heads/2311@{#357}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  41. Incrementing VERSION to 42.0.2311.62
    
    Cr-Commit-Position: refs/branch-heads/2311@{#356}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  42. Merge M42: libusb: Fix composite_close to close HID handles as well.
    
    When opening a composite device some combination of the WinUSB and HID
    APIs may be used. This patch fixes composite_close to close both WinUSB
    file handles and HID file handles.
    
    BUG=466578
    NOTRY=true
    
    Review URL: https://codereview.chromium.org/1032563002a
    (cherry picked from commit e56e8ef67c39f1a6ea256939ec8f6f5ee82e59cf)
    
    Cr-Commit-Position: refs/heads/master@{#321881}
    
    [email protected]
    
    Review URL: https://codereview.chromium.org/1034443003
    
    Cr-Commit-Position: refs/branch-heads/2311@{#355}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  43. New SRT prompt strings.
    
    BUG=NONE
    TEST=NONE
    NOTRY=true
    
    Review URL: https://codereview.chromium.org/1006373006
    
    (cherry picked from commit e778ea03683b0d76c968c5d662d28dbddb6b2a1d)
    
    Cr-Original-Commit-Position: refs/heads/master@{#322242}
    Cr-Commit-Position: refs/branch-heads/2311@{#354}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  44. Null check webview() before using it in RenderViewImpl::OnOrientationChange
    
    This null check is common in RenderViewImpl callbacks, and there are crash
    reports to indicate that it's necessary in OnOrientationChange()
    
    BUG=466485
    
    Review URL: https://codereview.chromium.org/1006073002
    
    Cr-Commit-Position: refs/heads/master@{#321186}
    (cherry picked from commit e20ec7cdb825c84c54392f7fa4dca9d2a1c05158)
    
    Review URL: https://codereview.chromium.org/1003233005
    
    Cr-Commit-Position: refs/branch-heads/2311@{#353}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  45. Updating XTBs based on .GRDs from branch 2311
    
    Cr-Commit-Position: refs/branch-heads/2311@{#352}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  46. Mac: Add rails for scrolling.
    
    Add a MouseWheelRailsFilter structure to compute the rail mode for
    input events, based on some simple hysteresis.
    
    Make InputHandlerProxy honor the rails requests of MouseWheel events.
    This is not an ideal long-term implementation -- the rails should be
    passed to cc::InputHandler, so that they can be handled correctly by
    other event types. This version is being used so that it may be merged.
    
    BUG=468454
    
    Review URL: https://codereview.chromium.org/1019153002
    
    Cr-Commit-Position: refs/heads/master@{#321738}
    (cherry picked from commit a51f1f51c94835659073afa96a7a57f3544c6da9)
    
    Review URL: https://codereview.chromium.org/1036843003
    
    Cr-Commit-Position: refs/branch-heads/2311@{#351}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  47. It is possible to sometimes have a null PermissionBubbleManager.
    
    BUG=457091
    [email protected]
    
    Review URL: https://codereview.chromium.org/1023213002
    
    Cr-Commit-Position: refs/heads/master@{#321812}
    (cherry picked from commit 2bb0feb026e70d97ee92cb72fe5c93e43eaa5c32)
    
    Review URL: https://codereview.chromium.org/1032833003
    
    Cr-Commit-Position: refs/branch-heads/2311@{#350}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  48. Fix crash opening App Info dialog on certain apps in Guest Mode.
    
    The App Info dialog was getting a nullptr on apps with the 'fileSystem'
    permission in Guest Mode (notably, the Get Help app). Added null checks
    to work around the problem.
    
    BUG=457346
    
    Review URL: https://codereview.chromium.org/994283003
    
    Cr-Commit-Position: refs/heads/master@{#321275}
    (cherry picked from commit 6e8c30f2947959b7d9246ff1a4353c3f81fd141c)
    
    [email protected]
    
    Review URL: https://codereview.chromium.org/1032053002
    
    Cr-Commit-Position: refs/branch-heads/2311@{#349}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
    
  49. Merge r319950 into M42 branch:
    
    Stop using DisplayConfigurator state in TouchTransformerController.
    
    The bug says that the state could be inconsistent with the status
    of DisplayManager. It's stabler to use DisplayManager only.
    
    BUG=465631, chrome-os-partner:37667
    [email protected], [email protected]
    TEST=None
    
    Review URL: https://codereview.chromium.org/995583003
    
    Cr-Commit-Position: refs/heads/master@{#319950}
    (cherry picked from commit 69a1d55ad81c517f181992496bfd1ec23dd51fad)
    
    Review URL: https://codereview.chromium.org/1014383004
    
    Cr-Commit-Position: refs/branch-heads/2311@{#348}
    Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}