summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix line ending with white spaces in some files.tfarina@chromium.org2010-07-283-17/+17
| | | | | | | | | | | BUG=50266 TEST=None Signed-off-by: Thiago Farina <tfarina@chromium.org> Review URL: http://codereview.chromium.org/3046028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53956 0039d316-1c4b-4281-b951-d872f2087c98
* Roll WebKit from 64201 to 64206.jorlow@chromium.org2010-07-281-1/+1
| | | | | | | | | TEST=none BUG=none Review URL: http://codereview.chromium.org/3009027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53954 0039d316-1c4b-4281-b951-d872f2087c98
* Resize the InfoBubbleView in ContentBlockedCookies.xibbauerb@chromium.org2010-07-281-12/+24
| | | | | | | | | | | XIB changes: Make the InfoBubbleView the same size as the NSView it's contained in. BUG=50520 TEST=none Review URL: http://codereview.chromium.org/3061024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53953 0039d316-1c4b-4281-b951-d872f2087c98
* Make NaCl/Chromium startup interface easier to maintainmseaborn@chromium.org2010-07-284-202/+11
| | | | | | | | | | | | | | | | | | Use the new NaClMainForChromium() from the NaCl tree, instead of sel_main.cc in the Chromium tree. Use the new variant of RegisterInternalNaClPlugin() that can receive multiple functions instead of just one. This depends on r2744 from NaCl. BUG=http://code.google.com/p/nativeclient/issues/detail?id=642 BUG=http://code.google.com/p/nativeclient/issues/detail?id=469 TEST=Chromium's nacl_ui_tests Review URL: http://codereview.chromium.org/3039016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53952 0039d316-1c4b-4281-b951-d872f2087c98
* Make product name dynamic in DOMUI pref unit testsstuartmorgan@chromium.org2010-07-281-1/+8
| | | | | | | | | BUG=50466 TEST=OptionsUITest test should pass on official builder in addition to main waterfall. Review URL: http://codereview.chromium.org/3015035 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53950 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 53892 - Initial scriptable object implementation.rsesek@chromium.org2010-07-2810-329/+107
| | | | | | | | | | | | | | | | | | Broke ChromiumOS ARM build, reverting. Errors from log: remoting/client/plugin/chromoting_scriptable_object.cc: In member function 'virtual bool remoting::ChromotingScriptableObject::HasProperty(const pp::Var&, pp::Var*)': remoting/client/plugin/chromoting_scriptable_object.cc:48: error: NULL used in arithmetic remoting/client/plugin/chromoting_scriptable_object.cc: In member function 'virtual bool remoting::ChromotingScriptableObject::HasMethod(const pp::Var&, pp::Var*)': remoting/client/plugin/chromoting_scriptable_object.cc:63: error: NULL used in arithmetic BUG=50248 TEST=write javascript to manually setup connection. Review URL: http://codereview.chromium.org/3064009 TBR=ajwong@chromium.org Review URL: http://codereview.chromium.org/3020038 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53949 0039d316-1c4b-4281-b951-d872f2087c98
* Fix wrong line-ending.markusheintz@chromium.org2010-07-281-1/+1
| | | | | | | | TEST=none BUG=none Review URL: http://codereview.chromium.org/2870076 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53948 0039d316-1c4b-4281-b951-d872f2087c98
* Fix bug which caused DNS time not to be reported by LoadTimingObserver.tonyg@chromium.org2010-07-284-15/+25
| | | | | | | | | | | | | | | | | | | The problem was the LogBoundConnectJobToRequest() sets SOCKET_POOL_BOUND_TO_CONNECT_JOB after RemoveConnectJob() ends SOCKET_POOL_CONNECT_JOB. Since there is no chance to return to the event loop, it is safe (although fragile), to store the last connect job record and access that on SOCKET_POOL_BOUND_TO_CONNECT_JOB. Also, after fixing the DNS issue, it became apparent that what was being measured as connect time actually included more than just the TCP connect. So I fixed that as well. BUG=50229 TEST=LoadTimingObserverTest.* Review URL: http://codereview.chromium.org/3028026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53945 0039d316-1c4b-4281-b951-d872f2087c98
* Quick fix for window sizing under resolution independence on Mac. Scrolling ↵avi@chromium.org2010-07-281-6/+12
| | | | | | | | | | | | | | | and the "more" arrows are still broken, but this at least makes things usable. Re-committing of r53272, but this time with more... correctness. Original review: http://codereview.chromium.org/3029020 BUG=http://crbug.com/19476 TEST=run app under high-res, click bookmark bar button, see that the popup is sized to hold the buttons. Review URL: http://codereview.chromium.org/3061021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53944 0039d316-1c4b-4281-b951-d872f2087c98
* Use a PDF for the upgrade dot.avi@chromium.org2010-07-283-8/+2
| | | | | | | | | BUG=http://crbug.com/49668 TEST=turn up resolution; make sure dot is crisp and clear Review URL: http://codereview.chromium.org/3066009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53943 0039d316-1c4b-4281-b951-d872f2087c98
* DevTools: Inspect Element doesn't select element in the Elements Panel when ↵pfeldman@chromium.org2010-07-281-1/+3
| | | | | | | | | | tools are docked. Original CL: http://http://codereview.chromium.org/2856066/show Review URL: http://codereview.chromium.org/3058020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53940 0039d316-1c4b-4281-b951-d872f2087c98
* gtk: Make use of the gtk signal macro in HtmlDialogGtk class.tfarina@chromium.org2010-07-282-9/+7
| | | | | | | | | | | BUG=None TEST=manually and trybots. Signed-off-by: Thiago Farina <tfarina@chromium.org> Review URL: http://codereview.chromium.org/3069001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53937 0039d316-1c4b-4281-b951-d872f2087c98
* Fully remove the hole in the Mac Sandbox that was used to supportmsneck@google.com2010-07-285-59/+1
| | | | | | | | | | | | | | | | | | Native Client. This removes the special sandbox commands as well as all special code. This CL replaces http://codereview.chromium.org/2881016/show which was rolled back because of problems on Mac OS X 10.5. Those problems were addressed in Native Client and pulled into Chrome with a DEPS file update in http://codereview.chromium.org/2881034/show which was committed as Chrome revision 53711. BUG=http://code.google.com/p/nativeclient/issues/detail?id=344 TEST=all tests pass, including nacl_ui_tests Review URL: http://codereview.chromium.org/3077003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53936 0039d316-1c4b-4281-b951-d872f2087c98
* Roll WebKit from 64196 to 64201.jorlow@chromium.org2010-07-281-1/+1
| | | | | | | | | TEST=none BUG=50512 Review URL: http://codereview.chromium.org/3075005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53935 0039d316-1c4b-4281-b951-d872f2087c98
* Remove Mac-only suppression in ExtensionPrefStoreTest, now fixed.pam@chromium.org2010-07-281-10/+0
| | | | | | | | BUG=48980 TEST=green mac_valgrind bot Review URL: http://codereview.chromium.org/2883039 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53934 0039d316-1c4b-4281-b951-d872f2087c98
* Use vector::push_back() to add object store names to the vector of names and ↵andreip@chromium.org2010-07-281-1/+1
| | | | | | | | avoid a crash Review URL: http://codereview.chromium.org/3031026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53933 0039d316-1c4b-4281-b951-d872f2087c98
* Watch out for invalid delegate and container after destroying the WebViewPlugin.bauerb@chromium.org2010-07-281-2/+4
| | | | | | | | | BUG=49836 TEST=Enable FlashBlock, block all plugins and go to a site with a flash animation. No crashy! Review URL: http://codereview.chromium.org/3020031 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53932 0039d316-1c4b-4281-b951-d872f2087c98
* Recommit r53882 "FTP: fix navigation to systems with broken EPSV support."i"jeremy@chromium.org2010-07-281-0/+15
| | | | | | | | Original revert was an attempt to diagnose a build bustage, but this wasn't the cause. Review URL: http://codereview.chromium.org/3012028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53931 0039d316-1c4b-4281-b951-d872f2087c98
* Roll WebKit from 64185 to 64195.jorlow@chromium.org2010-07-281-1/+1
| | | | | | | | | TEST=none BUG=none Review URL: http://codereview.chromium.org/3043026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53930 0039d316-1c4b-4281-b951-d872f2087c98
* Widen Memcheck suppression for bug 50336 (sync_unit_tests)timurrrr@chromium.org2010-07-281-1/+1
| | | | | | | | BUG=50336 TBR=glider Review URL: http://codereview.chromium.org/3081003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53929 0039d316-1c4b-4281-b951-d872f2087c98
* Suppression for bug 50504 - Memory leak in SharedResourcesDataSource::Register()timurrrr@chromium.org2010-07-281-1/+11
| | | | | | | | | BUG=50504 TEST=Less reports on Memcheck UI bots TBR=glider Review URL: http://codereview.chromium.org/3075004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53928 0039d316-1c4b-4281-b951-d872f2087c98
* Widen suppression for bug 16128timurrrr@chromium.org2010-07-281-8/+2
| | | | | | | | | BUG=16128 TBR=glider TEST=Valgrind unit on Mac should become greener Review URL: http://codereview.chromium.org/3074006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53927 0039d316-1c4b-4281-b951-d872f2087c98
* Revert r53885 "deps roll for new ffmpeg and switch to av_register_protocol2"jeremy@chromium.org2010-07-289-12/+11
| | | | | | | | Trying to track down cause of XP Perf bot regression. Review URL: http://codereview.chromium.org/3081002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53926 0039d316-1c4b-4281-b951-d872f2087c98
* Revert "FTP: fix navigation to systems with broken EPSV support."ijeremy@chromium.org2010-07-281-15/+0
| | | | | | | | | | XP Perf test regression diagnostic - http://build.chromium.org/buildbot/waterfall/builders/XP%20Perf%20(1)/builds/9081 This reverts commit r53882. Review URL: http://codereview.chromium.org/2884043 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53925 0039d316-1c4b-4281-b951-d872f2087c98
* Move click-to-play behind the --enable-click-to-play switch.bauerb@chromium.org2010-07-285-4/+23
| | | | | | | | | BUG=50086 TEST=none Review URL: http://codereview.chromium.org/3074005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53924 0039d316-1c4b-4281-b951-d872f2087c98
* Initial stream to file implementation.darin@chromium.org2010-07-289-10/+306
| | | | | | | | | | | | | This patch excludes one important detail. This code does not cleanup temp files yet. That will be added in a subsequent CL. R=brettw BUG=49789 TEST=third_party/ppapi/tests/test_url_loader.cc:TestStreamToFile Review URL: http://codereview.chromium.org/2806079 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53923 0039d316-1c4b-4281-b951-d872f2087c98
* Suppress bug 50484 (leaks in ProfileSync)timurrrr@chromium.org2010-07-281-0/+14
| | | | | | | | | | | | Suppressions are based on those generated by http://build.chromium.org/buildbot/memory/builders/Linux%20Tests%20(valgrind)(1)/builds/5238/steps/memory%20test:%20ui/logs/stdio http://build.chromium.org/buildbot/memory/builders/Chromium%20Mac%20UI%20(valgrind)(2)/builds/3700/steps/memory%20test:%20ui/logs/stdio http://build.chromium.org/buildbot/memory/builders/Chromium%20OS%20UI%20(valgrind)(1)/builds/3977/steps/memory%20test:%20unit/logs/stdio TBR=glider BUG=50484 Review URL: http://codereview.chromium.org/3067009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53922 0039d316-1c4b-4281-b951-d872f2087c98
* An experimental fix for Bug 49590.hbono@chromium.org2010-07-281-0/+2
| | | | | | | | | | This change just releases the BalloonController objects used in the tests. (This change does not use autorelease since I'm not sure if we can call autorelease before initializing an NSObject.) BUG=49590 TEST=make the "Chromium Mac (valgrind)" bot greener. Review URL: http://codereview.chromium.org/2808056 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53921 0039d316-1c4b-4281-b951-d872f2087c98
* Hide feedback button on login screen.dpolukhin@chromium.org2010-07-282-7/+2
| | | | | | | | | BUG= crosbug.com/4980 TEST=Observe no feedback button on login screen. Review URL: http://codereview.chromium.org/3023020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53920 0039d316-1c4b-4281-b951-d872f2087c98
* Port network options to DOM UI. Hook up all the functionality. UI touchup ↵chocobo@chromium.org2010-07-2813-7/+707
| | | | | | | | | | | work will be in another changelist. BUG=chromium-os:4744 BUG=49030 TEST=manual Review URL: http://codereview.chromium.org/3036020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53919 0039d316-1c4b-4281-b951-d872f2087c98
* Add remaining stuff for Mozc configuration DOMUI.satorux@chromium.org2010-07-287-31/+131
| | | | | | | | | | | This still lacks "Reset to default" button which original configuration dialog has, but all configuration items are implemented. Review URL: http://codereview.chromium.org/3043023 Patch from Takayoshi Kochi <kochi@chromium.org>. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53918 0039d316-1c4b-4281-b951-d872f2087c98
* Make sure we check http/https to collect stats for spdy or apa.lzheng@google.com2010-07-281-12/+10
| | | | | | | | | | | SpdyTrial_npn_http/npn_spdy: compare them for https traffic. xxx_AlternateProtocol_spdy/http: compare them for http traffic. BUG=46689 TEST=none Review URL: http://codereview.chromium.org/3023022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53916 0039d316-1c4b-4281-b951-d872f2087c98
* Add logic to save input method preference based on user clicks.satorux@chromium.org2010-07-282-5/+114
| | | | | | | | | | | | Along the way, add some sanity check code in language_options_list.js to filter bad language codes, just in case. TEST=manually BUG=chromium-os:4573 Review URL: http://codereview.chromium.org/3051013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53915 0039d316-1c4b-4281-b951-d872f2087c98
* Suppress bug 50484 (leaks in BrowserWithTestWindowTest::SetUp)glider@chromium.org2010-07-281-0/+16
| | | | | | | | | BUG=50484 TBR=timurrrr Review URL: http://codereview.chromium.org/2868074 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53914 0039d316-1c4b-4281-b951-d872f2087c98
* Make login cancel logic load localaccount file before attempting offline logincmasone@google.com2010-07-284-21/+147
| | | | | | | | | BUG=chromium-os:5169 TEST=unit tests Review URL: http://codereview.chromium.org/2847080 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53913 0039d316-1c4b-4281-b951-d872f2087c98
* Pulse new bookmarks (as triggered by bookmark bubble). If not possible, jrg@chromium.org2010-07-2810-28/+470
| | | | | | | | | | | | | | | | | | | | | | | pulse the topmost parent that is visible (e.g. "Other Bookmarks"). BUG=http://crbug.com/42028 TEST=\ Repeat this test with the following themes: 1) None, 2) Maria Carey, 3) Ocean Pacific, 4) American Apparel: . New profile. Click star to 'mark something. See bookmark pulse in bar. Cancel. Do that again, but set parent to "Other Bookmarks" and hit OK. New page; click star. Default parent is Other Bookmarks; see Other Bookmarks folder pulse. Add enough bookmarks on bar so something falls in overflow menu (chevron appears). Go to one of them, then click star. (You can't see chevron pulse.. it's hidden.) Create a folder. Add a bookmark to the folder. Go that page. Click on star; see folder pulse. Review URL: http://codereview.chromium.org/2805099 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53912 0039d316-1c4b-4281-b951-d872f2087c98
* Enable crash reporting by default with PyAuto on Mac/Linuxnirnimesh@chromium.org2010-07-282-5/+12
| | | | | | | | | | | | It's already enabled on windows by default. This of course applies only to the branded builds. Also, make the path to imported pyauto binaries prettier by applying os.path.normpath Change to chrome_switches.cc is to put a comment at the place where it belongs Review URL: http://codereview.chromium.org/2873073 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53911 0039d316-1c4b-4281-b951-d872f2087c98
* Removed extra files.zelidrag@chromium.org2010-07-281-14/+0
| | | | | | | | | BUG=none TEST=none Review URL: http://codereview.chromium.org/3018023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53910 0039d316-1c4b-4281-b951-d872f2087c98
* Adds unit tests for Serbian and Ukranian dictionaries.hbono@chromium.org2010-07-282-0/+32
| | | | | | | | | | This change is unit tests for <http://codereview.chromium.org/2805065/show>. BUG=43011,40340 TEST=unit_test --gtest_filter=SpellCheckTest* Review URL: http://codereview.chromium.org/2807035 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53909 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 53903 - Revert 52613 - Revert 52608 - Add and alternative ↵viettrungluu@chromium.org2010-07-283-141/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GetAppOutput() to process_util that takes a timeout. [For those keeping track, this removes it again. The failure wasn't a flake. :(] [Undoing the revert to see if the failure wasn't a flake.... Revert if the original failure, below, occurs again.] ["base_unittests" didn't exit cleanly on "Chromium Linux x64" but was killed due to timeout.] Contributed by tessamac@chromium.org TEST=none BUG=47356 Review URL: http://codereview.chromium.org/2810014 Patch from Tessa MacDuff <tessamac@chromium.org>. TBR=viettrungluu@chromium.org, tessamac@chromium.org Review URL: http://codereview.chromium.org/3012004 TBR=viettrungluu@chromium.org, tessamac@chromium.org Review URL: http://codereview.chromium.org/3036023 TBR=viettrungluu@chromium.org, tessamac@chromium.org Review URL: http://codereview.chromium.org/3045018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53908 0039d316-1c4b-4281-b951-d872f2087c98
* Fix for Issue 50340: @page rules inside @media print rules are not properlyyuzo@chromium.org2010-07-281-0/+1
| | | | | | | | | | | | | | handled The cause of the bug is that the document is not in printing mode when the page size is checked. BUG=50340 TEST=manual Review URL: http://codereview.chromium.org/2868071 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53907 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 52613 - Revert 52608 - Add and alternative GetAppOutput() to ↵viettrungluu@chromium.org2010-07-283-19/+141
| | | | | | | | | | | | | | | | | | | | | | | | | | process_util that takes a timeout. [Undoing the revert to see if the failure wasn't a flake.... Revert if the original failure, below, occurs again.] ["base_unittests" didn't exit cleanly on "Chromium Linux x64" but was killed due to timeout.] Contributed by tessamac@chromium.org TEST=none BUG=47356 Review URL: http://codereview.chromium.org/2810014 Patch from Tessa MacDuff <tessamac@chromium.org>. TBR=viettrungluu@chromium.org, tessamac@chromium.org Review URL: http://codereview.chromium.org/3012004 TBR=viettrungluu@chromium.org, tessamac@chromium.org Review URL: http://codereview.chromium.org/3036023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53903 0039d316-1c4b-4281-b951-d872f2087c98
* Chrome side of changes required to populate appcache resource list.kkanetkar@chromium.org2010-07-2832-100/+319
| | | | | | | | | BUG = 2821005 TEST = Manually navigate. Review URL: http://codereview.chromium.org/3009005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53902 0039d316-1c4b-4281-b951-d872f2087c98
* Roll WebKit 64185victorw@chromium.org2010-07-281-1/+1
| | | | | | | | | TBR=jorlow TEST=none BUG=none git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53900 0039d316-1c4b-4281-b951-d872f2087c98
* Add a very simple client HTML/JS webpage.ajwong@chromium.org2010-07-282-0/+69
| | | | | | | | | | | | | | | This should allow easier invocation of the chromoting plugin. The javascript will parse window.location.href, so the plugin should be invocable via the commandline for easier debugging. Note, this isn't tested yet, but should it should be close to right. BUG=50248 TEST=none TBR: hclam@chromium.org, garykac@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53899 0039d316-1c4b-4281-b951-d872f2087c98
* These changes are needed for when we turn on REAL gman@chromium.org2010-07-282-6/+12
| | | | | | | | | | OpenGL ES 2.0 GLSL and for the new texImage2D TBR=petersont@google.com Review URL: http://codereview.chromium.org/3035012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53898 0039d316-1c4b-4281-b951-d872f2087c98
* Rolls WebKit 64167:64184victorw@chromium.org2010-07-281-1/+1
| | | | | | | | | TBR=jorlow TEST=none BUG=none git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53897 0039d316-1c4b-4281-b951-d872f2087c98
* Updated some comments to point at bugs in ffmpeg_unittest.cc and ↵scherkus@chromium.org2010-07-282-1/+19
| | | | | | | | | | | | | | ffmpeg_audio_decoder.cc. No code change. BUG=49709,50457 TEST=none TBR=hclam Review URL: http://codereview.chromium.org/3077004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53896 0039d316-1c4b-4281-b951-d872f2087c98
* Widen a Valgrind suppression for an OS X system library.thakis@chromium.org2010-07-281-6/+2
| | | | | | | | | BUG=35164 Review URL: http://codereview.chromium.org/2832087 Patch from Evan Martin <evan@chromium.org>. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53895 0039d316-1c4b-4281-b951-d872f2087c98
* Refactor declaration order for 2 A/B tests.ziadh@chromium.org2010-07-281-7/+14
| | | | | | | | | | | | | | Rearranged the declaration order for probability groups contained in 2 A/B tests in a way that preserves the remaining probability space to the default value, after the other groups receive an equal share of the sample space. BUG=50451 r=jar Review URL: http://codereview.chromium.org/3080004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53894 0039d316-1c4b-4281-b951-d872f2087c98