git-svn-id: svn://svn.chromium.org/chrome/branches/648/src@75461 0039d316-1c4b-4281-b951-d872f2087c98

git-svn-id: svn://svn.chromium.org/chrome/branches/648/src@75451 0039d316-1c4b-4281-b951-d872f2087c98

git-svn-id: svn://svn.chromium.org/chrome/branches/648/src@75449 0039d316-1c4b-4281-b951-d872f2087c98

git-svn-id: svn://svn.chromium.org/chrome/branches/648/src@75435 0039d316-1c4b-4281-b951-d872f2087c98

git-svn-id: svn://svn.chromium.org/chrome/branches/648/src@75422 0039d316-1c4b-4281-b951-d872f2087c98

BUG=73208
TEST=NONE

TBR=kerz@chromium.org,stuartmorgan@chromium.org

Review URL: http://codereview.chromium.org/6542022

git-svn-id: svn://svn.chromium.org/chrome/branches/648/src@75409 0039d316-1c4b-4281-b951-d872f2087c98

Merge 75401 - Fix a regression when switching the options pane to use Dom UI: when a user clicks the "Make Chrome my default browser" button, we should reset the browser.check_default_browser to true.

BUG=73208
TEST=Follow steps listed in bug, observe that the infobar again shows up.

Review URL: http://codereview.chromium.org/6542018

TBR=robertshield@chromium.org
Review URL: http://codereview.chromium.org/6469057

git-svn-id: svn://svn.chromium.org/chrome/branches/648/src@75407 0039d316-1c4b-4281-b951-d872f2087c98

git-svn-id: svn://svn.chromium.org/chrome/branches/648/src@75356 0039d316-1c4b-4281-b951-d872f2087c98

git-svn-id: svn://svn.chromium.org/chrome/branches/648/src@75355 0039d316-1c4b-4281-b951-d872f2087c98

git-svn-id: svn://svn.chromium.org/chrome/branches/648/src@75354 0039d316-1c4b-4281-b951-d872f2087c98

Merge 72458 - [SYNC] Speculative fix for autofill change processor destroying on the wrong thread. The data type manager should now tell any datatype controller that is not already stopping or not running to stop. Namely, this covers the MODEL_STARTING and ASSOCIATING cases, which weren't being covered before. Tests that can reproduce these race conditions still needed.

BUG=61804
TEST=unit,sync_integration,self

Review URL: http://codereview.chromium.org/6273011

TBR=zea@chromium.org
Review URL: http://codereview.chromium.org/6544009

git-svn-id: svn://svn.chromium.org/chrome/branches/648/src@75346 0039d316-1c4b-4281-b951-d872f2087c98

git-svn-id: svn://svn.chromium.org/chrome/branches/648/src@75338 0039d316-1c4b-4281-b951-d872f2087c98

TEST=Fix for crash in setup.  See bug for details.
BUG=73212

Review URL: http://codereview.chromium.org/6533009

TBR=tommi@chromium.org
Review URL: http://codereview.chromium.org/6532037

git-svn-id: svn://svn.chromium.org/chrome/branches/648/src@75313 0039d316-1c4b-4281-b951-d872f2087c98

BUG=60090
TEST=On Windows and Mac, when a popup is blocked, there's an animation in the Omnibox.

Review URL: http://codereview.chromium.org/6028015

TBR=rsesek@chromium.org
Review URL: http://codereview.chromium.org/6541004

git-svn-id: svn://svn.chromium.org/chrome/branches/648/src@75310 0039d316-1c4b-4281-b951-d872f2087c98

Correctly update description and version when changing a PluginGroup.

PluginListTest:UpdatedPlugin tests that we don't regress on updating a disabled plugin.

BUG=72946
TEST=PluginGroupTest.MultipleVersions:PluginListTest:UpdatedPlugin

Review URL: http://codereview.chromium.org/6525012

Correctly match plugins to their definitions.

BUG=71781
TEST=PluginListTest.HardcodedGroups

Review URL: http://codereview.chromium.org/6286081

Review URL: http://codereview.chromium.org/6523060

git-svn-id: svn://svn.chromium.org/chrome/branches/648/src@75277 0039d316-1c4b-4281-b951-d872f2087c98

git-svn-id: svn://svn.chromium.org/chrome/branches/648/src@75225 0039d316-1c4b-4281-b951-d872f2087c98

git-svn-id: svn://svn.chromium.org/chrome/branches/648/src@75224 0039d316-1c4b-4281-b951-d872f2087c98

Merge 75195 - Change the help center link on the sync setup encryption tab to point to the new article, depending on Chrome/ChromeOS platform.

BUG=72064
TEST=click "learn more" from encryption tab

Review URL: http://codereview.chromium.org/6525057

TBR=johnnyg@chromium.org
Review URL: http://codereview.chromium.org/6533014

git-svn-id: svn://svn.chromium.org/chrome/branches/648/src@75208 0039d316-1c4b-4281-b951-d872f2087c98

BUG=chromium-os:12187
TEST=See issue

Review URL: http://codereview.chromium.org/6526039

TBR=stevenjb@google.com
Review URL: http://codereview.chromium.org/6531014

git-svn-id: svn://svn.chromium.org/chrome/branches/648/src@75201 0039d316-1c4b-4281-b951-d872f2087c98

This works around a bug in the Mac UI message pump (72007) that can lead to starvation
of delayed tasks.  To avoid starving WebCore timers indefinitely when using
requestAnimationFrame, this patch explicitly pumps the WebCore Timer queue one each animate() call.

BUG=71735
TEST=open the WebGL aquarium demo (http://webglsamples.googlecode.com/hg/aquarium/aquarium.html) and click on the * next to "Change View". The animation should always happen without multi-second delays.

Review URL: http://codereview.chromium.org/6524030

TBR=jamesr@chromium.org
Review URL: http://codereview.chromium.org/6531009

git-svn-id: svn://svn.chromium.org/chrome/branches/648/src@75187 0039d316-1c4b-4281-b951-d872f2087c98

This simplifies the schedule for requestAnimationFrame callbacks and always invokes
the callbacks from the top of DoDeferredUpdate.  Also adds a histogram for catch-up
timers so we can more easily quantify the effects of base::Time / base::TimeTicks
skew.

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/6519005

Needed to ensure that the bugfix for 71735 merges cleanly to the branch.

TBR=jamesr@chromium.org
Review URL: http://codereview.chromium.org/6507021

git-svn-id: svn://svn.chromium.org/chrome/branches/648/src@75185 0039d316-1c4b-4281-b951-d872f2087c98

with the result of that corruption.

1. Now we mark any open entry as dirty, even if we are
supposed to delete the entry right away because if we
crash before that, we may end up clearing the dirty
flag of a dirty entry.

2. When we look for a parent of a given entry we now
double check that the entry is the one that we want (and
not just another entry with the same key).

3. If we have a loop on the hash collision list (result of
failing to do 1 and 2 above), we figure that out.

4. Now every time we open an entry from an LRU list we end
up using the same code path (with the proper handling of
dirty entries).

BUG=69135
TEST=net_unittests

Review URL: http://codereview.chromium.org/6292011

TBR=rvargas@google.com
Review URL: http://codereview.chromium.org/6524047

git-svn-id: svn://svn.chromium.org/chrome/branches/648/src@75153 0039d316-1c4b-4281-b951-d872f2087c98

BUG=72938
TEST=none
TBR=vangelis

Review URL: http://codereview.chromium.org/6519020

TBR=zmo@google.com

git-svn-id: svn://svn.chromium.org/chrome/branches/648/src@75139 0039d316-1c4b-4281-b951-d872f2087c98

BUG=none
TEST=none
Review URL: http://codereview.chromium.org/6480081

TBR=dyu@chromium.org
Review URL: http://codereview.chromium.org/6528049

git-svn-id: svn://svn.chromium.org/chrome/branches/648/src@75137 0039d316-1c4b-4281-b951-d872f2087c98

git-svn-id: svn://svn.chromium.org/chrome/branches/648/src@75133 0039d316-1c4b-4281-b951-d872f2087c98

git-svn-id: svn://svn.chromium.org/chrome/branches/648/src@75124 0039d316-1c4b-4281-b951-d872f2087c98

git-svn-id: svn://svn.chromium.org/chrome/branches/648/src@75123 0039d316-1c4b-4281-b951-d872f2087c98

BUG=73150
TEST=none
R=bauerb

Review URL: http://codereview.chromium.org/6529051

git-svn-id: svn://svn.chromium.org/chrome/branches/648/src@75112 0039d316-1c4b-4281-b951-d872f2087c98

BUG=NONE
TEST=NONE

Review URL: http://codereview.chromium.org/6473016

TBR=cevans@chromium.org
Review URL: http://codereview.chromium.org/6528047

git-svn-id: svn://svn.chromium.org/chrome/branches/648/src@75111 0039d316-1c4b-4281-b951-d872f2087c98

If X errors after the notification service has been destroyed (during browser shutdown), we'll deref NULL. Instead, we should just ignore the X error (aside from logging it to ERROR).

BUG=70852
TEST=none

Review URL: http://codereview.chromium.org/6379009

TBR=estade@chromium.org
Review URL: http://codereview.chromium.org/6528040

git-svn-id: svn://svn.chromium.org/chrome/branches/648/src@75062 0039d316-1c4b-4281-b951-d872f2087c98

git-svn-id: svn://svn.chromium.org/chrome/branches/648/src@75061 0039d316-1c4b-4281-b951-d872f2087c98

git-svn-id: svn://svn.chromium.org/chrome/branches/648/src@75060 0039d316-1c4b-4281-b951-d872f2087c98

Turns out we need to do an integer round to paper over floating point issues.

Refer to discussion on https://bugs.webkit.org/show_bug.cgi?id=52697 for details.

BUG=69499
TEST=layout test in linked bug

Review URL: http://codereview.chromium.org/6250137

TBR=scherkus@chromium.org

git-svn-id: svn://svn.chromium.org/chrome/branches/648/src@75054 0039d316-1c4b-4281-b951-d872f2087c98

Merge 75021 - Enable the infobar to ask the user if they want to enable Reader to open PDFs by default.
Review URL: http://codereview.chromium.org/6480088

TBR=jam@chromium.org
Review URL: http://codereview.chromium.org/6523038

git-svn-id: svn://svn.chromium.org/chrome/branches/648/src@75022 0039d316-1c4b-4281-b951-d872f2087c98

Review URL: http://codereview.chromium.org/6523007

TBR=jam@chromium.org
Review URL: http://codereview.chromium.org/6528029

git-svn-id: svn://svn.chromium.org/chrome/branches/648/src@75017 0039d316-1c4b-4281-b951-d872f2087c98

"Merge" of r74609 to 648 branch. I say "merge" because this merges only the part of the patch which fixes the bug. The original patch also involved a bit of cleanup in other conflicting files on 648.

BUG=72620
TEST=NONE

Review URL: http://codereview.chromium.org/6529027

git-svn-id: svn://svn.chromium.org/chrome/branches/648/src@74993 0039d316-1c4b-4281-b951-d872f2087c98

Merge 74716 - The current implementation of client authentication for Windows and Mac matches the NSS implementation, in that it continously checks that the private key is still accessible. The intent is that once the user removes the private key (such as by ejecting a smart card, if it's stored on one), then the existing SSL sessions will become invalidated. However, depending on the smart card middleware, this may involve non-trivial work being done every SSL record, and may be causing a performance regression for authentication.

The new behaviour is that any negotiated SSL connections remain valid, even after the smart card is ejected, and any established SSL sessions are not invalidated and may be reused. This matches the observed behaviours of IE and Safari. Smart card client auth on Linux is unaffected and will continue polling the smart card to determine if it's been ejected / the key has been deleted.

TBR=rsleevi
BUG=71928
TEST=none
Review URL: http://codereview.chromium.org/6525022

git-svn-id: svn://svn.chromium.org/chrome/branches/648/src@74988 0039d316-1c4b-4281-b951-d872f2087c98

git-svn-id: svn://svn.chromium.org/chrome/branches/648/src@74968 0039d316-1c4b-4281-b951-d872f2087c98

git-svn-id: svn://svn.chromium.org/chrome/branches/648/src@74964 0039d316-1c4b-4281-b951-d872f2087c98

git-svn-id: svn://svn.chromium.org/chrome/branches/648/src@74963 0039d316-1c4b-4281-b951-d872f2087c98