summaryrefslogtreecommitdiffstats
path: root/third_party
Commit message (Collapse)AuthorAgeFilesLines
* I just put the code that does not compile on ARM. Trybots will fail because ↵apatrick@chromium.org2010-02-241-0/+10
| | | | | | | | | | | | | | I had to remove these from the CL to make gcl upload properly accept it. A + base\scoped_open_process.h A + chrome\plugin\command_buffer_stub_win.cc TEST=try BUG=none Review URL: http://codereview.chromium.org/661022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39937 0039d316-1c4b-4281-b951-d872f2087c98
* Move nphostapi.h to be with the rest of the NPAPI headers.jam@chromium.org2010-02-242-0/+326
| | | | | | Review URL: http://codereview.chromium.org/652161 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39852 0039d316-1c4b-4281-b951-d872f2087c98
* Missed OpenBSD ifdef in third_partypvalchev@google.com2010-02-231-1/+1
| | | | | | Review URL: http://codereview.chromium.org/652130 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39781 0039d316-1c4b-4281-b951-d872f2087c98
* ffmpeg configs with pthreads on windowsfbarchard@chromium.org2010-02-222-10/+10
| | | | | | | | | BUG=35850 TEST=build on windows and test ffmpeg dll sizes are reduced by about 30%. Review URL: http://codereview.chromium.org/646001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39607 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 39530 - GPU plugin forwards repaint events to Pepper plugin.apatrick@chromium.org2010-02-201-10/+0
| | | | | | | | | | | | | | | | WM_PAINT results in a call to Pepper repaint callback. Implemented WM_ERASEBKGND to prevent flickering on repaint. Implemented PGL_NO_CONTEXT (copied from EGL spec). This is already reviewed by alokp but unfortunately got entangled with this CL. TEST=none BUG=none Review URL: http://codereview.chromium.org/571018 TBR=alokp@chromium.org Review URL: http://codereview.chromium.org/650100 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39535 0039d316-1c4b-4281-b951-d872f2087c98
* GPU plugin forwards repaint events to Pepper plugin.apatrick@chromium.org2010-02-201-0/+10
| | | | | | | | | | | | | WM_PAINT results in a call to Pepper repaint callback. Implemented WM_ERASEBKGND to prevent flickering on repaint. Implemented PGL_NO_CONTEXT (copied from EGL spec). This is already reviewed by alokp but unfortunately got entangled with this CL. TEST=none BUG=none Review URL: http://codereview.chromium.org/571018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39530 0039d316-1c4b-4281-b951-d872f2087c98
* ffmpeg - add WAV support for chromiumos media player.fbarchard@chromium.org2010-02-194-18/+22
| | | | | | | | | | | BUG=32756 TEST=build with chromeos=1 and branding=Chromium Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=39335 Review URL: http://codereview.chromium.org/641001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39477 0039d316-1c4b-4281-b951-d872f2087c98
* Solaris: Second set adding in Solaris as an OS optionevan@chromium.org2010-02-183-4/+4
| | | | | | | | | | TEST=compiles BUG=30101 Patch by James Choi <jchoi42@pha.jhu.edu>. Review URL: http://codereview.chromium.org/606075 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39362 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 39335 - ffmpeg add WAV support for chromiumos media player.brettw@chromium.org2010-02-184-21/+17
| | | | | | | | | | | | BUG=32756 TEST=build with chromeos=1 and branding=Chromium Review URL: http://codereview.chromium.org/641001 TBR=fbarchard@chromium.org Review URL: http://codereview.chromium.org/647002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39336 0039d316-1c4b-4281-b951-d872f2087c98
* ffmpeg - add WAV support for chromiumos media player.fbarchard@chromium.org2010-02-184-17/+21
| | | | | | | | | BUG=32756 TEST=build with chromeos=1 and branding=Chromium Review URL: http://codereview.chromium.org/641001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39335 0039d316-1c4b-4281-b951-d872f2087c98
* Per Dick Sites advice, adding the CLD repeat flag to help with thejcampan@chromium.org2010-02-171-1/+1
| | | | | | | | | | | | | detection on some pages. This only marginally slows down the language detection. BUG=35156 TEST=Open http://app.jackrabbitclass.com/eventcalendar.asp?orgid=250131 in Chrome English. No translation infobar should be shown. Review URL: http://codereview.chromium.org/626008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39289 0039d316-1c4b-4281-b951-d872f2087c98
* solaris: minor ifdefsevan@chromium.org2010-02-171-1/+1
| | | | | | | | | | | | | base/process_util_posix.cc, base/third_party/nspr/prcpucfg.h, third_party/npapi/bindings/npapi.h: added alternate Solaris OS choice BUG=30101 TEST=compiles Patch by James Choi <jchoi42@pha.jhu.edu>. Review URL: http://codereview.chromium.org/606069 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39220 0039d316-1c4b-4281-b951-d872f2087c98
* ffmpeg additional source files for chromeos armfbarchard@chromium.org2010-02-171-0/+8
| | | | | | | | | BUG=32756 TEST=build with ffmpeg_branding=ChromeOS Review URL: http://codereview.chromium.org/614007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39176 0039d316-1c4b-4281-b951-d872f2087c98
* ffmpeg add solaris support.fbarchard@chromium.org2010-02-171-8/+8
| | | | | | | | | | | Original version by electricmonopole@gmail.com Code based on this review http://codereview.chromium.org/606075 BUG=30101 TEST=build ffmpeg on solaris. Review URL: http://codereview.chromium.org/606076 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39169 0039d316-1c4b-4281-b951-d872f2087c98
* FFmpeg requires additional arm source code for chromium linux arm.fbarchard@chromium.org2010-02-161-0/+4
| | | | | | | | | BUG=32755 TEST=build chromium on arm. Review URL: http://codereview.chromium.org/606072 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39140 0039d316-1c4b-4281-b951-d872f2087c98
* Fix some issues with compiling Mac plugin code with deprecation defines setstuartmorgan@chromium.org2010-02-161-0/+2
| | | | | | | | | | | | Makes the code compile under NP_NO_QUICKDRAW and NP_NO_CARBON (modulo some gyp stuff that 64-bit builds will need to prevent compiling the shim library), and makes the tweaking of DYLD_INSERT_LIBRARIES 32-bit only. Also removes a QuickDraw variable left over from an earlier version of the QuickDraw support. BUG=none TEST=none; supports future 64-bit compilation Review URL: http://codereview.chromium.org/597053 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39096 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 38882 - Land http://codereview.chromium.org/576001 again temporarily.glider@chromium.org2010-02-1648-2045/+820
| | | | | | | | | | | TBR=jar,antonm Review URL: http://codereview.chromium.org/596083 TBR=glider@chromium.org Review URL: http://codereview.chromium.org/604063 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39083 0039d316-1c4b-4281-b951-d872f2087c98
* ffmpeg no longer generates or uses version.hfbarchard@chromium.org2010-02-1214-14/+0
| | | | | | | | | BUG=32755 TEST=chrome should still build without these files. Review URL: http://codereview.chromium.org/604037 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38977 0039d316-1c4b-4281-b951-d872f2087c98
* ffmpeg on arm needs different assembly files.fbarchard@chromium.org2010-02-121-7/+15
| | | | | | | | | BUG=32755 TEST=linux arm version should build. Review URL: http://codereview.chromium.org/596089 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38976 0039d316-1c4b-4281-b951-d872f2087c98
* ffmpeg configs to fix valgrind and mem align hackfbarchard@chromium.org2010-02-1216-60/+60
| | | | | | | | | | | Also disable EBP and EBX in the config.h (manual patch) BUG=35561,35559 TEST=valgrind should build. Review URL: http://codereview.chromium.org/601066 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38974 0039d316-1c4b-4281-b951-d872f2087c98
* Land http://codereview.chromium.org/576001 again temporarily.glider@chromium.org2010-02-1248-820/+2045
| | | | | | | | TBR=jar,antonm Review URL: http://codereview.chromium.org/596083 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38882 0039d316-1c4b-4281-b951-d872f2087c98
* ffmpeg roll the deps which pulls in the new source, the gyp that builds the ↵fbarchard@chromium.org2010-02-1218-474/+3309
| | | | | | | | | | | new files and the config.h files for every platform. BUG=32755 TEST=build chromium/chrome on all platforms. Review URL: http://codereview.chromium.org/578024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38869 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 38766 - Temporarily land http://codereview.chromium.org/576001 to ↵glider@chromium.org2010-02-1148-2045/+820
| | | | | | | | | | | | | | | check the performance. TBR=antonm,jar Review URL: http://codereview.chromium.org/597040 TBR=glider@chromium.org Review URL: http://codereview.chromium.org/598064 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38772 0039d316-1c4b-4281-b951-d872f2087c98
* Temporarily land http://codereview.chromium.org/576001 to check theglider@chromium.org2010-02-1148-820/+2045
| | | | | | | | | | performance. TBR=antonm,jar Review URL: http://codereview.chromium.org/597040 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38766 0039d316-1c4b-4281-b951-d872f2087c98
* base::SharedMemory does not set the size in other than the creatingsehr@google.com2010-02-101-1/+4
| | | | | | | | process. Create an API to get the size of the audio shared memory region. Review URL: http://codereview.chromium.org/596038 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38665 0039d316-1c4b-4281-b951-d872f2087c98
* Include test_shell.gypi in webkit.gyp instead of maintaining a distinctmark@chromium.org2010-02-101-1/+1
| | | | | | | | | | | | | | | | | | test_shell.gyp. This allows the removal of webkit.gyp:pull_in_test_shell, eliminating the circular relationship between webkit.gyp and test_shell.gyp. The expected semantics of building all of test_shell during a webkit.gyp:All build is performed are retained. This change depends on GYP r781 (in Chromium at r38526) for GYP suffix operator path section treatment. It also depends on Chromium r38519 and r38658 for common.gypi treatment of chromium_code. BUG=33186 TEST=Xcode no longer holds stale project files in memory Review URL: http://codereview.chromium.org/602006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38664 0039d316-1c4b-4281-b951-d872f2087c98
* Audio support for native client requires some additional featuressehr@google.com2010-02-092-1/+5
| | | | | | | | | | | | | | | | from pepper. Notably, the existing pepper implementation was, by default, creating a high-priority producer thread. For the NaCl version this thread should be in the NaCl module, and hence we need to separate thread creation from pre-filling with the callback. The latter is used to send an RPC to NaCl to pass the shared memory and sync socket. Getting the shared memory was done by the first reserved state value. Getting the sync socket required allocating a second. Also changed the pepper test plugin to use the new startThread member. Review URL: http://codereview.chromium.org/593023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38544 0039d316-1c4b-4281-b951-d872f2087c98
* Implemented async flushes for Pepper 3D.apatrick@chromium.org2010-02-091-0/+10
| | | | | | | | | | | Added waitForProgress field to NPDeviceContext3D to select between a flush (that pushes more work to the GPU process and waits for at least some of it to have been completed) and getting the current state as quickly as possible. The previous method of checking to see if the put offset had advanced was incorrect. TEST=trybots BUG=none Review URL: http://codereview.chromium.org/561058 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38540 0039d316-1c4b-4281-b951-d872f2087c98
* Made some XmppTask functions static.akalin@chromium.org2010-02-093-5/+48
| | | | | | | | | | | Updated libjingle README and diff. BUG=none TEST=compiled Review URL: http://codereview.chromium.org/597010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38529 0039d316-1c4b-4281-b951-d872f2087c98
* linux: build with -Wextraevan@chromium.org2010-02-054-4/+4
| | | | | | | | | | | | 95% of this is removing "const" from return types, but turning this on found one bug! (A "for" loop that expected its iterator to go negative but which was using an unsigned type.) BUG=34160 Review URL: http://codereview.chromium.org/570012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38266 0039d316-1c4b-4281-b951-d872f2087c98
* Clean up third_party/cld.jshin@chromium.org2010-02-0485-2517/+267
| | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Remove files we don't use that come from toolbar 2. Simplify the directory structure by removing the redundant intermediary directories bar/toolbar/cld/i18n This will bring CLD a step closer to where it can be open-sourced separately (or along with CED for encoding detection.). It's not there yet. In addition to the clean-up, change |LanguageCode*| return 'nb', 'he', 'fil' instead of 'no', 'iw', and 'tl'. Also, use LanguageCodeWithDialects instead of LanguageCode to get 'zh-CN' instead of 'zh'. This is to simplify the 3-way mapping between Chrome's UI locale code, CLD's language code and what's accepted by Google Translate. It's also another preparation for open-sourcing because we'd better use the standard code rather than the obsolete code like 'iw' when open-sourcing. BUG=32759, 33613 TEST=third_party/cld builds on all platforms and pass the following tests: - unit_tests: Extension*.DetectTabLanguage and CompactLangDetTest.* - browser_tests: ExtensionBrowserTest.Toolstrip git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38146 0039d316-1c4b-4281-b951-d872f2087c98
* Updated the third_party/tcmalloc/vendor revision to r87.glider@chromium.org2010-02-0465-10146/+6480
| | | | | | | | | This change should not affect any Chromium builds. TBR=willchan, sgk Review URL: http://codereview.chromium.org/570021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38090 0039d316-1c4b-4281-b951-d872f2087c98
* OpenBSD/FreeBSD GYP changes (most of the remaining ones)pvalchev@google.com2010-02-045-14/+20
| | | | | | Review URL: http://codereview.chromium.org/565043 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38079 0039d316-1c4b-4281-b951-d872f2087c98
* Added support for lost context recovery on the client side. None of our ↵apatrick@chromium.org2010-02-031-0/+15
| | | | | | | | | | | | | | | | | | | service side GL implementations actually report lost contexts (yet). Added pglGetError to PGL library. pglSwapBuffers returns false on a lost context or other non-recoverable error and pglGetError reports PGL_CONTEXT_LOST. Updated demo plugins to reset their PGL contexts on context lost. Standalone plugins cannot currently recover from lost context because they don't use PGL. Added error code to NPDeviceContext3D for lost context. TEST=none BUG=none Review URL: http://codereview.chromium.org/566021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38039 0039d316-1c4b-4281-b951-d872f2087c98
* Dropping unconnected obsolete vsprops files.bradnelson@google.com2010-02-0311-136/+0
| | | | | | | | | BUG=8042 TEST=None Review URL: http://codereview.chromium.org/567033 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38016 0039d316-1c4b-4281-b951-d872f2087c98
* Make Chrome CLD uses the most recent generated tables.jcampan@chromium.org2010-02-034-225/+74905
| | | | | | | | | TEST=None BUG=None Review URL: http://codereview.chromium.org/565020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37995 0039d316-1c4b-4281-b951-d872f2087c98
* Changes necessary to compile gpu demos on linux. It is not functional yet ↵alokp@chromium.org2010-02-036-188/+8
| | | | | | | | | just compiling. BUG=26099 Review URL: http://codereview.chromium.org/552240 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37977 0039d316-1c4b-4281-b951-d872f2087c98
* To implement Pepper in Native Client we need access to the implementation of thesehr@google.com2010-02-032-2/+20
| | | | | | | | | | | | | | Pepper APIs in Chrome. Specifically, we need to be able to get the base::SharedMemory or TransportDIB memory regions used to communicate with devices. To enable doing this, especially in 64-bit Chrome, I needed to change the GetStateContext and SetStateContext functions to manipulate 64-bit values. This CL does not include the Native Client hookup to the new APIs, but is needed to do so. BUG=none TEST=none Review URL: http://codereview.chromium.org/569004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37975 0039d316-1c4b-4281-b951-d872f2087c98
* Remove yet another comma that gets in the way of the NaCl build.sehr@google.com2010-02-021-1/+1
| | | | | | Review URL: http://codereview.chromium.org/568003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37780 0039d316-1c4b-4281-b951-d872f2087c98
* Renamed ParseError -> Error, parse_error -> error, kParseNoError -> ↵apatrick@chromium.org2010-02-011-3/+12
| | | | | | | | | | | | kNoError, commandBufferEntries -> commandBufferSize. Added NPDevice3DContextError enumeration. TEST=none BUG=none Review URL: http://codereview.chromium.org/558054 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37751 0039d316-1c4b-4281-b951-d872f2087c98
* Redesigned CommandBuffer and NPDevice3D interfaces.apatrick@chromium.org2010-01-291-14/+6
| | | | | | | | | | | | All status is now in the Device3D context. It can be retreived with fewer IPC messages. It can be now be accessed off the main plugin thread, which is necessary to run OpenGL in another thread. TEST=none BUG=none Review URL: http://codereview.chromium.org/555020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37545 0039d316-1c4b-4281-b951-d872f2087c98
* Wrapper script for running swig.nirnimesh@chromium.org2010-01-272-0/+110
| | | | | | | | | BUG=32285 TEST=mac build should compile Review URL: http://codereview.chromium.org/556036 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37305 0039d316-1c4b-4281-b951-d872f2087c98
* In the sync database, use protobuf-based storage. Drop the oldnick@chromium.org2010-01-272-8/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | bookmark-only columns. Add getters and setters for BookmarkSpecifics to syncapi as well as syncable entries. Make the datatype be a required property when creating a syncapi node. Add a datatype for the 'google chrome' top level folder. Add database migrations from version 67 to the new schema. Add infrastructure to support migrations generically. Add unit tests for the migrations. Pull a new version of the protobuf library to pick up a fix for a bug that this change exposed (I upstreamed the fix). Fix some example code in the sql helpers so that it would actually compile. BUG=29899,30041 TEST=New unit tests for migrations: unit tests are based on actual database dumps. Additionally, I manually tested 2-client sync using combos of old-protocol servers, new-protocol servers, and initial database versions v67, v68, and v0 (new client). I manually verified that add/edit/delete works in these combination cases. Afterwards I verified (by inspecting the sync databases) that the ModelTypes are consistent across the various migration/protocol paths. Review URL: http://codereview.chromium.org/554066 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37253 0039d316-1c4b-4281-b951-d872f2087c98
* Refactor Pepper device APIneb@chromium.org2010-01-251-3/+2
| | | | | | | | | Track Pepper DeviceContexts using ID (and reclaim them upon shutdown) Refactor device-specific code into pepper_devices.h Review URL: http://codereview.chromium.org/548100 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37060 0039d316-1c4b-4281-b951-d872f2087c98
* Add in LICENSE.txt from original simplejson distribdpranke@chromium.org2010-01-251-0/+19
| | | | | | | | | | BUG=none TEST=none R=maruel@chromium.org Review URL: http://codereview.chromium.org/554058 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37048 0039d316-1c4b-4281-b951-d872f2087c98
* Make chromium and chromiumos for arm use the same options and turn off Neon.fbarchard@chromium.org2010-01-233-11/+14
| | | | | | | | | BUG=30817 TEST=build chromiumos for arm. This should build/link. Previously there were link errors. Review URL: http://codereview.chromium.org/543159 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36953 0039d316-1c4b-4281-b951-d872f2087c98
* Fixed bugs in libjingle's handling of connection errors.akalin@chromium.org2010-01-212-1/+9
| | | | | | | | | BUG=32819 TEST=see bug Review URL: http://codereview.chromium.org/545150 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36787 0039d316-1c4b-4281-b951-d872f2087c98
* Roll OCMock r54:55 to pull in some memory and warning fixes.rsesek@chromium.org2010-01-2112-101/+113
| | | | | | | | | BUG=32564 TEST=Trybots Review URL: http://codereview.chromium.org/554030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36750 0039d316-1c4b-4281-b951-d872f2087c98
* Taking in the fix from Dick Sites related to a memory error in the CLD code.jcampan@chromium.org2010-01-211-3/+26
| | | | | | | | | BUG=None TEST=Reliability tests should not crash. Review URL: http://codereview.chromium.org/551086 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36709 0039d316-1c4b-4281-b951-d872f2087c98
* Reland r36541 (which went in without any commit log by some magic). Was ↵jshin@chromium.org2010-01-195-200/+166
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reverted in r36550. Now I'm relanding with the full description. Port back CLD to Linux and Mac by replacing Windows API calls with ICU's equivalent APIs for normalization. I also fixed bug 23553 (Traditional Chinese is not detected) by calling LanguageCode instead of LanguageCode_ISO_639_1. The latter covers only ISO 639-1, but there are languages detected by CLD not covered by ISO 639-1. In that case, ISO 639-2 is used. In case even ISO 639-2 does not cover (e.g. Traditional Chinese), another fallback is taken by LanguageCode. The html file for CLD testing (french_sentence.html) is explicitly labelled with charset=ISO-8859-1. Original Review: http://codereview.chromium.org/523108 BUG=25206,23553 TEST=1. CLD is built on Linux/Mac 2. The following test pass: - unit_tests: Extension*.DetectTabLang* and CompactLangDet*.* - browser_tests: ExtensionBrowserTest.Toolstrip 3. Install the 'cld extension' in chrome/common/extensions/docs/examples/api/i18n/cld and go to http://news.google.com.tw and 'zh-TW' shows up in the language badge at the upper right (upper-left in he/ar Chrome) corner. TBR=jcampan Review URL: http://codereview.chromium.org/545123 TBR=jshin@chromium.org Review URL: http://codereview.chromium.org/551070 TBR=jshin@chromium.org Review URL: http://codereview.chromium.org/549091 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36552 0039d316-1c4b-4281-b951-d872f2087c98