summaryrefslogtreecommitdiffstats
path: root/chrome/tools
Commit message (Collapse)AuthorAgeFilesLines
* Cleanup: Remove unneeded browser_thread.h usage.thestig@chromium.org2010-12-132-3/+3
| | | | | | | | BUG=none TEST=none Review URL: http://codereview.chromium.org/5676004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69037 0039d316-1c4b-4281-b951-d872f2087c98
* Add user metrics for the login screen.satorux@chromium.org2010-12-131-0/+3
| | | | | | | | | | | | | | | | | | | Add user metrics for the following login actions: 1. login success 2. login failure 3. off the record login success (guest mode). Update chromeactions.txt by: % cd chrome/tools % PYTHONPATH=../../tools/python python extract_actions.py --hash TEST=login screen worked as before. BUG=chromium-os:8382 Review URL: http://codereview.chromium.org/5287003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68981 0039d316-1c4b-4281-b951-d872f2087c98
* Update PDF user actions.jam@chromium.org2010-12-042-0/+5
| | | | | | Review URL: http://codereview.chromium.org/5560005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68262 0039d316-1c4b-4281-b951-d872f2087c98
* Add experimental location features to the about:flags pagejoth@chromium.org2010-12-011-0/+2
| | | | | | | | | | | Also update chromeactions.txt to record new UMAs BUG=58277 TEST=enable, run browser with "--vmodule=*location*=3 http://html5demos.com/geo", check "gateways": appears in the log. Review URL: http://codereview.chromium.org/5346009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67838 0039d316-1c4b-4281-b951-d872f2087c98
* windows: remove PathService::Get() that uses wstringsevan@chromium.org2010-11-302-15/+13
| | | | | | | | | | This just required fixing the remaining callers. BUG=24672 Review URL: http://codereview.chromium.org/5356008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67783 0039d316-1c4b-4281-b951-d872f2087c98
* Stop using the old layout test plugin.tony@chromium.org2010-11-291-1/+1
| | | | | | | | | | | | I haven't deleted it yet because it might be useful for debugging failures. I'll delete it in a separate change so it's easy for someone to cherry pick the change back. BUG=64260 Review URL: http://codereview.chromium.org/5301003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67571 0039d316-1c4b-4281-b951-d872f2087c98
* Fix PyAuto on win after movign to python2.6nirnimesh@chromium.org2010-11-231-1/+1
| | | | | | | | Build .pyd instead of .dll Review URL: http://codereview.chromium.org/5279004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67162 0039d316-1c4b-4281-b951-d872f2087c98
* Manual commit since gcl is broken TBR=ifettejam@chromium.org2010-11-202-0/+2
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66846 0039d316-1c4b-4281-b951-d872f2087c98
* Add UMA reporting for about:flags usage.rsesek@chromium.org2010-11-182-0/+43
| | | | | | | | | BUG=none TEST=none Review URL: http://codereview.chromium.org/4910001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66638 0039d316-1c4b-4281-b951-d872f2087c98
* Add sanity checks of the BDIC files to Chrome.hbono@chromium.org2010-11-151-1/+11
| | | | | | | | | | This change updates ConvertDictTest that trims the end of BDICTs and verify hunspell::BDict::Verify() treats the trimmed BDICTs as corrupted. (This is a Chromium-side change of r65351 <http://crrev.com/65351>.) BUG=61206 TEST=unit_tests.exe --gtest_filter=ConvertDictTest.* Review URL: http://codereview.chromium.org/4477002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66098 0039d316-1c4b-4281-b951-d872f2087c98
* Update extract_actions to include PDF UMA stats.jam@chromium.org2010-11-122-0/+27
| | | | | | Review URL: http://codereview.chromium.org/4900003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66011 0039d316-1c4b-4281-b951-d872f2087c98
* Makes generate_profile able to generate top sites data.sky@chromium.org2010-10-281-38/+106
| | | | | | | | | BUG=60946 TEST=none Review URL: http://codereview.chromium.org/4194004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64274 0039d316-1c4b-4281-b951-d872f2087c98
* Convert LOG(INFO) to VLOG(1) - chrome/tools/.pkasting@chromium.org2010-10-202-23/+23
| | | | | | | | BUG=none TEST=none Review URL: http://codereview.chromium.org/3942001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63259 0039d316-1c4b-4281-b951-d872f2087c98
* Adding user metrics for context menus within the bookmarks bar.andybons@chromium.org2010-10-191-0/+2
| | | | | | | | | BUG=none TEST=none Review URL: http://codereview.chromium.org/3887001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63085 0039d316-1c4b-4281-b951-d872f2087c98
* o Update the mapping of action hashes to their appropriate identifiers.andybons@chromium.org2010-10-182-1/+3
| | | | | | | | | | | | o Update user_metrics.h to be more explicit about how to add metrics. o Update the some BookmarkBar metrics to fit on one line as is required by the script. BUG=59606 TEST=none Review URL: http://codereview.chromium.org/3815011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62982 0039d316-1c4b-4281-b951-d872f2087c98
* Move scoped_nsdisable_screen_update from base to app/macbrettw@chromium.org2010-10-181-2/+2
| | | | | | | | | | | Move scoped_aedesc from base to base/mac Use namespace and proper Google-style class naming. TEST=it compiles BUG=none Review URL: http://codereview.chromium.org/3828009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62904 0039d316-1c4b-4281-b951-d872f2087c98
* Move windows version-related stuff out of base/win_util and into ↵brettw@chromium.org2010-10-151-2/+2
| | | | | | | | | | | | | | base/win/windows_version. Many files now only need to include this instead of all of win_util. Remove a bunch of unused code from base/win_util. There was a surprising amount. Replace the AppUserModel property key with the one from the SDK now that we use the Win7 SDK. Move GetLogonSessionOnlyDACL from win_util to ipc since it's only used in that one place. TEST=it compiles BUG=none Review URL: http://codereview.chromium.org/3823002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62694 0039d316-1c4b-4281-b951-d872f2087c98
* base: Move SplitString functions into the base namespace and update the callers.tfarina@chromium.org2010-10-141-3/+3
| | | | | | | | | BUG=None TEST=trybots Review URL: http://codereview.chromium.org/3750001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62483 0039d316-1c4b-4281-b951-d872f2087c98
* Add --help and --man-page to chrome-wrapper.tony@chromium.org2010-10-081-0/+13
| | | | | | | | | --help shows command line args and --man-page opens the man page in the tree (preprocessed). Review URL: http://codereview.chromium.org/3529025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62007 0039d316-1c4b-4281-b951-d872f2087c98
* Add a --gdb flag to chrome-wrapper to make it easier to debugtony@chromium.org2010-10-081-2/+18
| | | | | | | | shared library builds. Review URL: http://codereview.chromium.org/3548019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61968 0039d316-1c4b-4281-b951-d872f2087c98
* Save real .dSYMs for Breakpad's crash_inspector and crash_report_sender.app mark@chromium.org2010-10-071-0/+3
| | | | | | | | | | | | | for proper debugging and Breakpadding. Dump symbols for Breakpad for these new files and for libffmpegsumo.dylib, and save all of their .dSYMs in the .dSYM archive. BUG=58310 TEST=none Review URL: http://codereview.chromium.org/3516022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61808 0039d316-1c4b-4281-b951-d872f2087c98
* Create a zip archive of generated policy templates on Windowsgfeher@chromium.org2010-10-071-0/+63
| | | | | | | | | | | The plan is to generate this zip later on an official buildbot, and publish it with stage_build.py. BUG=57805 TEST=none Review URL: http://codereview.chromium.org/3564008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61776 0039d316-1c4b-4281-b951-d872f2087c98
* Add "Use this language for spell checking" button.satorux@chromium.org2010-10-042-0/+137
| | | | | | | | | | | | On other platforms, spell check dictionary is configured from "Under the hood" options, but on Chrome OS, we integrate this setting with "Languages and Input" options. BUG=chromium-os:6292 TEST=Confirmed that spellcheck.dictionary was updated in Preferences file. Ran out/Release/unit_tests --gtest_filter='*LanguageOptionsHandlerTest*' Review URL: http://codereview.chromium.org/3549008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61345 0039d316-1c4b-4281-b951-d872f2087c98
* base: Finish moving the SplitString functions from string_util.h to ↵tfarina@chromium.org2010-09-241-1/+2
| | | | | | | | | | | string_split.h BUG=None TEST=trybos Review URL: http://codereview.chromium.org/3447008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60422 0039d316-1c4b-4281-b951-d872f2087c98
* Roll DEPS for Breakpad r692:r697, try 3.thestig@chromium.org2010-09-231-5/+2
| | | | | | | | BUG=none TEST=none Review URL: http://codereview.chromium.org/3432019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60320 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 60146 - Breakpad DEPS roll 692:697erikwright@chromium.org2010-09-221-1/+0
| | | | | | | | | | | BUG=None TEST=None Review URL: http://codereview.chromium.org/3386017 TBR=erikwright@chromium.org Review URL: http://codereview.chromium.org/3455013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60148 0039d316-1c4b-4281-b951-d872f2087c98
* Breakpad DEPS roll 692:697erikwright@chromium.org2010-09-221-0/+1
| | | | | | | | BUG=None TEST=None Review URL: http://codereview.chromium.org/3386017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60146 0039d316-1c4b-4281-b951-d872f2087c98
* Now that we can actually successfully nest both the setuid and the seccompmarkus@chromium.org2010-09-201-27/+51
| | | | | | | | | | | | | | | | | sandbox (not enabled by default) there are a lot more permutations of what our processes can look like. This changelist updates the chrome-process-identifier.sh script to recognize these permutations so that we can print correct data. It also fixes a bug that prevented us from identifying Chrome processes after the binary had been deleted from disk. BUG=none TEST=CHROME_DEVEL_SANDBOX=chrome-sandbox chrome-wrapper --enable-seccomp-sandbox; chrome-process-identifier.sh Review URL: http://codereview.chromium.org/3446012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59989 0039d316-1c4b-4281-b951-d872f2087c98
* The recent change for setting LD_LIBRARY_PATH doesn't actually work, as themarkus@chromium.org2010-09-151-7/+1
| | | | | | | | | | | | | | | | | script is executed by /bin/sh. On many systems, /bin/sh does not have support for "[[". We could either switch to a different shell (e.g. /bin/bash), we could switch to using "[" instead, or we could avoid the entire problem by using "${:+}" variable expansion. I tested that the latter does the right thing with /bin/bash, /bin/ash, /bin/dash, /bin/zsh, /bin/sh (the latter being a symbolic link to /bin/dash). So, I think we are on the safe side. BUG=54132 TEST=Start Chrome and notice that there no longer is an error message about "[[" being unavailable Review URL: http://codereview.chromium.org/3412004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59579 0039d316-1c4b-4281-b951-d872f2087c98
* Add more useful metrics to "Languages and Input" page in Chrome OS.satorux@chromium.org2010-09-142-0/+408
| | | | | | | | | | | | | | | | Record metrics with associated input method IDs, and language codes, to make the metrics data more useful. Update chromeactions.txt as follows: % cd chrome/tools % PYTHONPATH=../../tools/python python extract_actions.py --hash BUG=chromium-os:2637 TEST=manually. Review URL: http://codereview.chromium.org/3330021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59348 0039d316-1c4b-4281-b951-d872f2087c98
* Fix another instance of potentially dangling ":" in LD_LIBRARY_PATH.mmoss@google.com2010-09-131-1/+7
| | | | | | | | | | | This file is not packaged with Chrome, so not as likely to cause problems, but cleaning it up for completeness. BUG=54132 Review URL: http://codereview.chromium.org/3372010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59285 0039d316-1c4b-4281-b951-d872f2087c98
* Run worker processes via the zygote.agl@chromium.org2010-09-131-6/+6
| | | | | | | | | | | | | | | | | | | | | | The following tests fail when using the SUID sandbox because they try to count processes and the extra sandbox processes throw them off. They pass with this patch so long as the SUID sandbox isn't invoked (which is the case on the builders): WorkerTest.FLAKY_MultipleTabsQueuedSharedWorker WorkerTest.FLAKY_LimitPerPage WorkerTest.WorkerClose WorkerTest.QueuedSharedWorkerShutdown WorkerTest.FLAKY_QueuedSharedWorkerStartedFromOtherTab Note that this patch doesn't trigger the seccomp sandbox for worker processes. That will have to wait for another CL. BUG=54794 TEST=ui_tests http://codereview.chromium.org/3312021/show git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59242 0039d316-1c4b-4281-b951-d872f2087c98
* Change UI font at startup time if necessary, based on the UI locale.satorux@chromium.org2010-09-091-0/+4
| | | | | | | | | | | | | | | | | | | | | | As of writing, ChromeDroidSans is used as the UI font (see /etc/gtk-2.0/gtkrc). This setting does not work well for Japanese users as Chinese glyphs are used for Kanji characters. For Japanese UI, we should use a Japanese font. Introduce IDS_UI_FONT_FAMILY_CROS to control the UI font based on the UI locale. For now, app_locale_settings_ja.xtb only contains a non-default value: IPAPGothic. Just for the record, I originally tried to use "DroidSans Japanese" but for some reason, this caused space characters (0x20) to be garbled in the wrench menu. Hence, IPAPGotchic is chosen for now. TEST=manually on the netbook, and ubuntu BUG=chromium-os:4038 Review URL: http://codereview.chromium.org/3275008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58913 0039d316-1c4b-4281-b951-d872f2087c98
* Add libEGL.pdb and libGLESv2.pdb to the list of copied symbol filesjamesr@chromium.org2010-09-071-1/+3
| | | | | | | | | | | These DLLs are generated from ANGLE. The pdb's are needed to debug archived continuous builds. BUG=none TEST=Check chrome-win32-syms.zip on the builders Review URL: http://codereview.chromium.org/3310017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58743 0039d316-1c4b-4281-b951-d872f2087c98
* Linux: include an updated copy of xdg-mime that fixes default browser ↵mdm@chromium.org2010-09-031-9/+14
| | | | | | | | | | | selection on KDE 4. This should probably wait until after we branch for M7 this week. BUG=18106,33842 TEST=default browser selection works in KDE 4 on distributions shipping CVS xdg-mime Review URL: http://codereview.chromium.org/3258009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58449 0039d316-1c4b-4281-b951-d872f2087c98
* Reland r57812 (Add the new Mac manifest to the application bundle) and ↵gfeher@chromium.org2010-09-021-22/+0
| | | | | | | | | | | | | | | remove dummy translations Add the policy templates generated from chrome/app/policy_templates.json to the Mac application bundle. (The template generator for Mac is implemented in CL 3116027) Also remove the old manifest file and references to translations that are not there yet. The problem with the previous landing attempt was that in Release mode build, the following script was looking for binary files that were not there: build/mac/strip_from_xcode BUG=49316 TEST=add Chromium to the managed applications' list in the OSX Workgroup Manager, and see if it shows the manageable preferences with English descriptions Review URL: http://codereview.chromium.org/3287003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58366 0039d316-1c4b-4281-b951-d872f2087c98
* Linux Reliability Bot: set the correct name for 64-bit Breakpad symbol files.thestig@chromium.org2010-08-311-1/+1
| | | | | | | | BUG=none TEST=none Review URL: http://codereview.chromium.org/3236007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58066 0039d316-1c4b-4281-b951-d872f2087c98
* Linux: Enable symbol dumping on 64-bit Breakpad.thestig@chromium.org2010-08-311-1/+2
| | | | | | | | BUG=20737 TEST=none Review URL: http://codereview.chromium.org/3213005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58050 0039d316-1c4b-4281-b951-d872f2087c98
* Added D3DCompiler_42.dll to the installer.apatrick@chromium.org2010-08-302-0/+6
| | | | | | | | | | | This is a runtime dependency of D3DX9 which is needed to make ANGLE work on Windows. TEST=will run try when blocking CL is landed BUG=none Review URL: http://codereview.chromium.org/3134037 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57920 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 57812 - Add the new Mac manifest to the application bundlegfeher@chromium.org2010-08-291-0/+22
| | | | | | | | | | | | Add the policy templates generated from chrome/app/policy_templates.json to the Mac application bundle. (The template generator for Mac is implemented in CL 3116027) BUG=49316 TEST=add Chromium to the managed applications' list in the OSX Workgroup Manager, and see if it shows the manageable preferences TBR=thomasvl@chromium.org Review URL: http://codereview.chromium.org/3267003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57813 0039d316-1c4b-4281-b951-d872f2087c98
* Add the new Mac manifest to the application bundlegfeher@chromium.org2010-08-291-22/+0
| | | | | | | | | | | Add the policy templates generated from chrome/app/policy_templates.json to the Mac application bundle. (The template generator for Mac is implemented in CL 3116027) BUG=49316 TEST=add Chromium to the managed applications' list in the OSX Workgroup Manager, and see if it shows the manageable preferences Review URL: http://codereview.chromium.org/3143036 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57812 0039d316-1c4b-4281-b951-d872f2087c98
* Make the script more robust when using the zygote inside of the setuid sandbox.markus@chromium.org2010-08-261-6/+19
| | | | | | | | | | | | | | We now explicitly reject an process that has a "--type=" command line argument when scanning for the main browser process. Also, for the seccomp sandbox print the pid of the trusted process. This might be helpful information in some cases. TEST=none BUG=none Review URL: http://codereview.chromium.org/3184026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57565 0039d316-1c4b-4281-b951-d872f2087c98
* Renamed script so that it won't be reported by checkperms.markus@chromium.org2010-08-251-0/+0
| | | | | | | | BUG=none TEST=none Review URL: http://codereview.chromium.org/3203007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57374 0039d316-1c4b-4281-b951-d872f2087c98
* Minor performance improvement. Use "ps" instead of "sed" to find parentmarkus@chromium.org2010-08-251-1/+2
| | | | | | | | | | | | processes. And properly mark variables as local, so that the exit code from "identify" is correct. Otherwise, we needlessly scan for more processes when returning from "identify". TEST=none BUG=none Review URL: http://codereview.chromium.org/3173046 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57368 0039d316-1c4b-4281-b951-d872f2087c98
* A shell script that identifies the different Chrome processes. This scriptmarkus@chromium.org2010-08-251-0/+108
| | | | | | | | | | | | | | | | finds all the processes that belong to a given instance of Chrome and attempts to identify their types (e.g. browser, extension, plugin, zygote, renderer). It also prints out information on whether a sandbox is active and what type of sandbox has been identified. This script is likely to only work on Linux or systems that closely mimick Linux's /proc filesystem. TEST=start Chrome, invoke script, verify that it shows different process types BUG=none Review URL: http://codereview.chromium.org/3158033 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57354 0039d316-1c4b-4281-b951-d872f2087c98
* Re-land r56742 now with correct database filesbrettw@chromium.org2010-08-211-1/+1
| | | | | | | | | | | | | | | | A new field to describe the sources of history urls(visits) is added. This field is recorded in visit_database. So far, it can tell imported, synchronized, entension added or other(mainly testing) entries from user browsed entries. In the future, history extension API may allow queries to combinate with this criterion. BUG=none TEST=Unit tests are already included. Please test the web browser with history from previous versions to make sure the migration could be done properly. Also try to import or sync some history and inspect the sources added to the visit_source table in hitory database are correct. Original review: http://codereview.chromium.org/2906004/show Patch by weili@google.com git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56971 0039d316-1c4b-4281-b951-d872f2087c98
* Add d3dx9_42.dll, libEGL.dll, and libGLESv2.dll to the distributed builds.apatrick@chromium.org2010-08-202-0/+19
| | | | | | | | | | | | | | Landed issue 3032040 on darin@'s behalf. Original: http://codereview.chromium.org/3032040/show The issue with the introducation of a dependency on msvcr80.dll mentioned in the original issue comments is resolved. It seemed to be specific to darin's build configuration. TEST=try BUG=none Review URL: http://codereview.chromium.org/3118001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56884 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 56742 - A new field to describe the sources of history urls(visits) ↵brettw@chromium.org2010-08-191-1/+1
| | | | | | | | | | | | | | | | | | | is added. This field is recorded in visit_database. So far, it can tell imported, synchronized, entension added or other(mainly testing) entries from user browsed entries. In the future, history extension API may allow queries to combinate with this criterion. BUG=none TEST=Unit tests are already included. Please test the web browser with history from previous versions to make sure the migration could be done properly. Also try to import or sync some history and inspect the sources added to the visit_source table in hitory database are correct. Original review=http://codereview.chromium.org/2906004/show Patch by weili@google.com TBR=brettw@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56754 0039d316-1c4b-4281-b951-d872f2087c98
* A new field to describe the sources of history urls(visits) is added. This ↵brettw@chromium.org2010-08-191-1/+1
| | | | | | | | | | | | | | | | | field is recorded in visit_database. So far, it can tell imported, synchronized, entension added or other(mainly testing) entries from user browsed entries. In the future, history extension API may allow queries to combinate with this criterion. BUG=none TEST=Unit tests are already included. Please test the web browser with history from previous versions to make sure the migration could be done properly. Also try to import or sync some history and inspect the sources added to the visit_source table in hitory database are correct. Original review=http://codereview.chromium.org/2906004/show Patch by weili@google.com git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56742 0039d316-1c4b-4281-b951-d872f2087c98
* FBTF: Remove "obviously" unneeded standard C++ library #includes.viettrungluu@chromium.org2010-08-151-2/+2
| | | | | | | | | BUG=none TEST=builds Review URL: http://codereview.chromium.org/3179017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56171 0039d316-1c4b-4281-b951-d872f2087c98