summaryrefslogtreecommitdiffstats
path: root/chrome/chrome_tests.gypi
Commit message (Collapse)AuthorAgeFilesLines
* Fixes paths in r43760nirnimesh@chromium.org2010-04-071-2/+3
| | | | | | | | | TEST=green BUG=None Review URL: http://codereview.chromium.org/1564013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43865 0039d316-1c4b-4281-b951-d872f2087c98
* Tweaks to BoundsAnimator/SlideAnimation and TabStrip:sky@chromium.org2010-04-071-0/+1
| | | | | | | | | | | | | | | | . Adds unit test for BoundsAnimator and SlideAnimation. . Fixes leak in BoundsAnimator. . Fixes possibility of deleting delegate twice. . Makes sure delegate is notified when new animation is set for view. . Fixes crashes in TabStrip that resulted from dragging a tab back in. BUG=40475 TEST=make sure dragging tabs out/in to a tabstrip doesn't cause problems. Review URL: http://codereview.chromium.org/1585020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43864 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 43836 - Adds geolocation_permission_context_unittest.ccbulach@chromium.org2010-04-071-1/+0
| | | | | | | | | | | | | (most of this code is already covered by the more complex geolocation_browsertest.cc which traverses far more layers. this is a more specific unittest). TEST=geolocation_permission_context_unittest.cc Valgrind error: http://build.chromium.org/buildbot/memory/builders/Linux%20Tests%20(valgrind)(1)/builds/3857/steps/valgrind%20test:%20unit/logs/stdio Review URL: http://codereview.chromium.org/1596012 TBR=bulach@chromium.org Review URL: http://codereview.chromium.org/1629006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43849 0039d316-1c4b-4281-b951-d872f2087c98
* Adds geolocation_permission_context_unittest.ccbulach@chromium.org2010-04-071-0/+1
| | | | | | | | | | (most of this code is already covered by the more complex geolocation_browsertest.cc which traverses far more layers. this is a more specific unittest). TEST=geolocation_permission_context_unittest.cc Review URL: http://codereview.chromium.org/1596012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43836 0039d316-1c4b-4281-b951-d872f2087c98
* Move NormalizeLanguageCode() and IsKeyboardLayout() to LanguageLibrary.satorux@chromium.org2010-04-071-0/+1
| | | | | | | | | | | So that we can use these functions outside of LanguageConfigView. TEST=unit_tests BUG=none Review URL: http://codereview.chromium.org/1562015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43835 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 43684 - Localize CSS files in content scripts (but don't localize JS ↵cira@google.com2010-04-071-1/+0
| | | | | | | | | | | | | | | | files). Add UserScriptSlave unittest. BUG=39899 TEST=List css file in content_scripts section of the manifest. Refer to an image using url(chromeextension://__MSG_@@extension_id_/image.png); within that css. @@extension_id message should be replaced with actual id of the extension. Review URL: http://codereview.chromium.org/1585013 TBR=cira@chromium.org Review URL: http://codereview.chromium.org/1525014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43784 0039d316-1c4b-4281-b951-d872f2087c98
* Fix errors in ExtensionPrefs with storing the blacklist last ping day.asargent@chromium.org2010-04-061-0/+1
| | | | | | | | | | | | | | | | | | This moves where we were storing the blacklist last ping day so that we aren't storing an invalid extension id in the prefs, and adds code to keep invalid ids from being stored. It also removes some warnings in cases that aren't errors, and finally adds some unit tests for extension_prefs to try and keep similar problems from happening in the future. BUG=40017 TEST=Should not get any DCHECK failures in Debug builds when you do an extension update manually (via the chrome://extensions page) and then restart the browser. Review URL: http://codereview.chromium.org/1596008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43782 0039d316-1c4b-4281-b951-d872f2087c98
* Implemented customize sync dialog for OS X (except for integrationakalin@chromium.org2010-04-061-0/+1
| | | | | | | | | | | | | | | with the Sync Setup Wizard). Added "Customize..." button in Sync group of "Personal Stuff" in Preferences. (Preferences.xib) Added new customize sync dialog (SyncCustomize.xib) called by button above. BUG=34209 TEST=manual Review URL: http://codereview.chromium.org/1525007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43775 0039d316-1c4b-4281-b951-d872f2087c98
* Changing the translate back-end to use the Google Translate element.jcivelli@google.com2010-04-061-4/+3
| | | | | | | | | | | | | | | | When the user indicates that a page should be translated, the browser first fetches the Google Translate Element JS code. It then sends it to the renderer, which injects the script in the page, waits for the Translate element to be initialized and then calls the translate method on it. The TranslationService class previously used to translate text chunks is now unused and has been removed. Some of its static methods that are still used have been moved to the TranslateManager class. This CL also implements the "revert" translation behavior. BUG=35474,37778,35553,39375 TEST=Test the translation feature extensively. Review URL: http://codereview.chromium.org/1599016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43768 0039d316-1c4b-4281-b951-d872f2087c98
* Explicitly add a dependency on a few headers pyauto uses.nirnimesh@chromium.org2010-04-061-0/+2
| | | | | | Review URL: http://codereview.chromium.org/1524013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43760 0039d316-1c4b-4281-b951-d872f2087c98
* Add some shutdown perf tests. We measure shutdown for the combination ofthestig@chromium.org2010-04-061-0/+1
| | | | | | | | | | | shutdown method: {Close all windows, clicking exit, terminating process} and number of tabs open: {just about:blank, twenty tabs} BUG=23118 TEST=This CL adds a test. Review URL: http://codereview.chromium.org/1594008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43758 0039d316-1c4b-4281-b951-d872f2087c98
* Add support for basic extension automation through the Automation Proxy.kkania@chromium.org2010-04-061-0/+3
| | | | | | | | BUG=36171 TEST=none Review URL: http://codereview.chromium.org/1048002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43730 0039d316-1c4b-4281-b951-d872f2087c98
* Disable incremental linking for startup_tests. A trybot could not link this ↵thestig@chromium.org2010-04-061-0/+9
| | | | | | | | | | binary anymore after I added some shutdown tests. BUG=none TEST=none Review URL: http://codereview.chromium.org/1569022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43725 0039d316-1c4b-4281-b951-d872f2087c98
* gtk: Implement status icons on linux.evan@chromium.org2010-04-061-2/+4
| | | | | | | | | | | | | (Retry with less build breakage this time.) BUG=37375 TEST=out/Debug/unit_tests --gtest_filter=StatusTrayGtkTest.* Patch from Thiago Farina <thiago.farina@gmail.com> Review URL: http://codereview.chromium.org/1421001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43721 0039d316-1c4b-4281-b951-d872f2087c98
* Localize CSS files in content scripts (but don't localize JS files).cira@chromium.org2010-04-061-0/+1
| | | | | | | | | | | Add UserScriptSlave unittest. BUG=39899 TEST=List css file in content_scripts section of the manifest. Refer to an image using url(chrome-extension://__MSG_@@extension_id_/image.png); within that css. @@extension_id message should be replaced with actual id of the extension. Review URL: http://codereview.chromium.org/1585013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43684 0039d316-1c4b-4281-b951-d872f2087c98
* sync: Specify linking dependencies correctly. The browser library contains ↵thestig@chromium.org2010-04-051-7/+1
| | | | | | | | | | | lots of files in chrome/browser/sync. They need to depend on the syncapi library and not just sync_proto. BUG=none TEST=Random CLs don't trigger linking errors. TBR=nick Review URL: http://codereview.chromium.org/1564010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43675 0039d316-1c4b-4281-b951-d872f2087c98
* Re-land 43382, which was reverted in 43478 due to valgrind problems.cmasone@google.com2010-04-051-0/+2
| | | | | | | | | | | | | | Valgrind issues failures addressed, trying to land this again. Move fetching of fullfledged auth cookies to a time when we have the user's real profile available. Also, enable the use of a localaccount on Chrome OS. Initial CL: http://codereview.chromium.org/1515003 Revert CL: http://codereview.chromium.org/1517015 Review URL: http://codereview.chromium.org/1567020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43629 0039d316-1c4b-4281-b951-d872f2087c98
* Mac: Implement geolocation exceptions dialog.thakis@chromium.org2010-04-051-0/+1
| | | | | | | | | | | | | | | | xib changes: Content settings window: Enable & hook up "exceptions" button. The dialog is not "live" (i.e. if it's open while settings are deleted through the bubble, the window is only updated after closing & reopening it). It's not possible to do any editing in the window, only deleting. This matches windows/linux. http://imgur.com/q7qMK BUG=39818 TEST=Go to a few geolocation pages, click allow/deny. Then go to content settings->locations->exceptions, the visited pages should be listed. Review URL: http://codereview.chromium.org/1566015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43610 0039d316-1c4b-4281-b951-d872f2087c98
* Add the new extension install dialog for mac.aa@chromium.org2010-04-031-0/+1
| | | | | | | | | | | | | | There are two xibs in this change. ExtensionInstallPrompt.xib: This handles the more common case of installing an extension with one or more permission warnings. There is an NSBox with room for the warnings which are separated by \n\n. ExtensionInstallPromptNoWarnings.xib: It is also possible to install an extension with zero permission warnings. This is currently rare, but we hope to make it more common in the coming quarters. In this case, there is no NSBox and the layout is slightly different. BUG=29633 Review URL: http://codereview.chromium.org/1540013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43575 0039d316-1c4b-4281-b951-d872f2087c98
* Revert.evan@chromium.org2010-04-031-4/+2
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43556 0039d316-1c4b-4281-b951-d872f2087c98
* Build fix.evan@chromium.org2010-04-031-2/+3
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43554 0039d316-1c4b-4281-b951-d872f2087c98
* gtk: Implement status icons on linux.evan@chromium.org2010-04-031-0/+1
| | | | | | | | | | | BUG=37375 TEST=out/Debug/unit_tests --gtest_filter=StatusTrayGtkTest.* Patch from Thiago Farina <thiago.farina@gmail.com> Review URL: http://codereview.chromium.org/1421001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43553 0039d316-1c4b-4281-b951-d872f2087c98
* Removing crashing test that should not crash, at least until fix is found.dhg@chromium.org2010-04-021-1/+0
| | | | | | Review URL: http://codereview.chromium.org/1530018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43549 0039d316-1c4b-4281-b951-d872f2087c98
* Fix a crash when an extension bg page calls alert(). Add regression tests thismpcomplete@chromium.org2010-04-021-0/+1
| | | | | | | | | | time. BUG=37567 Review URL: http://codereview.chromium.org/1602005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43530 0039d316-1c4b-4281-b951-d872f2087c98
* Remove the themeing from the folder menu background, text in the folder menu ↵mrossetti@chromium.org2010-04-021-0/+1
| | | | | | | | | | | items, and no longer needed calls. Changed the menu button stroke color to a lighter shade of black. Did a bit of refactoring of how bookmark buttons are created. BUG=39428 TEST=Pop up a folder menu and insure that the background does not adopt any theme settings. Review URL: http://codereview.chromium.org/1589005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43511 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 43382 - Move fetching of fullfledged auth cookies to a time when we ↵jar@chromium.org2010-04-021-2/+0
| | | | | | | | | | | | | | | | | | 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
* Add a folders_only and subtree api to bookmark managerfeldstein@chromium.org2010-04-021-0/+1
| | | | | | | | | | | | | | | | 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
* Move fetching of full-fledged auth cookies to a time when we have the user's ↵cmasone@google.com2010-04-011-0/+2
| | | | | | | | | | | | | real profile available. Also, enable the use of a localaccount on Chrome OS 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 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43382 0039d316-1c4b-4281-b951-d872f2087c98
* Move the Nigori classes from base to sync.albertb@chromium.org2010-04-011-0/+2
| | | | | | | | | BUG=none TEST=NigoriTest Review URL: http://codereview.chromium.org/1549012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43366 0039d316-1c4b-4281-b951-d872f2087c98
* Fix a bug where we were showing "t" in language config dialog.satorux@chromium.org2010-04-011-0/+1
| | | | | | | | | | Instead, we'll be showing "Others" BUG=crosbug.com/2167 Review URL: http://codereview.chromium.org/1608002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43325 0039d316-1c4b-4281-b951-d872f2087c98
* AutoFill credit card field filling.dhollowa@chromium.org2010-03-311-0/+1
| | | | | | | | | | | | | Adds logic to heuristically determine when credit card fields are present in a form and fills in user-provided credit card data into form fields when appropriate. BUG=38320 TEST=CreditCardFieldTest, FormStructureTest, manual testing with cc.html (attached). Review URL: http://codereview.chromium.org/1534005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43233 0039d316-1c4b-4281-b951-d872f2087c98
* Adding API tests for getViews and infobars.finnur@chromium.org2010-03-311-0/+2
| | | | | | | | | | | | | Also fixing a bug where the wrong window id was returned back after creating the infobar, and changing html path param when calling show() from htlpPath to path as requrested by aa. TEST=See chrome_tests.gypi BUG=26463 Review URL: http://codereview.chromium.org/1561003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43176 0039d316-1c4b-4281-b951-d872f2087c98
* Attempt 2 at landing this. Patch is exactly same as last time around.sky@chromium.org2010-03-301-0/+1
| | | | | | | | | | | | Adds ability for ImageLoadingTracker to cache images. BUG=none TEST=none TBR=aa@chromium.org Review URL: http://codereview.chromium.org/1534006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43130 0039d316-1c4b-4281-b951-d872f2087c98
* Fixed flakiness of AccountScreenTest:avayvod@google.com2010-03-301-0/+2
| | | | | | | | | | | | | - test server to serve account creation page - deferred creation of login windows to tune account screen for testing - refactored InProcessBrowserTest to shutdown test reliably. BUG=39310 TEST=Run browser_tests with --gtest_filter=AccountScreenTest.* Review URL: http://codereview.chromium.org/1452001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43118 0039d316-1c4b-4281-b951-d872f2087c98
* Port some omnibox provider methods to Mac.nirnimesh@chromium.org2010-03-301-1/+0
| | | | | | | | | | | Well, I didn't really port. I just uncommented out some methods marked UNIMPLEMENTED(). They seem to work just fine. TEST=ui_tests --gtest_filter=OmniboxTest.* --run_omnibox_test Review URL: http://codereview.chromium.org/1513003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43094 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 43005 - Adds ability for ImageLoadingTracker to cache images.sky@chromium.org2010-03-291-1/+0
| | | | | | | | | | | | BUG=none TEST=none Review URL: http://codereview.chromium.org/1251011 TBR=sky@chromium.org Review URL: http://codereview.chromium.org/1526003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43008 0039d316-1c4b-4281-b951-d872f2087c98
* Adds ability for ImageLoadingTracker to cache images.sky@chromium.org2010-03-291-0/+1
| | | | | | | | | BUG=none TEST=none Review URL: http://codereview.chromium.org/1251011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43005 0039d316-1c4b-4281-b951-d872f2087c98
* Created test for panelsdavemoore@chromium.org2010-03-291-0/+1
| | | | | | Review URL: http://codereview.chromium.org/1543001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43003 0039d316-1c4b-4281-b951-d872f2087c98
* Mac: Give links in infobars a reliable hand cursor.thakis@chromium.org2010-03-291-1/+0
| | | | | | | | | | | | | Do this by switching the text from a NSTextField to a NSTextView. xib changes: Make text field an ordinary NSTextField instead of our own subclass, connect it to labelPlaceholder_ instead of to label_. BUG=?,22187 TEST=Open an infobar with a link (e.g. the new geolocation infobars). The cursor should become a hand on hover, and clicking the info bar should no longer put a caret in there. Other infobars (e.g. "Flash plugin crashed" when you kill the flash process on youtube) should look exactly as before. The cursor should still not become an ibeam. Review URL: http://codereview.chromium.org/1552001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42985 0039d316-1c4b-4281-b951-d872f2087c98
* Implemented initial version of themes syncing (behind a flag).akalin@chromium.org2010-03-291-0/+2
| | | | | | | | | BUG=32414 TEST=manual,unittests,trybot Review URL: http://codereview.chromium.org/1399001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42984 0039d316-1c4b-4281-b951-d872f2087c98
* Renamed pepper_test_plugin target to npapi_pepper_test_plugin. The automated ↵alokp@chromium.org2010-03-291-1/+1
| | | | | | | | tests copy built dll to plugins folder so they can be found and loaded. But chrome only loads dlls whose name matches np*.dll pattern. Hence the change. Review URL: http://codereview.chromium.org/1453001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42950 0039d316-1c4b-4281-b951-d872f2087c98
* Don't show extension state in cookie tree list.jochen@chromium.org2010-03-291-0/+1
| | | | | | | | | | BUG=38659 TEST=Unit tests in browsing_data_local_storage_helper_unittest.cc and browsing_data_database_helper_unittest.cc Review URL: http://codereview.chromium.org/1405002 Patch from Mattias Nissler. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42935 0039d316-1c4b-4281-b951-d872f2087c98
* Reverted back change #1337001, fixing the unit tests in chromium builds:georgey@chromium.org2010-03-291-0/+1
| | | | | | | | | | | | Second part of the integration with autofill servers. 1. Corrected signature calculations. 2. Added unit-test 3. Fixed numerous issues, including multiple forms on the page, etc. BUG=none TEST=should work correctly with more servers. Review URL: http://codereview.chromium.org/1516001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42933 0039d316-1c4b-4281-b951-d872f2087c98
* Added two browser tests for CompactLocationBarHost.oshima@chromium.org2010-03-281-11/+12
| | | | | | | | | | | Changed to use ui_controls::SendKeyPress instead of its own. BUG=http://crosbug.com/2028 TEST=two new browser tests for CompactLocationBarHost. Review URL: http://codereview.chromium.org/1463002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42920 0039d316-1c4b-4281-b951-d872f2087c98
* Reverting due to test failures on Interactive tests on Mac and Linuxamit@chromium.org2010-03-261-1/+0
| | | | | | | | | | | | | | | Revert 42846 - Second part of the integration with autofill servers. 1. Corrected signature calculations. 2. Added unittest 3. Fixed numerous issues, including multiple forms on the page, etc. BUG=none TEST=should work correctly with more servers. Review URL: http://codereview.chromium.org/1337001 TBR=georgey@chromium.org Review URL: http://codereview.chromium.org/1478001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42850 0039d316-1c4b-4281-b951-d872f2087c98
* Second part of the integration with autofill servers.georgey@chromium.org2010-03-261-0/+1
| | | | | | | | | | | 1. Corrected signature calculations. 2. Added unit-test 3. Fixed numerous issues, including multiple forms on the page, etc. BUG=none TEST=should work correctly with more servers. Review URL: http://codereview.chromium.org/1337001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42846 0039d316-1c4b-4281-b951-d872f2087c98
* Added a test for pepper3d. It ensures that we can successfully load a pepper ↵alokp@chromium.org2010-03-261-6/+2
| | | | | | | | 3d plugin and render. Review URL: http://codereview.chromium.org/1073003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42793 0039d316-1c4b-4281-b951-d872f2087c98
* Fixes bug where triggering session restore while the browser wassky@chromium.org2010-03-261-0/+1
| | | | | | | | | | | | | | already running would end up creating an extra tab. BUG=11594 TEST=open chrome with a single tabbed browser, turn on session restore, navigate to a page with a popup, close the tabbed browser, create a new window ala control-n (or double click on the desktop), and make the restored window doesn't end upw Review URL: http://codereview.chromium.org/1371002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42766 0039d316-1c4b-4281-b951-d872f2087c98
* In process browser test for login screen.dpolukhin@chromium.org2010-03-261-1/+2
| | | | | | | | | BUG=chromiumos:2036 TEST=Run out/Debug/browser_tests --gtest_filter=LoginManagerViewTest.TestBasic Review URL: http://codereview.chromium.org/1256004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42750 0039d316-1c4b-4281-b951-d872f2087c98
* [GTTF] Remove the in-process test launcher, which is no longer used.phajdan.jr@chromium.org2010-03-261-2/+0
| | | | | | | | | | | I plan to further rearrange the files after landing this CL so that the names make sense again. TEST=browser tests and live sync tests BUG=none Review URL: http://codereview.chromium.org/1310003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42737 0039d316-1c4b-4281-b951-d872f2087c98