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

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

Fix a bug in the GPU blacklist.  Originally if we fail to collect driver version, we won't apply blacklist logic.  This will fail us to blacklist ATI cards on linux.

BUG=none
TEST=blacklist all ATI cards on linux.
TBR=zmo

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

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

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

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

Blacklist GPU features on Windows XP.
Also, gpu blacklist is ignored if use-gl=osmesa; this is for chromium bots.

BUG=72975
TEST=on XP WebGL is disabled

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

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

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

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

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

Merge 75656 - If we switch into ChromeFrame as a result of a redirect then we need to navigate chrome to
the correct URL to ensure that scripts on the page see the correct URL. This functionality
regressed when the protocol sink patch landed. 

Fix is to read the URL from the ProtData object which wraps the underlying protocol sink,
when our active document loads.

Removed stale code from the Chromeframe moniker patch which eventually needs to go.

Fixes bug http://code.google.com/p/chromium/issues/detail?can=2&q=71860

BUG=71860
TEST=As described in the bug.

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

TBR=ananta@chromium.org
Review URL: http://codereview.chromium.org/6546079

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

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

Before we lock down (call LowerToken()) we force the IME subsystem to load, so the
required resources are acquired.

Typical sites that show the issue are weathernews.jp and www.nicovideo.jp

BUG=66605
TEST=see bug


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

TBR=cpu@chromium.org
Review URL: http://codereview.chromium.org/6541083

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

BUG=72496
TEST=see bug


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

TBR=cpu@chromium.org
Review URL: http://codereview.chromium.org/6549027

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

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

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

BUG=none
TEST=none
R=bauerb

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

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

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

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

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

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

BUG=70849
TEST=sync successfully once, shut down, corrupt the password store db, start up, make sure we don't crash

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

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

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

Merge 75412 - Add product-specific flags to the rename command in the registry.  This fixes a regression that prevented in-place upgrades of Chrome Frame from working.

BUG=73329
TEST=Follow the steps in the bug.  Between steps 4 and 5, check that the "cmd" registry value in HKLM\Software\Google\Update\Clients\{8BA986DA-5100-405E-AA35-86F34A02ACBF} contains "--chrome-frame".

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

TBR=grt@chromium.org
Review URL: http://codereview.chromium.org/6469069

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

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

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

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

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

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

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