Publish DEPS for Chromium 46.0.2490.37

• DEPS[diff]

Incrementing VERSION to 46.0.2490.37

Cr-Commit-Position: refs/branch-heads/2490@{#327}
Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}

• chrome/VERSION[diff]

Handle selection change caused by OnAdjustSelectionByCharacterOffset

Previously we were immediately returning from RenderFrame::didChangeSelection
when the selection change was caused by a call to
RenderFrame::OnAdjustSelectionByCharacterOffset. handling_select_range_ needs
to be set to true in OnAdjustSelectionByCharacterOffset so that we sync the
selection in didChangeSelection.

BUG=532117
TBR=creis@chromium.org

Review URL: https://codereview.chromium.org/1351723002

Cr-Commit-Position: refs/heads/master@{#349710}

Review URL: https://codereview.chromium.org/1346313004 .

Cr-Commit-Position: refs/branch-heads/2490@{#326}
Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}

• content/renderer/render_frame_impl.cc[diff]

[Android] Add --blacklist-file as a command-line option.

This is a partial backport of https://codereview.chromium.org/1294713008
to M46 to fix release bots.

BUG=517709
R=kerz@chromium.org

Review URL: https://codereview.chromium.org/1350803002 .

Cr-Commit-Position: refs/branch-heads/2490@{#325}
Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}

• build/android/adb_install_apk.py[diff]
• build/android/adb_reverse_forwarder.py[diff]
• build/android/buildbot/bb_device_status_check.py[diff]
• build/android/buildbot/bb_device_steps.py[diff]
• build/android/enable_asserts.py[diff]
• build/android/host_heartbeat.py[diff]
• build/android/provision_devices.py[diff]
• build/android/pylib/device/device_blacklist.py[diff]
• build/android/pylib/device/device_utils.py[diff]
• build/android/pylib/device/device_utils_test.py[diff]
• build/android/pylib/host_driven/test_case.py[diff]
• build/android/pylib/instrumentation/setup.py[diff]
• build/android/pylib/instrumentation/test_jar.py[diff]
• build/android/pylib/local/device/local_device_environment.py[diff]
• build/android/pylib/perf/perf_control_unittest.py[diff]
• build/android/pylib/perf/setup.py[diff]
• build/android/pylib/uiautomator/setup.py[diff]
• build/android/pylib/utils/emulator.py[diff]
• build/android/pylib/utils/test_environment.py[diff]
• build/android/screenshot.py[diff]
• build/android/test_runner.py[diff]
• build/android/tombstones.py[diff]
• build/android/update_verification.py[diff]

Remove HANDLE_FLAG_PROTECT_FROM_CLOSE flag from Tracked/ScopedHandle.

This reverts most of  https://crrev.com/c928d34ee861fd4102c352d9e79e1a4959a47209
(refs/heads/master@{#329516}).

There is a strong suspicion that this flag is causing a lot of extra crashes. In any
case, the change caused the handle verifier to be enabled for all channels, which was
not really intended (not desired).

BUG=475872
TBR=grt@chromium.org, wfh@chromium.org

Review URL: https://codereview.chromium.org/1355703002

Cr-Commit-Position: refs/heads/master@{#349531}
(cherry picked from commit 44c7a7ab481f11061bd398ce83eb43a0f549ce26)

Review URL: https://codereview.chromium.org/1350963003 .

Cr-Commit-Position: refs/branch-heads/2490@{#324}
Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}

• base/win/scoped_handle.cc[diff]
• chrome/app/close_handle_hook_win.cc[diff]

Make menu hardware key work on Custom Tabs

Menu key was not supported before in custom tabs. This CL adds the
support.

BUG=513770

Review URL: https://codereview.chromium.org/1342343002

Cr-Commit-Position: refs/heads/master@{#349289}
TBR=newt@chromium.org

Review URL: https://codereview.chromium.org/1352583003 .

Cr-Commit-Position: refs/branch-heads/2490@{#323}
Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}

• chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java[diff]

[Android] Fix RenderFrameHost registration issue in Java Bridge

1. Ensure that all current RenderFrameHosts get registered in
   GinJavaBridgeMessageFilter before providing named objects to the
   renderer.

2. Fix output parameters initialization in synchronous message handlers.

BUG=526876

Review URL: https://codereview.chromium.org/1326753002

Cr-Commit-Position: refs/heads/master@{#346924}
(cherry picked from commit 96f28dad1637eaa9b15dd5910dec605a85240a3b)

Review URL: https://codereview.chromium.org/1357683002 .

Cr-Commit-Position: refs/branch-heads/2490@{#322}
Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}

• content/browser/android/java/gin_java_bridge_dispatcher_host.cc[diff]
• content/browser/android/java/gin_java_bridge_message_filter.cc[diff]

Don't send error messages for touches on iframes

This is a normal case, so there's no reason for it to be treated as an
error. Sending a message causes an expensive JS->ObjC communication (in
fact, quite a few due to the way the touch looks nearby for elements),
which hurts gesture responsiveness.

BUG=532207
TBR=eugenebut

Review URL: https://codereview.chromium.org/1344953002

Cr-Commit-Position: refs/heads/master@{#349013}
(cherry picked from commit 58d3f29e66dc2168af91953406881949c85b6919)

Review URL: https://codereview.chromium.org/1350383002 .

Cr-Commit-Position: refs/branch-heads/2490@{#321}
Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}

• ios/web/web_state/js/resources/core.js[diff]

Android: Do not drop am/pm infomration from DateTimePickerDialog.

This fixes a regression by #335554.
input[type=datetime-local] didn't accept afternoon hours at all because
Calendar.HOUR was used.

BUG=529320
TBR=miguelg@chromium.org
Review URL: https://codereview.chromium.org/1346553002

Cr-Commit-Position: refs/heads/master@{#348859}
(cherry picked from commit cba1cd545ae9b9bad6ff50b95ff3cda285ebcd34)

Review URL: https://codereview.chromium.org/1354593003 .

Cr-Commit-Position: refs/branch-heads/2490@{#320}
Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}

• ui/android/java/src/org/chromium/ui/picker/DateTimePickerDialog.java[diff]

Merge "Allow 'chrome-extension:' URLs to bypass content settings (1/2)" to M46.

> We changed the behavior of 'Document::firstPartyForCookies' to return an
> empty URL in the case where any URL in the ancestor chain doesn't match
> the current document's URL. Previously, we'd simply return the top-level
> document's URL.
>
> This means that the content-settings bypass check in
> 'ContentSettingsObserver::IsWhitelistedForContentSettings' sees an empty
> URL as opposed to a 'chrome-extension://' URL for cases in which an
> extension loads a resource, so content settings are applied as per usual.
> This breaks things fairly badly for folks who have turned on third-party
> cookie blocking.
>
> In these patches, we introduce a new scheme registry for those schemes
> which ought to override Blink's concept of "first-party" when they're
> loaded into the top-level browsing context.
>
> Patch 1 (Blink): https://codereview.chromium.org/1305253012
> Patch 2 (Chromium): [This patch]
>
> BUG=527963
> R=jochen@chromium.org
>
> Review URL: https://codereview.chromium.org/1332563006

Cr-Commit-Position: refs/heads/master@{#348194}
(cherry picked from commit cfed7a300606c5eedb858433b37db5ffadf3b2cc)

Note: Moved the call of this method from Dispatcher::WebKitInitialized()
to Dispatcher::Dispatcher(), which is where the similar methods were at
this point in history.

TBR=amineer@chromium.org

Review URL: https://codereview.chromium.org/1351313002 .

Cr-Commit-Position: refs/branch-heads/2490@{#319}
Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}

• extensions/renderer/dispatcher.cc[diff]

[Ozone-DRM] Use CRTC's mode when configuring it for mirror mode

Using the same mode on both CRTCs may not work if the timings are not
correct. This patch configures the CRTC independently such that each one
uses its own mode and timings.

Also split modesetting from re-enabling so it is easier to reason when
the CRTC's current mode can be reused.

BUG=chrome-os-partner:42915

Review URL: https://codereview.chromium.org/1338843002

Cr-Commit-Position: refs/heads/master@{#348613}
(cherry picked from commit e342544e82671b42b94e1f2f6400ddb0a5c3b49a)

Review URL: https://codereview.chromium.org/1349263003 .

Cr-Commit-Position: refs/branch-heads/2490@{#318}
Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}

• ui/ozone/platform/drm/gpu/drm_vsync_provider.cc[diff]
• ui/ozone/platform/drm/gpu/hardware_display_controller.cc[diff]
• ui/ozone/platform/drm/gpu/hardware_display_controller.h[diff]
• ui/ozone/platform/drm/gpu/screen_manager.cc[diff]
• ui/ozone/platform/drm/gpu/screen_manager.h[diff]
• ui/ozone/platform/drm/gpu/screen_manager_unittest.cc[diff]

Revert "[Ozone-DRM] Modeset when re-mapping windows to controllers"

This reverts commit 35f67627bef75d0dec5dbb7fa63ea6d6ee738db5.

BUG=511446, 532765
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel

Review URL: https://codereview.chromium.org/1352153002 .

Cr-Commit-Position: refs/branch-heads/2490@{#317}
Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}

• cc/surfaces/display.cc[diff]
• content/browser/compositor/gpu_surfaceless_browser_compositor_output_surface.cc[diff]
• ui/ozone/platform/drm/gpu/drm_surface.cc[diff]
• ui/ozone/platform/drm/gpu/drm_surface_unittest.cc[diff]
• ui/ozone/platform/drm/gpu/drm_window.cc[diff]
• ui/ozone/platform/drm/gpu/drm_window.h[diff]
• ui/ozone/platform/drm/gpu/drm_window_unittest.cc[diff]
• ui/ozone/platform/drm/gpu/screen_manager.cc[diff]

Revert "[Ozone-DRM] Use CRTC's mode when configuring it for mirror mode"

This reverts commit 56bb13255007aa5889e9dd004b849270f81722a0.

Reverting temporarily to allow a clean revert of another patch.

BUG=chrome-os-partner:42915

Review URL: https://codereview.chromium.org/1350213002 .

Cr-Commit-Position: refs/branch-heads/2490@{#316}
Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}

• ui/ozone/platform/drm/gpu/drm_vsync_provider.cc[diff]
• ui/ozone/platform/drm/gpu/hardware_display_controller.cc[diff]
• ui/ozone/platform/drm/gpu/hardware_display_controller.h[diff]
• ui/ozone/platform/drm/gpu/screen_manager.cc[diff]
• ui/ozone/platform/drm/gpu/screen_manager.h[diff]
• ui/ozone/platform/drm/gpu/screen_manager_unittest.cc[diff]

[Spellcheck] Fix crash in no-suggestions case.

The FillSuggestions_OneLanguageNoSuggestions would crash with the old
FillSuggestions version, since it would loop essentially unbounded for
an empty suggestions vector.

The new version also simplifies the logic into a somewhat more clear
form. It runs potentially a few iterations more than the previous one,
but has easily understood bounds which will hopefully avoid further
under/overruns. (Famous last words! ;)

Also added a few more test cases for FillSuggestions, while I'm here.

BUG=524657

Review URL: https://codereview.chromium.org/1308313007

Cr-Commit-Position: refs/heads/master@{#349171}
(cherry picked from commit 9681cc8a90fda51924a8dd98e62d177bea14801f)

Review URL: https://codereview.chromium.org/1350183003 .

Cr-Commit-Position: refs/branch-heads/2490@{#315}
Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}

• chrome/renderer/spellchecker/spellcheck.cc[diff]
• chrome/renderer/spellchecker/spellcheck_unittest.cc[diff]

Incrementing VERSION to 46.0.2490.36

Cr-Commit-Position: refs/branch-heads/2490@{#314}
Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}

• chrome/VERSION[diff]

aw: Disable ipc command buffer by default

Due to possible deadlock situations that needs to resolved first.
See crbug.com/533082.

BUG=532620, 509702

Review URL: https://codereview.chromium.org/1351193002

Cr-Commit-Position: refs/heads/master@{#349530}
(cherry picked from commit c41dadee7d182d3714d6561c4719ace6e6cebb1d)

Conflicts:
android_webview/common/aw_switches.cc
android_webview/common/aw_switches.h
android_webview/lib/main/aw_main_delegate.cc

TBR=boliu@chromium.org

Review URL: https://codereview.chromium.org/1355683004 .

Cr-Commit-Position: refs/branch-heads/2490@{#313}
Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}

• android_webview/browser/aw_browser_main_parts.cc[diff]
• android_webview/common/aw_switches.cc[diff]
• android_webview/common/aw_switches.h[diff]

Cherry-pick xslt linebreak fix

We're currently using libxslt-1.1.28 which is the most recent tagged
version. Cherry-pick this fix that's not yet released, identified by
git bisect, and confirmed that it fixes the bug in Blink.

Added layout test in Blink to be landed after this lands here:
https://codereview.chromium.org/1344243002

R=thakis@chromium.org
BUG=530587, 463958, 502468

Review URL: https://codereview.chromium.org/1347873002

Cr-Commit-Position: refs/heads/master@{#349196}
(cherry picked from commit 2ef6a940f303d1af0c46f5e4d07cfce8cbe0c9f4)

Review URL: https://codereview.chromium.org/1351153002 .

Cr-Commit-Position: refs/branch-heads/2490@{#312}
Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}

• third_party/libxslt/README.chromium[diff]
• third_party/libxslt/libxslt/xslt.c[diff]

[Android WebView] Speculative fix for GrantFileSchemeAccesstoChildProcess crash

Most likely the Java side is trying to call a native method on
an already destroyed object.

BUG=532079

Review URL: https://codereview.chromium.org/1339103003

Cr-Commit-Position: refs/heads/master@{#349430}
(cherry picked from commit 08e4a8407ca8678344a550c5cdf0032bab51aa31)

Review URL: https://codereview.chromium.org/1350123002 .

Cr-Commit-Position: refs/branch-heads/2490@{#311}
Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}

• android_webview/java/src/org/chromium/android_webview/AwContents.java[diff]

Updating XTBs based on .GRDs from branch 2490

Cr-Commit-Position: refs/branch-heads/2490@{#310}
Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}

• chrome/app/resources/chromium_strings_fa.xtb[diff]
• chrome/app/resources/generated_resources_bn.xtb[diff]
• chrome/app/resources/generated_resources_cs.xtb[diff]
• chrome/app/resources/generated_resources_de.xtb[diff]
• chrome/app/resources/generated_resources_gu.xtb[diff]
• chrome/app/resources/generated_resources_tr.xtb[diff]
• chrome/app/resources/google_chrome_strings_fa.xtb[diff]
• chrome/browser/resources/chromeos/chromevox/strings/chromevox_strings_gu.xtb[diff]
• chrome/browser/resources/chromeos/chromevox/strings/chromevox_strings_nl.xtb[diff]
• components/policy/resources/policy_templates_fa.xtb[diff]
• extensions/strings/extensions_strings_tr.xtb[diff]
• remoting/resources/remoting_strings_am.xtb[diff]
• remoting/resources/remoting_strings_bn.xtb[diff]
• remoting/resources/remoting_strings_fa.xtb[diff]
• remoting/resources/remoting_strings_gu.xtb[diff]
• remoting/resources/remoting_strings_kn.xtb[diff]
• remoting/resources/remoting_strings_ml.xtb[diff]
• remoting/resources/remoting_strings_mr.xtb[diff]
• remoting/resources/remoting_strings_ms.xtb[diff]
• remoting/resources/remoting_strings_sw.xtb[diff]
• remoting/resources/remoting_strings_ta.xtb[diff]
• remoting/resources/remoting_strings_te.xtb[diff]

Another effort to fix WebRTC notification for Custom Tabs

In https://codereview.chromium.org/1327193004, "Touch to return" was
removed from all normal chrome tabs, an it was added only to Custom
tabs. This is exactly the opposite behavior we expect.

This CL fixes the string mistake.

BUG=524855

Review URL: https://codereview.chromium.org/1346403005

Cr-Commit-Position: refs/heads/master@{#349296}

R=dfalcantara@chromium.org
TBR=dfalcantara@chromium.org

Review URL: https://codereview.chromium.org/1353623002 .

Cr-Commit-Position: refs/branch-heads/2490@{#309}
Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}

• chrome/android/java/src/org/chromium/chrome/browser/media/MediaNotificationService.java[diff]

Revert "Upstream changes made to RTL geometry helper functions."

This reverts commit 35ea3e7e64ee856dd77de8452c9c3b87f8e147cf.

The CL was cherry-picked twice due to miscommunication (original
author asked independently two developers to cherry-pick the CL).

BUG=530602
TBR=ellyjones@chromium.org
TBR=lpromero@chromium.org

Review URL: https://codereview.chromium.org/1353863002 .

Cr-Commit-Position: refs/branch-heads/2490@{#308}
Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}

• ios/chrome/browser/ui/rtl_geometry.mm[diff]

Upstream changes made to RTL geometry helper functions.

This CL adds a few helper functions.

BUG=530602
R=marq@chromium.org,sdefresne@chromium.org

Review URL: https://codereview.chromium.org/1338403002

Cr-Commit-Position: refs/heads/master@{#348858}
(cherry picked from commit d87fec843581bd47ecab70f471c775d643d49654)

Review URL: https://codereview.chromium.org/1350633004 .

Cr-Commit-Position: refs/branch-heads/2490@{#307}
Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}

• ios/chrome/browser/ui/rtl_geometry.mm[diff]

Upstream changes made to RTL geometry helper functions.

This CL adds a few helper functions.

BUG=530602
R=marq@chromium.org,sdefresne@chromium.org
TBR=droger@chromium.org

Review URL: https://codereview.chromium.org/1338403002

Cr-Commit-Position: refs/heads/master@{#348858}
(cherry picked from commit d87fec843581bd47ecab70f471c775d643d49654)

patch from issue 1348223002 at patchset 40001 (http://crrev.com/1348223002#ps40001)

Review URL: https://codereview.chromium.org/1353853002 .

Cr-Commit-Position: refs/branch-heads/2490@{#306}
Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}

• ios/chrome/browser/ui/rtl_geometry.h[diff]
• ios/chrome/browser/ui/rtl_geometry.mm[diff]

Change app banner Finch metrics to use variations parameters.

This allows all of the adjustable values to be varied within the same
study, rather than requiring separate studies (with separate sample
groups).

BUG=487519
R=benwells

Review URL: https://codereview.chromium.org/1351433003

Cr-Commit-Position: refs/heads/master@{#349113}
(cherry picked from commit 864a4fbe07242928f3b0b74b525b2fd2b0d00af0)

Review URL: https://codereview.chromium.org/1354483002 .

Cr-Commit-Position: refs/branch-heads/2490@{#305}
Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}

• chrome/browser/banners/app_banner_settings_helper.cc[diff]

[Android] Show warning if user tries to create new empty bookmark folder

BUG=530489

Review URL: https://codereview.chromium.org/1347093004

Cr-Commit-Position: refs/heads/master@{#349291}
(cherry picked from commit 4eda88f349e92056cc85f85b2667f30cce9b2685)

TBR=newt@chromium.org

Review URL: https://codereview.chromium.org/1351733004 .

Cr-Commit-Position: refs/branch-heads/2490@{#304}
Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}

• chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkAddEditFolderActivity.java[diff]
• chrome/android/java/src/org/chromium/chrome/browser/widget/EmptyAlertEditText.java[diff]

[Merge] Mac: Don't replace "quotes" with “smartquotes” in the Omnibox

Actually, disable all substitutions be default. They're not likely to be
useful for the omnibox.

Since linking to the 10.10 SDK, the omnibox on Mac has started
smartquotifying input. It also replaces "--" with an em-dash. These are
unlikely to be desired for URL or search input, so this restores the old
behavior.

BUG=528014
TEST=Type a quote (") or two dashes (--) in the Omnibox on Mac and wait
a second. It shouldn't get replaced by a different character.

Review URL: https://codereview.chromium.org/1320093005

Cr-Commit-Position: refs/heads/master@{#348783}
(cherry picked from commit 39a9074f2fc832be61d1332af1175cfae8bf9186)

Review URL: https://codereview.chromium.org/1349033002 .

Cr-Commit-Position: refs/branch-heads/2490@{#303}
Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}

• chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor.mm[diff]

Fix Chromoting install on Mac OS X 10.11 (El Capitan).

Install was failing when trying to start the host process with a sandbox error:
  launchctl System Policy: deny mach-priv-task-port

This is because we were using bsexec to create our sandbox (which requires a task id) and the default policy on 10.11 has been changed from earlier versions to deny this.

The problem is fixed by using asuser instead of bsexec.

BUG=519138

Review URL: https://codereview.chromium.org/1323623003

Cr-Commit-Position: refs/heads/master@{#346277}
(cherry picked from commit 23a9c4b7a090f06ddac117a7795fe5b055549e62)

Review URL: https://codereview.chromium.org/1344243004 .

Cr-Commit-Position: refs/branch-heads/2490@{#302}
Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}

• remoting/host/installer/mac/Scripts/remoting_postflight.sh[diff]
• remoting/host/installer/mac/Scripts/remoting_preflight.sh[diff]

Incrementing VERSION to 46.0.2490.35

Cr-Commit-Position: refs/branch-heads/2490@{#301}
Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}

• chrome/VERSION[diff]

[Android] Fix a crash on deleting bookmarks.

For some Android versions, popup menu adapter's isEnabled() can be
called after dismiss() is called.

BUG=532137

Review URL: https://codereview.chromium.org/1352573002

Cr-Commit-Position: refs/heads/master@{#349235}
(cherry picked from commit c4e4e5d0367ecfdc4788fd8d785f756e281fb13c)

TBR=newt@chromium.org

Review URL: https://codereview.chromium.org/1349883002 .

Cr-Commit-Position: refs/branch-heads/2490@{#300}
Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}

• chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkRow.java[diff]

Fix size estimation for prerender in custom tabs

- Fix estimated size for prerender to not subtract the navigation bar size which is
actually included in the frameSize in Blink.
- Fix estimated size to send dp rather than pixel values.
- Cache the prerendered size (in pixels and including control container height) so
that we set the contentviewcore size before swap to avoid any unnecessary resizes.

BUG=525229

Review URL: https://codereview.chromium.org/1353523003 .

Cr-Commit-Position: refs/branch-heads/2490@{#299}
Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}

• chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java[diff]

Update the key for getting animRes out of an Activity bundle

In M, the key used for these fields inside the ActivityOptions have
changed which makes the exit animation not work on M devices.
This adds the new keys for M.

BUG=530770

Review URL: https://codereview.chromium.org/1345373002 .

Cr-Commit-Position: refs/branch-heads/2490@{#298}
Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}

• chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java[diff]

Incrementing VERSION to 46.0.2490.34

Cr-Commit-Position: refs/branch-heads/2490@{#297}
Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}

• chrome/VERSION[diff]

Fix to not switch upgrading users to Tabbed mode.

Check whether user has migrated to Document mode before setting opt-out state.

BUG=532558
TBR=tedchoc@chromium.org

Review URL: https://codereview.chromium.org/1346343002 .

Cr-Commit-Position: refs/branch-heads/2490@{#296}
Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}

• chrome/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceManager.java[diff]
• chrome/android/java/src/org/chromium/chrome/browser/preferences/DocumentModeManager.java[diff]

Fix flakiness in SitePerProcessBrowserTest.ProxyCreationSkipsSubtree.

One of the frame navigations in this test is checking the frame tree
after waiting on a TestFrameNavigationObserver and assuming that the
frame's child frames don't exist at that point, but that may not
be the case.  This CL changes that navigation to a page without
subframes, which don't seem to be needed/used in the test.
https://crbug.com/514420#c5 has more details.

BUG=514420
TBR=nick@chromium.org

Review URL: https://codereview.chromium.org/1322333002

Cr-Commit-Position: refs/heads/master@{#347253}
(cherry picked from commit 617df037bc906d9b6479ecf59b364893cba3cc49)

Review URL: https://codereview.chromium.org/1346283002 .

Cr-Commit-Position: refs/branch-heads/2490@{#295}
Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}

• content/browser/site_per_process_browsertest.cc[diff]

Make sure FBO is correct for both kModeProcess and kModeDraw

This is achieved by setting the correct FBO before each kModeDraw and
hardware renderer won't reset it at the end of the draw so that
kModeProcess between kModeDraws also has the correct FBO.

This CL is to solve a bug where kModeProcess could run some GL commands
that binds the wrong FBO, and the following kModeDraw is messed up.

BUG=527113

Review URL: https://codereview.chromium.org/1335033004

Cr-Commit-Position: refs/heads/master@{#348766}
(cherry picked from commit 6e71d4fae8fac13fc46399f367ab77a675027499)

Review URL: https://codereview.chromium.org/1345223002 .

Cr-Commit-Position: refs/branch-heads/2490@{#294}
Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}

• android_webview/browser/aw_gl_surface.cc[diff]
• android_webview/browser/aw_gl_surface.h[diff]
• android_webview/browser/hardware_renderer.cc[diff]
• android_webview/browser/hardware_renderer.h[diff]
• android_webview/browser/shared_renderer_state.cc[diff]

[Extensions] Don't allow extensions to inject scripts into extension pages

Don't allow extensions to inject scripts into other extension pages, since this
is a security risk. This was meant to be addressed, but there was an incorrect
early-return. Also add a regression test.

BUG=529682
TBR=kalman@chromium.org
Review URL: https://codereview.chromium.org/1335083004

Cr-Commit-Position: refs/heads/master@{#348707}
(cherry picked from commit c318b93de2ee7b8cc78e506dd2dd161af7d6819d)

Review URL: https://codereview.chromium.org/1344213003 .

Cr-Commit-Position: refs/branch-heads/2490@{#293}
Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}

• chrome/browser/extensions/content_script_apitest.cc[diff]
• chrome/test/data/extensions/api_test/content_scripts/background_page_iframe/background.html[Added - diff]
• chrome/test/data/extensions/api_test/content_scripts/background_page_iframe/background.js[Added - diff]
• chrome/test/data/extensions/api_test/content_scripts/background_page_iframe/manifest.json[Added - diff]
• chrome/test/data/extensions/api_test/content_scripts/script_a_com/manifest.json[Added - diff]
• chrome/test/data/extensions/api_test/content_scripts/script_a_com/script.js[Added - diff]
• extensions/renderer/extension_injection_host.cc[diff]
• extensions/renderer/script_injection.cc[diff]
• extensions/renderer/script_injection.h[diff]
• extensions/renderer/script_injection_manager.cc[diff]
• extensions/renderer/user_script_injector.cc[diff]
• extensions/renderer/user_script_set.cc[diff]

Fix spacing within location bar bubbles

Modify IconLabelBubbleView::GetSizeForLabelWidth()
to avoid computing a larger size than is necessary
for the icon and text within a location bar bubble.

BUG=529715
TEST=manual
TBR=pkasting

Review URL: https://codereview.chromium.org/1336663002

Cr-Commit-Position: refs/heads/master@{#348242}
(cherry picked from commit 9f5aa837cf1edded5698b0f5e86189519571b1c9)

Review URL: https://codereview.chromium.org/1348773005 .

Cr-Commit-Position: refs/branch-heads/2490@{#292}
Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}

• chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc[diff]

[Extensions UI Mac] Fix resizing logic when highlighting the actions container

The logic here was inverted - resizing should be allowed only if not resizing.

BUG=529955
TBR=avi@chromium.org

Review URL: https://codereview.chromium.org/1321223004

Cr-Commit-Position: refs/heads/master@{#348057}
(cherry picked from commit 6f12265bb05aad2e2a7f2387ececc0730093364d)

Review URL: https://codereview.chromium.org/1350813002 .

Cr-Commit-Position: refs/branch-heads/2490@{#291}
Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}

• chrome/browser/ui/cocoa/extensions/browser_actions_container_view.mm[diff]

Do not drop data on the floor in SpdySession::DoReadLoop.

Merge CL with modifications to test so that it compiles.
These modifications are necessary due to refactorings that
happened in the meanwhile.

TBR=mef@chromium.org

Original description:

Do not drop data on the floor in SpdySession::DoReadLoop.

Patch Set 1 adds regression test, watch it specatularily fail in trybot logs.
Patch Set 2 fixes the issue.

BUG=531570

Review URL: https://codereview.chromium.org/1345453005

Cr-Commit-Position: refs/heads/master@{#348726}
(cherry picked from commit 125cde33c45c37472639c94e4af73760042bdcb0)

Review URL: https://codereview.chromium.org/1346193003 .

Cr-Commit-Position: refs/branch-heads/2490@{#290}
Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}

• net/spdy/spdy_session.cc[diff]
• net/spdy/spdy_session_unittest.cc[diff]

Revert "Revert "Stop unfreezing tabs "frozen" for lazy loads""

This reverts commit 05e72c589c1123e32d6deb78833983598f5d6767.

Fixes the compile failure.

BUG=495877
TBR=kerz

Review URL: https://codereview.chromium.org/1345183004 .

Cr-Commit-Position: refs/branch-heads/2490@{#289}
Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}

• chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java[diff]
• chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java[diff]
• chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java[diff]
• chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java[diff]
• chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabModelBase.java[diff]
• chrome/android/javatests/src/org/chromium/chrome/browser/TabsOpenedFromExternalAppTest.java[diff]
• chrome/test/android/javatests/src/org/chromium/chrome/test/MultiActivityTestBase.java[diff]

Fixed compile error ash/rotator/screen_rotation_animation_unittest.cc.

The commit 6adb1e2fb718df6586fcfeb3d93cb466af7d0f18 caused a compile error
in ash/rotator/screen_rotation_animation_unittest.cc.

TBR=oshima@chromium.org

BUG=496986

Review URL: https://codereview.chromium.org/1350753003 .

Cr-Commit-Position: refs/branch-heads/2490@{#288}
Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}

• ash/rotator/screen_rotation_animation_unittest.cc[diff]

Snap screen rotation animation layers to final position if the animation is aborted.

Some users were seeing incorrectly aligned and rotated backgrounds while
at the lock screen.  It was possible that the session state animations
were aborting the screen rotation animations prematurely and thus they
would get stuck in a bad position.

TBR=oshima@chromium.org

TEST=ScreenRotationAnimationTest.LayerTransformGetsSetToTargetWhenAborted

BUG=496986

Review URL: https://codereview.chromium.org/1315573003

Cr-Commit-Position: refs/heads/master@{#348734}
(cherry picked from commit ca01f9e55651e4a7285f551e83bd561b01787c19)

Review URL: https://codereview.chromium.org/1350743002 .

Cr-Commit-Position: refs/branch-heads/2490@{#287}
Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}

• ash/ash.gyp[diff]
• ash/rotator/screen_rotation_animation.cc[diff]
• ash/rotator/screen_rotation_animation_unittest.cc[Added - diff]

[iOS] Fix thread-safety in registration of CRWRedirectNetworkClientFactory factory.

Don't retain CRW web view web controller to AddNetworkClientFactory.
This fixes a crash in NTP pref tests.

BUG=499781

Review URL: https://codereview.chromium.org/1309603006

(cherry picked from commit 5dd0cee8af64a3d6755f2b3decd24cc2c8c8ecd6)

Cr-Original-Commit-Position: refs/heads/master@{#349111}
Cr-Commit-Position: refs/branch-heads/2490@{#286}
Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}

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

Android Media Notification: fix crash in some Acer Kitkat devices.

Some versions of KitKat do not support AudioManager.registerMediaButtonIntent
with a PendingIntent. They will throw a NullPointerException, in which case
they should be able to activate a MediaSessionCompat with only transport
controls.

BUG=524865
TBR=avayvod@chromium.org

Review URL: https://codereview.chromium.org/1340973002

Cr-Commit-Position: refs/heads/master@{#348623}
(cherry picked from commit 810705df7b46cc3863838e4cff4bc2ab33ac8b29)

Review URL: https://codereview.chromium.org/1348133002 .

Cr-Commit-Position: refs/branch-heads/2490@{#285}
Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}

• chrome/android/java/src/org/chromium/chrome/browser/media/ui/NotificationMediaPlaybackControls.java[diff]

Permission Bubble: some code clean-up.

Instead of using ::NavigationEntryCommitted and ::DidNavigateMainFrame,
the PermissionBubbleManager is now only using ::DidNavigateMainFrame.

Following discussion in:
https://codereview.chromium.org/1266003004/

BUG=None
TBR=felt@chromium.org

Review URL: https://codereview.chromium.org/1287743004

Cr-Commit-Position: refs/heads/master@{#345009}
(cherry picked from commit 82a6993b864314b676265a16e78b7fac9c21423f)

Review URL: https://codereview.chromium.org/1347053002 .

Cr-Commit-Position: refs/branch-heads/2490@{#284}
Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}

• chrome/browser/ui/website_settings/permission_bubble_manager.cc[diff]
• chrome/browser/ui/website_settings/permission_bubble_manager.h[diff]

banners: add conversion from dp -> px when getting native app details

All native fetch code expects the icon size to be in px but a dp is
passed by the app banner code. Fix this so that a conversion to px
is performed before the native app details are requested.

BUG=531838
TBR=mlamouri@chromium.org

Review URL: https://codereview.chromium.org/1339323002

Cr-Commit-Position: refs/heads/master@{#348936}
(cherry picked from commit 927a3f48bfefb56e95e3f4719d9701e851f13b6a)

Review URL: https://codereview.chromium.org/1348663003 .

Cr-Commit-Position: refs/branch-heads/2490@{#283}
Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}

• chrome/android/java/src/org/chromium/chrome/browser/banners/AppBannerManager.java[diff]

webapps: fix theme color on status bar for Galaxy devices

On Galaxy S devices (specifically the S6) on L and above, setting the theme color
too early for the status bar causes the status bar to be set to white.

Also on other devices, setting the color too early simply causes the color to be ignored
which leads to the theme color not being set properly until page load.

Fix this by setting in onResume which is late enough such that the change takes hold
but early enough such that it appears before the web app is loaded fully.

BUG=531530
TBR=mlamouri@chromium.org

Review URL: https://codereview.chromium.org/1336913003

Cr-Commit-Position: refs/heads/master@{#348627}
(cherry picked from commit ecb3a122c9ee59a66e17aede8ab853d447714c8c)

Review URL: https://codereview.chromium.org/1346993003 .

Cr-Commit-Position: refs/branch-heads/2490@{#282}
Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}

• chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappActivity.java[diff]

[Merge to M46] Perform password import from Keychain in the muted mode.

Merge approval at http://crbug.com/514838#c8.

Original description:
------------------------------
This will decrese the amount of times the Keychain prompt is shown to the user.

BUG=514838

Review URL: https://codereview.chromium.org/1330293002

Cr-Commit-Position: refs/heads/master@{#348133}
------------------------------
(cherry picked from commit 0e2c9fa9df91f57d50b1ef6e2accf8ad77907516)

TBR=vasilii@chromium.org

Review URL: https://codereview.chromium.org/1346983002 .

Cr-Commit-Position: refs/branch-heads/2490@{#281}
Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}

• chrome/browser/password_manager/password_store_mac.cc[diff]

Add null checks to ExpandedControllerActivity

ExpandedControllerActivity has recently apparently started crashing
during closedown (in spite of being unchanged for years). These
null checks should prevent the reported crashes.

BUG=523106
TBR=avayod@chromium.org

Review URL: https://codereview.chromium.org/1310443007

Cr-Commit-Position: refs/heads/master@{#345593}
(cherry picked from commit a9b7edbce194c8ba13132c18b083ae21c661e136)

Review URL: https://codereview.chromium.org/1345143002 .

Cr-Commit-Position: refs/branch-heads/2490@{#280}
Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}

• chrome/android/java/src/org/chromium/chrome/browser/media/remote/ExpandedControllerActivity.java[diff]

Merge to M46: Simple client side heuristics for checking username.

Do not use text field on change password forms if it contains only small number. It's unlikely that this is username, probably it's some service information which JavaScript uses for some purpose. This will fix change password support on facebook.com.

Also this CL contains a small fix with UI bubble, namely do not to show "no username" in Save Bubble. It was already implemented for change password forms, and currently it expands this for any "no username" credentials.

BUG=530082
TBR=vabr@chromium.org

Review URL: https://codereview.chromium.org/1331043002

Cr-Commit-Position: refs/heads/master@{#348388}
(cherry picked from commit 338739ef0209e8ee7941df36fd8fc25b40697fcf)

Review URL: https://codereview.chromium.org/1345173002 .

Cr-Commit-Position: refs/branch-heads/2490@{#279}
Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}

• chrome/browser/password_manager/password_manager_browsertest.cc[diff]
• chrome/browser/ui/views/passwords/manage_passwords_bubble_view.cc[diff]
• chrome/test/data/password/password_form.html[diff]
• components/password_manager/core/browser/password_form_manager.cc[diff]
• components/password_manager/core/browser/password_form_manager.h[diff]
• components/password_manager/core/browser/password_form_manager_unittest.cc[diff]
• components/password_manager/core/browser/password_manager.cc[diff]

[Merge M46] ServiceWorker: Add null check for provider host to be transferred out

ServiceWorkerProviderHost to be transferred out could be deleted during
asynchronous cross-site transfer operation.

BUG=507113
TBR=michaeln@chromium.org

Review URL: https://codereview.chromium.org/1325023004

Cr-Commit-Position: refs/heads/master@{#347347}
(cherry picked from commit 0d251c6df2b8cd4ab6500a2812e753d8c930abfa)

Review URL: https://codereview.chromium.org/1349663002 .

Cr-Commit-Position: refs/branch-heads/2490@{#278}
Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}

• content/browser/service_worker/service_worker_context_core.cc[diff]

[Merge M46] ServiceWorker: Drop statechange events if WebServiceWorkerProxy is not ready

This is a quick fix for http://crbug.com/507110

BUG=507110
TBR=ksakamoto@chromium.org

Review URL: https://codereview.chromium.org/1325143004

Cr-Commit-Position: refs/heads/master@{#347878}
(cherry picked from commit 3ded5b9d6d175d8f243390f81296e2c4ea6a80fa)

Review URL: https://codereview.chromium.org/1343373002 .

Cr-Commit-Position: refs/branch-heads/2490@{#277}
Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}

• content/child/service_worker/web_service_worker_impl.cc[diff]

Calculate metrics regarding password reuse in a more efficient manner.

Calculating these metrics involves counting, for each stored account, the number of other accounts that are reusing the same password.  The numbers are further split based on whether each of the accounts are for HTTP or HTTPS sites, and whether the "other" account is for the same domain, a public suffix matching domain, or a different domain.

Because the old implementation relied on IsPublicSuffixDomainMatch() to tell if two domains were PSL matches (i.e. relied on using a binary comparison operator for finding equivalence classes), it necessarily involved nested for-loops, and had a complexity of O(n^2), where n is the number of accounts, with a high constant factor.  This proved to take several tenths of seconds for users with lots of passwords.

This CL improves on performance in two ways:
 -- It pre-calculates and caches the registry controlled portions of domains for each account, using only O(n) calls to GetRegistryControlledDomain(), which is the term that has the highest constant factor.
 -- Instead of enumerating over all "other" accounts for each account, the new solution first groups accounts by domain and by registry controlled domain, then calculates the total number of accounts in each of these groups plus the grand totals, and finally uses the inclusion-exclusion principle to derive the desired numbers. This has a total complexity of only O(n*log(n)).

BUG=517422
TBR=mkwst@chromium.org

Review URL: https://codereview.chromium.org/1330333002

Cr-Commit-Position: refs/heads/master@{#348369}
(cherry picked from commit 373e8026a683570f40035d6e459131b7a96b25e2)

Review URL: https://codereview.chromium.org/1347003002 .

Cr-Commit-Position: refs/branch-heads/2490@{#276}
Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}

• components/password_manager/core/browser/login_database.cc[diff]
• components/password_manager/core/browser/login_database_unittest.cc[diff]

Merge to M46: Gallery: unselect current selection when empty space is clicked.

TBR=hirono@chromium.org
BUG=523981
TEST=browser_tests:GalleryBrowserTest.EmptySpaceClickUnselectsInThumbnailModeOn(Downloads|Drive)

Review URL: https://codereview.chromium.org/1318433002

Cr-Commit-Position: refs/heads/master@{#345276}
(cherry picked from commit d6bf3eb2eaa848dfeed89ec7f3233918c914adca)

Review URL: https://codereview.chromium.org/1350623002 .

Cr-Commit-Position: refs/branch-heads/2490@{#275}
Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}

• chrome/browser/chromeos/file_manager/gallery_browsertest.cc[diff]
• ui/file_manager/gallery/js/gallery.js[diff]
• ui/file_manager/gallery/js/thumbnail_mode.js[diff]
• ui/file_manager/integration_tests/gallery/thumbnail_mode.js[diff]