Fixes WebSettingDialog addDescriptionSection assertion causing crash.

This addresses two problems: a crash due to an assertion failure in
addDescriptionSection in WebSettingDialog for Android and two nearly identical
description sections appearing in the page info on Android. The root cause of
this was a bad rebase while working on
https://codereview.chromium.org/473643002/ where the double call to
addDescriptionSection was added. This CL simply removes the redundant/wrong
second call to addDecriptionSection.

BUG=404293
TBR=ianwen@chromium.org,tedchoc@chromium.org

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

Cr-Commit-Position: refs/heads/master@{#290356}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@290356 0039d316-1c4b-4281-b951-d872f2087c98
(cherry picked from commit 0ce108b7f87098120a1188d5d1dce826c7d11575)

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

Cr-Commit-Position: refs/branch-heads/2125@{#294}
Cr-Branched-From: b68026d94bda36dd106a3d91a098719f952a9477-refs/heads/master@{#290040}
Always guard against IME events for all KeyPress.

Previously, only BS/DEL set this guard but there are cases with keyboards
that send single characters immediately followed by a composition (e.g.
swiping words on stock Google keyboard) and we want to make sure that
there is no race condition where the actions taken in response to the
KeyPress don't cancel the following composition.

BUG=408678

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

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

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

Cr-Commit-Position: refs/branch-heads/2125@{#295}
Cr-Branched-From: b68026d94bda36dd106a3d91a098719f952a9477-refs/heads/master@{#290040}
[Android] Stop all media on undoable close.

-Stop all media playback on an undoable tab close

BUG=388600

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

Cr-Commit-Position: refs/heads/master@{#292959}
(cherry picked from commit 8cda4271a88ecf178e1b6104bcca6cb35527f765)

Always guard against IME events for all KeyPress.

Previously, only BS/DEL set this guard but there are cases with keyboards
that send single characters immediately followed by a composition (e.g.
swiping words on stock Google keyboard) and we want to make sure that
there is no race condition where the actions taken in response to the
KeyPress don't cancel the following composition.

BUG=408678

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

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

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

Cr-Commit-Position: refs/branch-heads/2125@{#296}
Cr-Branched-From: b68026d94bda36dd106a3d91a098719f952a9477-refs/heads/master@{#290040}
Incrementing VERSION to 38.0.2125.59

Cr-Commit-Position: refs/branch-heads/2125@{#297}
Cr-Branched-From: b68026d94bda36dd106a3d91a098719f952a9477-refs/heads/master@{#290040}
Fix a crash in SerialIoHandler.

When a receive error occurs, the SerialConnection pauses receives, which
triggers a call to CancelRead(). This should be a no-op as this occurs
after the previous read completed with an error, but
pending_read_buffer_ isn't cleared until after the error is reported to
SerialConnection. Thus, on posix, a call to ReadDone is enqueued, but
the pending read is cleared before it runs, leading to a crash. This
change clears pending_read_buffer_ and pending_write_buffer_ before
calling Done() or DoneWithError().

BUG=410331

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

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

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

Cr-Commit-Position: refs/branch-heads/2125@{#298}
Cr-Branched-From: b68026d94bda36dd106a3d91a098719f952a9477-refs/heads/master@{#290040}
Merge: Use SetAlternateDesktop(false) for service process. Service process may run as windows service and it fails to create a window station.

BUG=410237

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

Cr-Commit-Position: refs/heads/master@{#293391}
(cherry picked from commit 13db9e4e90bf7809af656f04a7d5bda626cdc893)

TBR=vitalybuka@chromium.org

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

Cr-Commit-Position: refs/branch-heads/2125@{#299}
Cr-Branched-From: b68026d94bda36dd106a3d91a098719f952a9477-refs/heads/master@{#290040}
Merge: Delete temporarily dir for PDF to EMF conversion after EMF files closed. printing::Emf keeps files locked so base::ScopedTempDir can't delete them and leaks files.

Failures or crashes still may leak files. I ignore them to have change simple enough for merging into beta.

BUG=411681
NOTRY=true
R=scottmg@chromium.org, thestig@chromium.org

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

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

Conflicts:
	chrome/browser/printing/pdf_to_emf_converter.cc
	chrome/browser/printing/print_view_manager_base.h

TBR=vitalybuka@chromium.org

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

Cr-Commit-Position: refs/branch-heads/2125@{#300}
Cr-Branched-From: b68026d94bda36dd106a3d91a098719f952a9477-refs/heads/master@{#290040}
Fixed missing dot in username

BUG=385740
TBR=nkostylev@chromium.org
Review URL: https://codereview.chromium.org/540323002

Cr-Commit-Position: refs/heads/master@{#293736}
(cherry picked from commit 172f59cdec7d8de26f3a1e7608790dca35b9d029)

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

Cr-Commit-Position: refs/branch-heads/2125@{#301}
Cr-Branched-From: b68026d94bda36dd106a3d91a098719f952a9477-refs/heads/master@{#290040}
Merge r293734: Added SigninManager.isSignInDisabledByPolicy.

BUG=398378,410729

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

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

R=joaodasilva@chromium.org

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

Cr-Commit-Position: refs/branch-heads/2125@{#302}
Cr-Branched-From: b68026d94bda36dd106a3d91a098719f952a9477-refs/heads/master@{#290040}
Fix strict mode violations in Android.

BUG=408525

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

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

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

Cr-Commit-Position: refs/branch-heads/2125@{#303}
Cr-Branched-From: b68026d94bda36dd106a3d91a098719f952a9477-refs/heads/master@{#290040}
cc: Don't make tiles for mask layers that are too big for a texture.

If a mask layer's width or height are larger than the max texture size,
we do not use the contents of the mask layer. So if we're not going to
use the contents, there's no reason to make tiles and allocate memory
for them.

This changes PictureLayerImpl to return an empty tile size for masks
that are too large to have tiles. Then changes PictureLayerTiling to
use the empty tile size as a signal to make the whole tiling an empty
size.

Last, we use the empty tile size to also signal not making a low res
tiling, so that masks continue to not get a low res tiling if they are
large.

TBR=enne@chromium.org, vmpstr@chromium.org
BUG=409984

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

Cr-Commit-Position: refs/heads/master@{#293656}
(cherry picked from commit 132fdfe17dd03c0066e27fe876602122c522aa8b)

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

Cr-Commit-Position: refs/branch-heads/2125@{#304}
Cr-Branched-From: b68026d94bda36dd106a3d91a098719f952a9477-refs/heads/master@{#290040}
Merge to branch 2125
> Speculative fix for DelegatedFrameHost destructor crashes
>
> It appears that RenderWidgetHostViewMac::Destroy is never getting
> called in some instances, and that is resulting in crashes when we end
> up in its destructor, which is called by Objective C's runtime.
>
> I suspect that this is a leak somewhere, and that on other platforms we
> simply never call the destructor.
>
> Call the necessary bits of RenderWidgetHostViewMac::Destroy to avoid
> crash when a RenderWidgetHostImpl reaches its destructor before its
> view_ has been reset.
>
> Also, turn the weak pointers to RenderWidgetHostViewBase in
> RenderWidgetHostImpl and RenderWidgetHostViewGuest
> to use base::WeakPtr to prevent the many dangling instances.
>
> BUG=404828
>
> Review URL: https://codereview.chromium.org/538883002
>
> Cr-Commit-Position: refs/heads/master@{#293573}

TBR=ccameron@chromium.org

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

Cr-Commit-Position: refs/branch-heads/2125@{#305}
Cr-Branched-From: b68026d94bda36dd106a3d91a098719f952a9477-refs/heads/master@{#290040}
aw: Skip hardware onDraw when visible rect is empty

Framework does not clamp onDraw to only the visible area. However must
still request functor in this case to support rt-side animation, and to
obtain the correct draw matrix. This means HardwareRenderer must be able
to handle not having a parent frame available.

BUG=412623

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

Cr-Commit-Position: refs/heads/master@{#294093}
(cherry picked from commit 693c6a04c69d69a1240e4b83e2ec7fea459acda4)

TBR=boliu@chromium.org

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

Cr-Commit-Position: refs/branch-heads/2125@{#306}
Cr-Branched-From: b68026d94bda36dd106a3d91a098719f952a9477-refs/heads/master@{#290040}
Merge: Cast: Reject Old RTCP Packets

Merging only media/cast/sender/congestion_control.cc in r290667 to
branch 2125.

BUG=412550
R=hubbe@chromium.org

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

Cr-Commit-Position: refs/branch-heads/2125@{#307}
Cr-Branched-From: b68026d94bda36dd106a3d91a098719f952a9477-refs/heads/master@{#290040}
aw: Invalidate view on hardware teardown

This is a new requirement in L during functor teardown.

BUG=412617

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

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

TBR=boliu@chromium.org

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

Cr-Commit-Position: refs/branch-heads/2125@{#308}
Cr-Branched-From: b68026d94bda36dd106a3d91a098719f952a9477-refs/heads/master@{#290040}
Incrementing VERSION to 38.0.2125.60

Cr-Commit-Position: refs/branch-heads/2125@{#309}
Cr-Branched-From: b68026d94bda36dd106a3d91a098719f952a9477-refs/heads/master@{#290040}
Keep track of network error in ProxyRetryInfo.

Use it to log error type in BypassOneNetworkError UMA.
This fixes DataReductionProxy.BypassOnNetworkError UMA recording bug.

BUG=395769

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

Cr-Commit-Position: refs/heads/master@{#290054}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@290054 0039d316-1c4b-4281-b951-d872f2087c98
(cherry picked from commit d0483b1909b7094854485c0e6ae9360e46e39929)

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

Cr-Commit-Position: refs/branch-heads/2125@{#310}
Cr-Branched-From: b68026d94bda36dd106a3d91a098719f952a9477-refs/heads/master@{#290040}
Merge to 2125 "DevTools: follow up to r288297, check rvh for being null in all branches."

> DevTools: follow up to r288297, check rvh for being null in all branches.

> Review URL: https://codereview.chromium.org/482503002

> Cr-Commit-Position: refs/heads/master@{#290151}
> git-svn-id: svn://svn.chromium.org/chrome/trunk/src@290151 0039d316-1c4b-4281-b951-d872f2087c98

(cherry picked from commit 41e9da8b7be723e48a2a544be9ea88dce700f6e8)
BUG=403235
TBR=pfeldman@chromium.org

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

Cr-Commit-Position: refs/branch-heads/2125@{#311}
Cr-Branched-From: b68026d94bda36dd106a3d91a098719f952a9477-refs/heads/master@{#290040}
Remove cespy.dll from the browser blacklist

cespy.dll is a LSP and preventing it from loading in Chrome prevents
users from accessing the internet.

TBR=csharp@chromium.org
BUG=399968

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

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

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

Cr-Commit-Position: refs/branch-heads/2125@{#312}
Cr-Branched-From: b68026d94bda36dd106a3d91a098719f952a9477-refs/heads/master@{#290040}
[Merge] [Win] Don't show the add/remove desktop shortcut for single users.

If there's a single user in chrome://settings, you can navigate to
chrome://settings/manageProfile to edit it (even though the UI doesn't
always let you). In this case, however, we shouldn't display the add/remove
desktop shortcut button in the manageProfile overlay (since the shortcut for
single users is a non-profile generic Chrome shortcut)

BUG=409735
TBR=noms@chromium.org
TEST=Start Chrome. Ensure you only have one profile.
Go to chrome://settings/manageProfile. There shouldn't be an add/remove
shortcut button.

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

Cr-Commit-Position: refs/heads/master@{#293804}
(cherry picked from commit 11ae275b8b1b06b5bd2f85760a050fc9b6c58c99)

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

Cr-Commit-Position: refs/branch-heads/2125@{#313}
Cr-Branched-From: b68026d94bda36dd106a3d91a098719f952a9477-refs/heads/master@{#290040}