summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add a bunch of preferences to sync.skrul@chromium.org2010-04-0210-43/+284
| | | | | | | | | | This includes a fix for not crashing when we encounter a preference that is not registered. BUG=39958 Review URL: http://codereview.chromium.org/1571006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43497 0039d316-1c4b-4281-b951-d872f2087c98
* Block plugin HandleURLRequest calls with invalid chars like @,;,\ before the ↵inferno@chromium.org2010-04-022-16/+33
| | | | | | | | | | | first / (or start of path) in URL. BUG=40016 TEST=None Review URL: http://codereview.chromium.org/1540011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43496 0039d316-1c4b-4281-b951-d872f2087c98
* Add new strings for the search engine experimental dialog. Also remove a ↵mirandac@chromium.org2010-04-021-17/+8
| | | | | | | | | | | | | superfluous NTP promo string. BUG= 37564 TEST= none Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=43352 Review URL: http://codereview.chromium.org/1587007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43495 0039d316-1c4b-4281-b951-d872f2087c98
* string changes from http://codereview.chromium.org/1120006/erikkay@chromium.org2010-04-022-0/+12
| | | | | | | | | | | to make sure that they land before string freeze. BUG=38352 TEST=none Review URL: http://codereview.chromium.org/1613002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43494 0039d316-1c4b-4281-b951-d872f2087c98
* Added command-line whitelist data to UrlSecurityManager. These are used by ↵ahendrickson@chromium.org2010-04-029-545/+55
| | | | | | | | | | | | | all platforms; Windows will use IInternetSecurityManager if they are not present. Removed registry code from HttpAuthFilterWhitelist, as we're now using a different method of authentication on Windows. BUG=29596 TEST=None. Review URL: http://codereview.chromium.org/1569010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43493 0039d316-1c4b-4281-b951-d872f2087c98
* Mac: Register for keychain notifications on the main thread.snej@chromium.org2010-04-021-0/+17
| | | | | | | | | | | Fixes issues where SSL doesn't notice changes made to keychains, like plugging in a crypto-card after Chrome launches. BUG=37766,34767 TEST=None (manual testing) Review URL: http://codereview.chromium.org/1575016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43492 0039d316-1c4b-4281-b951-d872f2087c98
* Fixes invalid read in AnimationContainer. If all the animations aresky@chromium.org2010-04-022-7/+7
| | | | | | | | | | | | | deleted when updating then when AnimationContainer tried to notify the observer it would access memory already deleted. The fix is to up the ref count when updating the timers. BUG=40177 TEST=none Review URL: http://codereview.chromium.org/1613001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43491 0039d316-1c4b-4281-b951-d872f2087c98
* editing/selection/extend-selection.html times out in debug mode.darin@chromium.org2010-04-021-0/+2
| | | | | | | | | | | | mark it as slow. TBR=arv BUG=39855 TEST=none Review URL: http://codereview.chromium.org/1518014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43490 0039d316-1c4b-4281-b951-d872f2087c98
* Mark OtherRedirectsDontForkProcess as FLAKY because it crashed at leastdmazzoni@chromium.org2010-04-021-1/+2
| | | | | | | | | | | | twice this morning - revisions 43472 and 43474. BUG=32799 TEST=greenify the tree TBR=rohitrao Review URL: http://codereview.chromium.org/1574011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43489 0039d316-1c4b-4281-b951-d872f2087c98
* Sample code for tracking extension and content events.erikkay@chromium.org2010-04-026-0/+594
| | | | | | | | https://chrome.google.com/extensions/detail/kkfibincabhfblmkmhcabnlghmncdcaf Review URL: http://codereview.chromium.org/1541001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43488 0039d316-1c4b-4281-b951-d872f2087c98
* Update routing info and nudge syncer in ConfigureDataTypes().skrul@chromium.org2010-04-0210-85/+125
| | | | | | | | | | | | | | Here is an incomplete change that will reconfigure the routing info when the DTM calls ConfigureDataTypes. Some open questions: - How will the SBH actually nudge the syncer? I can add a SyncManager::Nudge method if that makes sense. - Looking at the nudge code, it looks like it is possible for nudges to get dropped on the floor. This could be really bad since sync can't start until the syncer thread runs and downloads updates for new data types. Is there a better way to make sure the syncer thread runs at this point? Also, I changed the callback method used for the SBH to notify the DTM that downloads are ready by switching the raw CancelableTask instance with a RunnableMethod. The previous version has the DTM touching the CancelableTask pointer after it was handed over to the SBH which was bad. This should be better. Review URL: http://codereview.chromium.org/1484001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43487 0039d316-1c4b-4281-b951-d872f2087c98
* Update to WebKit r57002darin@chromium.org2010-04-021-1/+1
| | | | | | | | | | TBR=pfeldman BUG=none TEST=none Review URL: http://codereview.chromium.org/1591010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43485 0039d316-1c4b-4281-b951-d872f2087c98
* translate infobar: sort languages in menus by application localekuan@chromium.org2010-04-024-17/+75
| | | | | | | | | | | | - provide string16 sorting methods (there were only std::wstring sorting methods before) - problem is fixed on win, mac, linux and chromeos BUG=39850 TEST=verify per bug report. Review URL: http://codereview.chromium.org/1542009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43484 0039d316-1c4b-4281-b951-d872f2087c98
* Fix bug which causes proxy authentication requeststonyg@chromium.org2010-04-021-4/+4
| | | | | | | | | | to crash Debug builds. BUG=39329 TEST=Mocking a proxy isn't trivial. Ideas? Review URL: http://codereview.chromium.org/1355001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43483 0039d316-1c4b-4281-b951-d872f2087c98
* Adds images needed for new tab animation. I'm separating this intosky@chromium.org2010-04-023-0/+3
| | | | | | | | | | | | its own patch so I can get valid try results. TBR=jcivelli@chromium.org BUG=none TEST=none Review URL: http://codereview.chromium.org/1602004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43482 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 43475 - Adding "preload_engines" and "use_global_engine" preferences ↵rohitrao@chromium.org2010-04-025-79/+2
| | | | | | | | | | | | | | to Chrome side. BUG=crosbug.com/488 TEST=none Review URL: http://codereview.chromium.org/1546010 TBR=yusukes@chromium.org Review URL: http://codereview.chromium.org/1520012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43481 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 43476 - Use "preload_engines" pref on Chrome side to save the list of ↵rohitrao@chromium.org2010-04-022-239/+124
| | | | | | | | | | | | | | | | active IMEs. This change depends on http://codereview.chromium.org/1546010. BUG=crosbug.com/488 TEST=manual Review URL: http://codereview.chromium.org/1576010 TBR=yusukes@chromium.org Review URL: http://codereview.chromium.org/1540012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43480 0039d316-1c4b-4281-b951-d872f2087c98
* With SPDY, when a proxy is set via automatic settings, we had a crash.mbelshe@chromium.org2010-04-021-0/+2
| | | | | | | | | | | | | | | This turned out to be due to the HttpNetworkTransaction leaving the response_ in tact, and accidentally tripping a condition check in the SPDY code. Fix is to properly clear out the response after the tunnel is established. BUG=40159 TEST=none Review URL: http://codereview.chromium.org/1572015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43479 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 43382 - Move fetching of fullfledged auth cookies to a time when we ↵jar@chromium.org2010-04-0227-1073/+332
| | | | | | | | | | | | | | | | | | have the user's real profile available. Also, enable the use of a localaccount on Chrome OS [Valgrind was red, per investigation by rohitrao] many of the changes here are just callsite fixes, because I changed the signature of a function. I also moved my code into the chromeos namespace, which accounts for several other files. The important stuff is in: 1) google_authenticator* 2) cookie_fetcher* 3) login_utils.cc Review URL: http://codereview.chromium.org/1515003 TBR=cmasone@google.com Review URL: http://codereview.chromium.org/1517015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43478 0039d316-1c4b-4281-b951-d872f2087c98
* Move allocator dependency to base for profiler.cc.mmoss@google.com2010-04-022-8/+6
| | | | | | | | | Fixes Linux shlib errors like: lib.target/libbase.so: undefined symbol: ProfilerStart Review URL: http://codereview.chromium.org/1576015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43477 0039d316-1c4b-4281-b951-d872f2087c98
* Use "preload_engines" pref on Chrome side to save the list of active IMEs.yusukes@chromium.org2010-04-022-124/+239
| | | | | | | | | | | This change depends on http://codereview.chromium.org/1546010. BUG=crosbug.com/488 TEST=manual Review URL: http://codereview.chromium.org/1576010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43476 0039d316-1c4b-4281-b951-d872f2087c98
* Adding "preload_engines" and "use_global_engine" preferences to Chrome side.yusukes@chromium.org2010-04-025-2/+79
| | | | | | | | | BUG=crosbug.com/488 TEST=none Review URL: http://codereview.chromium.org/1546010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43475 0039d316-1c4b-4281-b951-d872f2087c98
* Change KeyboardAccessTests from DISABLED to FLAKY to see if they pass now.dmazzoni@chromium.org2010-04-021-2/+2
| | | | | | | | | | BUG=39213 TEST=interactive_ui_tests pass for me locally on Linux, Vista, and XP. TBR=maruel Review URL: http://codereview.chromium.org/1553009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43474 0039d316-1c4b-4281-b951-d872f2087c98
* 1. Create a new sandbox type which allows access to Unix sockets in the Macmsneck@google.com2010-04-028-9/+121
| | | | | | | | | | | | | | | | | | | | | renderer sandbox to support running Native Client. 2. Put the Native Client sel_ldr (which contains the user's untrusted code) into a new Mac sandbox type. 3. Open /dev/random in SandboxWarmup(). 4. Remove the "--nosandbox" flag when running Mac tests. See http://codereview.chromium.org/1234003/show and http://codereview.chromium.org/1525005/show which were both reverted because of problems on Mac 10.6. This change is identical except for the ";NACL" lines in renderer.sb files and the corresponding lines in nacl-loader.sb. Unix socket support for the sandbox changed considerably from 10.5 to 10.6. BUG=http://code.google.com/p/nativeclient/issues/detail?id=327 TEST=nacl_ui_tests still pass while running in the sandbox. Review URL: http://codereview.chromium.org/1559012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43473 0039d316-1c4b-4281-b951-d872f2087c98
* Enable DnsMasterTest.*, URLFetcher*Test.*, HttpBridgeTest.*glider@chromium.org2010-04-021-8/+0
| | | | | | | | under ThreadSanitizer on Mac OS Review URL: http://codereview.chromium.org/1605008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43472 0039d316-1c4b-4281-b951-d872f2087c98
* Don't navigate TestShell page to about:blank if it's devtools frontend ↵yurys@chromium.org2010-04-021-3/+7
| | | | | | | | because it is supposed to load only devtools frontend page and only once. Review URL: http://codereview.chromium.org/1600007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43471 0039d316-1c4b-4281-b951-d872f2087c98
* Updating trunk VERSION from 368.0 to 369.0chrome-release@google.com2010-04-021-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43467 0039d316-1c4b-4281-b951-d872f2087c98
* Add remaining test cases for NetworkScreen.nkostylev@google.com2010-04-023-43/+116
| | | | | | | | | | | | Connecting Ethernet & Cellular network test cases. Fix language library mock warning for CrosInProcessBrowserTest (SetImeConfig). BUG=crosbug.com/2037 TEST=out/Debug/browser_tests --gtest_filter=NetworkScreenTest* Review URL: http://codereview.chromium.org/1604005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43465 0039d316-1c4b-4281-b951-d872f2087c98
* Repair DevTools in docked mode on Gtk. After ↵yurys@chromium.org2010-04-021-2/+12
| | | | | | | | | | http://codereview.chromium.org/1025005 browser hangs when switching between tabs with docked devtools or inspecting an element in a tab with docked devtools. BUG=39716,39883 Review URL: http://codereview.chromium.org/1539008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43464 0039d316-1c4b-4281-b951-d872f2087c98
* POSIX: In functions where we wait for a process with timeout, increment the ↵thestig@chromium.org2010-04-021-14/+24
| | | | | | | | | | amount of time we sleep between polls from 1 to 256 milliseconds instead of always sleeping 250 milliseconds. BUG=none TEST=Perf tests that use WaitForSingleProcess but finishes under 250 ms will get more accurate results. Review URL: http://codereview.chromium.org/1518008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43463 0039d316-1c4b-4281-b951-d872f2087c98
* Fix a pyauto crash while loading locales.nirnimesh@chromium.org2010-04-021-1/+3
| | | | | | | | | | | | Override base::DIR_MODULE too. This is needed for loading up resources correctly. BUG=40192 TEST=python chrome/test/functional/test_basic.py Review URL: http://codereview.chromium.org/1555005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43462 0039d316-1c4b-4281-b951-d872f2087c98
* Add a folders_only and subtree api to bookmark managerfeldstein@chromium.org2010-04-0211-92/+307
| | | | | | | | | | | | | | | | Adds a new API to the experimental.bookmarkManager namespace getSubtree(id, foldersOnly, callback) Which returns any subtree, and if foldersOnly is true, only returns the folders. At this point, only the bookmark tree is using the new call. BUG=39877 TEST=ExtensionBookmarksTest.* Review URL: http://codereview.chromium.org/1611001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43461 0039d316-1c4b-4281-b951-d872f2087c98
* Add --websocket-live-experiment-host flag to debug websocket live experiment.ukai@chromium.org2010-04-024-15/+51
| | | | | | | | | | | If --websocket-live-experiment-host is specified, it is used for host of websocket live experiment in debug build. BUG=none TEST=none Review URL: http://codereview.chromium.org/1524005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43460 0039d316-1c4b-4281-b951-d872f2087c98
* Add missing js file to gyp filefeldstein@chromium.org2010-04-021-0/+1
| | | | | | | | | | | | | BMM was broken, missing this in the gyp file TBR Arv BUG=none TEST=open the BMM and make sure bookmarks show up Review URL: http://codereview.chromium.org/1584009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43459 0039d316-1c4b-4281-b951-d872f2087c98
* Fix a ChromeFrame crash which occurs while handling the open url ↵ananta@chromium.org2010-04-021-2/+4
| | | | | | | | | | | | | | | notification from Chrome. This crash happens while attempting to dereference a NULL IWebBrowser2 interface pointer, which could occur if the client site is NULL, i.e. chrome frame is in the process of being torn down. This fixes bug http://code.google.com/p/chromium/issues/detail?id=40174 Bug=40174 Review URL: http://codereview.chromium.org/1585014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43457 0039d316-1c4b-4281-b951-d872f2087c98
* Fix a ChromeFrame crash which occurs probably in the upgrade scenario where ↵ananta@chromium.org2010-04-021-1/+4
| | | | | | | | | | | | | | | we fail to cocreate our active document object which was most likely unregistered. Added a check to bail here. Fixes bug http://code.google.com/p/chromium/issues/detail?id=40169 Bug=40169 Review URL: http://codereview.chromium.org/1564008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43456 0039d316-1c4b-4281-b951-d872f2087c98
* Fix a ChromeFrame crash in the bind status callback which occurs due to a ↵ananta@chromium.org2010-04-021-1/+3
| | | | | | | | | | | | | | | | | NULL delegate pointer being dereferenced. It appears that there are cases where the IMoniker::BindToObject function is called with a bind context without a registered callback. In this case we should not do anything. Fix is to revoke our callback if we don't find a previous callback. This fixes bug http://code.google.com/p/chromium/issues/detail?id=40153 Bug=40153 Review URL: http://codereview.chromium.org/1589010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43455 0039d316-1c4b-4281-b951-d872f2087c98
* Add TableModel for geolocation settings.mattm@chromium.org2010-04-025-0/+215
| | | | | | | | | BUG=39817,39820 TEST=manual Review URL: http://codereview.chromium.org/1534013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43454 0039d316-1c4b-4281-b951-d872f2087c98
* Override a few more expectations due to r43444.scherkus@chromium.org2010-04-021-0/+2
| | | | | | | | | | TBR=nsylvain BUG=19113 TEST=Windows layout tests should go green Review URL: http://codereview.chromium.org/1512014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43449 0039d316-1c4b-4281-b951-d872f2087c98
* Change NOTREACHED for a LOG(WARNING) when we can't deletensylvain@chromium.org2010-04-021-4/+8
| | | | | | | | | the cache. This should help the unit tests. BUG:38562 Review URL: http://codereview.chromium.org/1594002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43446 0039d316-1c4b-4281-b951-d872f2087c98
* Fix syncing deleted autofills and properly associate when an autofill is added.zork@chromium.org2010-04-023-23/+37
| | | | | | | | | BUG=39957 TEST=Manually test. Review URL: http://codereview.chromium.org/1546009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43445 0039d316-1c4b-4281-b951-d872f2087c98
* Bilinear video scaling enabled (using Skia).scherkus@chromium.org2010-04-022-15/+25
| | | | | | | | | | | | | | | This has a performance impact on scaled video but looks considerably better. We still use our optimized path for unscaled video. Patch by sergeyu@chromium.org http://codereview.chromium.org/1081011/show BUG=19113 TEST=none Review URL: http://codereview.chromium.org/1535017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43444 0039d316-1c4b-4281-b951-d872f2087c98
* Add Flash EULA to about box on Mac (for branded builds).viettrungluu@chromium.org2010-04-021-2/+24
| | | | | | | | | BUG=none TEST=On Chromium, about box should be the same as before. On Google Chrome, about box should have "Adobe Flash Player License Agreement" below the Google Terms of Service, with "License Agreement" an appropriate link. Review URL: http://codereview.chromium.org/1610001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43443 0039d316-1c4b-4281-b951-d872f2087c98
* Implement closing handshake described in draft-hixie-thewebsocketprotocol-76.ukai@chromium.org2010-04-022-4/+126
| | | | | | | | | | | | | | | | exchange closing frame (0xFF 0x00) to close the WebSocket connection cleanly. Land it again with eliminating LOG(ERROR), because it got arm build fail by relocation overflow in relocation 10 at line 167 (LOG(ERROR) line) in net/base/keygen_handler_nss.cc TBR=rohitrao,jar BUG=none TEST=none Review URL: http://codereview.chromium.org/1605007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43442 0039d316-1c4b-4281-b951-d872f2087c98
* Don't forcibly set our network state to NETWORK_LOADING after media initializes.scherkus@chromium.org2010-04-021-3/+2
| | | | | | | | | | | We already set the network state to NETWORK_LOADING before we kick off initialization. Furthermore, we may end up caching the entire media resource and set our network state to NETWORK_IDLE in which case we really don't want to switch back to NETWORK_LOADING. BUG=25185 TEST=covered by layout tests Review URL: http://codereview.chromium.org/1518013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43441 0039d316-1c4b-4281-b951-d872f2087c98
* Move enable/disable storage to prefs.nick@chromium.org2010-04-0216-167/+242
| | | | | | | | | | | | | | | | | | | | | | | The ProfileSyncService will manage the enabled/disabled types. Remove CustomizeSyncWindowView's DataTypeManager dependency; it should really just be operating on the preferences via the ProfileSyncService. Clarify the difference between types being enabled (meaning the user wants to sync them) versus being advertisable (meaning we support the datatype, and advertise that the user has the option of syncing it). BUG=34209,38340 TEST=After syncing, open the options dialog and recustomize your options. Verify that the enabled types from the wizard match the initial state of the options window. After changing the options and hitting "accept", observe that a breakpoint in DTM::Configure gets triggered, with exactly the new configuration set. Verify that the preferences are preserved on restart, as well as across Stop Syncing / Start Syncing. Review URL: http://codereview.chromium.org/1556009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43440 0039d316-1c4b-4281-b951-d872f2087c98
* Enable support for additional media formats by using the duration from ↵scherkus@chromium.org2010-04-021-1/+7
| | | | | | | | | | | | | | | AVFormatContext, if present. Some media formats do not have a duration specified in the individual audio/video streams. However if the container itself lists a duration we can simply rely on that value. Patch by ducksource@gmail.com BUG=none TEST=additional media formats should be playable in Chrome if enabled in FFmpeg Review URL: http://codereview.chromium.org/1608005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43439 0039d316-1c4b-4281-b951-d872f2087c98
* Fix AutoFillProfile leaks in WebDataService.tim@chromium.org2010-04-021-9/+14
| | | | | | | | TBR=akalin Review URL: http://codereview.chromium.org/1569016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43438 0039d316-1c4b-4281-b951-d872f2087c98
* Fixed bugs related to the GPU process terminating unexpectedly.kbr@google.com2010-04-022-11/+4
| | | | | | | | | | BUG=40173 TEST=ran WebGL tests, killed GPU process, and reloaded page TBR=jam Review URL: http://codereview.chromium.org/1549013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43437 0039d316-1c4b-4281-b951-d872f2087c98
* Add generic "json dict" entry point for pyauto commands. Will preventjrg@chromium.org2010-04-0213-4/+255
| | | | | | | | | | | | | | | | the need to modify the automation proxy anymore. New pyauto commands will only need to edit pyauto.py (to add a new SendJSONCommand() call) and browser_proxy.cc (to implement the other side). Contrast with the normal editing of ~8 files. Also added WaitForAllDownloadsToComplete using new JSON path. BUG=http://crbug.com/39274 Review URL: http://codereview.chromium.org/1547012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43436 0039d316-1c4b-4281-b951-d872f2087c98