summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Publish DEPS for Chromium 9.0.572.19.0.572.1gitdeps2014-04-071-308/+190
|
* Updating trunk VERSION from 572.0 to 573.0 to 572.1chrome-release@google.com2010-11-041-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/572/src@65038 0039d316-1c4b-4281-b951-d872f2087c98
* Branching for 572 @65030chrome-release@google.com2010-11-040-0/+0
| | | | git-svn-id: svn://svn.chromium.org/chrome/branches/572/src@65036 0039d316-1c4b-4281-b951-d872f2087c98
* Temporarily disable failing layout test on Windows & Mac (Debug)rolandsteiner@chromium.org2010-11-041-0/+2
| | | | | | | | | BUG=none TEST=none TBR=dumi git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65030 0039d316-1c4b-4281-b951-d872f2087c98
* Add include directory for ICC JPEG. Turns out this is required to actually ↵abarth@chromium.org2010-11-041-0/+5
| | | | | | use the library. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65029 0039d316-1c4b-4281-b951-d872f2087c98
* Implement DOM UI version of keyboard overlay.mazda@chromium.org2010-11-0412-0/+24062
| | | | | | | | | | | Add a URL chrome://keyboardoverlay/ for keyboard overlay. BUG=chromium-os:6268 TEST=manually on the net book Review URL: http://codereview.chromium.org/4226001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65028 0039d316-1c4b-4281-b951-d872f2087c98
* Prevent the timezone change in Guest mode.satorux@chromium.org2010-11-042-0/+12
| | | | | | | | | | | | | | | | The timezone change has been already prohibited by r64579 in C++, but we should also disable this in the system settings page. Note that manually_disabled is introduced in pref_ui.js since setting "disabled = true" in options pages is overridden in the event listener in pref_ui.js. BUG=chromium-os:8541 TEST=confirmed that the timezone selection was disabled in guest mode. Review URL: http://codereview.chromium.org/4296001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65027 0039d316-1c4b-4281-b951-d872f2087c98
* [Mac] Turn down window-resize time for tests.shess@chromium.org2010-11-041-0/+10
| | | | | | | | | | | | | You know when you're running the unit tests and windows pop up and a sheet slides in? This makes them not do that. Found this setting while researching something else. BUG=none TEST=none Review URL: http://codereview.chromium.org/4410002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65026 0039d316-1c4b-4281-b951-d872f2087c98
* WebKit roll 71224:71300rolandsteiner@chromium.org2010-11-041-1/+1
| | | | | | | | | BUG=none TEST=none Review URL: http://codereview.chromium.org/4468001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65024 0039d316-1c4b-4281-b951-d872f2087c98
* Fixing a stupid typo.dumi@chromium.org2010-11-041-1/+1
| | | | | | | | | | BUG=none TEST=none TBR=darin Review URL: http://codereview.chromium.org/4426004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65023 0039d316-1c4b-4281-b951-d872f2087c98
* Including <stdin.h> to hopefully fix a build error on the ChromeOS bots.dumi@chromium.org2010-11-041-0/+2
| | | | | | | | | | BUG=none TEST=none TBR=darin Review URL: http://codereview.chromium.org/4469001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65022 0039d316-1c4b-4281-b951-d872f2087c98
* Disable AccessibilityWinBrowserTest.TestNotificationValueChangedctguil@chromium.org2010-11-041-1/+2
| | | | | | | | | BUG=61849 TEST=none TBR=dmazzoni@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65017 0039d316-1c4b-4281-b951-d872f2087c98
* Remaining fixes for activation process.zelidrag@chromium.org2010-11-042-27/+91
| | | | | | | | | BUG=chromium-os:8400 TEST=make sure cellular connection can be activated from chrome:mobilesetup Review URL: http://codereview.chromium.org/4333002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65016 0039d316-1c4b-4281-b951-d872f2087c98
* Fancy filter (jpeg term) using 9 3 3 1 coefficients for chroma upsample.fbarchard@chromium.org2010-11-046-122/+297
| | | | | | | | | BUG=none TEST=none Review URL: http://codereview.chromium.org/4425002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65012 0039d316-1c4b-4281-b951-d872f2087c98
* OSMesa SwapBuffers does not fail if the window handle is invalid on windows.apatrick@chromium.org2010-11-041-9/+18
| | | | | | | | | | | This is because the primary application of this class of GLContext is for testing and we do not want every GL related ui browser test to become flaky if there is a race condition between GL context destruction and window destruction. TEST=try BUG=none Review URL: http://codereview.chromium.org/4458001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65011 0039d316-1c4b-4281-b951-d872f2087c98
* Adding OOM priority management for renderers on ChromeOS.gspencer@chromium.org2010-11-049-13/+259
| | | | | | | | | | | | | | | | | [I actually did this two months ago, and though I had committed it, but due to the "git cl push" vs "git cl dcommit" craziness, it was never in the tree.] It was previously reviewed and LGTM'd here: http://codereview.chromium.org/3235007/show BUG=none TEST=Tested on device, both using large numbers of tabs, and small tabs that used lots of memory. Review URL: http://codereview.chromium.org/4446002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65010 0039d316-1c4b-4281-b951-d872f2087c98
* Moving/Rename host/ClientConnection.{h,cc} -> protocol/ConnectionToClient.{h,cc}ajwong@chromium.org2010-11-0411-192/+225
| | | | | | | | | | | Also move the unittest. BUG=None TEST=compiles Review URL: http://codereview.chromium.org/4352002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65009 0039d316-1c4b-4281-b951-d872f2087c98
* Remove FileRef, FileIO and DirectoryReader PPAPI tests from ui_testsdumi@chromium.org2010-11-041-12/+0
| | | | | | | | | | | | | for now. It looks like run_testserver is crashing. BUG=none TEST=none TBR=darin Review URL: http://codereview.chromium.org/4411002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65008 0039d316-1c4b-4281-b951-d872f2087c98
* roll libvpx forward by 1 CL to force a sync. attempt to get buildbots to syncfbarchard@chromium.org2010-11-041-1/+1
| | | | | | | | BUG=none TEST=none git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65007 0039d316-1c4b-4281-b951-d872f2087c98
* Move protocol classes to the remoting::protocol namespacesergeyu@chromium.org2010-11-0447-79/+148
| | | | | | | | | BUG=None TEST=compiles Review URL: http://codereview.chromium.org/4233005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65006 0039d316-1c4b-4281-b951-d872f2087c98
* Pepper's directory reader implementation + test.dumi@chromium.org2010-11-0425-230/+454
| | | | | | | | | BUG=none TEST=test_directory_reader.cc Review URL: http://codereview.chromium.org/4107004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65002 0039d316-1c4b-4281-b951-d872f2087c98
* chrome_exe_main: name os-specific files according to naming patternevan@chromium.org2010-11-046-18/+19
| | | | | | | | | | | | These files probably just predate us having a _win suffix on Windows-specific code. BUG=18504 TEST=compiles Review URL: http://codereview.chromium.org/4451001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65001 0039d316-1c4b-4281-b951-d872f2087c98
* linux: include linux/nfs_fs.h for NFS superblock magicevan@chromium.org2010-11-041-1/+1
| | | | | | | | | | | | The location of the definition we want has moved over time. See the bug for why this location is better. BUG=52269 TEST=compiles Review URL: http://codereview.chromium.org/4455001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65000 0039d316-1c4b-4281-b951-d872f2087c98
* adding a space to DEPSfbarchard@chromium.org2010-11-041-0/+1
| | | | | | | | BUG=none TEST=none git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64999 0039d316-1c4b-4281-b951-d872f2087c98
* DOMUI: Make content settings exception lists zippy (aka expandable/collapsable).mdm@chromium.org2010-11-048-71/+367
| | | | | | | | | | Loosely based on http://codereview.chromium.org/3038006 by estade. BUG=57437 TEST=cool zippy exception lists in DOMUI content settings Review URL: http://codereview.chromium.org/4191005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64998 0039d316-1c4b-4281-b951-d872f2087c98
* removing a blank linefbarchard@chromium.org2010-11-041-1/+0
| | | | | | | | BUG=none TEST=none git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64997 0039d316-1c4b-4281-b951-d872f2087c98
* move full libvpx tree into deps to include license and gypfbarchard@chromium.org2010-11-042-98/+5
| | | | | | | | | BUG=55165 TEST=tools/licenses.py Review URL: http://codereview.chromium.org/4341005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64996 0039d316-1c4b-4281-b951-d872f2087c98
* Handle volume keys within Chrome (restore WM key handling)davej@chromium.org2010-11-032-1/+35
| | | | | | | | | | | Until volume key grabbing is removed from window manager, Chrome needs to keep responding to the key messages from window manager. This patch puts that functionality back in until this is done. BUG=chromium-os:6074, chromium-os:8635 TEST=Volume Up/Down and Mute keys should work when screen is locked and when logged in normally. Review URL: http://codereview.chromium.org/4420001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64994 0039d316-1c4b-4281-b951-d872f2087c98
* [ChromeOS] Hardcoded screen lock enabled for google.com users.xiyuan@chromium.org2010-11-031-1/+10
| | | | | | | | | | | | | This is a sad change that we have to hard code this. :( And hopefully, we will get the enterprise feature complete soon and could remove this hack. BUG=none. TEST=Verify that screen lock is enabled for google.com logins. Review URL: http://codereview.chromium.org/4347001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64992 0039d316-1c4b-4281-b951-d872f2087c98
* Reduce Jankometer measurements by only periodically samplingjar@chromium.org2010-11-031-0/+50
| | | | | | | | | | | | | | | | The Jankometer is monitoring durations for each task, but most of the time, this work is not used. I changed the system to only sample the durations, unless someone turns on a watchdog, and then we monitor every event. The sampling is deterministic, (every N events is sampled) but should be fine when we aggregate across thousands of users in a histogram. r=brettw Review URL: http://codereview.chromium.org/4279003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64991 0039d316-1c4b-4281-b951-d872f2087c98
* Allow histograms in cache stats.cc to bypass corruption checksjar@chromium.org2010-11-037-19/+249
| | | | | | | | | | | | | | | | This is a relanding of http://codereview.chromium.org/4174002 The change in this CL is that I've made the function to look for errors virtual, and over-rode it in StatsHistograms. The current override doesn't actually check for inconsistencies, so that the UMA checks (and renderer-to-histogram checks) won't complain and refuse to transport the histograms. BUG=61281 r=rvargas Review URL: http://codereview.chromium.org/4364001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64990 0039d316-1c4b-4281-b951-d872f2087c98
* Reenabling the ChromeFrame test FullTabModeIE_WindowClose which failed ↵ananta@chromium.org2010-11-031-5/+1
| | | | | | | | | | | | | because the type lib needs to be generated and included in the chrome frame binary. This may need a clobber. Bug=61011 TBR=amit Review URL: http://codereview.chromium.org/4445001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64989 0039d316-1c4b-4281-b951-d872f2087c98
* PyAuto hooks for Sync in TestingAutomationProviderrsimha@chromium.org2010-11-0316-67/+570
| | | | | | | | | | | | | | | | | | This patch exposes hooks for sync in TestingAutomationProvider that the chrome pyauto test suite can use. It contains the following changes: - Partial revert of an earlier change to ProfileSyncServiceHarness. Some of its methods were made pure virtual, but this ended up being unnecessary. Also ripped out unnecessary code from LiveSyncTest. - Minor refactor of ProfileSyncServiceHarness to allow for scenarios where the browser is restarted. - A bunch of new methods in TestingAutomationProvider: SignInToSync, GetSyncInfo, AwaitSyncCycleCompletion, EnableSyncForDatatypes and DisableSyncForDatatypes. - A new method in model_type.h/cc called ModelTypeFromString. Required for automation. - New APIs in pyauto.py for sync. - New test suite sync.py with sample tests. BUG=53651, 60970, 56460, 61639 TEST=run pyauto sync tests Review URL: http://codereview.chromium.org/4096004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64988 0039d316-1c4b-4281-b951-d872f2087c98
* Add support for the extended header parameter syntax in Content-Disposition ↵jshin@chromium.org2010-11-037-25/+268
| | | | | | | | | | | | | | | | | | | | | | header (RFC 5987). It's not generic, but is only used for 'filename' param. The CL is originally by James Simonsen I reviewed at http://codereview.chromium.org/4254001/show I added a check for ASCIIness for RFC 5987 extended header and a few tests to NetUti*.GetFileNameFromCD (net_unittests) and I*.ConvertCo*Norma* (base_unittests). I also replaced '\uxxxx' notation with the corresponding UTF-8 byte sequence because Visual Studio does not understand it yet. BUG=57830 TEST="net_unittests --gtest_filter=NetU*.GetFil*", "base_unittests --gtest_filter=I*.Conver*Norm*" and tests at http://greenbytes.de/tech/tc2231/ Original CL / Review: By James Simonsen; at http://codereview.chromium.org/4254001/show Review URL: http://codereview.chromium.org/4435001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64987 0039d316-1c4b-4281-b951-d872f2087c98
* net: Make Snap Start check cert verification and add metricsagl@chromium.org2010-11-035-12/+60
| | | | | | | | | | | | | | | | This CL causes Snap Start to only trigger if the certificate verification has completed by the time we are ready to send out the handshake message. It also adds a couple of NetLog entries and histograms around the Snap Start code. BUG=none TEST=none http://codereview.chromium.org/4408001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64986 0039d316-1c4b-4281-b951-d872f2087c98
* Roll gyp DEPS to 856. This pulls in 2 makefile changestony@chromium.org2010-11-031-1/+1
| | | | | | | | and 3 xcode changes. Review URL: http://codereview.chromium.org/4106017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64985 0039d316-1c4b-4281-b951-d872f2087c98
* Re-design the malware interstitial page. The change is mostly about: make ↵arv@chromium.org2010-11-033-38/+198
| | | | | | | | | | | | | | | the 'go back' button big and green in a central place, to encourage people go back to safety; and more clear description about why we block the page. Sample screenshots at: https://docs.google.com/document/edit?id=1Kk2wxsj8JjIjlC1WUPamDlEPWZH-iWUoECMRdyQ9t_4&hl=en&authkey=CJKfrM0D Patch from Ke Wang <kewang@google.com> BUG=60813 TEST=unit_tests. To see the UI change, start the browser and try load some sites in malware blacklist. Review URL: http://codereview.chromium.org/4175003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64984 0039d316-1c4b-4281-b951-d872f2087c98
* Disabling GPUUITest.UITestLaunchedWithOSMesa valgrind.apatrick@chromium.org2010-11-031-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Compiling 32-bit mesa shared libraries with -fPIC did not help. http://build.chromium.org/p/chromium.memory/builders/Linux%20Tests%20%28valgrind%29%282%29/builds/232/steps/memory%20test%3A%20ui_1/logs/stdio [----------] 1 test from GPUUITest [ RUN ] GPUUITest.UITestLaunchedWithOSMesa Started Valgrind wrapper for this test, PID=6448 [6449:6449:1270472640591:ERROR:master_preferences.cc(137)] Failed to parse /mnt/data/build/slave/chromium-rel-linux-valgrind-tests-2/build/src/sconsbuild/Release/master_preferences valgrind: mmap(0x38000000, 2039808) failed in UME with error 22 (Invalid argument). valgrind: this can be caused by executables with very large text, data or bss segments. [6397:6397:1103/142706:1270745403157:ERROR:automation_proxy.cc(461)] Disconnecting channel after error! chrome/test/ui/ui_test.cc:444: Failure Value of: tab_proxy->NavigateToURLBlockUntilNavigationsComplete( url, number_of_navigations) Actual: 0 Expected: AUTOMATION_MSG_NAVIGATION_SUCCESS Which is: 1 file:///mnt/data/build/slave/chromium-rel-linux-valgrind-tests-2/build/src/chrome/test/data/gpu/webgl.html [6397:6397:1103/142706:1270745404805:ERROR:automation_proxy.cc(448)] Automation channel has been closed; dropping message! chrome/test/ui/ui_test.cc:380: Failure Value of: automation()->GetBrowserWindowCount(&window_count) Actual: false Expected: true chrome/test/ui/ui_test.cc:495: Failure Value of: tab_proxy.get() Actual: false Expected: true chrome/test/ui/gpu_uitest.cc:37: Failure Value of: GetActiveTabTitle() Actual: L"" Expected: std::wstring(L"SUCCESS: Mesa OffScreen") Which is: L"SUCCESS: Mesa OffScreen" [6397:6397:1103/142706:1270745405095:ERROR:automation_proxy.cc(448)] Automation channel has been closed; dropping message! chrome/test/ui/ui_test.cc:263: Failure Value of: automation()->SetFilteredInet(false) Actual: false Expected: true [6397:6397:1103/142706:1270745405175:ERROR:automation_proxy.cc(448)] Automation channel has been closed; dropping message! chrome/test/ui/ui_test.cc:267: Failure Value of: automation()->GetBrowserWindowCount(&window_count) Actual: false Expected: true [6397:6397:1103/142706:1270745405232:ERROR:automation_proxy.cc(448)] Automation channel has been closed; dropping message! chrome/test/ui/ui_test.cc:288: Failure Value of: browser_proxy.get() Actual: false Expected: true [ FAILED ] GPUUITest.UITestLaunchedWithOSMesa (305498 ms) [----------] 1 test from GPUUITest (305498 ms total) TEST=none BUG=61601 Review URL: http://codereview.chromium.org/4437001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64983 0039d316-1c4b-4281-b951-d872f2087c98
* Add a suppression for CallMyActivateTSMDocument.rsesek@chromium.org2010-11-031-1/+20
| | | | | | | | | BUG=61816 TEST=Mac Valgrind goes green Review URL: http://codereview.chromium.org/4434001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64982 0039d316-1c4b-4281-b951-d872f2087c98
* Delete third_party/scons.evan@chromium.org2010-11-03183-47969/+0
| | | | | | | | | | Manually submitting http://codereview.chromium.org/4413001/show git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64981 0039d316-1c4b-4281-b951-d872f2087c98
* Update .gitignore based on looking at DEPS.evan@chromium.org2010-11-031-10/+3
| | | | | | | | | | | Removing some obsolete entries. DEPS found from using "gclient recurse pwd" and then examining redundant entries manually to verify they weren't used on other platforms. Review URL: http://codereview.chromium.org/4426001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64980 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 64828 - "Revert 64493 - These are files need to be added to ↵tessamac@google.com2010-11-034-0/+586
| | | | | | | | | | | | | | | benchmarks extension." This reverts commit fbf3155bc7b82cbf56c9e6bdbd806a81daf2f2ce. Also update docs. BUG=61650 TEST=Successfully ran build.py Review URL: http://codereview.chromium.org/4421001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64979 0039d316-1c4b-4281-b951-d872f2087c98
* Prevented access to WEP passphrase from UI. Fixed forget network button in ↵zelidrag@chromium.org2010-11-035-67/+32
| | | | | | | | | | | settings. TEST=make sure we don't show WEP passphrase in UI, make sure forget network button works again BUG=chromium-os:8413, chomium-os:8441 Review URL: http://codereview.chromium.org/4162004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64976 0039d316-1c4b-4281-b951-d872f2087c98
* Do not use the new message pump for TOUCH_UI yet.bryeung@google.com2010-11-031-1/+2
| | | | | | | | | | | It isn't quite ready. BUG=none TEST=build and run chrome, can type in the omnibox again Review URL: http://codereview.chromium.org/4425001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64975 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 64960 - Turn on file access checks on Win.rafaelw@chromium.org2010-11-0316-184/+27
| | | | | | | | | | BUG=60211 Review URL: http://codereview.chromium.org/4222005 TBR=jam@chromium.org Review URL: http://codereview.chromium.org/4431001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64974 0039d316-1c4b-4281-b951-d872f2087c98
* Kill Extension::RuntimeData and move its guts to ExtensionsService.mpcomplete@chromium.org2010-11-036-97/+94
| | | | | | | | | | | | ImageCache remains on Extension, on the expectation that it will eventually be loaded at startup. BUG=56558 TEST=no functional change Review URL: http://codereview.chromium.org/4132005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64973 0039d316-1c4b-4281-b951-d872f2087c98
* Rename classes for Chromoting:garykac@chromium.org2010-11-0333-654/+716
| | | | | | | | | | | | ChromotocolServer -> protocol::SessionManager ChromotocolConnection -> protocol::Session BUG=none TEST=compiles + make chromoting connection Review URL: http://codereview.chromium.org/4313001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64971 0039d316-1c4b-4281-b951-d872f2087c98
* Make CUPS cloud print proxy to support multiple print servers.gene@google.com2010-11-035-168/+446
| | | | | | | | | | | Add notifications for printer settings changed, and periodic update to check for new printers. BUG=none TEST=Make sure CP proxy works on Linux. Review URL: http://codereview.chromium.org/4233004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64970 0039d316-1c4b-4281-b951-d872f2087c98
* Remove an used function.bryeung@google.com2010-11-032-12/+0
| | | | | | | | | BUG=none TEST=still compiles, passes try bots Review URL: http://codereview.chromium.org/4405001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64968 0039d316-1c4b-4281-b951-d872f2087c98
* Fix 2 accessibility events that were not being sent with the appropriate ↵kkania@chromium.org2010-11-031-2/+2
| | | | | | | | | | accessibility object. BUG=none TEST=none Review URL: http://codereview.chromium.org/4337001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64967 0039d316-1c4b-4281-b951-d872f2087c98