Publish DEPS for Chromium 60.0.3112.97

• DEPS[diff]

Incrementing VERSION to 60.0.3112.97

TBR=dimu@chromium.org

Change-Id: Ie55d09224f09228f17b43e31b56a7c3679d80d07
Reviewed-on: https://chromium-review.googlesource.com/606794
Reviewed-by: chrome-release-bot@chromium.org <chrome-release-bot@chromium.org>
Cr-Commit-Position: refs/branch-heads/3112@{#715}
Cr-Branched-From: b6460e24cf59f429d69de255538d0fc7a425ccf9-refs/heads/master@{#474897}

• chrome/VERSION[diff]

Fix special locale handling of google's prepopulated ids.

Previous patch:
https://chromium-review.googlesource.com/604392

Pulled out the previously matching template URL for all
cases but the special handling of google.  Causing it to
crash as it tried to check the template url below.

NOPRESUBMIT=true
NOTRY=true
TBR=yusufo@chromium.org
BUG=751491,753340,753323

Change-Id: I748b2d2cf9394ad0b2b379699549e7479fb0cd91
Reviewed-on: https://chromium-review.googlesource.com/605972
Commit-Queue: Ted Choc <tedchoc@chromium.org>
Reviewed-by: Yusuf Ozuysal <yusufo@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#492698}(cherry picked from commit 42a6d3fc6bd54fa40f27cec67d8cd1265923a157)
Reviewed-on: https://chromium-review.googlesource.com/606691
Reviewed-by: Ted Choc <tedchoc@chromium.org>
Cr-Commit-Position: refs/branch-heads/3112@{#714}
Cr-Branched-From: b6460e24cf59f429d69de255538d0fc7a425ccf9-refs/heads/master@{#474897}

• chrome/browser/android/locale/special_locale_handler.cc[diff]
• chrome/browser/android/locale/special_locale_handler_unittest.cc[diff]

Incrementing VERSION to 60.0.3112.96

TBR=dimu@chromium.org

Change-Id: Ie7392640b59fc1844239f51da11a2a85f89f0e5e
Reviewed-on: https://chromium-review.googlesource.com/604868
Reviewed-by: chrome-release-bot@chromium.org <chrome-release-bot@chromium.org>
Cr-Commit-Position: refs/branch-heads/3112@{#713}
Cr-Branched-From: b6460e24cf59f429d69de255538d0fc7a425ccf9-refs/heads/master@{#474897}

• chrome/VERSION[diff]

Ensure existing custom search engines are not applicable to be filtered out.

BUG=751491

Change-Id: Ifa2b8df2bf438015e34daf2ca99480c105693856
Reviewed-on: https://chromium-review.googlesource.com/604379
Reviewed-by: Yusuf Ozuysal <yusufo@chromium.org>
Cr-Commit-Position: refs/branch-heads/3112@{#712}
Cr-Branched-From: b6460e24cf59f429d69de255538d0fc7a425ccf9-refs/heads/master@{#474897}

• chrome/browser/android/locale/special_locale_handler.cc[diff]
• chrome/browser/search_engines/template_url_service_android.cc[diff]

Incrementing VERSION to 60.0.3112.95

TBR=dimu@chromium.org

Change-Id: I81aa320eb99181ade0d1360486f541bfc353539c
Reviewed-on: https://chromium-review.googlesource.com/603151
Reviewed-by: chrome-release-bot@chromium.org <chrome-release-bot@chromium.org>
Cr-Commit-Position: refs/branch-heads/3112@{#711}
Cr-Branched-From: b6460e24cf59f429d69de255538d0fc7a425ccf9-refs/heads/master@{#474897}

• chrome/VERSION[diff]

Incrementing VERSION to 60.0.3112.94

TBR=dimu@chromium.org

Change-Id: I431f4f53d91efc5fc772a46c384416f337dcd278
Reviewed-on: https://chromium-review.googlesource.com/602640
Reviewed-by: chrome-release-bot@chromium.org <chrome-release-bot@chromium.org>
Cr-Commit-Position: refs/branch-heads/3112@{#710}
Cr-Branched-From: b6460e24cf59f429d69de255538d0fc7a425ccf9-refs/heads/master@{#474897}

• chrome/VERSION[diff]

Incrementing VERSION to 60.0.3112.93

TBR=dimu@chromium.org

Change-Id: I052212bdf2268186eb2c78eedd3f21ea5d1ccfb3
Reviewed-on: https://chromium-review.googlesource.com/602262
Reviewed-by: chrome-release-bot@chromium.org <chrome-release-bot@chromium.org>
Cr-Commit-Position: refs/branch-heads/3112@{#709}
Cr-Branched-From: b6460e24cf59f429d69de255538d0fc7a425ccf9-refs/heads/master@{#474897}

• chrome/VERSION[diff]

Revert "[Merge to M61] US International (PC) Keyboard layout was missing resourceId"

This reverts commit 473178198f08e9071cfa76a74c9fc5cd53269890.

Reason for revert: Merged to the wrong branch number (M60 instead of M61).

Original change's description:
> [Merge to M61] US International (PC) Keyboard layout was missing resourceId
> 
> Symbol xkb:us:intl_pc:eng wasn't being properly decoded and was being displayed as something like the following in UI elements:
> _comp_ime_jkghodnilhceideoidjikpgommlajknkxkb:us:intl_pc:eng
> 
> See linked bug for more info
> 
> TBR=isandrk@google.com
> 
> (cherry picked from commit 34836cc78e7eb47c4f0fe708fe369171181184f8)
> 
> Bug: 739809
> Change-Id: I95f20736b2de39cb86db956dc582d8a8bdf3b9bb
> Reviewed-on: https://chromium-review.googlesource.com/590227
> Reviewed-by: Ivan Šandrk <isandrk@chromium.org>
> Reviewed-by: Steven Bennetts <stevenjb@chromium.org>
> Reviewed-by: Shu Chen <shuchen@chromium.org>
> Commit-Queue: Ivan Šandrk <isandrk@chromium.org>
> Cr-Original-Commit-Position: refs/heads/master@{#490356}
> Reviewed-on: https://chromium-review.googlesource.com/599948
> Cr-Commit-Position: refs/branch-heads/3112@{#704}
> Cr-Branched-From: b6460e24cf59f429d69de255538d0fc7a425ccf9-refs/heads/master@{#474897}

TBR=stevenjb@chromium.org,shuchen@chromium.org,isandrk@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 739809
Change-Id: I38e0912b06a472c89f6957619c6828b19a7fbe0c
Reviewed-on: https://chromium-review.googlesource.com/601991
Reviewed-by: Ivan Šandrk <isandrk@chromium.org>
Cr-Commit-Position: refs/branch-heads/3112@{#708}
Cr-Branched-From: b6460e24cf59f429d69de255538d0fc7a425ccf9-refs/heads/master@{#474897}

• ui/base/ime/chromeos/input_method_util.cc[Deleted - diff]
• ui/chromeos/ui_chromeos_strings.grd[diff]

Revert "[Merge to M61] Support domain rename to secondary domain on managed ChromeOS devices"

This reverts commit b306d9864c96f55a1777b5bcc085ab11f261e7fd.

Reason for revert: Causing compile error on Official stable channel builders. I believe this was merged to the wrong branch. 

BUG=752263,548321

Original change's description:
> [Merge to M61] Support domain rename to secondary domain on managed ChromeOS devices
> 
> After enrolling a device, the domain name is commited to write-once memory and
> hence cannot just be changed. In order to support domain renames (eg. a customer
> decides to do rebranding and wants to display the new domain) we will send down
> a display_domain from the DMServer to the client, and in the UI we will display
> this new domain.
> 
> TBR=isandrk@google.com
> 
> (cherry picked from commit 636b89d918ba972762f20263f1c6c9083ed42678)
> 
> Bug: 548321
> Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
> Change-Id: I06b6ccf868b541e37d9c194180edcc3fd2b01c76
> Reviewed-on: https://chromium-review.googlesource.com/565574
> Reviewed-by: Chris Palmer <palmer@chromium.org>
> Reviewed-by: Achuith Bhandarkar <achuith@chromium.org>
> Reviewed-by: calamity <calamity@chromium.org>
> Reviewed-by: Steven Bennetts <stevenjb@chromium.org>
> Reviewed-by: Maksim Ivanov <emaxx@chromium.org>
> Commit-Queue: Ivan Šandrk <isandrk@chromium.org>
> Cr-Original-Commit-Position: refs/heads/master@{#490355}
> Reviewed-on: https://chromium-review.googlesource.com/600053
> Reviewed-by: Ivan Šandrk <isandrk@chromium.org>
> Cr-Commit-Position: refs/branch-heads/3112@{#705}
> Cr-Branched-From: b6460e24cf59f429d69de255538d0fc7a425ccf9-refs/heads/master@{#474897}

TBR=stevenjb@chromium.org,achuith@chromium.org,palmer@chromium.org,calamity@chromium.org,emaxx@chromium.org,isandrk@chromium.org

Change-Id: I420641f38e3c5566a3758d33b7fbffc946d284eb
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 548321
Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
Reviewed-on: https://chromium-review.googlesource.com/601447
Reviewed-by: Michael Moss <mmoss@chromium.org>
Cr-Commit-Position: refs/branch-heads/3112@{#707}
Cr-Branched-From: b6460e24cf59f429d69de255538d0fc7a425ccf9-refs/heads/master@{#474897}

• ash/public/interfaces/system_tray.mojom[diff]
• ash/system/enterprise/tray_enterprise.cc[diff]
• ash/system/enterprise/tray_enterprise_unittest.cc[diff]
• ash/system/tray/system_tray_controller.cc[diff]
• ash/system/tray/system_tray_controller.h[diff]
• ash/system/user/user_card_view.cc[diff]
• chrome/browser/chromeos/login/enrollment/enterprise_enrollment_helper_impl.cc[diff]
• chrome/browser/chromeos/login/screens/terms_of_service_screen.cc[diff]
• chrome/browser/chromeos/login/screens/user_selection_screen.cc[diff]
• chrome/browser/chromeos/login/version_info_updater.cc[diff]
• chrome/browser/chromeos/login/version_info_updater.h[diff]
• chrome/browser/chromeos/policy/blocking_login_browsertest.cc[diff]
• chrome/browser/chromeos/policy/browser_policy_connector_chromeos.cc[diff]
• chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h[diff]
• chrome/browser/chromeos/policy/browser_policy_connector_chromeos_browsertest.cc[Deleted - diff]
• chrome/browser/chromeos/system/device_disabling_manager.cc[diff]
• chrome/browser/resources/chromeos/login/screen_gaia_signin.js[diff]
• chrome/browser/resources/gaia_auth_host/authenticator.js[diff]
• chrome/browser/resources/policy.html[diff]
• chrome/browser/resources/policy.js[diff]
• chrome/browser/ui/ash/system_tray_client.cc[diff]
• chrome/browser/ui/ash/system_tray_client.h[diff]
• chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.cc[diff]
• chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc[diff]
• chrome/browser/ui/webui/help/help_handler.cc[diff]
• chrome/browser/ui/webui/ntp/ntp_resource_cache.cc[diff]
• chrome/browser/ui/webui/policy_ui.cc[diff]
• chrome/browser/ui/webui/policy_ui_handler.cc[diff]
• chrome/browser/ui/webui/settings/about_handler.cc[diff]
• chrome/test/BUILD.gn[diff]
• components/policy/proto/device_management_backend.proto[diff]
• components/policy_strings.grdp[diff]
• ui/login/account_picker/md_user_pod_row.js[diff]
• ui/login/account_picker/user_pod_row.js[diff]

Incrementing VERSION to 60.0.3112.92

TBR=dimu@chromium.org

Change-Id: I0b8077444ad69dad69d79816df17671d9d53c477
Reviewed-on: https://chromium-review.googlesource.com/600642
Reviewed-by: chrome-release-bot@chromium.org <chrome-release-bot@chromium.org>
Cr-Commit-Position: refs/branch-heads/3112@{#706}
Cr-Branched-From: b6460e24cf59f429d69de255538d0fc7a425ccf9-refs/heads/master@{#474897}

• chrome/VERSION[diff]

[Merge to M61] Support domain rename to secondary domain on managed ChromeOS devices

After enrolling a device, the domain name is commited to write-once memory and
hence cannot just be changed. In order to support domain renames (eg. a customer
decides to do rebranding and wants to display the new domain) we will send down
a display_domain from the DMServer to the client, and in the UI we will display
this new domain.

TBR=isandrk@google.com

(cherry picked from commit 636b89d918ba972762f20263f1c6c9083ed42678)

Bug: 548321
Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
Change-Id: I06b6ccf868b541e37d9c194180edcc3fd2b01c76
Reviewed-on: https://chromium-review.googlesource.com/565574
Reviewed-by: Chris Palmer <palmer@chromium.org>
Reviewed-by: Achuith Bhandarkar <achuith@chromium.org>
Reviewed-by: calamity <calamity@chromium.org>
Reviewed-by: Steven Bennetts <stevenjb@chromium.org>
Reviewed-by: Maksim Ivanov <emaxx@chromium.org>
Commit-Queue: Ivan Šandrk <isandrk@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#490355}
Reviewed-on: https://chromium-review.googlesource.com/600053
Reviewed-by: Ivan Šandrk <isandrk@chromium.org>
Cr-Commit-Position: refs/branch-heads/3112@{#705}
Cr-Branched-From: b6460e24cf59f429d69de255538d0fc7a425ccf9-refs/heads/master@{#474897}

• ash/public/interfaces/system_tray.mojom[diff]
• ash/system/enterprise/tray_enterprise.cc[diff]
• ash/system/enterprise/tray_enterprise_unittest.cc[diff]
• ash/system/tray/system_tray_controller.cc[diff]
• ash/system/tray/system_tray_controller.h[diff]
• ash/system/user/user_card_view.cc[diff]
• chrome/browser/chromeos/login/enrollment/enterprise_enrollment_helper_impl.cc[diff]
• chrome/browser/chromeos/login/screens/terms_of_service_screen.cc[diff]
• chrome/browser/chromeos/login/screens/user_selection_screen.cc[diff]
• chrome/browser/chromeos/login/version_info_updater.cc[diff]
• chrome/browser/chromeos/login/version_info_updater.h[diff]
• chrome/browser/chromeos/policy/blocking_login_browsertest.cc[diff]
• chrome/browser/chromeos/policy/browser_policy_connector_chromeos.cc[diff]
• chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h[diff]
• chrome/browser/chromeos/policy/browser_policy_connector_chromeos_browsertest.cc[Added - diff]
• chrome/browser/chromeos/system/device_disabling_manager.cc[diff]
• chrome/browser/resources/chromeos/login/screen_gaia_signin.js[diff]
• chrome/browser/resources/gaia_auth_host/authenticator.js[diff]
• chrome/browser/resources/policy.html[diff]
• chrome/browser/resources/policy.js[diff]
• chrome/browser/ui/ash/system_tray_client.cc[diff]
• chrome/browser/ui/ash/system_tray_client.h[diff]
• chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.cc[diff]
• chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc[diff]
• chrome/browser/ui/webui/help/help_handler.cc[diff]
• chrome/browser/ui/webui/ntp/ntp_resource_cache.cc[diff]
• chrome/browser/ui/webui/policy_ui.cc[diff]
• chrome/browser/ui/webui/policy_ui_handler.cc[diff]
• chrome/browser/ui/webui/settings/about_handler.cc[diff]
• chrome/test/BUILD.gn[diff]
• components/policy/proto/device_management_backend.proto[diff]
• components/policy_strings.grdp[diff]
• ui/login/account_picker/md_user_pod_row.js[diff]
• ui/login/account_picker/user_pod_row.js[diff]

[Merge to M61] US International (PC) Keyboard layout was missing resourceId

Symbol xkb:us:intl_pc:eng wasn't being properly decoded and was being displayed as something like the following in UI elements:
_comp_ime_jkghodnilhceideoidjikpgommlajknkxkb:us:intl_pc:eng

See linked bug for more info

TBR=isandrk@google.com

(cherry picked from commit 34836cc78e7eb47c4f0fe708fe369171181184f8)

Bug: 739809
Change-Id: I95f20736b2de39cb86db956dc582d8a8bdf3b9bb
Reviewed-on: https://chromium-review.googlesource.com/590227
Reviewed-by: Ivan Šandrk <isandrk@chromium.org>
Reviewed-by: Steven Bennetts <stevenjb@chromium.org>
Reviewed-by: Shu Chen <shuchen@chromium.org>
Commit-Queue: Ivan Šandrk <isandrk@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#490356}
Reviewed-on: https://chromium-review.googlesource.com/599948
Cr-Commit-Position: refs/branch-heads/3112@{#704}
Cr-Branched-From: b6460e24cf59f429d69de255538d0fc7a425ccf9-refs/heads/master@{#474897}

• ui/base/ime/chromeos/input_method_util.cc[Added - diff]
• ui/chromeos/ui_chromeos_strings.grd[diff]

Incrementing VERSION to 60.0.3112.91

TBR=dimu@chromium.org

Change-Id: I52b498f8cf6d4c7fa5a27f60f7fef18c7dc16f26
Reviewed-on: https://chromium-review.googlesource.com/599287
Reviewed-by: chrome-release-bot@chromium.org <chrome-release-bot@chromium.org>
Cr-Commit-Position: refs/branch-heads/3112@{#703}
Cr-Branched-From: b6460e24cf59f429d69de255538d0fc7a425ccf9-refs/heads/master@{#474897}

• chrome/VERSION[diff]

Incrementing VERSION to 60.0.3112.90

TBR=dimu@chromium.org

Change-Id: Iaf647ed03156acb8b03685d99afd1decf573bb2b
Reviewed-on: https://chromium-review.googlesource.com/596784
Reviewed-by: chrome-release-bot@chromium.org <chrome-release-bot@chromium.org>
Cr-Commit-Position: refs/branch-heads/3112@{#702}
Cr-Branched-From: b6460e24cf59f429d69de255538d0fc7a425ccf9-refs/heads/master@{#474897}

• chrome/VERSION[diff]

Fix SpecialLocaleHandler to handle google correctly.

TBR=yusufo@chromium.org
NOTRY=true
NOPRESUBMIT=true
BUG=740892

Change-Id: I00961581ab855cead35eab7d100fd66e9b1b1dcc
Reviewed-on: https://chromium-review.googlesource.com/592498
Commit-Queue: Ted Choc <tedchoc@chromium.org>
Reviewed-by: David Trainor <dtrainor@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#490592}(cherry picked from commit fe4fa703609adc86f3d87f5fe64e620afd452053)
Reviewed-on: https://chromium-review.googlesource.com/596808
Reviewed-by: Ted Choc <tedchoc@chromium.org>
Cr-Commit-Position: refs/branch-heads/3112@{#701}
Cr-Branched-From: b6460e24cf59f429d69de255538d0fc7a425ccf9-refs/heads/master@{#474897}

• chrome/browser/android/locale/special_locale_handler.cc[diff]

Fix bug in PaintOpBuffer folding alpha optimization

PaintOpBuffer tries to fold together saveLayer/draw/restore into a
single draw-with-alpha, however it was doing this in cases that it
shouldn't.  If the external saveLayer had an alpha of 255, then it would
believe that it was always a noop.  However, if the draw op had some
blend mode or image filter (and thus didn't support folding) then it's
not safe to consider this saveLayer a noop.

Fix by reordering the conditionals so that if the draw op doesn't
support then PaintOpBuffer goes down the normal no folding raster path.

TBR=enne@chromium.org

(cherry picked from commit 23681aaf9e05a6db8f10f072f0db8c03e9334e6f)

Bug: 748485
Cq-Include-Trybots: master.tryserver.blink:linux_trusty_blink_rel
Change-Id: I0eeea49f3348aecda137860231a78b0075993834
Reviewed-on: https://chromium-review.googlesource.com/585633
Reviewed-by: Vladimir Levin <vmpstr@chromium.org>
Commit-Queue: enne <enne@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#489494}
Reviewed-on: https://chromium-review.googlesource.com/596947
Reviewed-by: enne <enne@chromium.org>
Cr-Commit-Position: refs/branch-heads/3112@{#700}
Cr-Branched-From: b6460e24cf59f429d69de255538d0fc7a425ccf9-refs/heads/master@{#474897}

• cc/paint/paint_op_buffer.cc[diff]
• cc/paint/paint_op_buffer_unittest.cc[diff]

Incrementing VERSION to 60.0.3112.89

TBR=dimu@chromium.org

Change-Id: I7328467c361ff9a55653d2becf1d4ceafa6bfd33
Reviewed-on: https://chromium-review.googlesource.com/595157
Reviewed-by: chrome-release-bot@chromium.org <chrome-release-bot@chromium.org>
Cr-Commit-Position: refs/branch-heads/3112@{#699}
Cr-Branched-From: b6460e24cf59f429d69de255538d0fc7a425ccf9-refs/heads/master@{#474897}

• chrome/VERSION[diff]

Revert "Stability instrumentation Crashpad integration"

This reverts commit fecdf607e706474b65a4d26e554f0504aead3f3e.

Suspected of causing crashes on Win7 Stable 60 when UserDataDir
is set to have expandable ${variables} in it. :(

This will need to be back merged to 60 and 61.

TBR=scottmg@chromium.org

(cherry picked from commit 332af9ce8cf255ba7dc1604ab4a56e1c597ed338)

Bug: 718437, 748949
Cq-Include-Trybots: master.tryserver.chromium.win:win10_chromium_x64_rel_ng
Change-Id: Id379a7c167f536154af1c67aa3dc6e17ca516934
Reviewed-on: https://chromium-review.googlesource.com/589775
Reviewed-by: Greg Thompson <grt@chromium.org>
Reviewed-by: Mark Mentovai <mark@chromium.org>
Reviewed-by: Robert Shield <robertshield@chromium.org>
Reviewed-by: Sigurður Ásgeirsson <siggi@chromium.org>
Reviewed-by: Alex Clarke <alexclarke@chromium.org>
Commit-Queue: Scott Graham <scottmg@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#490410}
Reviewed-on: https://chromium-review.googlesource.com/595145
Reviewed-by: Scott Graham <scottmg@chromium.org>
Cr-Commit-Position: refs/branch-heads/3112@{#698}
Cr-Branched-From: b6460e24cf59f429d69de255538d0fc7a425ccf9-refs/heads/master@{#474897}

• chrome/app/chrome_crash_reporter_client_win.cc[diff]
• chrome/app/chrome_exe_main_win.cc[diff]
• chrome/app/chrome_main_delegate.cc[diff]
• chrome/install_static/install_details.cc[diff]
• chrome/install_static/install_details.h[diff]
• chrome/install_static/install_util.cc[diff]
• chrome/install_static/install_util.h[diff]
• chrome/install_static/install_util_unittest.cc[diff]
• chrome/install_static/product_install_details.cc[diff]
• chrome/install_static/user_data_dir.cc[diff]
• chrome/install_static/user_data_dir.h[diff]
• chrome/install_static/user_data_dir_win_unittest.cc[diff]
• chrome/installer/setup/installer_crash_reporting.cc[diff]
• chrome/installer/setup/setup_main.cc[diff]
• chrome_elf/chrome_elf.def[diff]
• chrome_elf/chrome_elf_main.cc[diff]
• components/browser_watcher/BUILD.gn[diff]
• components/browser_watcher/minidump_user_streams.h[Deleted - diff]
• components/browser_watcher/postmortem_minidump_writer_win.cc[diff]
• components/browser_watcher/stability_report_extractor.cc[diff]
• components/browser_watcher/stability_report_user_stream_data_source.cc[Deleted - diff]
• components/browser_watcher/stability_report_user_stream_data_source.h[Deleted - diff]
• components/crash/content/app/BUILD.gn[diff]
• components/crash/content/app/DEPS[diff]
• components/crash/content/app/crashpad.cc[diff]
• components/crash/content/app/crashpad.h[diff]
• components/crash/content/app/crashpad_mac.mm[diff]
• components/crash/content/app/crashpad_win.cc[diff]
• components/crash/content/app/run_as_crashpad_handler_win.cc[diff]
• components/crash/content/app/run_as_crashpad_handler_win.h[diff]
• headless/app/headless_shell.cc[diff]
• headless/lib/headless_content_main_delegate.cc[diff]

Incrementing VERSION to 60.0.3112.88

TBR=dimu@chromium.org

Change-Id: I8785be7b9f36790f442d5a7f52a1cef4fde69d24
Reviewed-on: https://chromium-review.googlesource.com/593128
Reviewed-by: chrome-release-bot@chromium.org <chrome-release-bot@chromium.org>
Cr-Commit-Position: refs/branch-heads/3112@{#697}
Cr-Branched-From: b6460e24cf59f429d69de255538d0fc7a425ccf9-refs/heads/master@{#474897}

• chrome/VERSION[diff]

Incrementing VERSION to 60.0.3112.87

TBR=dimu@chromium.org

Change-Id: I1499c51c3f8058c05681994ffa09bffbec6b7f29
Reviewed-on: https://chromium-review.googlesource.com/593151
Reviewed-by: chrome-release-bot@chromium.org <chrome-release-bot@chromium.org>
Cr-Commit-Position: refs/branch-heads/3112@{#696}
Cr-Branched-From: b6460e24cf59f429d69de255538d0fc7a425ccf9-refs/heads/master@{#474897}

• chrome/VERSION[diff]

Incrementing VERSION to 60.0.3112.86

TBR=dimu@chromium.org

Change-Id: If9b35534328efd6b71188cc9cfe6334cc0f211a8
Reviewed-on: https://chromium-review.googlesource.com/592747
Reviewed-by: chrome-release-bot@chromium.org <chrome-release-bot@chromium.org>
Cr-Commit-Position: refs/branch-heads/3112@{#695}
Cr-Branched-From: b6460e24cf59f429d69de255538d0fc7a425ccf9-refs/heads/master@{#474897}

• chrome/VERSION[diff]

Fixing a compile error on M60 branch due to missing forward declaration

This CL fixes the broken build introduced in
https://chromium-review.googlesource.com/c/592413.

TBR=ekaramad@chromium.org, tkent@chromium.org

(cherry picked from commit c0510e322a9526540162ca93be933d7a4c2f2100)

Bug: 739199
Change-Id: Ida864688c5bcc254614d169bb03a88a58549c651
Reviewed-on: https://chromium-review.googlesource.com/592525
Reviewed-by: Ehsan Karamad <ekaramad@chromium.org>
Cr-Original-Commit-Position: refs/branch-heads/3163@{#127}
Cr-Original-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
Reviewed-on: https://chromium-review.googlesource.com/591922
Cr-Commit-Position: refs/branch-heads/3112@{#694}
Cr-Branched-From: b6460e24cf59f429d69de255538d0fc7a425ccf9-refs/heads/master@{#474897}

• third_party/WebKit/Source/web/ChromeClientImpl.h[diff]

Incrementing VERSION to 60.0.3112.85

TBR=dimu@chromium.org

Change-Id: I3810eb941684b4a1d7db5d3f0bc542b3d53d1e00
Reviewed-on: https://chromium-review.googlesource.com/592520
Reviewed-by: chrome-release-bot@chromium.org <chrome-release-bot@chromium.org>
Cr-Commit-Position: refs/branch-heads/3112@{#693}
Cr-Branched-From: b6460e24cf59f429d69de255538d0fc7a425ccf9-refs/heads/master@{#474897}

• chrome/VERSION[diff]

Fix a crash due to GetDocument().GetFrame() returning nullptr

 In ChromeClientImpl::OnMouseDown the node passed might have a document
 whose
 frame is nullptr. This was causing crashes when trying to get the
 AutofillClient
 from WebLocalFrame associated with the GetFrame().

 The new method ChromeClientImpl::AutofillClientFromFrame will now take
 a nullable
 frame and returns the AutofillClient corresponding to the associated
 WebLocalFrame.

 Bug: 739199
 TBR=tkent@chromium.org
 Change-Id: Id5b7fdc1ec1ed27fd43c7cc870a691df80eb9eda
 Reviewed-on: https://chromium-review.googlesource.com/580294
 Reviewed-by: Kent Tamura <tkent@chromium.org>
 Commit-Queue: Ehsan Karamad <ekaramad@chromium.org>
 Cr-Commit-Position: refs/heads/master@{#489045}
 (cherry picked from commit 94db0a33758ba48ae3c6da75b58b2ba480ac9bcf)

Change-Id: Id5b7fdc1ec1ed27fd43c7cc870a691df80eb9eda
Reviewed-on: https://chromium-review.googlesource.com/592408
Reviewed-by: Ehsan Karamad <ekaramad@chromium.org>
Cr-Commit-Position: refs/branch-heads/3112@{#692}
Cr-Branched-From: b6460e24cf59f429d69de255538d0fc7a425ccf9-refs/heads/master@{#474897}

• third_party/WebKit/Source/web/ChromeClientImpl.cpp[diff]
• third_party/WebKit/Source/web/ChromeClientImpl.h[diff]

Roll src/third_party/freetype/src/ a12a34451..7819aeb62 (58 commits)

https://chromium.googlesource.com/chromium/src/third_party/freetype2.git/+log/a12a34451a99..7819aeb622a9

$ git log a12a34451..7819aeb62 --date=short --no-merges --format='%ad %ae %s'
2017-06-28 bungeman Avoid Microsoft compiler warnings (#51331).
2017-06-27 wl * src/cff/cffparse.c (do_fixed): Fix typo.
2017-06-27 wl [truetype] Integer overflows.
2017-06-24 wl [truetype] Integer overflows.
2017-06-22 wl [cff, truetype] Integer overflows.
2017-06-21 apodtele [sfnt] Synthesize a Unicode charmap if one is missing.
2017-06-20 wl Remove deprecated comment.
2017-06-20 tonyt Fix pkg-config in freetype-config for cross-compiling (#51274).
2017-06-20 wl [cff, truetype] Integer overflows.
2017-06-17 apodtele [base, smooth] LCD filtering cleanups.
2017-06-16 wl [truetype] Integer overflows.
2017-06-15 wl [bdf, cff] Integer overflows.
2017-06-14 wl * src/winfonts/winfnt.c (FNT_Face_Init): Don't set active encoding.
2017-06-13 wl [cff, truetype] Integer overflows.
2017-06-11 wl [cff] Integer overflows.
2017-06-10 wl [truetype] Fix TT_Set_Var_Design.
2017-06-10 wl * src/base/ftcalc.c (FT_DivFix): Fix embarrassing typo.
2017-06-09 wl [cff, truetype] Integer overflows.
2017-06-09 wl Provide more macros for flooring, ceiling, and rounding.
2017-06-09 wl Remove unused macros.
2017-06-09 wl */*: Remove `OVERFLOW_' prefix.
2017-06-07 wl [cff, truetype] Integer overflows.
2017-06-06 wl [cff] Integer overflow.
2017-06-05 wl [cff] Integer overflow.
2017-06-04 wl [cff, truetype] Integer overflows.
2017-06-03 wl [base, cff, truetype] Integer overflows.
2017-06-03 wl * builds/unix/freetype-config.in: Fix pkg-config test (#51162).
2017-06-03 wl [bdf] Synchronize sanity checks with pcf driver.
2017-06-03 wl [cff, truetype] Integer overflows.
2017-06-03 wl ftcalc.h: Avoid left-shift of negative numbers.
2017-06-02 wl [cff] Even more integer overflows.
2017-06-02 wl [cff] More integer overflows.
2017-06-02 wl [bdf] Don't left-shift negative numbers.
2017-06-02 wl [bdf] Fix integer scanning routines.
2017-06-02 wl [cff] Fix integer overflows.
2017-06-01 wl [smooth] Some 32bit integer overflow run-time errors.
2017-06-01 wl Minor comment.
2017-06-01 wl * src/base/ftglyph.c (FT_Get_Glyph): Check `slot->advance'.
2017-06-01 wl [psaux] 32bit integer overflow tun-time errors (#46149).
2017-06-01 wl * src/truetype/ttinterp.c (TT_RunIns): Adjust loop counter again.
2017-05-31 wl [cff] 32bit integer overflow run-time errors 2/2 (#46149).
2017-05-30 wl [cff] 32bit integer overflow run-time errors 1/2 (#46149).
2017-05-30 wl [psaux] Correctly handle sequences of multiple number signs.
2017-05-29 wl [pcf] 32bit integer overflow run-time errors (#46149).
2017-05-29 wl Handle some integer overflow run-time errors (#46149, #48979).
2017-05-28 wl * include/freetype/internal/ftcalc.h (FLOAT_TO_FIXED): Remove.
2017-05-28 wl [cff] s/cf2_floatToFixed/cf2_doubleToFixed/.
2017-05-28 wl Fix negation of INT_MIN and LONG_MIN (#46149).
2017-05-27 wl [truetype] Fix handling of design coordinates (#51127).
2017-05-24 wl [bdf, pcf] Support ISO646.1991-IRV character encoding (aka ASCII).
2017-05-20 madigens [truetype] Always use interpreter v35 for B/W rendering (#51051).
2017-05-20 apodtele [smooth] Implement minimal dynamic padding for LCD filtering.
2017-05-17 wl [autofit] More code sorting.
2017-05-17 wl Code sorting.
2017-05-15 wl [sfnt] Return proper scaling values for SBIX bitmaps.
2017-05-15 wl [truetype] Fix error handling for embedded bitmaps.
2017-05-15 apodtele [autofit] Make autohint warping NORMAL option.
2017-05-14 wl Remove remnants of raster pool.

Created with:
  roll-dep src/third_party/freetype/src
R=bungeman@chromium.org, drott@chromium.org, michaelbai@chromium.org, wangxianzhu@chromium.org

Change-Id: I3e5740eab26f174b3281e623855814ebc711ba8e
Reviewed-on: https://chromium-review.googlesource.com/550379
Commit-Queue: Ben Wagner <bungeman@google.com>
Reviewed-by: Xianzhu Wang <wangxianzhu@chromium.org>
Reviewed-by: Dominik Röttsches <drott@chromium.org>
Cr-Commit-Position: refs/heads/master@{#483453}

(cherry picked from commit 4d6320ef3dee4ac9f29055b6b9d75497ea67796f)
BUG=chromium:726631

Change-Id: I989a89f5a29d8c69cc5f9ac81d4c15413e2da03a
Reviewed-on: https://chromium-review.googlesource.com/592292
Reviewed-by: Ben Wagner <bungeman@chromium.org>
Cr-Commit-Position: refs/branch-heads/3112@{#691}
Cr-Branched-From: b6460e24cf59f429d69de255538d0fc7a425ccf9-refs/heads/master@{#474897}

• DEPS[diff]
• third_party/WebKit/LayoutTests/platform/linux/fast/text/chromium-linux-fontconfig-renderstyle-expected.png[diff]
• third_party/freetype/README.chromium[diff]
• third_party/freetype/include/freetype-custom-config/ftoption.h[diff]
• third_party/freetype/roll-freetype.sh[Added - diff]

[iOS] Adding underlying errors information when displaying an error

Error with description and one underlying error:
https://drive.google.com/open?id=0ByXziH_JVCGJZkZzS2s2VEx2Z28

Error without description and with one underlying error:
https://drive.google.com/open?id=0ByXziH_JVCGJdENIVUdxMEZjbDA

Error without description and without underlying error:
https://drive.google.com/open?id=0ByXziH_JVCGJZlZIZzBOYnl2dWs

TBR=jlebel@chromium.org

(cherry picked from commit 78f86382084b7dd9ecd922e000a4b4d44d10af69)

Bug: 749699
Change-Id: I6ec36d328b405d7a69835c9a45744c4519c336dc
Reviewed-on: https://chromium-review.googlesource.com/589967
Reviewed-by: Benoit Zanotti <bzanotti@chromium.org>
Reviewed-by: Jérôme Lebel <jlebel@chromium.org>
Commit-Queue: Jérôme Lebel <jlebel@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#490360}
Reviewed-on: https://chromium-review.googlesource.com/592030
Cr-Commit-Position: refs/branch-heads/3112@{#690}
Cr-Branched-From: b6460e24cf59f429d69de255538d0fc7a425ccf9-refs/heads/master@{#474897}

• ios/chrome/browser/ui/authentication/BUILD.gn[diff]
• ios/chrome/browser/ui/authentication/authentication_ui_util.h[diff]
• ios/chrome/browser/ui/authentication/authentication_ui_util.mm[diff]
• ios/chrome/browser/ui/authentication/authentication_ui_util_unittest.mm[Added - diff]

[ios] Check that an active WebState exists before returning page titles.

This change is a speculative fix for https://crbug.com/749477 and aligns the iOS
implementation of GetTitle() with desktop's.

BUG=749477
TBR=rohitrao@google.com

(cherry picked from commit 3f66eaed29028323708438d837e23e9d5f0f1cfd)

Change-Id: I87f21fe2e84b069547376c2d315d8288f46039cb
Reviewed-on: https://chromium-review.googlesource.com/590135
Commit-Queue: Justin Cohen <justincohen@chromium.org>
Reviewed-by: Justin Cohen <justincohen@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#490371}
Reviewed-on: https://chromium-review.googlesource.com/592232
Reviewed-by: Peter Lee <pkl@chromium.org>
Cr-Commit-Position: refs/branch-heads/3112@{#689}
Cr-Branched-From: b6460e24cf59f429d69de255538d0fc7a425ccf9-refs/heads/master@{#474897}

• ios/chrome/browser/ui/omnibox/chrome_omnibox_client_ios.mm[diff]

Back property with weak ivar in GoogleLandingVC

The property used by GoogleLandingViewController were "assign" and synthesized.
This CL creates WeakNSProtocol ivar to back them.

BUG=732778, 749453

(cherry picked from commit c7765512eae644492ecc71c9d0bb0d571e5bdd62)

Change-Id: I57e899fed6515ec4384cf3aa611f928ac6a6f97a
Reviewed-on: https://chromium-review.googlesource.com/590767
Reviewed-by: Gauthier Ambard <gambard@chromium.org>
Reviewed-by: Rohit Rao <rohitrao@chromium.org>
Cr-Commit-Position: refs/branch-heads/3112@{#688}
Cr-Branched-From: b6460e24cf59f429d69de255538d0fc7a425ccf9-refs/heads/master@{#474897}

• ios/chrome/browser/ui/ntp/google_landing_view_controller.mm[diff]

Incrementing VERSION to 60.0.3112.84

TBR=dimu@chromium.org

Change-Id: Ia810abe44fd4efa19af44aed9e265fabdc643600
Reviewed-on: https://chromium-review.googlesource.com/590711
Reviewed-by: chrome-release-bot@chromium.org <chrome-release-bot@chromium.org>
Cr-Commit-Position: refs/branch-heads/3112@{#687}
Cr-Branched-From: b6460e24cf59f429d69de255538d0fc7a425ccf9-refs/heads/master@{#474897}

• chrome/VERSION[diff]

Reland: Fix WebViewImpl::SetZoomLevel to not be a no-op if a plugin is focused.

(cherry picked from commit 212f8f9b75225b4a3b24975aac38d3987a3efba3)

Bug: 735358
Change-Id: I4157b38acb3a305ad882bf7d2dc542351face30e
Reviewed-on: https://chromium-review.googlesource.com/577390
Reviewed-by: Kentaro Hara <haraken@chromium.org>
Reviewed-by: Stuart Langley <slangley@chromium.org>
Commit-Queue: Daniel Cheng <dcheng@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#488110}
Reviewed-on: https://chromium-review.googlesource.com/590193
Reviewed-by: Alexandre Elias <aelias@chromium.org>
Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Cr-Commit-Position: refs/branch-heads/3112@{#686}
Cr-Branched-From: b6460e24cf59f429d69de255538d0fc7a425ccf9-refs/heads/master@{#474897}

• third_party/WebKit/Source/web/WebViewImpl.cpp[diff]
• third_party/WebKit/Source/web/tests/WebViewTest.cpp[diff]

Incrementing VERSION to 60.0.3112.83

TBR=dimu@chromium.org

Change-Id: Ie584ae93d98177e05a221c7cc4d7544f7e81641a
Reviewed-on: https://chromium-review.googlesource.com/590178
Reviewed-by: chrome-release-bot@chromium.org <chrome-release-bot@chromium.org>
Cr-Commit-Position: refs/branch-heads/3112@{#685}
Cr-Branched-From: b6460e24cf59f429d69de255538d0fc7a425ccf9-refs/heads/master@{#474897}

• chrome/VERSION[diff]

Revert "Fix WebViewImpl::SetZoomLevel to not be a no-op if a plugin is focused."

This reverts commit 579d425199727402fbcf4041ce62488a35939eda.

Reason for revert: Breaks compile due to missing include on branch

BUG=749406

Original change's description:
> Fix WebViewImpl::SetZoomLevel to not be a no-op if a plugin is focused.
> 
> TBR=haraken@chromium.org,slangley@chromium.org
> 
> (cherry picked from commit 212f8f9b75225b4a3b24975aac38d3987a3efba3)
> 
> Bug: 735358
> Change-Id: Ibe2a98bd93c1e6288e7c8e9a3633f21e3433350a
> Reviewed-on: https://chromium-review.googlesource.com/577390
> Reviewed-by: Kentaro Hara <haraken@chromium.org>
> Reviewed-by: Stuart Langley <slangley@chromium.org>
> Commit-Queue: Daniel Cheng <dcheng@chromium.org>
> Cr-Original-Commit-Position: refs/heads/master@{#488110}
> Reviewed-on: https://chromium-review.googlesource.com/587407
> Reviewed-by: Daniel Cheng <dcheng@chromium.org>
> Cr-Commit-Position: refs/branch-heads/3112@{#676}
> Cr-Branched-From: b6460e24cf59f429d69de255538d0fc7a425ccf9-refs/heads/master@{#474897}

TBR=dcheng@chromium.org,haraken@chromium.org,slangley@chromium.org

Change-Id: I771d9c74373494de6f970cf304ac02992292f005
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 735358
Reviewed-on: https://chromium-review.googlesource.com/590648
Reviewed-by: Alexandre Elias <aelias@chromium.org>
Cr-Commit-Position: refs/branch-heads/3112@{#684}
Cr-Branched-From: b6460e24cf59f429d69de255538d0fc7a425ccf9-refs/heads/master@{#474897}

• third_party/WebKit/Source/web/WebViewImpl.cpp[diff]
• third_party/WebKit/Source/web/tests/WebViewTest.cpp[diff]

Incrementing VERSION to 60.0.3112.82

TBR=dimu@chromium.org

Change-Id: I9daa764b95521ab5a8bc571b8e6217ce02dfb67e
Reviewed-on: https://chromium-review.googlesource.com/590174
Reviewed-by: chrome-release-bot@chromium.org <chrome-release-bot@chromium.org>
Cr-Commit-Position: refs/branch-heads/3112@{#683}
Cr-Branched-From: b6460e24cf59f429d69de255538d0fc7a425ccf9-refs/heads/master@{#474897}

• chrome/VERSION[diff]

[M60] Fix the merge for AutofillOfferLocalSaveIfServerCardManuallyEntered

Forgot an include in https://chromium-review.googlesource.com/c/587402

Bug: None
Change-Id: I9a07131d6e6079f67fd8a453304ba058501405c1
Reviewed-on: https://chromium-review.googlesource.com/590691
Reviewed-by: Mathieu Perreault <mathp@chromium.org>
Cr-Commit-Position: refs/branch-heads/3112@{#682}
Cr-Branched-From: b6460e24cf59f429d69de255538d0fc7a425ccf9-refs/heads/master@{#474897}

• components/autofill/core/browser/personal_data_manager_unittest.cc[diff]

Reland OOBE display chooser commits + add Mash guard

This CL will reland / revert revert 2 commits and add a non-Mash guard
for listening to DeviceDataManager. A TODO has been added about using
InputDeviceClient in Mash, but it's not super urgent as the reaction to
the event is a NOP in Mash further down the call chain.

Revert "Revert of Remove confusing keyboard test & focus on input device"
  commit 8a2f3aa1eedac03d1fec4cccd802711424c39ce1

Revert "Revert "Listen to changes to touch input devices""
  commit 0cd134a54e6f49ef56245db82edced7b2dc44f52

TBR=felixe@chromium.org

(cherry picked from commit d706dfca2856894481f82ae6d5235166b7fc7c7b)

Bug: 738885
Change-Id: Ic805ca3966df2969d8444b2c441eac24f75dce62
Reviewed-on: https://chromium-review.googlesource.com/575138
Commit-Queue: Felix Ekblom <felixe@chromium.org>
Reviewed-by: Mitsuru Oshima <oshima@chromium.org>
Reviewed-by: Jacob Dufault <jdufault@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#488622}
Reviewed-on: https://chromium-review.googlesource.com/583454
Cr-Commit-Position: refs/branch-heads/3112@{#681}
Cr-Branched-From: b6460e24cf59f429d69de255538d0fc7a425ccf9-refs/heads/master@{#474897}

• chrome/browser/chromeos/login/ui/login_display_host_impl.cc[diff]
• chrome/browser/chromeos/login/ui/login_display_host_impl.h[diff]
• chrome/browser/ui/webui/chromeos/login/oobe_display_chooser.cc[diff]
• chrome/browser/ui/webui/chromeos/login/oobe_display_chooser_unittest.cc[diff]
• chrome/browser/ui/webui/chromeos/login/oobe_ui.cc[diff]

Incrementing VERSION to 60.0.3112.81

TBR=dimu@chromium.org

Change-Id: I2f685db45a34a54bab321bbae2974d0a9e5f487b
Reviewed-on: https://chromium-review.googlesource.com/589907
Reviewed-by: chrome-release-bot@chromium.org <chrome-release-bot@chromium.org>
Cr-Commit-Position: refs/branch-heads/3112@{#680}
Cr-Branched-From: b6460e24cf59f429d69de255538d0fc7a425ccf9-refs/heads/master@{#474897}

• chrome/VERSION[diff]

[Merge M60] Upstream should not be offered for masked cards when AutofillOfferLocalSaveIfServerCardManuallyEntered flag is off

Bug: 748266
Change-Id: I42c291dd7ea15787bcebe292a85993ff608d5a72
Reviewed-on: https://chromium-review.googlesource.com/587402
Reviewed-by: Mathieu Perreault <mathp@chromium.org>
Reviewed-by: Roger McFarlane <rogerm@chromium.org>
Cr-Commit-Position: refs/branch-heads/3112@{#679}
Cr-Branched-From: b6460e24cf59f429d69de255538d0fc7a425ccf9-refs/heads/master@{#474897}

• components/autofill/core/browser/autofill_manager.cc[diff]
• components/autofill/core/browser/autofill_manager_unittest.cc[diff]
• components/autofill/core/browser/personal_data_manager.cc[diff]
• components/autofill/core/browser/personal_data_manager_unittest.cc[diff]

Incrementing VERSION to 60.0.3112.80

TBR=dimu@chromium.org

Change-Id: I0df6f6831d4deb68608ccdda7d9063b2c17efc21
Reviewed-on: https://chromium-review.googlesource.com/588128
Reviewed-by: chrome-release-bot@chromium.org <chrome-release-bot@chromium.org>
Cr-Commit-Position: refs/branch-heads/3112@{#678}
Cr-Branched-From: b6460e24cf59f429d69de255538d0fc7a425ccf9-refs/heads/master@{#474897}

• chrome/VERSION[diff]

Revert "window.open() should gate new tab/new popup based on toolbar visibility."

This reverts commit e507bb334d3c66917eec47fbc476ed0a7d62f33f.

Bug: 723655
Change-Id: I4d13c7899d215d9d0d7e6d4866b50a337af5b1b4
Reviewed-on: https://chromium-review.googlesource.com/587997
Reviewed-by: Nate Chapin <japhet@chromium.org>
Cr-Commit-Position: refs/branch-heads/3112@{#677}
Cr-Branched-From: b6460e24cf59f429d69de255538d0fc7a425ccf9-refs/heads/master@{#474897}

• third_party/WebKit/LayoutTests/fast/dom/Window/open-as-popup-vs-tab.html[Deleted - diff]
• third_party/WebKit/Source/web/ChromeClientImpl.cpp[diff]
• third_party/WebKit/Source/web/tests/ChromeClientImplTest.cpp[diff]

Fix WebViewImpl::SetZoomLevel to not be a no-op if a plugin is focused.

TBR=haraken@chromium.org,slangley@chromium.org

(cherry picked from commit 212f8f9b75225b4a3b24975aac38d3987a3efba3)

Bug: 735358
Change-Id: Ibe2a98bd93c1e6288e7c8e9a3633f21e3433350a
Reviewed-on: https://chromium-review.googlesource.com/577390
Reviewed-by: Kentaro Hara <haraken@chromium.org>
Reviewed-by: Stuart Langley <slangley@chromium.org>
Commit-Queue: Daniel Cheng <dcheng@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#488110}
Reviewed-on: https://chromium-review.googlesource.com/587407
Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Cr-Commit-Position: refs/branch-heads/3112@{#676}
Cr-Branched-From: b6460e24cf59f429d69de255538d0fc7a425ccf9-refs/heads/master@{#474897}

• third_party/WebKit/Source/web/WebViewImpl.cpp[diff]
• third_party/WebKit/Source/web/tests/WebViewTest.cpp[diff]

[merge to m60] Bad format at all_time_in_state

merge to m60 on behalf of weidongg

cpu may be offline and not report freq, the all_time_in_state looks like
this:
freq\t\tcpu0\t\tcpu1\t\tcpu2\t\tcpu3\t\t
126000\t\t1501\t\t1501\t\t
216000\t\t327\t\t327\t\t
408000\t\t86\t\t86\t\t

CpuDataCollector did not include the case like this, thus reports error.
This CL fixes this problem and adds unit test.

TBR=derat@chromium.org
BUG=739574
TEST=CpuDataCollectorTest.ReadCpuFreqAllTimeInStateOff

(cherry picked from commit 90fd8c3e191c33de5a342c77d059e9ecdbd80bb4)

Change-Id: If4bf584a81eac158c38069fa6228cfc79ffb7665
Reviewed-on: https://chromium-review.googlesource.com/564000
Commit-Queue: Weidong Guo <weidongg@chromium.org>
Reviewed-by: Dan Erat <derat@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#485471}
Reviewed-on: https://chromium-review.googlesource.com/586731
Reviewed-by: Qiang(Joe) Xu <warx@chromium.org>
Cr-Commit-Position: refs/branch-heads/3112@{#675}
Cr-Branched-From: b6460e24cf59f429d69de255538d0fc7a425ccf9-refs/heads/master@{#474897}

• chrome/browser/chromeos/power/cpu_data_collector.cc[diff]
• chrome/browser/chromeos/power/cpu_data_collector_unittest.cc[diff]

[merge to m60] Make cpu_data_collector handle "N/A"

merge to m60 on behalf of weidongg

/sys/devices/system/cpu/cpufreq/all_time_in_state reports cpu freq as
"N/A" for the cpu/freq combinations that are invalid. This CL makes
cpu_data_collector handle the case and adds unit test for it.

TBR=derat@chromium.org
BUG=548510
TEST=unit_tests --gtest_filter=CpuDataCollectorTest.*

(cherry picked from commit c2111cb9d677572689cff4917c7c66642eaa1fc9)

Review-Url: https://codereview.chromium.org/2950963002
Cr-Original-Commit-Position: refs/heads/master@{#481249}
Change-Id: I002f1093715445bf5e6a4d01e963f01cd0640b6d
Reviewed-on: https://chromium-review.googlesource.com/586646
Reviewed-by: Qiang(Joe) Xu <warx@chromium.org>
Cr-Commit-Position: refs/branch-heads/3112@{#674}
Cr-Branched-From: b6460e24cf59f429d69de255538d0fc7a425ccf9-refs/heads/master@{#474897}

• chrome/browser/chromeos/power/cpu_data_collector.cc[diff]
• chrome/browser/chromeos/power/cpu_data_collector_unittest.cc[diff]

Fixed webViewLoadingStateDidChange crash.

webViewLoadingStateDidChange crashes on dereferencing a null pointer.
It is unknown how app gets into this state, but registering another load
request is a better option than crashing.

TBR=eugenebut@google.com

(cherry picked from commit 541f04637e46170e3882e20e047820046436c02a)

Bug: 737595
Change-Id: Ibbe66fe5689722fea2de205d07871f3dacec136a
Reviewed-on: https://chromium-review.googlesource.com/585864
Reviewed-by: Kurt Horimoto <kkhorimoto@chromium.org>
Commit-Queue: Eugene But <eugenebut@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#489537}
Reviewed-on: https://chromium-review.googlesource.com/586926
Reviewed-by: Eugene But <eugenebut@chromium.org>
Cr-Commit-Position: refs/branch-heads/3112@{#673}
Cr-Branched-From: b6460e24cf59f429d69de255538d0fc7a425ccf9-refs/heads/master@{#474897}

• ios/web/web_state/ui/crw_web_controller.mm[diff]

Incrementing VERSION to 60.0.3112.79

TBR=dimu@chromium.org

Change-Id: If7efc74a83430a50d8f182cacb0c70d33fb2dce5
Reviewed-on: https://chromium-review.googlesource.com/585778
Reviewed-by: chrome-release-bot@chromium.org <chrome-release-bot@chromium.org>
Cr-Commit-Position: refs/branch-heads/3112@{#672}
Cr-Branched-From: b6460e24cf59f429d69de255538d0fc7a425ccf9-refs/heads/master@{#474897}

• chrome/VERSION[diff]