1. Publish DEPS for Chromium 39.0.2171.25
    
  2. Incrementing VERSION to 39.0.2171.25
    
    Cr-Commit-Position: refs/branch-heads/2171@{#119}
    Cr-Branched-From: 267aeeb8d85c8503a7fd12bd14654b8ea78d3974-refs/heads/master@{#297060}
    
  3. Revert "Fixed odd behavior for keyboards using the AL_CONSUMER_CONTROL_CONFIG"
    
    This reverts commit 6b7305748f00a08fc37b6fb86eba4e333c321afd, except for the
    AUTHORS change from that commit.
    
    BUG=398345,420226
    TBR=garykac
    
    Review URL: https://codereview.chromium.org/643243002
    
    Cr-Commit-Position: refs/heads/master@{#299182}
    (cherry picked from commit 2ab1fbf454a9c9ce98b183016646a3d33428cb93)
    
    Review URL: https://codereview.chromium.org/653523002
    
    Cr-Commit-Position: refs/branch-heads/2171@{#118}
    Cr-Branched-From: 267aeeb8d85c8503a7fd12bd14654b8ea78d3974-refs/heads/master@{#297060}
    
  4. Incrementing VERSION to 39.0.2171.24
    
    Cr-Commit-Position: refs/branch-heads/2171@{#117}
    Cr-Branched-From: 267aeeb8d85c8503a7fd12bd14654b8ea78d3974-refs/heads/master@{#297060}
    
  5. Incrementing VERSION to 39.0.2171.23
    
    Cr-Commit-Position: refs/branch-heads/2171@{#116}
    Cr-Branched-From: 267aeeb8d85c8503a7fd12bd14654b8ea78d3974-refs/heads/master@{#297060}
    
  6. Revert "Support search as a sticky key."
    
    As an important modifier on Chrome OS, this cl makes it possible to use
    sequenced and locked sticky key modes with the search key.
    
    BUG=416964
    TEST=manual
    
    Review URL:  https://codereview.chromium.org/598733002
    
    Cr-Commit-Position: refs/heads/master@{#297054}
    (cherry picked from commit 151aef63430e196c0bdbf1ad1e0706a5c8e484a9)
    
    [email protected]
    
    Review URL: https://codereview.chromium.org/651493002
    
    Cr-Commit-Position: refs/branch-heads/2171@{#115}
    Cr-Branched-From: 267aeeb8d85c8503a7fd12bd14654b8ea78d3974-refs/heads/master@{#297060}
    
  7. Merge: Fix the filtering logic for x-chrome-manage-account header
    
    The current code checks if the request is loaded in a main frame and if it
    is triggered by a user gesture. As per discussion with eisinger@ there is
    no reliable way to associate a request with a user gesture, instead
    we should check if the requested resource type is a main frame resource.
    
    BUG=394869
    [email protected]
    
    Review URL: https://codereview.chromium.org/632803002
    
    Cr-Commit-Position: refs/heads/master@{#298372}
    (cherry picked from commit 564d209d5733494ca2847eef75161151e1dd0f24)
    
    Review URL: https://codereview.chromium.org/641403002
    
    Cr-Commit-Position: refs/branch-heads/2171@{#114}
    Cr-Branched-From: 267aeeb8d85c8503a7fd12bd14654b8ea78d3974-refs/heads/master@{#297060}
    
  8. [Merge] [Win] Fix focus related issues in the new avatar bubble.
    
    This does two things:
    
    1. Removed the background color on the buttons when tabbing. This makes
    it consistent with the Mac, where on tabbing, we only show an outline on
    the buttons, and only when the button is hovered does its background change
    
    2. Fixes the bug where when a button is pressed, it is disabled to prevent
    double clicking. I don't think double clicks are an issue, but the disabling
    is definitely an issue as it makes the FocusManager advance focus, which
    end up looking weird.
    
    BUG=413154
    TEST=Start Chrome with --enable-new-avatar-menu. Clicking on the Switch
    Person button should not look like it has temporarily focused the Incognito
    button.
    [email protected]
    
    Review URL: https://codereview.chromium.org/632343002
    
    Cr-Commit-Position: refs/heads/master@{#298735}
    (cherry picked from commit bbe3ca081e006afa49de69838b3b909f5932e784)
    
    Review URL: https://codereview.chromium.org/647003002
    
    Cr-Commit-Position: refs/branch-heads/2171@{#113}
    Cr-Branched-From: 267aeeb8d85c8503a7fd12bd14654b8ea78d3974-refs/heads/master@{#297060}
    
  9. Fix excess items being dropped into app list folders.
    
    This CL fixes an issue where more than the maximum number of apps can be
    dragged into an app list folder due to the app list checking the model
    index of the drag target rather than the actual bounds of the items in
    the grid view.
    
    BUG=419642
    
    Review URL: https://codereview.chromium.org/623473004
    
    Cr-Commit-Position: refs/heads/master@{#297969}
    (cherry picked from commit ab7c20fb1a43407e6ef8ce1a48dbeed27fcf7eee)
    
    Conflicts:
    	ui/app_list/views/apps_grid_view.cc
    	ui/app_list/views/apps_grid_view.h
    
    [email protected]
    
    Review URL: https://codereview.chromium.org/648683004
    
    Cr-Commit-Position: refs/branch-heads/2171@{#112}
    Cr-Branched-From: 267aeeb8d85c8503a7fd12bd14654b8ea78d3974-refs/heads/master@{#297060}
    
  10. Don't call SetProperty on the plugin unless HasProperty is true
    
    The default implementation of SetProperty in the plugin (inside
    ScriptableObject) will throw an exception. This can result in an
    unexpected exception in JS when properties are set on the plugin
    element. We should only call SetProperty if the plugin has that
    property.
    
    BUG=414842
    [email protected]
    
    Review URL: https://codereview.chromium.org/640033003
    
    Cr-Commit-Position: refs/heads/master@{#299040}
    (cherry picked from commit 0b40913d6e0cff095e373ea216680870d1215336)
    
    Review URL: https://codereview.chromium.org/648773002
    
    Cr-Commit-Position: refs/branch-heads/2171@{#111}
    Cr-Branched-From: 267aeeb8d85c8503a7fd12bd14654b8ea78d3974-refs/heads/master@{#297060}
    
  11. Intercept SetProperty calls in PluginObject again
    
    We previously removed the ability for Pepper plugins to intercept
    properties set on the plugin element as we thought that this
    private feature wasn't used anywhere. It turns out that this feature
    is still used by the deprecated gTalk plugin. This patch adds back
    the ability for the plugin element to intercept the call and passes
    it on to the plugin process. This feature can be removed as soon
    as we remove gTalk.
    
    See also the blink side change at https://codereview.chromium.org/640073005/
    
    BUG=414842
    [email protected]
    
    Review URL: https://codereview.chromium.org/639253003
    
    Cr-Commit-Position: refs/heads/master@{#298936}
    (cherry picked from commit 17abcdf596b0ba90345f69634ff4855ff8c5e8a8)
    
    Review URL: https://codereview.chromium.org/641273002
    
    Cr-Commit-Position: refs/branch-heads/2171@{#110}
    Cr-Branched-From: 267aeeb8d85c8503a7fd12bd14654b8ea78d3974-refs/heads/master@{#297060}
    
  12. Merge "easy-signin: Show tooltip for first login after setup."
    
    > - Migrate hardlock state from user prefs to local state;
    > - Change hardlock state from a boolean to an enum to support multiple hardlock
    >   cases;
    > - PAIRING_CHANGED hardlock when user has pairing data but it is different from
    >   cryptohome keys;
    > - NO_PAIRING when user has no pairing data;
    > - Refresh easy unlock keys when lock screen is dismissed
    >   with password;
    >
    > Unrelated fix:
    > - Move prefs::kEasyUnlockAllowed to EasyUnlockServiceRegular because it is
    >   a user pref/policy;
    >
    > BUG=419099
    >
    > Review URL: https://codereview.chromium.org/619443003
    >
    > Cr-Commit-Position: refs/heads/master@{#298245}
    > (cherry picked from commit e4f1c4e088cca7af5caeb41b3312831ae39e7abd)
    
    [email protected]
    
    Review URL: https://codereview.chromium.org/647483003
    
    Cr-Commit-Position: refs/branch-heads/2171@{#109}
    Cr-Branched-From: 267aeeb8d85c8503a7fd12bd14654b8ea78d3974-refs/heads/master@{#297060}
    
  13. Fix race condition in DRP
    
    There is a race condition between the IO thread and the UI thread when
    DataReductionProxyAuthRequestHandler is constructed on the IO thread and
    WebView tries to set the DRP key on the UI thread.
    
    This CL also makes DataReductionProxyAuthRequestHandler ignore empty
    DRP key.
    
    BUG=418344
    
    Review URL: https://codereview.chromium.org/614603004
    
    Cr-Commit-Position: refs/heads/master@{#298325}
    (cherry picked from commit fdb00d529bf47bffd9a4342aae15d001b70a2c71)
    
    Review URL: https://codereview.chromium.org/640013002
    
    Cr-Commit-Position: refs/branch-heads/2171@{#108}
    Cr-Branched-From: 267aeeb8d85c8503a7fd12bd14654b8ea78d3974-refs/heads/master@{#297060}
    
  14. Merge: [Easy Unlock] Support for hover and active effects on user pod icons
    
    To simplify things, define icon resource URLs in CSS instead of passing
    them from C++. To set an icon only id for the icon resource is passed to js.
    This also enables us to set up spinner using css animation.
    
    While here fix two issues that occur when unfocusing and focusing back
    easy unlockable user pod:
    1. clicking on the unfocused pod (given that no other pod were focused)
    would immediately attempt unlock instead of bringing the focus to the pod first
    2. if the pod was unfocused by ESC key, clicking on it would not bring it to foreground.
    The reason is the main input for the pod is pod itself, which doesn't get hidden
    on ESC key, and does not really loose focus. So when the pod is clicked
    there is no focus event, which is relied on for updating the UI.
    
    BUG=406234
    
    Review URL: https://codereview.chromium.org/623443006
    
    Cr-Commit-Position: refs/heads/master@{#298153}
    (cherry picked from commit d366f72f171dd176aa89f8e0baaca34ef70545c6)
    
    [email protected]
    
    Review URL: https://codereview.chromium.org/642603003
    
    Cr-Commit-Position: refs/branch-heads/2171@{#107}
    Cr-Branched-From: 267aeeb8d85c8503a7fd12bd14654b8ea78d3974-refs/heads/master@{#297060}
    
  15. Setting version to 39.0.2171.22
    
    Cr-Commit-Position: refs/branch-heads/2171@{#106}
    Cr-Branched-From: 267aeeb8d85c8503a7fd12bd14654b8ea78d3974-refs/heads/master@{#297060}
    
  16. Merge "easy-signin: Flip enable flag to disable."
    >
    > BUG=419013
    >
    > Review URL: https://codereview.chromium.org/621503002
    >
    > Cr-Commit-Position: refs/heads/master@{#297596}
    > (cherry picked from commit 1958f5a80aa6eaa1d6c560d1e5bb485ca6f83092)
    
    [email protected]
    
    Review URL: https://codereview.chromium.org/642583005
    
    Cr-Commit-Position: refs/branch-heads/2171@{#105}
    Cr-Branched-From: 267aeeb8d85c8503a7fd12bd14654b8ea78d3974-refs/heads/master@{#297060}
    
  17. Merge: Fix crash in ChromeExtensionMessageFilter::OnPostMessage
    
    Speculative fix: ChromeExtensionMessageFilter can outlive its Profile, so
    check |profile_| for NULL in OnPostMessage as is done in other message
    handlers.
    
    BUG=419047
    TEST=none
    [email protected]
    
    Review URL: https://codereview.chromium.org/617053002
    
    Cr-Commit-Position: refs/heads/master@{#297531}
    (cherry picked from commit a3e007d47ef0ca2d089510a64f4760a0f8bfeadd)
    
    Review URL: https://codereview.chromium.org/640963002
    
    Cr-Commit-Position: refs/branch-heads/2171@{#104}
    Cr-Branched-From: 267aeeb8d85c8503a7fd12bd14654b8ea78d3974-refs/heads/master@{#297060}
    
  18. [Merge] The User Manager pod action menu should not be displayed offscreen.
    
    BUG=418459
    TEST=Start Chrome with --enable-new-avatar-menu. Click on the "Switch person" button to
    bring up the User Manager. Resize the User Manager so that the pods are right on the edge
    of the window. Press the action button on each of the pods -- the popup menu should not
    be displayed partially offscreen.
    [email protected]
    
    Review URL: https://codereview.chromium.org/619693003
    
    Cr-Commit-Position: refs/heads/master@{#298264}
    (cherry picked from commit c5526a3e8c808b61734cfd07e859a16ec09ac17b)
    
    Review URL: https://codereview.chromium.org/639793004
    
    Cr-Commit-Position: refs/branch-heads/2171@{#103}
    Cr-Branched-From: 267aeeb8d85c8503a7fd12bd14654b8ea78d3974-refs/heads/master@{#297060}
    
  19. Remove kCmdInstallExtension and kCmdInstallApp from Installer code
    
    Remove the code to add work items for kCmdInstallExtension and kCmdInstallApp
    in the installer code, and add code to remove any old registry links to them.
    Also remove validation code for these.
    
    This is required in order to remove the --(limited)-install-from-webstore switches.
    
    BUG=297647
    
    Review URL: https://codereview.chromium.org/612093007
    
    Cr-Commit-Position: refs/heads/master@{#297664}
    (cherry picked from commit aa895c2b0d1c1b6a3e5dc4e79195ef4911179ab9)
    [email protected]
    
    Review URL: https://codereview.chromium.org/641893003
    
    Cr-Commit-Position: refs/branch-heads/2171@{#102}
    Cr-Branched-From: 267aeeb8d85c8503a7fd12bd14654b8ea78d3974-refs/heads/master@{#297060}
    
  20. linux: Do not fallback to the hardware keycodes for modifiers.
    
    Previously Chrome would fall-back to deriving VKEY values directly from the hardware keycode if it was unable to derive a value from the X KeySym. While that is necessary for e.g. providing valid VKEYs for printable character keys under non-Latin keyboard layouts (such as Hebrew or Arabic), it had the side-effect of causing KeySyms with no VKEY equivalent to be mapped to incorrect meanings.
    
    In issue 402320, for example, the ISO_Level3_Latch KeySym has no VKEY equivalent, so should result in VKEY_UNKNOWN, but was instead having an incorrect VKEY derived from the X11 keycode instead.
    
    Note that there is no clear reason why we don't allow the modifier keys to fall back to the hardware keycode while we allow the printable character keys to fall back.  It's just close to what users expect.  There could be a problem if a keyboard layout had a composition character on Control + Ч (which falls back to VKEY_X).  Users cannot type that composition character because a Cut accelerator triggers instead.
    
    This approach is a heuristic designed to approximate the VKEY values that a Windows system would generate, to ensure compatibility.
    
    BUG=402320
    TEST=Done manually (assigning ISO_Level3_Latch to key code 108).
    [email protected]
    
    Review URL: https://codereview.chromium.org/611993002
    
    Cr-Commit-Position: refs/heads/master@{#298478}
    (cherry picked from commit 83c2b41f1a06ca226a05edf0602d5c6efea32a8b)
    
    Review URL: https://codereview.chromium.org/639343002
    
    Cr-Commit-Position: refs/branch-heads/2171@{#101}
    Cr-Branched-From: 267aeeb8d85c8503a7fd12bd14654b8ea78d3974-refs/heads/master@{#297060}
    
  21. Incrementing VERSION to 39.0.2171.18
    
    Cr-Commit-Position: refs/branch-heads/2171@{#100}
    Cr-Branched-From: 267aeeb8d85c8503a7fd12bd14654b8ea78d3974-refs/heads/master@{#297060}
    
  22. Incrementing VERSION to 39.0.2171.17
    
    Cr-Commit-Position: refs/branch-heads/2171@{#99}
    Cr-Branched-From: 267aeeb8d85c8503a7fd12bd14654b8ea78d3974-refs/heads/master@{#297060}
    
  23. Incrementing VERSION to 39.0.2171.16
    
    Cr-Commit-Position: refs/branch-heads/2171@{#98}
    Cr-Branched-From: 267aeeb8d85c8503a7fd12bd14654b8ea78d3974-refs/heads/master@{#297060}
    
  24. Fix the menu alignment for the three button menu.
    
    Also, fixes a crash for an index out of bounds check.
    
    Also also, adds two button layout for when two icons are shown in the top row.
    
    BUG=416552
    
    Review URL: https://codereview.chromium.org/608283004
    
    [Android] Fix menu adapter crash
    
    Increment VIEW_TYPE_COUNT to account for the new type of list item.
    
    Review URL: https://codereview.chromium.org/632083002
    
    BUG=416552
    NOTRY=true
    TBR=dtrainor
    
    Review URL: https://codereview.chromium.org/643493002
    
    Cr-Commit-Position: refs/branch-heads/2171@{#97}
    Cr-Branched-From: 267aeeb8d85c8503a7fd12bd14654b8ea78d3974-refs/heads/master@{#297060}
    
  25. Remove --install-from-webstore and --limited-install-from-webstore
    
    Both these switches should be removed, as they allow malware
    to potentially install extensions on a user's computer.
    Since the --install-from-webstore switch is also being used
    to install ephemeral apps, rename it to
    --install-ephemeral-app-from-webstore, and ensure that this
    only works on installed ephemeral apps on Windows. (This
    has sufficient checks in place, such as an extension of
    the same ID already being installed, that this is safe.)
    
    BUG=410833
    
    Review URL: https://codereview.chromium.org/617833003
    
    Cr-Commit-Position: refs/heads/master@{#297868}
    (cherry picked from commit 462b2fbc2e486d47ab682770418fa6deacfe67be)
    [email protected]
    
    Review URL: https://codereview.chromium.org/633373006
    
    Cr-Commit-Position: refs/branch-heads/2171@{#96}
    Cr-Branched-From: 267aeeb8d85c8503a7fd12bd14654b8ea78d3974-refs/heads/master@{#297060}
    
  26. Fix pixeldated HiDPI Mac widgets with impl-side painting
    
    Allow SkiaBitLockers to specify that they should record a bitmap at
    a specified scale. Callers that know that they will be replayed at a
    given scale factor can specify the final scale during record.
    
    BUG=408557
    
    Review URL: https://codereview.chromium.org/611253004
    [email protected] (see https://codereview.chromium.org/611253004)
    
    Cr-Commit-Position: refs/heads/master@{#297485}
    (cherry picked from commit 74565e75e8cc51f49b47dd26a2cabce85479b61e)
    
    Review URL: https://codereview.chromium.org/640953002
    
    Cr-Commit-Position: refs/branch-heads/2171@{#95}
    Cr-Branched-From: 267aeeb8d85c8503a7fd12bd14654b8ea78d3974-refs/heads/master@{#297060}
    
  27. Incrementing VERSION to 39.0.2171.15
    
    Cr-Commit-Position: refs/branch-heads/2171@{#94}
    Cr-Branched-From: 267aeeb8d85c8503a7fd12bd14654b8ea78d3974-refs/heads/master@{#297060}
    
  28. [Merge M39] Fix typing in the omnibox on weird installs of XMonad.
    
    Based on bug reports, it is possible to configure XMonad such that it does not support
    _NET_ACTIVE_WINDOW but claims that it does.
    http://xmonad.org/xmonad-docs/xmonad-contrib/XMonad-Hooks-SetWMName.html is likely
    related.
    
    This CL reverts https://codereview.chromium.org/549713003
    
    BUG=416490
    TEST=None
    TBR=pkotwicz
    
    Review URL: https://codereview.chromium.org/633683002
    
    Cr-Commit-Position: refs/heads/master@{#298332}
    (cherry picked from commit 55551dd225935e3a441c0877888b5e38025f5a42)
    
    Review URL: https://codereview.chromium.org/634383002
    
    Cr-Commit-Position: refs/branch-heads/2171@{#93}
    Cr-Branched-From: 267aeeb8d85c8503a7fd12bd14654b8ea78d3974-refs/heads/master@{#297060}
    
  29. [Revert] Do not release capture when clicking to open select box on Linux Aura
    
    The CL is reverted because it causes crbug.com/417516
    
    BUG=417516
    TEST=Manual, see bug
    TBR=pkotwicz
    
    Review URL: https://codereview.chromium.org/640883002
    
    Cr-Commit-Position: refs/branch-heads/2171@{#92}
    Cr-Branched-From: 267aeeb8d85c8503a7fd12bd14654b8ea78d3974-refs/heads/master@{#297060}
    
  30. Enable cryptotoken in guest mode.
    
    Guest mode use only incognito profile so requires incognito:split mode.
    
    (cherry picked from commits 136713b61a661a056bc9f6cca42cd5458cc9cd61 and
    6fc517d5c12996f85ec00fe4507a4a4136a30066)
    
    BUG=415854
    TEST=manual
    [email protected],[email protected]
    
    Review URL: https://codereview.chromium.org/639123002
    
    Cr-Commit-Position: refs/branch-heads/2171@{#91}
    Cr-Branched-From: 267aeeb8d85c8503a7fd12bd14654b8ea78d3974-refs/heads/master@{#297060}
    
  31. Remove GT-I9500 (international Galaxy S4) from Ganesh whitelist.
    
    Ganesh renders brokenly on this device (PowerVR SGX 544MP).
    
    NOTRY=true
    BUG=418936
    
    Review URL: https://codereview.chromium.org/634123003
    
    Cr-Commit-Position: refs/heads/master@{#298625}
    (cherry picked from commit 8b253e8e1aa7666874a1964d076280a01729be78)
    
    Conflicts:
    	gpu/config/software_rendering_list_json.cc
    
    Review URL: https://codereview.chromium.org/641783002
    
    Cr-Commit-Position: refs/branch-heads/2171@{#90}
    Cr-Branched-From: 267aeeb8d85c8503a7fd12bd14654b8ea78d3974-refs/heads/master@{#297060}
    
  32. [Search] Minute string change for the first-run experience
    
    BUG=416228
    
    Review URL: https://codereview.chromium.org/611373002
    
    (cherry picked from commit 270804f00dddf9deb84367c4aa29ed348634ad91)
    
    Cr-Original-Commit-Position: refs/heads/master@{#298479}
    Cr-Commit-Position: refs/branch-heads/2171@{#89}
    Cr-Branched-From: 267aeeb8d85c8503a7fd12bd14654b8ea78d3974-refs/heads/master@{#297060}
    
  33. Merge to M-39 branch 2171 - Fix TooltipAura initial sizing.
    
    r296874 regressed initial tooltip sizing on Aura.
    (Widget::SetContentsView sizes the view to the widget)
    
    Reorder the View sizing to after the Widget init.
    
    BUG=418456
    TEST=The first Linux Aura tooltip is sized correctly.
    [email protected]
    
    Review URL: https://codereview.chromium.org/613753003
    
    Cr-Commit-Position: refs/heads/master@{#297281}
    (cherry picked from commit a5cdf5ead358ca6ae98deadafc99ddaa06465e23)
    
    Review URL: https://codereview.chromium.org/638113002
    
    Cr-Commit-Position: refs/branch-heads/2171@{#88}
    Cr-Branched-From: 267aeeb8d85c8503a7fd12bd14654b8ea78d3974-refs/heads/master@{#297060}
    
  34. Merge: Move html.height=100% from uber.css to chrome_shared.css. Now settings page from Chrome OS does not apply uber.css.
    
    BUG=178819,412272
    [email protected]
    
    Review URL: https://codereview.chromium.org/613683004
    
    Cr-Commit-Position: refs/heads/master@{#297493}
    (cherry picked from commit 83cbc0eb332701e4cf15061326a129a0155f02b4)
    
    Review URL: https://codereview.chromium.org/638073002
    
    Cr-Commit-Position: refs/branch-heads/2171@{#87}
    Cr-Branched-From: 267aeeb8d85c8503a7fd12bd14654b8ea78d3974-refs/heads/master@{#297060}
    
  35. Merge "Pass correct country iso code to PhoneNumberDetector"
    
    Merge 4e645e9bc69350f9799262584ad8b82255d0dd8e from master.
    
    > A typo in https://codereview.chromium.org/254823005 caused wrong
    > parameter is passed to PhoneNumberDetector, causing detection failure
    > of phone numbers without full country code.
    >
    > BUG=418704
    >
    > Review URL: https://codereview.chromium.org/638753002
    >
    > Cr-Commit-Position: refs/heads/master@{#298628}
    
    [email protected]
    
    Review URL: https://codereview.chromium.org/636183004
    
    Cr-Commit-Position: refs/branch-heads/2171@{#86}
    Cr-Branched-From: 267aeeb8d85c8503a7fd12bd14654b8ea78d3974-refs/heads/master@{#297060}
    
  36. aw: Separate out compositor frame and other inputs
    
    Only pipeline updating the compositor frame. Do not pipeline other
    inputs which can change even if the frame is not updated.
    
    BUG=420908
    
    Review URL: https://codereview.chromium.org/627363003
    
    Cr-Commit-Position: refs/heads/master@{#298397}
    (cherry picked from commit 6439a53dde557a4508d20e80119b718e1e79e01d)
    
    [email protected]
    
    Review URL: https://codereview.chromium.org/637923003
    
    Cr-Commit-Position: refs/branch-heads/2171@{#85}
    Cr-Branched-From: 267aeeb8d85c8503a7fd12bd14654b8ea78d3974-refs/heads/master@{#297060}
    
  37. [Sync] Avoid erroneous re-entrancy when model association times out.
    
    This change fixes a bug where model association timeout can cause a
    std::queue in DataTypeManagerImpl to be .pop()d when it's already empty.
    See linked bug for more information.
    
    Prior to this change, when model load is aborted (AbortModelLoad) the
    model's ModelLoadCallback would be invoked.  After this change, the
    ModelLoadCallback will not be invoked when AbortModelLoad is called.
    
    Update existing unit test so they no longer expect a call to
    ModelLoadCallback when aborting.
    
    Add CHECKs to DataTypeManagerImpl to ensure it never .pop()s an empty
    stl::queue.
    
    Add unit test to DataTypeManagerImpl to repro this bug.
    
    BUG=419034
    
    Review URL: https://codereview.chromium.org/609223007
    
    Cr-Commit-Position: refs/heads/master@{#297967}
    (cherry picked from commit e8e5b6435ce01f868540e92ed7fff8a4043f8345)
    
    TBR=zea
    
    Review URL: https://codereview.chromium.org/638033002
    
    Cr-Commit-Position: refs/branch-heads/2171@{#84}
    Cr-Branched-From: 267aeeb8d85c8503a7fd12bd14654b8ea78d3974-refs/heads/master@{#297060}
    
  38. aw: Do not cancel fallback tick on pipeline stall
    
    This can cause a live lock if pipeline is stalled waiting for the
    fallback tick. However we cannot skip invalidate to avoid drawing a bad
    frame.
    
    BUG=420702
    
    Review URL: https://codereview.chromium.org/630953003
    
    Cr-Commit-Position: refs/heads/master@{#298369}
    (cherry picked from commit 4aa98dc6f54564fa3a06128ff299ff7eefa9a946)
    
    [email protected]
    
    Review URL: https://codereview.chromium.org/636183003
    
    Cr-Commit-Position: refs/branch-heads/2171@{#83}
    Cr-Branched-From: 267aeeb8d85c8503a7fd12bd14654b8ea78d3974-refs/heads/master@{#297060}
    
  39. Files.app: Refresh  metatada after the default task is changed
    
    After the default task is changed, the metadata of visible entries should be refreshed but it wasn't. This patch fixes that.
    
    BUG=411791
    TEST=manually tested
    
    Review URL: https://codereview.chromium.org/625873002
    
    Cr-Commit-Position: refs/heads/master@{#298192}
    (cherry picked from commit 32fac5d2f38371e0973f3f96aa8acf3a9d840089)
    
    [email protected]
    
    Review URL: https://codereview.chromium.org/633013004
    
    Cr-Commit-Position: refs/branch-heads/2171@{#82}
    Cr-Branched-From: 267aeeb8d85c8503a7fd12bd14654b8ea78d3974-refs/heads/master@{#297060}
    
  40. Expand ETC1-power-of-two workaround to all SGX 5xx models.
    
    This driver bug was also observed on a SGX 531, so extend the blacklist
    matching.
    
    NOTRY=true
    BUG=414816
    
    Review URL: https://codereview.chromium.org/635983002
    
    Cr-Commit-Position: refs/heads/master@{#298616}
    (cherry picked from commit e3dc52eb147546a3715cd66d5080150a855791d7)
    
    Conflicts:
    	gpu/config/gpu_driver_bug_list_json.cc
    
    Review URL: https://codereview.chromium.org/638803003
    
    Cr-Commit-Position: refs/branch-heads/2171@{#81}
    Cr-Branched-From: 267aeeb8d85c8503a7fd12bd14654b8ea78d3974-refs/heads/master@{#297060}
    
  41. Fix the user-visible size computation for the display settings.
    
    BUG=419864
    [email protected]
    [email protected]
    TEST=the new test case covers
    
    Review URL: https://codereview.chromium.org/612883008
    
    Cr-Commit-Position: refs/heads/master@{#298091}
    (cherry picked from commit 6d0b6b1671b6c201f221c4520c0ccfa91bbbd573)
    
    Review URL: https://codereview.chromium.org/630043005
    
    Cr-Commit-Position: refs/branch-heads/2171@{#80}
    Cr-Branched-From: 267aeeb8d85c8503a7fd12bd14654b8ea78d3974-refs/heads/master@{#297060}
    
  42. Mac: Try to align the new style profile button with the location bar.
    
    When there is a fullscreen button to the right of the new style profile button,
    align the profile button with the location bar (although it won't be aligned
    when there are extension buttons).
    
    BUG=414113
    
    Review URL: https://codereview.chromium.org/596933002
    
    Cr-Commit-Position: refs/heads/master@{#297719}
    (cherry picked from commit 618e1a78bf2be6ea17d20f21f457d57f79346b22)
    
    Conflicts:
    	chrome/browser/ui/cocoa/browser_window_layout.mm
    	chrome/browser/ui/cocoa/browser_window_layout_unittest.mm
    
    [email protected]
    [email protected]
    
    Review URL: https://codereview.chromium.org/633603003
    
    Cr-Commit-Position: refs/branch-heads/2171@{#79}
    Cr-Branched-From: 267aeeb8d85c8503a7fd12bd14654b8ea78d3974-refs/heads/master@{#297060}