summaryrefslogtreecommitdiffstats
path: root/tools/grit
Commit message (Collapse)AuthorAgeFilesLines
* Move src/gfx/ to src/ui/gfxsail@chromium.org2011-02-021-1/+1
| | | | | | | | | | | To reduce the size of this change I've left stub header files in src/gfx/. Once all includes have been updated I'll delete the stub files. BUG=71063 TEST=Still doing test builds. Review URL: http://codereview.chromium.org/6246027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73530 0039d316-1c4b-4281-b951-d872f2087c98
* Cloud print proxy enablement under policy control.scottbyer@chromium.org2011-02-021-3/+16
| | | | | | | | | | | | Implement policy control of the cloud print policy, in just the UI part for now (in the service requires some refactoring). BUG=59769 TEST=Change the policy and verifying that the UI in Under the Hood gets disabled or enabled properly, with the policy notification at the top. Review URL: http://codereview.chromium.org/6344013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73523 0039d316-1c4b-4281-b951-d872f2087c98
* Add presubmit checks for grit. This runs the unittests.tony@chromium.org2011-02-024-10/+40
| | | | | | | | | | | | | | | Fix the grd_reader tests to pass if run from any directory (previously, it had to be run from tools/grit). Fix rc_unittest to pass on Linux (it was sensitive to line endings). If the user doesn't have access to the internal repository, there will be lots of failures :( Maybe there's a way to detect this case and skip the tests? Review URL: http://codereview.chromium.org/6349026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73498 0039d316-1c4b-4281-b951-d872f2087c98
* Add a grit define for enabling third_party translations.tony@chromium.org2011-02-017-30/+57
| | | | | | | | | | | | | Turn it off by default and add conditions to chromium_strings.grd for third_party specific outputs. Add the ability to filter xtb files (translations) using if nodes. TEST=still able to compile chrome Review URL: http://codereview.chromium.org/6392033 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73314 0039d316-1c4b-4281-b951-d872f2087c98
* Provide better error messages when grit fails to open a file whiletony@chromium.org2011-01-271-2/+10
| | | | | | | | | | flattening. BUG=70185 Review URL: http://codereview.chromium.org/6401001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72853 0039d316-1c4b-4281-b951-d872f2087c98
* Allow ADM(X) templates to manage both MACHINE and USER policiesgfeher@chromium.org2011-01-273-90/+168
| | | | | | | | | | | ADMX policies will have the XML attribute class set to "both", ADM policies will be presented twice, once under CLASS MACHINE, and once under CLASS USER. BUG=70232 TEST=Add chrome.adm to Group Policy Editor and see if Chrome policies appear both under User Configuration and Machine Configuration, and they can be configured independently. Repeat this with chrome.admx. Review URL: http://codereview.chromium.org/6327011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72792 0039d316-1c4b-4281-b951-d872f2087c98
* DevTools: update inspector_strings.grd to match current Inspector'smnaganov@chromium.org2011-01-241-3/+0
| | | | | | | | | | | | | | strings, delete devtools_strings.grd. These strings are only used for Ubuntu Chromium translations, not affecting Chrome release process. BUG=none TEST=none Review URL: http://codereview.chromium.org/6273009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72329 0039d316-1c4b-4281-b951-d872f2087c98
* Fix generating descriptions of policy template stringsgfeher@chromium.org2011-01-192-3/+24
| | | | | | | | | BUG=none TEST=python:PolicyJsonUnittest.* Review URL: http://codereview.chromium.org/6312006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71808 0039d316-1c4b-4281-b951-d872f2087c98
* Remove 'annotations' dictionary in policy_definitions.json.jkummerow@chromium.org2011-01-188-106/+47
| | | | | | | | | | | The former members of the dict are now included directly in the policy definitions. BUG=64898 TEST=existing unit tests in tools/grit/grit/format/policy_templates/ Review URL: http://codereview.chromium.org/6360002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71635 0039d316-1c4b-4281-b951-d872f2087c98
* Roll WebKit DEPS past WebKit move. Update gyp files and include paths to ↵abarth@chromium.org2011-01-171-1/+1
| | | | | | reflect the move. Consolidate how we DEPS in WebKit source files. Cross fingers. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71586 0039d316-1c4b-4281-b951-d872f2087c98
* [grit] Avoid intermediate files for HTML inlining when building .pak filesakalin@chromium.org2011-01-146-33/+88
| | | | | | | | | | | | This avoids problems where multiple invocations of grit try to write to the same intermediate file. BUG=69633 TEST=Manually Review URL: http://codereview.chromium.org/6245002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71491 0039d316-1c4b-4281-b951-d872f2087c98
* [Sync] Port about:sync to DOMUIakalin@chromium.org2011-01-141-0/+3
| | | | | | | | | | | | | | | | | Write chrome://sync-internals DOMUI page which is like about:sync but automatically updates on sync events. Make about:sync{,-internals} aliases for chrome://sync-internals. More diagnostic capabilities will be added to chrome://sync-internals in future CLs. BUG=69500 TEST=Manual Review URL: http://codereview.chromium.org/6299002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71435 0039d316-1c4b-4281-b951-d872f2087c98
* Integrate user strings into the JSON policy template filegfeher@chromium.org2011-01-1430-775/+1200
| | | | | | | | | | | The new concept is the following: policy_templates.json contains all the data necessary to generate templates: policy names, English captions, descriptions, etc. This gets translated the following GRIT gatherer: policy_json.py. The text of the translated JSON file is then picked up, parsed, and passed to the writers by template_formatter.py. BUG=64898 TEST=PolicyJsonUnittest.* Review URL: http://codereview.chromium.org/6134006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71421 0039d316-1c4b-4281-b951-d872f2087c98
* Support int-typed policies in policy template generatorjkummerow@chromium.org2011-01-1315-40/+283
| | | | | | | | | | | Also fix bug 69054 (reg_writer erroneously outputs integers as decimal values). BUG=68843, 69054 TEST=tools/grit/grit/format/policy_templates/*_unittest.py Review URL: http://codereview.chromium.org/6176005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71316 0039d316-1c4b-4281-b951-d872f2087c98
* Policy: Add ProxyMode and deprecate ProxyServerMode.danno@chromium.org2011-01-1319-65/+501
| | | | | | | | | | | | | - Add support for 'deprecated' attribute in template generator - Add support for both int- and string- based enums in the template generator - Add logic to handle ProxyMode and fall back to ProxyServerMode BUG=68134 TEST=ConfigurationPolicyPrefStore*, new policy template generator tests Review URL: http://codereview.chromium.org/5958014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71315 0039d316-1c4b-4281-b951-d872f2087c98
* Improved sorting for policy templatesjkummerow@chromium.org2011-01-1110-97/+198
| | | | | | | | | | | | | Mac templates: sort policies alphabetically Linux .json examples: sort policies alphabetically Windows .reg examples: group all policies with type!="list" BUG=61733 TEST=manual inspection of generated policy template files; grit.format.policy_templates.writers.template_writer_unittest Review URL: http://codereview.chromium.org/6137002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71022 0039d316-1c4b-4281-b951-d872f2087c98
* Autofill heuristics regular expressions should be stored in external data files.dhollowa@chromium.org2011-01-051-0/+4
| | | | | | | | | | | This change moves the Autofill heuristics regular expressions out to a new autofill_resources.grd file. This grd file is not meant to be localized. Eventually it will contain the locale-specific regular expressions as well as the English versions. This CL, however, just moves the English versions out of source. BUG=55787 TEST=FormStructureBrowserTest.HTMLFiles Review URL: http://codereview.chromium.org/6026010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70535 0039d316-1c4b-4281-b951-d872f2087c98
* Update grit_info.py to use optparse and add the ability to passtony@chromium.org2011-01-051-16/+40
| | | | | | | | | | | | | | in build defines (e.g., -D chromeos). This will make it possible for us to handle build dependencies in all configurations. I'll make a follow up change that adds the -D flags to the gyp files. BUG=68028 Review URL: http://codereview.chromium.org/6065012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70518 0039d316-1c4b-4281-b951-d872f2087c98
* This fixes resource loading for the virtual keyboard.bryeung@chromium.org2011-01-041-1/+1
| | | | | | | | | BUG=none TEST=the keyboard no longer 404s in touchui builds Review URL: http://codereview.chromium.org/5977007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70447 0039d316-1c4b-4281-b951-d872f2087c98
* html_inline.py: update comments to match reality, fix a small typoevan@chromium.org2011-01-041-3/+2
| | | | | | | | | Though the comments say it doesn't inline CSS, it actually does; I also noticed there's a typo in the CSS-inlining regex. Review URL: http://codereview.chromium.org/6057007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70429 0039d316-1c4b-4281-b951-d872f2087c98
* Implement a ReadyPromptContent that displays a prompt to accept, temporarily ↵erikwright@chromium.org2010-12-141-0/+1
| | | | | | | | | | decline, or permanently decline ready mode. Implement a RegistryReadyModeState that manages the state (based on user's decision) in the registry. Interfaces to integrate those with the installer. BUG=None TEST=chrome_frame_unittests --gtest_filter='Ready*' Review URL: http://codereview.chromium.org/5747002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69175 0039d316-1c4b-4281-b951-d872f2087c98
* Wire the template generator's unit tests into a presubmit scriptgfeher@chromium.org2010-12-131-0/+26
| | | | | | | | | BUG=none TEST=add a failure into the tests and try 'git cl presubmit' Review URL: http://codereview.chromium.org/5725002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69003 0039d316-1c4b-4281-b951-d872f2087c98
* Remove some scons.py files we don't use anymore. They weretony@chromium.org2010-12-021-199/+0
| | | | | | | | | used to get inputs and outputs, but we have other scripts for that now. Review URL: http://codereview.chromium.org/5544001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68091 0039d316-1c4b-4281-b951-d872f2087c98
* Fix example lists and untranslated text in generated policy documentationgfeher@chromium.org2010-11-292-12/+27
| | | | | | | | | | | | | Lists stored in Windows Registry should start numbering from 1 and not from 0. Strings displayed in the generated documentation should not be hard-coded, but come from the .grd file. BUG=64405,64213 TEST=python:DocWriterUnittest.* Review URL: http://codereview.chromium.org/5358004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67566 0039d316-1c4b-4281-b951-d872f2087c98
* Generate .reg files with example values of policiesgfeher@chromium.org2010-11-265-6/+329
| | | | | | | | | BUG=62532 TEST=python:RegWriterUnittest.* Review URL: http://codereview.chromium.org/5328004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67451 0039d316-1c4b-4281-b951-d872f2087c98
* Add version information to the policy templatesgfeher@chromium.org2010-11-1811-87/+192
| | | | | | | | | | | | | | Add for each policy the version number of Chrome when is was introduced. Update platform-based policy filtering to use the new template format (no new logic introduced.) Update the HTML documentation writer to use the new version numbers. BUG=62500 TEST=PolicyTemplateGeneratorUnittest.testPolicyFiltering,DocWriterUnittest.testAddPolicyDetails,DocWriterUnittest.testAddPolicySection Review URL: http://codereview.chromium.org/4704006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66601 0039d316-1c4b-4281-b951-d872f2087c98
* Replace spaces with underscores in keys of Mac stringtables of policiesgfeher@chromium.org2010-11-045-38/+54
| | | | | | | | | BUG=61054 TEST=PListWriterUnittest.*,PListStringsWriterUnittest.* Review URL: http://codereview.chromium.org/4318001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65039 0039d316-1c4b-4281-b951-d872f2087c98
* Generate example JSON policy configuration filesgfeher@chromium.org2010-11-026-20/+325
| | | | | | | | | | | Also fix filtering of single (non-groupped) policies by platforms. BUG=56531 TEST=JsonWriterUnittest.*,PolicyTemplateGeneratorUnittest.testPolicyFiltering Review URL: http://codereview.chromium.org/4164006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64748 0039d316-1c4b-4281-b951-d872f2087c98
* Add ChromeOS to the list of valid platform names in the policy metafilegfeher@chromium.org2010-10-273-0/+5
| | | | | | | | | BUG=58498 TEST=none Review URL: http://codereview.chromium.org/4175001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64054 0039d316-1c4b-4281-b951-d872f2087c98
* Fix adml writer unittest and admx writer unittestmarkusheintz@chromium.org2010-10-072-19/+29
| | | | | | | | | BUG=57528 TEST=run tests Review URL: http://codereview.chromium.org/3628001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61798 0039d316-1c4b-4281-b951-d872f2087c98
* Before if you provided a non-existent tool, grit would give an error message ↵petersont@chromium.org2010-10-061-1/+4
| | | | | | | | referring you to the help, but if you don't provide a tool at all it would just fail. Review URL: http://codereview.chromium.org/3549016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61680 0039d316-1c4b-4281-b951-d872f2087c98
* Shorten the name of policy groups and sort them by captiongfeher@chromium.org2010-10-012-13/+32
| | | | | | | | | | | Also add Chromium vs Google Chrome clarification at the beginning of the generated policy documentation and remove ADM outputs with pseudo-translations. BUG=None TEST=manual Review URL: http://codereview.chromium.org/3605003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61163 0039d316-1c4b-4281-b951-d872f2087c98
* o Add user customizable launch type for apps by adding options in each apps ↵andybons@chromium.org2010-09-301-8/+8
| | | | | | | | | | | | | | | | | | | | | context menu. o Updated some comments that were using the outdated NOTIFY_PREF_CHANGED notification. o Make LAUNCH_PINNED the default type returned by ExtensionPrefs if it does not already exist. o Some minor refactoring within the code to reduce duplication. BUG=54731 TEST=NONE patch from issue 3419010 Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=60997 Reverted: http://crrev.com/61000 Review URL: http://codereview.chromium.org/3453029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61021 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 60997 - o Add user customizable launch type for apps by adding ↵andybons@chromium.org2010-09-291-8/+8
| | | | | | | | | | | | | | | | | | | | options in each apps context menu. o Updated some comments that were using the outdated NOTIFY_PREF_CHANGED notification. o Make LAUNCH_PINNED the default type returned by ExtensionPrefs if it does not already exist. o Some minor refactoring within the code to reduce duplication. BUG=54731 TEST=NONE patch from issue 3419010 Review URL: http://codereview.chromium.org/3453029 TBR=andybons@chromium.org Review URL: http://codereview.chromium.org/3517004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61000 0039d316-1c4b-4281-b951-d872f2087c98
* o Add user customizable launch type for apps by adding options in each apps ↵andybons@chromium.org2010-09-291-8/+8
| | | | | | | | | | | | | | | | | context menu. o Updated some comments that were using the outdated NOTIFY_PREF_CHANGED notification. o Make LAUNCH_PINNED the default type returned by ExtensionPrefs if it does not already exist. o Some minor refactoring within the code to reduce duplication. BUG=54731 TEST=NONE patch from issue 3419010 Review URL: http://codereview.chromium.org/3453029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60997 0039d316-1c4b-4281-b951-d872f2087c98
* Clean up generated policy documentationgfeher@chromium.org2010-09-284-93/+247
| | | | | | | | | | | | Order policies alphabetically for all the generated templates. Show group descriptions in the generated documentation. BUG=56358,56654 TEST=DocWriterUnittest.testAddPolicySection,DocWriterUnittest.testAddPolicyRow, PolicyTemplateGenerator.testSorting Review URL: http://codereview.chromium.org/3431031 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60789 0039d316-1c4b-4281-b951-d872f2087c98
* Update ADMX/ADML writer to use to latest formate of the policy_template.json ↵markusheintz@chromium.org2010-09-272-27/+31
| | | | | | | | | | | file. BUG=57025 TEST=Current unit-tests need to pass. Review URL: http://codereview.chromium.org/3390031 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60639 0039d316-1c4b-4281-b951-d872f2087c98
* Change the ADMX/ADML Writer to map policy groups to "category" elements and ↵markusheintz@chromium.org2010-09-275-334/+341
| | | | | | | | | | | policies to "policy" element. This will fix issue 55722 for ADMX/ADML policy templates. BUG=55722 TEST=admx_writer_unittest.py, adml_writer_unittest.py Review URL: http://codereview.chromium.org/3439011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60629 0039d316-1c4b-4281-b951-d872f2087c98
* Clean up the policy and message model of the template generatorgfeher@chromium.org2010-09-2411-313/+222
| | | | | | | | | | | | | In the old model each policy had to be in a group, and messages could be inherited from groups to policies. In the new model single policies does not have to be in groups and there is no inheritance of messages across policies/groups. Instead of that, policies have now two captions for different purposes. (Documented in policy_templates.json.) This is a more simple concept. BUG=55722,56512 TEST=covered by policy template generator unit tests Review URL: http://codereview.chromium.org/3454017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60458 0039d316-1c4b-4281-b951-d872f2087c98
* Moving "Writer" related code for processing the policy tree from ↵markusheintz@chromium.org2010-09-2313-117/+72
| | | | | | | | | | | | | policy_generator.py to the template_writer.py. This is the first CL in a couple of refactoring steps. BUG=56512 TEST=Current tests need to pass Review URL: http://codereview.chromium.org/3496001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60276 0039d316-1c4b-4281-b951-d872f2087c98
* Use 'Categories' instead of 'ADM policies' in ADM for related policiesgfeher@chromium.org2010-09-222-41/+157
| | | | | | | | | | | This is necessary because the Windows Group Policy editor does not support setting a list to empty, but if the list is in a separate policy, then it can be set to disabled or not configured. BUG=55722 TEST=AdmWriterUnittest.* Review URL: http://codereview.chromium.org/3436013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60160 0039d316-1c4b-4281-b951-d872f2087c98
* Generate html documentation for enterprise policiesgfeher@chromium.org2010-09-219-22/+892
| | | | | | | | | | | Use the .json and .grd description of the policies to generate HTML markup that can be uploaded straight to dev.chromium.org. BUG=54712 TEST=DocWriterUnittest.* Review URL: http://codereview.chromium.org/3452006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60032 0039d316-1c4b-4281-b951-d872f2087c98
* Add annotations to the policy template metafilegfeher@chromium.org2010-09-1514-44/+321
| | | | | | | | | | | The annotations include a list of supported platforms for each policy. Depending on this, only the supported policies are written for each template type. BUG=54665 TEST=PolicyTemplateGeneratorUnittest.testPolicyFiltering, {Adm,Plist,PlistStrings}WriterUnittest.testNonSupportedPolicy, {Admx,Adml}WriterUnittest.testPlatform Review URL: http://codereview.chromium.org/3303027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59483 0039d316-1c4b-4281-b951-d872f2087c98
* ADMX/ADMLWriter unit-testsmarkusheintz@chromium.org2010-09-103-0/+385
| | | | | | | | | | BUG=54376 TEST=admx_writer_unittest.py adml_writer_unittest.py Review URL: http://codereview.chromium.org/3290018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59092 0039d316-1c4b-4281-b951-d872f2087c98
* Add policy support for Chrome Frame. New Chrome Frame messages added to th ↵tommi@chromium.org2010-09-102-0/+3
| | | | | | | | | | | | | | json and grd files that are used to generate the policy templates. Added matching constants for the policy elements to the policy_constants files. Added support for a new template value, $3, that represents the Chrome Frame product name in policy templates. TEST=none BUG=29349 Review URL: http://codereview.chromium.org/3325011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59050 0039d316-1c4b-4281-b951-d872f2087c98
* Fix Chrome ADM registry key and move template config strings to one placegfeher@chromium.org2010-09-079-121/+119
| | | | | | | | | | | Set the Chrome policy registry keyname to "Software\\Policies\\Google\\Chrome" for ADM output. Move all such constant strings to a common place for ADM, ADMX and plist output. (So that such bugs will be harder to overlook next time.) BUG=54630 TEST=manual + grit/format/policy_templates/writer/* Review URL: http://codereview.chromium.org/3299009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58696 0039d316-1c4b-4281-b951-d872f2087c98
* Fix a bug that caused messages to wrongly fallback to English in some cases.satorux@chromium.org2010-09-073-7/+31
| | | | | | | | | | | | | Before this fix, <message> elements with use_name_for_id attribute, inside <if expr='pp_ifdef(...)'> were falling back to English, because defines information was not present when evaluating conditions. TEST=wrote and ran testUseNameForIdAndPpIfdef (python grit.py unit). There were failing tests before this change, and this change did not increase the number of failing tests. Also confirmed that http://codereview.chromium.org/3275008/show worked fine with this patch. BUG=54360 Review URL: http://codereview.chromium.org/3335003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58678 0039d316-1c4b-4281-b951-d872f2087c98
* Move newline escaping from TemplateFormater to AdmWriters and ↵markusheintz@chromium.org2010-09-033-6/+10
| | | | | | | | | | | PListStringsWriter. BUG=53953 TEST=adm_writer_unittest.py, plist_strings_writer_unittest.py Review URL: http://codereview.chromium.org/3214014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58468 0039d316-1c4b-4281-b951-d872f2087c98
* Add unit tests to adm_writergfeher@chromium.org2010-08-316-119/+375
| | | | | | | | | | | Add unit tests to adm_writer, clean up other writer unit tests and fix list policies generated by adm_writer. (Move KEYNAME into the PART structure.) BUG=none TEST=none Review URL: http://codereview.chromium.org/3284006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57995 0039d316-1c4b-4281-b951-d872f2087c98
* ADMX/ADML Writer to generate ADMX/ADMl templates.markusheintz@chromium.org2010-08-303-1/+682
| | | | | | | | | BUG=53315 TEST=manual Review URL: http://codereview.chromium.org/3162030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57858 0039d316-1c4b-4281-b951-d872f2087c98