summaryrefslogtreecommitdiffstats
path: root/build
Commit message (Collapse)AuthorAgeFilesLines
* Fix test_results.LogFull() issue for Debug build.wangxianzhu@chromium.org2012-08-223-6/+9
| | | | | | | | | | | Details of the failure: http://build.chromium.org/p/tryserver.chromium/builders/android_test/builds/377/steps/Test%20suite%20base_unittests/logs/stdio BUG=none Review URL: https://chromiumcodereview.appspot.com/10868008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152678 0039d316-1c4b-4281-b951-d872f2087c98
* Turn off cygwin for grit again.iannucci@chromium.org2012-08-211-1/+2
| | | | | | | | | | | | | Roll gyp has already been updated prevent the issues which happened previously with msvs 2008. This is a second attempt at https://chromiumcodereview.appspot.com/10832121/ BUG=123026 R=scottmg,joi,thakis Review URL: https://chromiumcodereview.appspot.com/10824268 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152639 0039d316-1c4b-4281-b951-d872f2087c98
* Change Android build configurations (step 3).wangxianzhu@chromium.org2012-08-214-19/+14
| | | | | | | | | | | | | | | | | | Step 1 is https://chromiumcodereview.appspot.com/10827273/ which changed Debug build to build size-optimized code with DCHECK. Step 2 is https://chromiumcodereview.appspot.com/10836323/ which updated developer scripts and buildbot scripts to support the new configurations. Step 3: change Release configuration to no DCHECK and change default configuration to Debug. BUG=none Review URL: https://chromiumcodereview.appspot.com/10831381 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152504 0039d316-1c4b-4281-b951-d872f2087c98
* Change Android build configurations (step 2).wangxianzhu@chromium.org2012-08-2113-44/+91
| | | | | | | | | | | | | | Step 1 is https://chromiumcodereview.appspot.com/10827273/ which changed Debug build to build size-optimized code with DCHECK. Step 2: update developer scripts and buildbot scripts to support to new configurations. BUG=none Review URL: https://chromiumcodereview.appspot.com/10836323 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152468 0039d316-1c4b-4281-b951-d872f2087c98
* Move the gyp variables used for grit defines on android to actually work.tedchoc@chromium.org2012-08-211-6/+4
| | | | | | | | | | | | | | | | | The enable_themes and enable_extensions gyp variables were in a different scope that prevented the grit_defines from having the correct value when evaluating the condition. Moves the variable assignment into the same scope as the variable declaration and now everything is happy. TEST=touch chrome/browser/browser_resources.grd && \ make chrome_resources (check about_version does not have theme icon) BUG= Review URL: https://chromiumcodereview.appspot.com/10828396 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152455 0039d316-1c4b-4281-b951-d872f2087c98
* Silence adb command output by defaultilevy@chromium.org2012-08-211-2/+2
| | | | | | | | | - Cherrypick from downstream https://gerrit-int.chromium.org/#/c/23445/ Review URL: https://chromiumcodereview.appspot.com/10657017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152449 0039d316-1c4b-4281-b951-d872f2087c98
* Replace gdb-add-index with cleanroom rewrite from vrk@ajwong@chromium.org2012-08-212-103/+40
| | | | | | | | | | | This CL takes add-index.sh and overwrites gdb-add-index. BUG=none Review URL: https://chromiumcodereview.appspot.com/10827427 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152443 0039d316-1c4b-4281-b951-d872f2087c98
* Only default incremental linking on in shared_libraryscottmg@chromium.org2012-08-201-1/+4
| | | | | | | | | | | | static_library + incremental explodes due to overly large size when all the .objs are pulled into the final binary. BUG=143660 Review URL: https://chromiumcodereview.appspot.com/10825461 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152412 0039d316-1c4b-4281-b951-d872f2087c98
* Use NDK r8b and 64-bit toolchainmichaelbai@chromium.org2012-08-203-6/+20
| | | | | | | | | | | | | - Roll DEPS to NDK r8b - Use 64-bit toolchain - Use gold linker BUG= Review URL: https://chromiumcodereview.appspot.com/10837226 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152376 0039d316-1c4b-4281-b951-d872f2087c98
* [Android] Add Chrome Shell package name constant.mkosiba@chromium.org2012-08-201-1/+2
| | | | | | | | | | | | This adds the constant for the Chrome Shell package which we're bringing up downstream at the moment. BUG= Review URL: https://chromiumcodereview.appspot.com/10823410 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152371 0039d316-1c4b-4281-b951-d872f2087c98
* Don't rely on the Android toolchain being exported in the PATH for the ↵peter@chromium.org2012-08-201-4/+5
| | | | | | | | | | | | | | | | | | | {CC,CXX,LINK,AR}_target defines. The make build has start using these environment variables since gyp revision 1470[1]. This works in the Chromium repository as the Android toolchain is being exported in the PATH, which is something WebKit doesn't do, and we shouldn't be relying on in general. Instead, use the paths to the toolchain and prefix them with Android's goma wrapper, which yields the same effect. [1] https://code.google.com/p/gyp/source/detail?r=1470 BUG= TEST= Review URL: https://chromiumcodereview.appspot.com/10827419 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152340 0039d316-1c4b-4281-b951-d872f2087c98
* Update iossim.gyp to use src/build/ios/mac_build.gypi.lliabraa@chromium.org2012-08-201-0/+5
| | | | | | | | | | | The mac_build.gypi will build the iossim executable using ninja. BUG=None Review URL: https://chromiumcodereview.appspot.com/10827200 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152335 0039d316-1c4b-4281-b951-d872f2087c98
* Dummy change to trigger the botsnsylvain@chromium.org2012-08-191-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152295 0039d316-1c4b-4281-b951-d872f2087c98
* Dummy change to trigger the botsnsylvain@chromium.org2012-08-191-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152293 0039d316-1c4b-4281-b951-d872f2087c98
* linux/clang: Disable the last two warnings, turn on -Werrorthakis@chromium.org2012-08-181-1/+6
| | | | | | | | | BUG=138571 TBR=tony Review URL: https://chromiumcodereview.appspot.com/10855238 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152242 0039d316-1c4b-4281-b951-d872f2087c98
* Add STEP_WARNINGS to ManagedInstall failureilevy@chromium.org2012-08-181-1/+2
| | | | | | | | | | | and fix typo BUG= Review URL: https://chromiumcodereview.appspot.com/10837327 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152241 0039d316-1c4b-4281-b951-d872f2087c98
* - Modified FILES.cfg to copy remoting host to archive.yihongg@chromium.org2012-08-181-0/+10
| | | | | | | | - Added remoting host dependencies in chromium_builder_qa so that chromium bot will have remoting host to support me2me test cases. Review URL: https://chromiumcodereview.appspot.com/10825409 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152222 0039d316-1c4b-4281-b951-d872f2087c98
* Fix names of disabled unit tests.newt@chromium.org2012-08-181-3/+3
| | | | | | | | | | | Several tests were renamed from ExperimentsHelperTest.* to VariationsHelperTest.*. This updates unit_tests_disabled accordingly, and should fix the android_test try bot. Review URL: https://chromiumcodereview.appspot.com/10860021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152217 0039d316-1c4b-4281-b951-d872f2087c98
* Enable PromoResourceServiceTestaruslan@chromium.org2012-08-181-3/+0
| | | | | | | | | | | | Enable the PromoResourceService tests on Android testbots and make sure they don't fail due to incorrectly set time on the testbot devices. BUG=139642 TEST=unit_tests Review URL: https://chromiumcodereview.appspot.com/10837074 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152204 0039d316-1c4b-4281-b951-d872f2087c98
* Disable SpdyCredentialBuilder tests with OpenSSL.pliard@chromium.org2012-08-171-3/+0
| | | | | | | | | | | | | | | These tests fail on Linux redux, that uses OpenSSL, due to ec_private_key_openssl.cc which is not implemented yet. They were already disabled on Android through an entry in build/android/gtest_filter/net_unittests_disabled. TEST=net_unittests BUG=142833,140991 Review URL: https://chromiumcodereview.appspot.com/10830354 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152163 0039d316-1c4b-4281-b951-d872f2087c98
* Fix calls to ls /root that might be emptyilevy@chromium.org2012-08-171-8/+3
| | | | | | | | | | | - My earlier CL https://chromiumcodereview.appspot.com/10823382 is problematic. This mostly reverts it and fixes the issue in a better way. Review URL: https://chromiumcodereview.appspot.com/10827403 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152130 0039d316-1c4b-4281-b951-d872f2087c98
* Make ant touch jar outputscjhopman@chromium.org2012-08-171-0/+6
| | | | | | | | | | | | | This prevents Gyp from performing unnecessary build actions due to Ant not updating the modification time of the output when Gyp believes the output is stale. BUG=143229 Review URL: https://chromiumcodereview.appspot.com/10825403 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152125 0039d316-1c4b-4281-b951-d872f2087c98
* Organize adb install cmds and reboot on failureilevy@chromium.org2012-08-173-52/+90
| | | | | | | | | | | | - Rewrote adb_install_content_shell to not call adb install directly - New function in android_commands 'ManagedInstall' which attempts to work around package manager freezes by restarting device BUG=141899 Review URL: https://chromiumcodereview.appspot.com/10824227 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152058 0039d316-1c4b-4281-b951-d872f2087c98
* Added reboot phone step to android testersilevy@chromium.org2012-08-175-9/+30
| | | | | | | | | | | - Does not break bot, but attempts to wait until phone boots - Minor fixes to adb_device_functions BUG=141899 Review URL: https://chromiumcodereview.appspot.com/10837180 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152052 0039d316-1c4b-4281-b951-d872f2087c98
* Disable adb root default call in android_commandsilevy@chromium.org2012-08-171-3/+6
| | | | | | | | | | | | | We need to change downstream scripts to explicitly call this. This is causing devices to drop offline during the adb root command. I will manually pull this change downstream. BUG=143109 Review URL: https://chromiumcodereview.appspot.com/10823382 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152019 0039d316-1c4b-4281-b951-d872f2087c98
* enable incremental linking by default when using ninja on Windowsscottmg@chromium.org2012-08-161-1/+5
| | | | | | | | | | BUG=125748 TEST=ninja windows links Review URL: https://chromiumcodereview.appspot.com/10366002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151930 0039d316-1c4b-4281-b951-d872f2087c98
* chromeos: Remove CROS_FONTS_USING_BCI.derat@chromium.org2012-08-161-6/+0
| | | | | | | | | | | | | | | | | | | This was a #define that was added when we were deciding whether we should use the bytecode interpreter or FreeType's autohinter when rendering UI text on Chrome OS. The text had different heights depending on which setting was used, so a bunch of constants were special-cased when BCI was enabled. We've been using the autohinter for a long time, and we'll need to update lots of newer code if we decide to switch to BCI someday. BUG=none TEST=UI text looks the same as before TBR=tony@chromium.org,davemoore@chromium.org,zork@chromium.org Review URL: https://chromiumcodereview.appspot.com/10828336 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151928 0039d316-1c4b-4281-b951-d872f2087c98
* Load ICU data from file on iOS.blundell@chromium.org2012-08-161-0/+1
| | | | | | | | | | | On iOS, load ICU data from a file instead of compiling it in, to keep binary size down for the low-memory environment. BUG=None Review URL: https://chromiumcodereview.appspot.com/10829320 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151900 0039d316-1c4b-4281-b951-d872f2087c98
* Remove the dependency on the STRIP env variable for Androidpeter@chromium.org2012-08-163-4/+9
| | | | | | | | | | | | Android builds currently rely on the STRIP environment variable to be available during build time, rather than just at project generation time. It shouldn't. BUG=142642 Review URL: https://chromiumcodereview.appspot.com/10832295 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151886 0039d316-1c4b-4281-b951-d872f2087c98
* Android: start building libwebview on FYI waterfall.torne@chromium.org2012-08-161-2/+3
| | | | | | | | | | Move the libwebview target to android_experimental so it gets compiled and linked on the FYI waterfall (but not the main waterfall or trybots yet). This will help us see when it's been broken by other changes. Review URL: https://chromiumcodereview.appspot.com/10829333 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151877 0039d316-1c4b-4281-b951-d872f2087c98
* Add a new target to build the mac binaries used for asan security tests.nsylvain@chromium.org2012-08-151-0/+9
| | | | | | Review URL: https://chromiumcodereview.appspot.com/10855184 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151781 0039d316-1c4b-4281-b951-d872f2087c98
* Add compiler_experiemental stage to fyi builderilevy@chromium.org2012-08-152-4/+3
| | | | | | | | | | | | Also deleting unused fyi_buildertester script BUG= TEST= Review URL: https://chromiumcodereview.appspot.com/10802033 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151780 0039d316-1c4b-4281-b951-d872f2087c98
* Remove forced static_library build for Dr. Memory now that the toolbruening@google.com2012-08-152-2/+4
| | | | | | | | | | | | | | | | | supports the debug MSVS libc dll. Also disabled debug build inlining and FPO to support increasing debug build optimization. Re-add unit_tests to the "Windows Tests (DrMemory)" bot. (The unit_tests cannot be linked with static_library, which is why they were removed from the bot.) BUG=137180 R=rnk@chromium.org Review URL: https://chromiumcodereview.appspot.com/10834341 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151770 0039d316-1c4b-4281-b951-d872f2087c98
* Only install the 32-bit compat packages on 64-bit.mmoss@chromium.org2012-08-151-1/+7
| | | | | | | | | | | This prevents the script from failing on 32-bit Ubuntu where the 32-bit compat packages don't exist. BUG=138234 Review URL: https://chromiumcodereview.appspot.com/10825369 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151745 0039d316-1c4b-4281-b951-d872f2087c98
* Remove uses of Android's test runner's --ant-compile, as well as the flag ↵peter@chromium.org2012-08-151-1/+0
| | | | | | | | | | | | | | itself. It has been superseded by --sdk-build, which has already been set for all other Chromium and WebKit users. BUG= Review URL: https://chromiumcodereview.appspot.com/10855147 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151709 0039d316-1c4b-4281-b951-d872f2087c98
* Remove touch optimized layout on ChromeOSflackr@chromium.org2012-08-151-2/+2
| | | | | | | | | | BUG=138281 TEST=No touch optimized ui in about flags, nor does it get set when a touch screen is plugged in. Review URL: https://chromiumcodereview.appspot.com/10832252 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151694 0039d316-1c4b-4281-b951-d872f2087c98
* Eliminate the 'build_ppapi_ipc_proxy_untrusted' build flag for untrusted ↵bbudge@chromium.org2012-08-152-20/+0
| | | | | | | | | | | | | PPAPI proxy builds. This CL removes our custom GYP flag and modifies the build so both the SRPC and IPC proxies are built side by side. In addition, NaClBrowser now checks the '--enable-nacl-ipc-proxy' flag to determine which IRT to load. The IPC proxy's name is of the form 'nacl_ipc_irt_*'. BUG=116317 TEST=builds and runs NaCl apps with --enable-nacl-ipc-proxy TBR=bbudge@chromium.org Review URL: https://chromiumcodereview.appspot.com/10831316 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151693 0039d316-1c4b-4281-b951-d872f2087c98
* Fix for ninja buildcjhopman@chromium.org2012-08-151-2/+2
| | | | | | | | | | | | There is no need to specify the dir for these ant filelists. In ninja these paths are relative while they are absolute in make. BUG= Review URL: https://chromiumcodereview.appspot.com/10831318 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151644 0039d316-1c4b-4281-b951-d872f2087c98
* Change Android build configurations (step 1).wangxianzhu@chromium.org2012-08-141-23/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | Before this change we build Release builds size-optimized code with DCHECK, while we almost never use the Debug build which is not size-optimized. Now change Debug build to build size-optimized code with DCHECK but still temporarily keep Release build and default configuration unchanged before everyone (the bots, scripts and developers) knows how to deal with this change. Next steps will be: Step 2: update developer scripts and buildbot scripts to handle the new configuration. Step 3: change Release configuration to no DCHECK and change default configuration to Debug. After all steps finish, this new configuration will better match Chromium and WebKit (e.g. better matches the DEBUG and RELEASE tags in WebKit layout test expectations), and makes it easier to build a performance build. Review URL: https://chromiumcodereview.appspot.com/10827273 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151589 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 151581 - Eliminate the 'build_ppapi_ipc_proxy_untrusted' build flag ↵bbudge@chromium.org2012-08-142-0/+20
| | | | | | | | | | | | | | | for untrusted PPAPI proxy builds. This CL removes our custom GYP flag and modifies the build so both the SRPC and IPC proxies are built side by side. In addition, NaClBrowser now checks the '--enable-nacl-ipc-proxy' flag to determine which IRT to load. The IPC proxy's name is of the form 'nacl_ipc_irt_*'. BUG=116317 TEST=builds and runs NaCl apps with --enable-nacl-ipc-proxy Review URL: https://chromiumcodereview.appspot.com/10836220 TBR=bbudge@chromium.org Review URL: https://chromiumcodereview.appspot.com/10825351 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151584 0039d316-1c4b-4281-b951-d872f2087c98
* Eliminate the 'build_ppapi_ipc_proxy_untrusted' build flag for untrusted ↵bbudge@chromium.org2012-08-142-20/+0
| | | | | | | | | | | | PPAPI proxy builds. This CL removes our custom GYP flag and modifies the build so both the SRPC and IPC proxies are built side by side. In addition, NaClBrowser now checks the '--enable-nacl-ipc-proxy' flag to determine which IRT to load. The IPC proxy's name is of the form 'nacl_ipc_irt_*'. BUG=116317 TEST=builds and runs NaCl apps with --enable-nacl-ipc-proxy Review URL: https://chromiumcodereview.appspot.com/10836220 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151581 0039d316-1c4b-4281-b951-d872f2087c98
* Add a build target for perf_av bot dependencies.shadi@chromium.org2012-08-141-0/+8
| | | | | | | | | BUG=142495 TEST=rm -rf out, build chromium_builder_perf_av, run functional/media/ pyauto tests. Review URL: https://chromiumcodereview.appspot.com/10824287 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151578 0039d316-1c4b-4281-b951-d872f2087c98
* Second attempt at fixing Ninja build for Android and change make for host os ↵yfriedman@chromium.org2012-08-141-4/+4
| | | | | | | | | | | | | | | optionally use goma Now, to build with goma, you must: 1) Set $GOMA_DIR 2) Specify Goma in the path such as: PATH=$GOMA_DIR/android/:$PATH ninja -j250 -C out/Release base_unittests_apk "2)" above is necessary temporarily until the *_target variables are removed from build/android/envsetup.sh Review URL: https://chromiumcodereview.appspot.com/10834296 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151532 0039d316-1c4b-4281-b951-d872f2087c98
* Make jars build from a single ant .xml templatecjhopman@chromium.org2012-08-132-17/+28
| | | | | | | | | | | | | | The ant build files for each of the jars that we create consisted of only fairly straightforward boilerplate. With the recent changes to java.gypi and java_aidl.gypi we can now build these correctly from a single .xml with GYP passing in defines for the minor differences. BUG=136756 Review URL: https://chromiumcodereview.appspot.com/10831227 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151334 0039d316-1c4b-4281-b951-d872f2087c98
* Make java_aidl targets export include directoriescjhopman@chromium.org2012-08-132-2/+12
| | | | | | | | | | | | | | | | | | | Native code generation rules typically add their output directory to their dependent's 'include_dirs'. This change makes targets that include java_aidl.gypi do a similar thing for other java*.gypi targets. Make java.gypi pass this variable to ant and content.xml use the variable rather than hardcoding the directory. Also, move the aidl output folder into <(SHARED_INTERMEDIATE_DIR) as it should be. BUG= Review URL: https://chromiumcodereview.appspot.com/10855060 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151315 0039d316-1c4b-4281-b951-d872f2087c98
* Android's native_tests.gyp should take WebKit's directory structure into ↵peter@chromium.org2012-08-131-0/+2
| | | | | | | | | | | | account. This broke the WebKit Chromium Android bot. BUG=142322 Review URL: https://chromiumcodereview.appspot.com/10829291 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151257 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 151110 - Fix ninja build for Android after ↵peter@chromium.org2012-08-131-7/+4
| | | | | | | | | | | | | | | http://codereview.chromium.org/10836080/ This CL broke the WebKit Android build bot and EWS bots by exporting CC and CXX, which caused the global make settings as defined in gyp to be ignored. Original review URL: https://chromiumcodereview.appspot.com/10836192 TBR=yfriedman@chromium.org Review URL: https://chromiumcodereview.appspot.com/10829296 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151251 0039d316-1c4b-4281-b951-d872f2087c98
* Make ChromeOS imply enable_hidpipkotwicz@chromium.org2012-08-111-2/+2
| | | | | | | | | | | | Bug=None Test=Compile ChromeOS without enable_hidpi GYP_DEFINE. R=flackr TBR=sky Review URL: https://chromiumcodereview.appspot.com/10829281 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151160 0039d316-1c4b-4281-b951-d872f2087c98
* Fix ninja build for Android after http://codereview.chromium.org/10836080/yfriedman@chromium.org2012-08-101-4/+7
| | | | | | | | | CC/CXX/AR now refer to target compilation. We need to specifically set the host toolchain (CC_host, CX_host, AR_host) as well. Review URL: https://chromiumcodereview.appspot.com/10836192 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151110 0039d316-1c4b-4281-b951-d872f2087c98
* Use the NDK that has been checked into android_tools.navabi@chromium.org2012-08-102-15/+3
| | | | | | | | | BUG= Review URL: https://chromiumcodereview.appspot.com/10828242 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151080 0039d316-1c4b-4281-b951-d872f2087c98