summaryrefslogtreecommitdiffstats
path: root/build
Commit message (Collapse)AuthorAgeFilesLines
* Fix running WebKit layout tests by not indenting a continuation.peter@chromium.org2012-11-071-1/+1
| | | | | | | | BUG= Review URL: https://codereview.chromium.org/11364128 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166440 0039d316-1c4b-4281-b951-d872f2087c98
* Remove unneeded symbolic link to libraries.cjhopman@chromium.org2012-11-072-12/+4
| | | | | | | | | | | | | The stack annotation tool has been changed to work with Chrome output directory structure and so we no longer need to create the artificial structure in out/android. BUG= Review URL: https://chromiumcodereview.appspot.com/11368102 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166423 0039d316-1c4b-4281-b951-d872f2087c98
* Teach the WebKit bots how to run layout tests, TestWebKitAPI and ↵peter@chromium.org2012-11-072-7/+48
| | | | | | | | | | | | | webkit_unit_tests for Android This will enable them to run the suites themselves. Having more detailed error messages and uploading the created results will be implemented after this. BUG=136774 Review URL: https://chromiumcodereview.appspot.com/11312101 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166417 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 166369 - Revert 166365 - roll clang 165787:167488pastarmovj@google.com2012-11-071-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | Seems like a clobber might be enough to fix the issues caused by this CL. Reverted because it is assumed to be the cause for multiple compile failures on mac and linux. Fixes crash in arm codegen. Doesn't warn on -Wno-arc-abi. Nicer diagnostics for nested macro instantiations. Includes asan support for android on linux (shout if you need that on mac). Fixes issue with debug information in .S files. Renames -faddress-sanitizer to -fsanitize=address (continue to use -faddress-sanitizer in chromium for now, until we've updated all third-party gyp files) BUG=159712,159452,159475,159502,159598,59580 TBR=hans Review URL: https://codereview.chromium.org/11361133 TBR=thakis@chromium.org Review URL: https://codereview.chromium.org/11377020 TBR=pastarmovj@google.com Review URL: https://codereview.chromium.org/11377023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166405 0039d316-1c4b-4281-b951-d872f2087c98
* Support running Android apk-based tests under ASan.eugenis@chromium.org2012-11-072-11/+13
| | | | | | | BUG=137569 Review URL: https://codereview.chromium.org/11361125 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166394 0039d316-1c4b-4281-b951-d872f2087c98
* Disable ASan instrumentation of globals on Android.eugenis@chromium.org2012-11-071-0/+9
| | | | | | | BUG=137569,159801 Review URL: https://codereview.chromium.org/11275185 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166391 0039d316-1c4b-4281-b951-d872f2087c98
* Make sure we build the tools used for testing minidumps on Android.jcivelli@chromium.org2012-11-071-0/+6
| | | | | | | | | | BUG=None TEST=None Review URL: https://chromiumcodereview.appspot.com/11368111 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166377 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 166365 - roll clang 165787:167488pastarmovj@google.com2012-11-071-8/+0
| | | | | | | | | | | | | | | | | | | | | Reverted because it is assumed to be the cause for multiple compile failures on mac and linux. Fixes crash in arm codegen. Doesn't warn on -Wno-arc-abi. Nicer diagnostics for nested macro instantiations. Includes asan support for android on linux (shout if you need that on mac). Fixes issue with debug information in .S files. Renames -faddress-sanitizer to -fsanitize=address (continue to use -faddress-sanitizer in chromium for now, until we've updated all third-party gyp files) BUG=159712,159452,159475,159502,159598,59580 TBR=hans Review URL: https://codereview.chromium.org/11361133 TBR=thakis@chromium.org Review URL: https://codereview.chromium.org/11377020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166369 0039d316-1c4b-4281-b951-d872f2087c98
* roll clang 165787:167488thakis@chromium.org2012-11-071-0/+8
| | | | | | | | | | | | | | | | Fixes crash in arm codegen. Doesn't warn on -Wno-arc-abi. Nicer diagnostics for nested macro instantiations. Includes asan support for android on linux (shout if you need that on mac). Fixes issue with debug information in .S files. Renames -faddress-sanitizer to -fsanitize=address (continue to use -faddress-sanitizer in chromium for now, until we've updated all third-party gyp files) BUG=159712,159452,159475,159502,159598,59580 TBR=hans Review URL: https://codereview.chromium.org/11361133 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166365 0039d316-1c4b-4281-b951-d872f2087c98
* Fix adb_run_content_shell to correctly pass URL.tedchoc@chromium.org2012-11-072-2/+2
| | | | | | | | | | | | Also fixes testshell to support launching with a URL and triggering new intents (and fixes it's adb_run_chromium_testshell. BUG=159602 Review URL: https://chromiumcodereview.appspot.com/11377011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166357 0039d316-1c4b-4281-b951-d872f2087c98
* Add TakeScreenshot command to android_commands.frankf@chromium.org2012-11-063-12/+19
| | | | | | | | | | Also, take screenshots using /system/bin/screencap instead of monkeyrunner. BUG=158851 Review URL: https://codereview.chromium.org/11366068 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166273 0039d316-1c4b-4281-b951-d872f2087c98
* ASan on Android requires -pie.eugenis@chromium.org2012-11-061-0/+10
| | | | | | Review URL: https://codereview.chromium.org/11363104 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166212 0039d316-1c4b-4281-b951-d872f2087c98
* Android: fixes instrumentation tests call to LogFull.bulach@chromium.org2012-11-061-1/+1
| | | | | | | | | | | | | | Following: https://chromiumcodereview.appspot.com/11363088 add an extra empty parameter. BUG= TEST=instrumentation tests on android Review URL: https://chromiumcodereview.appspot.com/11293115 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166208 0039d316-1c4b-4281-b951-d872f2087c98
* Android: fix webview build.torne@chromium.org2012-11-061-0/+3
| | | | | | | | | | | | TARGET_ARCH doesn't get set in the webview path through envsetup; hardcode it to ARM for now. This will be revisited once envsetup has been tidied up to make this less complicated. BUG= Review URL: https://codereview.chromium.org/11359069 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166198 0039d316-1c4b-4281-b951-d872f2087c98
* Android: uses an object rather than the Boolean for synchronizing LibraryLoad.bulach@chromium.org2012-11-061-1/+0
| | | | | | | | | BUG=159173 Review URL: https://chromiumcodereview.appspot.com/11312066 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166193 0039d316-1c4b-4281-b951-d872f2087c98
* Cleanup resource_bundle_unittestpkotwicz@chromium.org2012-11-061-1/+1
| | | | | | | | | BUG=None Test=ResourceBundleTest.* Review URL: https://chromiumcodereview.appspot.com/11358014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166134 0039d316-1c4b-4281-b951-d872f2087c98
* Android: Report step failure when tests time out.nileshagrawal@chromium.org2012-11-062-24/+24
| | | | | | | | | | | | | | | Currently when tests time out, we retry them but still mark the step as a warning, which does not cause a step failure. We should report a failure when tests time out. Also adding more stats on how many tests we were supposed to run and how many we failed to run. BUG= Review URL: https://chromiumcodereview.appspot.com/11363088 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166132 0039d316-1c4b-4281-b951-d872f2087c98
* Move Chromoting strings to string_resources.grd and simplify ↵sergeyu@chromium.org2012-11-061-3/+6
| | | | | | | | | | | | | | | | | | remoting_resources target. Previously all strings were in messages.json files. Moving them to GRD file will allow to share them with native components. Also simplified how resources are generated: 1. Now <if> is used to handle branded strings instead of generating grd file in build time 2. Removed resource_ids - ids are now specified in grd files. BUG=158995 Review URL: https://chromiumcodereview.appspot.com/11275101 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166127 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 166085 - Selective build clobbering feature (landmines.py and android ↵vandebo@chromium.org2012-11-064-289/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | build scripts). It looks like this made win extract_build fail. Adds the ability for devs/troopers/etc. to set 'landmines' in the tree so that the build will selectively clobber when a builder moves over a revision with such a change. This cl has an basis landmines.py, and hooks the clobber mechanism to the android build scripts. The relevant cl which implements this for compile.py is here: https://chromiumcodereview.appspot.com/11234013/ I'm planning to also implement an informational invocation for gclient to let devs know about any potential landmines so they can decide if they need to clobber. R=cmp,maruel@chromium.org BUG=121897 Review URL: https://chromiumcodereview.appspot.com/11175016 TBR=iannucci@chromium.org Review URL: https://codereview.chromium.org/11293111 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166105 0039d316-1c4b-4281-b951-d872f2087c98
* Selective build clobbering feature (landmines.py and android build scripts).iannucci@chromium.org2012-11-064-50/+289
| | | | | | | | | | | | | | | | | | | | | | Adds the ability for devs/troopers/etc. to set 'landmines' in the tree so that the build will selectively clobber when a builder moves over a revision with such a change. This cl has an basis landmines.py, and hooks the clobber mechanism to the android build scripts. The relevant cl which implements this for compile.py is here: https://chromiumcodereview.appspot.com/11234013/ I'm planning to also implement an informational invocation for gclient to let devs know about any potential landmines so they can decide if they need to clobber. R=cmp,maruel@chromium.org BUG=121897 Review URL: https://chromiumcodereview.appspot.com/11175016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166085 0039d316-1c4b-4281-b951-d872f2087c98
* Android: Fix finbugs step on experimental bots.nileshagrawal@chromium.org2012-11-061-1/+0
| | | | | | | | BUG= Review URL: https://codereview.chromium.org/11365101 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166079 0039d316-1c4b-4281-b951-d872f2087c98
* Pass -g1 on android release builds with fastbuildilevy@chromium.org2012-11-051-29/+51
| | | | | | | | | | | Also reorganizing fastbuild section. NOTRY=True Review URL: https://chromiumcodereview.appspot.com/11364088 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166076 0039d316-1c4b-4281-b951-d872f2087c98
* Revert "Move Chromoting strings to string_resources.grd and simplify ↵phajdan.jr@chromium.org2012-11-051-6/+3
| | | | | | | | remoting_resources target." This reverts commit f5dfed801f9358411900c4f9ca58ef0a11cce9ae. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166069 0039d316-1c4b-4281-b951-d872f2087c98
* Move Chromoting strings to string_resources.grd and simplify ↵sergeyu@chromium.org2012-11-051-3/+6
| | | | | | | | | | | | | | | | | remoting_resources target. Previously all strings were in messages.json files. Moving them to GRD file will allow to share them with native components. Also simplified how resources are generated: 1. Now <if> is used to handle branded strings instead of generating grd file in build time 2. Removed resource_ids - ids are now specified in grd files. BUG=158995 Review URL: https://codereview.chromium.org/11275101 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166068 0039d316-1c4b-4281-b951-d872f2087c98
* Add an option to specify the versio to tweak_info_plist, and use it to set ↵jochen@chromium.org2012-11-051-15/+27
| | | | | | | | | | | | | the version of content_shell This breaks the dependency on chrome/VERSION to build content shell on mac BUG=156242 Review URL: https://chromiumcodereview.appspot.com/11367095 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166044 0039d316-1c4b-4281-b951-d872f2087c98
* Add several strings to the grit whitelist for iOS.blundell@chromium.org2012-11-051-0/+9
| | | | | | Review URL: https://chromiumcodereview.appspot.com/11359056 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166033 0039d316-1c4b-4281-b951-d872f2087c98
* Android: Remove dependency on language detection library.nileshagrawal@chromium.org2012-11-051-0/+9
| | | | | | | | | | | | Savings: 1.2MB in stripped so (in the .rodata section) 750K in APK size BUG=155069 Review URL: https://chromiumcodereview.appspot.com/11361051 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166024 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 166003 - Move Chromoting strings to string_resources.grd and simplify ↵sergeyu@chromium.org2012-11-051-6/+3
| | | | | | | | | | | | | | | | | | | | remoting_resources target. Previously all strings were in messages.json files. Moving them to GRD file will allow to share them with native components. Also simplified how resources are generated: 1. Now <if> is used to handle branded strings instead of generating grd file in build time 2. Removed resource_ids - ids are now specified in grd files. BUG=158995 Review URL: https://codereview.chromium.org/11275101 TBR=sergeyu@chromium.org Review URL: https://codereview.chromium.org/11365095 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166013 0039d316-1c4b-4281-b951-d872f2087c98
* Move Chromoting strings to string_resources.grd and simplify ↵sergeyu@chromium.org2012-11-051-3/+6
| | | | | | | | | | | | | | | | | remoting_resources target. Previously all strings were in messages.json files. Moving them to GRD file will allow to share them with native components. Also simplified how resources are generated: 1. Now <if> is used to handle branded strings instead of generating grd file in build time 2. Removed resource_ids - ids are now specified in grd files. BUG=158995 Review URL: https://codereview.chromium.org/11275101 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166003 0039d316-1c4b-4281-b951-d872f2087c98
* Disable isolate_dependency_tracked in build driver for .isolate files.maruel@chromium.org2012-11-051-1/+11
| | | | | | | | | | | | | This is to help speed up the switch over. This will be reenabled once the switch over is in progress. R=csharp@chromium.org BUG= Review URL: https://chromiumcodereview.appspot.com/11365087 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165965 0039d316-1c4b-4281-b951-d872f2087c98
* Changes to build/common.gypi for iOS.blundell@chromium.org2012-11-051-1/+10
| | | | | | | | | | | - Disable some features that are not used on iOS. - Remove dSYM in debug mode to reduce build time. - Build for armv7 as armv7s is not yet fully tested. Review URL: https://chromiumcodereview.appspot.com/11364072 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165948 0039d316-1c4b-4281-b951-d872f2087c98
* Change copy_test_data_ios.py to enable copying hidden files.blundell@chromium.org2012-11-051-4/+3
| | | | | | | | | | | Loosen the dotfile test in this script as some tests can use hidden files. BUG= Review URL: https://chromiumcodereview.appspot.com/11312084 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165936 0039d316-1c4b-4281-b951-d872f2087c98
* Add a native test target and for android_webview.mkosiba@chromium.org2012-11-051-0/+2
| | | | | | | | | | | | | This adds the .gyp target for the android_webview native unittests. This change also adds running them to the fyi bot. BUG=None Android-only chagne, ran through trybots before submitting. NOTRY=true Review URL: https://chromiumcodereview.appspot.com/11366035 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165920 0039d316-1c4b-4281-b951-d872f2087c98
* Android: improves test sharding reliability.bulach@chromium.org2012-11-052-25/+66
| | | | | | | | | | | | | | | | | Originally test sharding for android was written with performance in mind (i.e., to scale up the test speed per device). Now that we're on the main waterfall, we need to improve reliability as devices may randomly drop offline during tests. This patch captures exceptions in key places and retries if there are enough devices available. BUG=153718 TEST=run android tests, randomly unplugging devices Review URL: https://chromiumcodereview.appspot.com/11275078 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165918 0039d316-1c4b-4281-b951-d872f2087c98
* Whitspace change.cmp@chromium.org2012-11-051-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165894 0039d316-1c4b-4281-b951-d872f2087c98
* Whitespace change.cmp@chromium.org2012-11-041-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165885 0039d316-1c4b-4281-b951-d872f2087c98
* Run findbugs and findbugs-plugin test on clang bot.michaelbai@chromium.org2012-11-033-7/+49
| | | | | | | | | | | - Also rebaseline the known bugs. BUG=156116 Review URL: https://chromiumcodereview.appspot.com/11365044 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165848 0039d316-1c4b-4281-b951-d872f2087c98
* Add structural support for building chrome_browser.gyp on iOSstuartmorgan@chromium.org2012-11-031-1/+2
| | | | | | | | | | | | | | | | This is not yet used, but helps lay the groundwork for building chrome/ targets for iOS. This uses exclude-all-and-include since Chrome for iOS uses only a subset of chrome/browser/, so the include list will be much more manageable and maintainable than an exclude list. BUG=156699 Review URL: https://chromiumcodereview.appspot.com/11361056 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165802 0039d316-1c4b-4281-b951-d872f2087c98
* Clang: enable -Wtautological-constant-out-of-range-comparehans@chromium.org2012-11-021-13/+0
| | | | | | | | | | | | This warning was implemented in Clang a couple of weeks ago, and now our code base is clean enough to enable it. BUG=151927 Review URL: https://chromiumcodereview.appspot.com/11366060 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165793 0039d316-1c4b-4281-b951-d872f2087c98
* Android: Fix test runner retry modenileshagrawal@chromium.org2012-11-021-2/+5
| | | | | | | | | | | | Currently, whenever the test runner script retries a test suite, it goes in fast_and_loose mode and never comes out of it. This causes the test script to not push test data for any other test suite. BUG= Review URL: https://codereview.chromium.org/11359050 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165789 0039d316-1c4b-4281-b951-d872f2087c98
* Android: Disable WebContentsVideoCaptureDeviceTestilevy@chromium.org2012-11-021-0/+2
| | | | | | | | | | | | | | | | | Disable WebContentsVideoCaptureDeviceTest.* These are timing out on android phones. Unfortunately our test runners did not go red for this timeout. We are fixing the test runner issue separately. BUG=159234 TEST=Verify correct number of content_unittest tests passed R=nileshagrawal@chromium.org Review URL: https://codereview.chromium.org/11358076 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165764 0039d316-1c4b-4281-b951-d872f2087c98
* Disable DeathTests inside unit_tests for androidkaiwang@chromium.org2012-11-021-2/+3
| | | | | | | | | BUG=155883 TBR=sievers@chromium.org Review URL: https://codereview.chromium.org/11360068 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165763 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 163638 - Adds units for all Chromium perf tests. These units are ↵sullivan@chromium.org2012-11-021-4/+4
| | | | | | | | | | | recorded in the graphs.dat file, and can then be used to determine whether the test has improved or regressed when the graph goes up. Review URL: https://chromiumcodereview.appspot.com/11234012 TBR=sullivan@chromium.org Review URL: https://codereview.chromium.org/11365067 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165685 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 165605 - Fix branding in chromoting string resources.hbono@chromium.org2012-11-021-6/+3
| | | | | | | | | | | | | | | | | When chromoting resources were converted from messages.json to .grd format incorrect branding was used. Beside that simplified how resources are generated: 1. Now <if> is used to handle branded strings instead of generating grd file in build time 2. Removed resource_ids - ids are now specified in grd files. BUG=158995 Review URL: https://chromiumcodereview.appspot.com/11275101 TBR=sergeyu@chromium.org Review URL: https://codereview.chromium.org/11359035 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165611 0039d316-1c4b-4281-b951-d872f2087c98
* Fix branding in chromoting string resources.sergeyu@chromium.org2012-11-021-3/+6
| | | | | | | | | | | | | | When chromoting resources were converted from messages.json to .grd format incorrect branding was used. Beside that simplified how resources are generated: 1. Now <if> is used to handle branded strings instead of generating grd file in build time 2. Removed resource_ids - ids are now specified in grd files. BUG=158995 Review URL: https://chromiumcodereview.appspot.com/11275101 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165605 0039d316-1c4b-4281-b951-d872f2087c98
* Android: makes "apk_package" optional in adb_install_apk.pybulach@chromium.org2012-11-013-19/+37
| | | | | | | | | | | | We can derive the package name from the mandatory apk. BUG= TEST=adb_install_apk.py --apk ContentShell.apk Review URL: https://chromiumcodereview.appspot.com/11365004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165450 0039d316-1c4b-4281-b951-d872f2087c98
* Added test for findbugs plugin.michaelbai@chromium.org2012-11-011-0/+1
| | | | | | | | | | | | | | - The java files had the issue that findbugd plugin need to find out, they compiled with the same configuration as chrome for android's. - The run_findbugs_plugin_tests.py runs the findbugs against the above Java classes, and expects to find the same issues as those in expected_result.txt. BUG=143971, 157970 Review URL: https://chromiumcodereview.appspot.com/11343057 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165442 0039d316-1c4b-4281-b951-d872f2087c98
* Add a class for management of thermal throttlingaberent@chromium.org2012-11-011-0/+47
| | | | | | | | | | | The new class allows detection of whether the device is now, or has been, thermally throttled, hence allowing rejection of performance results affected by thermal throttling. BUG=158575 Review URL: https://chromiumcodereview.appspot.com/11352004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165367 0039d316-1c4b-4281-b951-d872f2087c98
* More changes for TSan v2 support:glider@chromium.org2012-11-011-1/+5
| | | | | | | | | | | -- add the ignores file -- set the appropriate definitions for compiling dynamic annotations -- add suppressions for existing data races BUG=23244,62694,102327,120808,158718 Review URL: https://codereview.chromium.org/11227052 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165330 0039d316-1c4b-4281-b951-d872f2087c98
* Account for server vs host clock skew in cookie expiration times.pauljensen@chromium.org2012-11-011-0/+1
| | | | | | | | | | | | | When setting a cookie's expiration time in the cookie store we need to take into account any difference between the HTTP server and the host machine's real time clock. This reverts 159685 which reverted 146616. BUG=135131 TEST=net_unittests --gtest_filter=CookieMonster/CookieStoreTest/0.TestCookieDeletion Review URL: https://chromiumcodereview.appspot.com/11339032 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165323 0039d316-1c4b-4281-b951-d872f2087c98