summaryrefslogtreecommitdiffstats
path: root/DEPS
Commit message (Collapse)AuthorAgeFilesLines
* WebKit roll 104985:105014jamesr@chromium.org2012-01-141-1/+1
| | | | | | Review URL: http://codereview.chromium.org/9213021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117788 0039d316-1c4b-4281-b951-d872f2087c98
* roll gyp 1155:1160thakis@chromium.org2012-01-141-1/+1
| | | | | | | | | | | | | | | | 1156: make/mac: More refactorings and fixes related to env vars. 1157: ninja: rearrange target_outputs into an object 1158: ninja: delete an obsolete comment about a removed hack 1159: ninja/mac: Add envvar support. 1160: make: Fix a regression introduced in r1156. BUG=96894 TEST=none TBR=mark Review URL: http://codereview.chromium.org/9174021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117778 0039d316-1c4b-4281-b951-d872f2087c98
* roll gyp 1144:1155thakis@chromium.org2012-01-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | 1145: make/mac: Simplify how BUILT_PRODUCTS_DIR is computed. 1146: make/mac: Make $(SRCROOT) absolute, to match Xcode. 1147: ninja: split out the logic for linking from target writing 1148: make/mac: Move EXECUTABLE_NAME computation into XcodeSettings. 1149: ninja: refactor mac bundle code into separate method 1150: Add a test for escaping of backslashes in list expansion 1151: make/mac: Move GetXcodeEnv() to xcode_emulation. 1152: make/mac: Extract the topological sorting logic in WriteXcodeEnv() 1153: make/mac: Fold Xcode env normalization to xcode_emulation. 1154: ninja: Remove a few unused "spec" parameters. 1155: ninja: move bundle logic out of WriteTarget BUG=100510,96894 TEST=none TBR=mark Review URL: http://codereview.chromium.org/9112043 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117741 0039d316-1c4b-4281-b951-d872f2087c98
* WebKit roll 104948:104985jamesr@chromium.org2012-01-141-1/+1
| | | | | | Review URL: http://codereview.chromium.org/9133018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117734 0039d316-1c4b-4281-b951-d872f2087c98
* Keep NaCl toolchain tarballs, so we can do a faster clean.noelallen@google.com2012-01-131-0/+1
| | | | | | | | | | | | | | | | | | Add the --keep argument to the downloader to that we keep the original tarball instead of deleting it after untarring. Currently we only blow away the toolchain when we download a new one. Since it lives in the sources, and since we add components to it during the build process, the toolchain does not get cleaned through a conventional clean such as deleting out/Debug. The SDK builders will build an SDK tarball which contains the toolchain plus user libraries. To improve buildtime we will want to re-untar instead of downloading everytime. BUG=109207 Review URL: http://codereview.chromium.org/9186054 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117671 0039d316-1c4b-4281-b951-d872f2087c98
* WebKit roll 104937:104948jamesr@chromium.org2012-01-131-1/+1
| | | | | | Review URL: http://codereview.chromium.org/9133008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117669 0039d316-1c4b-4281-b951-d872f2087c98
* roll skia to 3035reed@google.com2012-01-131-1/+1
| | | | | | Review URL: http://codereview.chromium.org/9199012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117659 0039d316-1c4b-4281-b951-d872f2087c98
* WebKit roll 104900:104937jamesr@chromium.org2012-01-131-1/+1
| | | | | | Review URL: http://codereview.chromium.org/9174004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117648 0039d316-1c4b-4281-b951-d872f2087c98
* WebKit roll 104880:104900apavlov@chromium.org2012-01-131-1/+1
| | | | | | | | TBR=jamesr@chromium.org Review URL: http://codereview.chromium.org/9204003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117618 0039d316-1c4b-4281-b951-d872f2087c98
* Roll DEPS for Breakpad r897:r902. Mostly changes being upstreamed from ↵thestig@chromium.org2012-01-131-1/+1
| | | | | | | | CrOS's branch. Cleanup some whitespaces while we're at it. Review URL: http://codereview.chromium.org/9158035 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117602 0039d316-1c4b-4281-b951-d872f2087c98
* WebKit roll 104855:104880dimich@chromium.org2012-01-131-1/+1
| | | | | | Review URL: http://codereview.chromium.org/9187080 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117597 0039d316-1c4b-4281-b951-d872f2087c98
* WebKit roll 104841:104855dimich@chromium.org2012-01-131-1/+1
| | | | | | Review URL: http://codereview.chromium.org/9190063 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117550 0039d316-1c4b-4281-b951-d872f2087c98
* WebKit roll 104834:104841dimich@chromium.org2012-01-121-1/+1
| | | | | | Review URL: http://codereview.chromium.org/9148073 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117514 0039d316-1c4b-4281-b951-d872f2087c98
* WebKit roll 104801:104834dimich@chromium.org2012-01-121-1/+1
| | | | | | Review URL: http://codereview.chromium.org/9190049 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117478 0039d316-1c4b-4281-b951-d872f2087c98
* Skia DEPS roll 2993->3023epoger@chromium.org2012-01-121-1/+1
| | | | | | Review URL: http://codereview.chromium.org/9139057 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117439 0039d316-1c4b-4281-b951-d872f2087c98
* WebKit roll 104786:104801apavlov@chromium.org2012-01-121-1/+1
| | | | | | | | TBR=dimich@chromium.org Review URL: http://codereview.chromium.org/9185047 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117423 0039d316-1c4b-4281-b951-d872f2087c98
* WebKit roll 104657:104786dimich@chromium.org2012-01-121-1/+1
| | | | | | Review URL: http://codereview.chromium.org/9139049 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117395 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 117374 - Roll webkit revision to 104763dimich@chromium.org2012-01-121-1/+1
| | | | | | | | | Review URL: http://codereview.chromium.org/9186028 TBR=dimich@chromium.org Review URL: http://codereview.chromium.org/9185042 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117387 0039d316-1c4b-4281-b951-d872f2087c98
* Roll gyp 1135:1144thakis@chromium.org2012-01-121-1/+1
| | | | | | | | | | | | | | | | | | | | | 1136: ninja/mac: Don't choke on bundles that have no 'sources'. 1137: ninja/mac: Make dependencies on bundles work correctly. 1138: make/mac: Delay space escaping until write time. 1139: make/mac: Add a test for the behavior added in gyp r1011 1140: ninja: make the tuple returned by WriteSpec() match target_outputs 1141: Adds a test for parts of http://code.google.com/p/gyp/source/detail?r=1012 1142: Fixing presubmit warning. 1143: Rename test to reflect what it's actually testing. 1144: make/mac: Get PRODUCT_NAME and FULL_PRODUCT_NAME from XcodeSettings. BUG=chromium:96894 TEST=make build still works on mac and linux, ninja build still works on linux, ninja build still doesn't work on mac TBR=mark Review URL: http://codereview.chromium.org/9185039 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117380 0039d316-1c4b-4281-b951-d872f2087c98
* Roll webkit revision to 104763dimich@chromium.org2012-01-121-1/+1
| | | | | | | | | | | TBR= BUG= TEST= Review URL: http://codereview.chromium.org/9186028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117374 0039d316-1c4b-4281-b951-d872f2087c98
* Roll ANGLE 939:941apatrick@chromium.org2012-01-121-1/+1
| | | | | | | Workarounds for Intel drivers that crash when freeing D3D queries. Review URL: http://codereview.chromium.org/9188015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117340 0039d316-1c4b-4281-b951-d872f2087c98
* Update libvpx revision in DEPSmcgrathr@chromium.org2012-01-111-1/+1
| | | | | | | | | | | | | | | | | This brings in these changes: http://codereview.chromium.org/8501011 r109236 Suppress libvpx warning http://codereview.chromium.org/8666017 r113567 Build libvpx on non-Mac POSIX platforms also, by reusing the linux config. http://codereview.chromium.org/9185015 r117274 Compile libvpx code as PIC for all Linux targets BUG= http://code.google.com/p/chromium/issues/detail?id=109318 TEST= sizes test should show chrome-textrel=0 R=jkoleszar@google.com Review URL: http://codereview.chromium.org/9187016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117287 0039d316-1c4b-4281-b951-d872f2087c98
* NaCl: Update revision in DEPS, r7519 -> r7561sehr@google.com2012-01-111-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This pulls in the following Native Client changes: r7520: (jvoung) Re-enable the temporarily disabled sled tests for ARM. r7521: (ncbray) Remove a dead file, nalt_trim_tests.cc. r7522: (sehr) Second try to fix message fragmentation. Also enhanced the test to test trusted implementation of fragmentation and to use the actual IMC implementation. r7523: (mcgrathr) Update jsoncpp_revision, disable -Werror for building jsoncpp r7525: (pdox) Add usr/ directory to search path of pnacl driver. r7526: (pdox) PNaCl: Update UPSTREAM_REV to bring in: r7527: (noelallen) Fix tar creation issues. r7528: (robertm) Roll live untrusted toolchains from r7487 to r7525 r7530: (robertm) Added support for the inclusion of ppapi-headers to the pnacl TC build script. r7531: (kschimpf) When multiple prefix bytes are allowed by the x86-32 validator (i.e. r7532: (kschimpf) Add more pre/post conditions for testing the x86-64 validator. r7533: (mcgrathr) Record SHA1 of downloaded toolchain tarballs, consider up to date when --file-hash value matches r7534: (kschimpf) Do several cleanups to validator code, in preparation for adding r7535: (mcgrathr) Build binutils without zlib support r7536: (jvoung) Push iquote option through the pnacl driver to clang to build "faad" from naclports. r7537: (pdox) PNaCl: Some adjustments to make the driver more configure-friendly. r7538: (noelallen) Remove extra changes to Cygtar r7539: (eugenis) Widen Memcheck allocator suppressions. r7540: (mcgrathr) Update x86 toolchains to 7535 r7542: (dschuff) Add attributes to torture tests and test configurations r7543: (ncbray) Refactor validator halt trimming to not depend on the code's base address. r7544: (mcgrathr) Update chrome_rev in DEPS r7546: (dschuff) Add attributes to more torturetest failures r7547: (robertm) Roll toolchain deps to 7537 r7549: (jvoung) Clarify some more testsuite failures. r7550: (ncbray) Refactor the 32-bit validator to use codesize instead of vlimit/iadrlimit. r7551: (robertm) Support .cxx as valid file name extension for source code. r7552: (mcgrathr) Remove vestiges of srpcgen r7553: (bradnelson) Adding selector item for osx 10.7 (to turn on 10.7 builders). r7554: (jasonwkim) Make driver support arbitrary digit arguments to -O r7555: (dschuff) Add known failure attribute support to llvm testsuite result parser r7556: (bradnelson) For platforms that don't have stndup (in some versions), r7557: (bradnelson) Disable gyp compile step on mac 10.7 bots until we have trybots to sort r7558: (jasonwkim) Make driver support arbitrary digit arguments to -O r7559: (robertm) pnacl: Remove .ll intermediate step from .c -> .bc compilation step, to make r7560: (dschuff) Add additional expected fail for llvm testsuite and enable checking for unexpected passes r7561: (jvoung) Temporarily have the llvm merge bot run merges against a partially-okay merge (up to 147864) to see if the bot can find upstream changes that will fix things. BUG=none TEST=nacl_integration Review URL: http://codereview.chromium.org/9186010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117249 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 117211 - WebKit roll 104657:104701flackr@chromium.org2012-01-111-1/+1
| | | | | | | | | | | | | | | | | | | | The following error was caught by the mac_rel bot: third_party/WebKit/Source/WebCore/css/CSSStyleSelector.cpp:2660:13:error: enumeration value 'CSSPropertyWebkitFontKerning' not handled in switch [-Werror,-Wswitch-enum] switch (property) { ^ 1 error generated. make: *** [out/Release/obj.target/webcore_remaining/third_party/WebKit/Source/WebCore/css/CSSStyleSelector.o] Error 1 TBR=dimich@chromium.org BUG=none TEST=none Review URL: http://codereview.chromium.org/9148023 TBR=apavlov@chromium.org Review URL: http://codereview.chromium.org/9185011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117234 0039d316-1c4b-4281-b951-d872f2087c98
* Roll in revision 124 of libyuv to fix build errors on chromium os (arm).tommi@chromium.org2012-01-111-1/+1
| | | | | | Review URL: http://codereview.chromium.org/9185008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117232 0039d316-1c4b-4281-b951-d872f2087c98
* WebKit roll 104657:104701apavlov@chromium.org2012-01-111-1/+1
| | | | | | | | | | TBR=dimich@chromium.org BUG=none TEST=none Review URL: http://codereview.chromium.org/9148023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117211 0039d316-1c4b-4281-b951-d872f2087c98
* IndexedDB: Run cursor-prefetch webkit layout test as ui test.dgrogan@chromium.org2012-01-111-0/+3
| | | | | | | | | | | | | | The test exercises a bug that is only triggered when run in multi-process chromium. The patch in https://bugs.webkit.org/show_bug.cgi?id=75596 has to be committed and rolled before this change can be committed. This ui test will eventually run all of the IDB layout tests. BUG=108071 TEST= Review URL: http://codereview.chromium.org/9108004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117196 0039d316-1c4b-4281-b951-d872f2087c98
* WebKit roll 104632:104657dimich@chromium.org2012-01-111-1/+1
| | | | | | Review URL: http://codereview.chromium.org/9181011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117150 0039d316-1c4b-4281-b951-d872f2087c98
* WebKit roll 104535:104632dimich@chromium.org2012-01-111-1/+1
| | | | | | Review URL: http://codereview.chromium.org/9158023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117128 0039d316-1c4b-4281-b951-d872f2087c98
* Skia DEPS roll 2988->2993epoger@chromium.org2012-01-101-1/+1
| | | | | | Review URL: http://codereview.chromium.org/9169012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117057 0039d316-1c4b-4281-b951-d872f2087c98
* WebKit roll 104502:104535dimich@chromium.org2012-01-101-1/+1
| | | | | | Review URL: http://codereview.chromium.org/9169004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117006 0039d316-1c4b-4281-b951-d872f2087c98
* OTS roll to r78bashi@chromium.org2012-01-101-1/+1
| | | | | | | | | | | BUG=109358 TEST=Trybots TBR=agl@chromium.org,yusukes@chromium.org Review URL: http://codereview.chromium.org/9137001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116997 0039d316-1c4b-4281-b951-d872f2087c98
* Webkit roll 104462:104502dimich@chromium.org2012-01-101-1/+1
| | | | | | Review URL: http://codereview.chromium.org/9148012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116979 0039d316-1c4b-4281-b951-d872f2087c98
* Roll jsoncpp to 248.ronghuawu@chromium.org2012-01-091-1/+1
| | | | | | | | | | | Fix the compile warnings on Windows. BUG=108513 TEST=build Review URL: http://codereview.chromium.org/9154002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116946 0039d316-1c4b-4281-b951-d872f2087c98
* Try to unbork WebKit canaries. Update DEPS to exclude Chromium Mac CG layout ↵dimich@chromium.org2012-01-091-9/+0
| | | | | | | | | | tests. Follows http://trac.webkit.org/changeset/104464 and co. Review URL: http://codereview.chromium.org/9151013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116910 0039d316-1c4b-4281-b951-d872f2087c98
* Skia deps roll 2980->2988epoger@chromium.org2012-01-091-1/+1
| | | | | | Review URL: http://codereview.chromium.org/9152002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116880 0039d316-1c4b-4281-b951-d872f2087c98
* Roll WebKit DEPS 104394:104462jknotten@chromium.org2012-01-091-1/+1
| | | | | | | | | | TBR=dimich@chromium.org BUG=None TEST=None Review URL: http://codereview.chromium.org/9149006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116866 0039d316-1c4b-4281-b951-d872f2087c98
* WebKit roll 104390:104394dslomov@chromium.org2012-01-081-1/+1
| | | | | | | | TBR=jknotten@chromium.org,dimich@chromium.org Review URL: http://codereview.chromium.org/9129002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116837 0039d316-1c4b-4281-b951-d872f2087c98
* WebKit roll 104386:104390dslomov@chromium.org2012-01-071-1/+1
| | | | | | | | TBR=jknotten@chromium.org,dimich@chromium.org Review URL: http://codereview.chromium.org/9142001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116831 0039d316-1c4b-4281-b951-d872f2087c98
* WebKit roll 104316:104386dslomov@chromium.org2012-01-071-1/+1
| | | | | | | | TBR=jknotten@chromium.org,dimich@chromium.org Review URL: http://codereview.chromium.org/9122023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116829 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 116819 - WebKit roll 104316:104375dslomov@chromium.org2012-01-071-1/+1
| | | | | | | | | | | | | Broken perf tests TBR=jknotten@chromium.org Review URL: http://codereview.chromium.org/9120023 TBR=dslomov@chromium.org Review URL: http://codereview.chromium.org/9123025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116827 0039d316-1c4b-4281-b951-d872f2087c98
* WebKit roll 104316:104375dslomov@chromium.org2012-01-071-1/+1
| | | | | | | | TBR=jknotten@chromium.org Review URL: http://codereview.chromium.org/9120023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116819 0039d316-1c4b-4281-b951-d872f2087c98
* roll gyp 1134:1135thakis@chromium.org2012-01-071-1/+1
| | | | | | | | | | | | 1135: Move the 2.5 fix to the file where it's needed. BUG=109452 TEST=10.5 bots on perf waterfall go green. TBR=kerz@chromium.org Review URL: http://codereview.chromium.org/9120019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116797 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 116766 - chromeos: Merge tools/cros.DEPS/DEPS into the main DEPS.satorux@chromium.org2012-01-071-7/+0
| | | | | | | | | | | | | | | | | | | | Reason: The new git workflow system failed to convert DEPS to .DEPS.git with this patch... This is to simplify setup needed to work on Chrome for Chrome OS. cros.git and system_api.git are Chrome OS only, but pretty small. The sizes of the repositories are 1.3MB and 260KB, and the former will be gone in the not distant future. BUG=108090 TEST=the error message is shown while gclient sync as intended if .gclient contains the deprecated cros_deps rule. Review URL: http://codereview.chromium.org/9131003 TBR=satorux@chromium.org Review URL: http://codereview.chromium.org/9122018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116790 0039d316-1c4b-4281-b951-d872f2087c98
* roll gyp 1127:1134thakis@chromium.org2012-01-071-1/+1
| | | | | | | | | | | | | | | | | | | 1128: test/restat/gyptest-restat.py passes with xcode, so enable it there too. 1129: ninja/mac: Copy gyp-mac-tool into out/Debug. 1130: ninja/mac: Bundle support, part 1: Add support for mac_bundle_resources. 1131: ninja/mac: Bundle support, part 2: Add support for Info.plist files. 1132: ninja/mac: Bundle support, part 3: Actually support bundles. 1133: ninja/mac: Put dylibs directly into the product directory. 1134: Make xcode_emulation.py work with Python 2.5. (hopefully.) BUG=96894,109452 TEST=10.5 perf bots don't go red. make build continues working, ninja build continues to not work. TBR=mark Review URL: http://codereview.chromium.org/9124019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116784 0039d316-1c4b-4281-b951-d872f2087c98
* chromeos: Merge tools/cros.DEPS/DEPS into the main DEPS.satorux@chromium.org2012-01-061-0/+7
| | | | | | | | | | | | | | | This is to simplify setup needed to work on Chrome for Chrome OS. cros.git and system_api.git are Chrome OS only, but pretty small. The sizes of the repositories are 1.3MB and 260KB, and the former will be gone in the not distant future. BUG=108090 TEST=the error message is shown while gclient sync as intended if .gclient contains the deprecated cros_deps rule. Review URL: http://codereview.chromium.org/9131003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116766 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 116665 - roll gyp 1127:1131kerz@chromium.org2012-01-061-1/+1
| | | | | | | | | | | | | | | | | | | | This broke two mac perf bots - http://build.chromium.org/p/chromium.perf/builders/Mac10.5%20Perf%281%29/builds/12995 1128: test/restat/gyptest-restat.py passes with xcode, so enable it there too. 1129: ninja/mac: Copy gyp-mac-tool into out/Debug. 1130: ninja/mac: Bundle support, part 1: Add support for mac_bundle_resources. 1131: ninja/mac: Bundle support, part 2: Add support for Info.plist files. BUG=96894 TEST=make build on mac still works, ninja build still doesn't TBR=mark Review URL: http://codereview.chromium.org/9113018 TBR=thakis@chromium.org Review URL: http://codereview.chromium.org/9122014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116754 0039d316-1c4b-4281-b951-d872f2087c98
* WebKit roll 104283:104316dslomov@chromium.org2012-01-061-1/+1
| | | | | | | | TBR=jknotten@chromium.org Review URL: http://codereview.chromium.org/9121010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116737 0039d316-1c4b-4281-b951-d872f2087c98
* roll skia to 2980reed@google.com2012-01-061-1/+1
| | | | | | Review URL: http://codereview.chromium.org/9123006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116707 0039d316-1c4b-4281-b951-d872f2087c98
* Roll WebKit 104232:104283jknotten@chromium.org2012-01-061-1/+1
| | | | | | | | TBR=dslomov@chromium.org Review URL: http://codereview.chromium.org/9121006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116667 0039d316-1c4b-4281-b951-d872f2087c98