summaryrefslogtreecommitdiffstats
path: root/sandbox/win
Commit message (Collapse)AuthorAgeFilesLines
* Remove wow_helper from 64-bit buildsjschuh@chromium.org2013-08-031-9/+13
| | | | | | | | | BUG=267893 R=rvargas@chromium.org Review URL: https://chromiumcodereview.appspot.com/21886007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@215496 0039d316-1c4b-4281-b951-d872f2087c98
* Fix invalid check of ntstatus code.etienneb@chromium.org2013-07-311-1/+1
| | | | | | | | | | | This issue was found by a Linter. R=erikwright@chromium.org,jschuh@chromium.org BUG= Review URL: https://chromiumcodereview.appspot.com/21031008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@214627 0039d316-1c4b-4281-b951-d872f2087c98
* Update include paths in sandbox for base/process changes.rsesek@chromium.org2013-07-231-2/+1
| | | | | | | | | BUG=242290 R=rvargas@chromium.org Review URL: https://codereview.chromium.org/19824004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@213104 0039d316-1c4b-4281-b951-d872f2087c98
* Use non-array operator new for memory deleted by non-array delete.bruening@google.com2013-06-211-4/+4
| | | | | | | | | | BUG=252425 R=cpu@chromium.org TEST=Dr. Memory no longer reports the mismatch Review URL: https://codereview.chromium.org/16983011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@207829 0039d316-1c4b-4281-b951-d872f2087c98
* Sandbox: be defensive against compiler (de)optimizations when handling IPCs.rvargas@chromium.org2013-06-201-14/+32
| | | | | | | | | | | | We capture the IPC buffer before doing real work with it, but a crazy compiler _could_ mess up the initial checks that we do. So, do more checks! BUG=247898 TEST=current tests. Review URL: https://chromiumcodereview.appspot.com/17126002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@207309 0039d316-1c4b-4281-b951-d872f2087c98
* Use a direct include of strings headers in rlz/, sandbox/, skia/, sql/, sync/.avi@chromium.org2013-06-1111-11/+11
| | | | | | | | | | BUG=247723 TEST=none TBR=ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/16358024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205458 0039d316-1c4b-4281-b951-d872f2087c98
* Fix new[]/delete mismatches in sandbox handle code by switching to ↵bruening@chromium.org2013-06-082-4/+7
| | | | | | | | | | | | scoped_ptr<C, base::FreeDeleter>. BUG=246802 R=jschuh@chromium.org TEST=browser_tests under Dr. Memory Review URL: https://chromiumcodereview.appspot.com/16404003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205053 0039d316-1c4b-4281-b951-d872f2087c98
* Fix DCHECK_NT macrohans@chromium.org2013-05-301-1/+1
| | | | | | | | | | | | | | The expressions on both sides of the : should have the same type, in this case void. This fixes a Clang error. BUG=82385 R=jschuh@chromium.org Review URL: https://codereview.chromium.org/16101011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203153 0039d316-1c4b-4281-b951-d872f2087c98
* Include stddef.h for the definition of size_t.hans@chromium.org2013-05-301-0/+2
| | | | | | | | | | These errors were caught by Clang. BUG=82385 Review URL: https://chromiumcodereview.appspot.com/16196003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203136 0039d316-1c4b-4281-b951-d872f2087c98
* Grab bag of clang fixes for Windows codernk@chromium.org2013-05-171-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These should hopefully be uncontroversial, so I'm sending them to Darin because he has global OWNERS approval on src/*. Let me know if you want to split this up and farm it out to individual components. R=darin@chromium.org CC=thakis@chromium.org BUG=82385 Fix some -Wdeprecated-writable-strings warnings for wide string literals. net/dns/dns_config_service_win_unittest.cc net/http/http_auth_sspi_win.cc net/http/http_auth_sspi_win.h ui/shell_dialogs/select_file_dialog_win_unittest.cc Use reinterpret_cast<> to convert from void * to a function pointer. chrome/browser/policy/policy_loader_win.cc content/browser/gamepad/gamepad_platform_data_fetcher_win.cc Remove "public" from a typedef. It's not clear that that really means. chrome/browser/enumerate_modules_model_unittest_win.cc Escape an unescaped backslash in a wide string iteral to prevent it from being interpreted as a unicode literal ("\uXXX"). chrome/browser/storage_monitor/test_portable_device_watcher_win.cc Use base::UTF8ToUTF16() over ATL::CA2W() and avoid an unnecessary c_str(). Clang can't convert from CA2WEX<> to string16. chrome/browser/ui/views/external_tab_container_win.cc Fix a -Wenum-compare warning when asserting that two enum values are equal. sandbox/win/src/policy_params.h Don't define va_copy for clang. It provides one in <stdarg.h>. third_party/leveldatabase/port/port_chromium.h Review URL: https://chromiumcodereview.appspot.com/15200005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@200814 0039d316-1c4b-4281-b951-d872f2087c98
* Fix small race in the sandboxcpu@chromium.org2013-04-194-9/+4
| | | | | | | | | | | | | | | DuplicateHandle with DUPLICATE_CLOSE_SOURCE always closes the handle, right now on failure we close it which means we are closing an invalid handle or closing some other handle in the small race window. Reported by Ashutosh Mehra from Adobe. BUG=233251 TEST=none Review URL: https://chromiumcodereview.appspot.com/13912024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@195029 0039d316-1c4b-4281-b951-d872f2087c98
* Rewrite scoped_array<T> to scoped_ptr<T[]> in sandbox.dcheng@chromium.org2013-04-129-10/+10
| | | | | | | | | | | This is a manual cleanup pass using sed for files which are not built on Linux. BUG=171111 Review URL: https://chromiumcodereview.appspot.com/13888007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@194027 0039d316-1c4b-4281-b951-d872f2087c98
* Update the remaining references to sys_string_conversions.h to its new location.tfarina@chromium.org2013-03-302-3/+3
| | | | | | | | | | | | BUG=196305 TBR=isherman@chromium.org,rsleevi@chromium.org,keybuk@chromium.org,fischman@chromium.org, thestig@chromium.org,alexeypa@chromium.org,rogerta@chromium.org,cpu@chromium.org, akalin@chromium.org,ben@chromium.org,tony@chromium.org Review URL: https://chromiumcodereview.appspot.com/13322003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191479 0039d316-1c4b-4281-b951-d872f2087c98
* Refactor sandbox_policy.cc so that it doesn't contain the sandbox policies ↵jam@chromium.org2013-03-201-0/+2
| | | | | | | | | | | | | | | | | | | | for all processes. Instead have whoever creates a sandboxed process set this data. This allows us to clean a few NaCl related changes in content: -remove NaCl sandbox rules from content -remove the hack for ifdef'ing out the GPU policy since it didn't link for nacl64.exe -remove the 1GB memory reservation for the NaCl loader process out of content Other cleanup: -renamed sandbox_policy.* to sandbox_win.* to match the other platform-specific sandbox files -moved BrokerGetFileHandleForProcess to internal content files since it's not called from outside -remove AddGpuDllEvictionPolicy since it was redundant (the one dll it removed was already listed in the generic list) There's still more cleanup to be done in the sandbox code (i.e. remove chrome frame switch, nacl process type switch etc). I will do that in future changes. BUG=191682 Review URL: https://codereview.chromium.org/12805004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@189175 0039d316-1c4b-4281-b951-d872f2087c98
* Remove sandbox win64 warningjschuh@chromium.org2013-02-121-7/+0
| | | | | | | | | Tests all pass and are getting enabled on the bots this week. BUG=168414 Review URL: https://codereview.chromium.org/12221109 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181924 0039d316-1c4b-4281-b951-d872f2087c98
* Ignore DEP and SEHOP flags on Win64jschuh@chromium.org2013-02-121-0/+3
| | | | | | | | | | These flags aren't supported on 64-bit and can throw an error on Win8 process creation. BUG=147752 Review URL: https://chromiumcodereview.appspot.com/12207106 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181840 0039d316-1c4b-4281-b951-d872f2087c98
* Replace FilePath with base::FilePath in some more top level directories.brettw@chromium.org2013-02-101-1/+2
| | | | | | Review URL: https://codereview.chromium.org/12217101 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181640 0039d316-1c4b-4281-b951-d872f2087c98
* Disable ProcessMitigationsTest.CheckDep on Win64jschuh@chromium.org2013-02-071-2/+2
| | | | | | | | DEP is already enabled by default and Win64 throws an error when you try to manipulate the setting at all. Review URL: https://codereview.chromium.org/12218061 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181382 0039d316-1c4b-4281-b951-d872f2087c98
* Windows: Allow subprocesses to inherit non-console stdout/stderrmseaborn@chromium.org2013-02-038-3/+142
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this change, the renderer and other subprocesses never inherit stdout and stderr when they are pipe handles. Stdout/stderr will be pipe handles when chrome.exe/browser_tests.exe is running under Buildbot or under Cygwin's default terminal, mintty. We fix this by specifying PROC_THREAD_ATTRIBUTE_HANDLE_LIST in the arguments to CreateProcess(). The fix only applies on Windows >=Vista. Although it's probably safe for stdout/stderr to be inherited when it is a pipe handle or file handle, we put this behind the flag "--enable-logging". (This flag already makes stderr work when chrome.exe/browser_tests.exe is running under a Windows console -- a case which is not handled by the code path we're adding here because a Windows console is not an inheritable kernel handle.) Note that this relies on the fix committed in http://crrev.com/178656. BUG=171836 TEST=manually add logging to renderer process and check that it appears when running chrome.exe or browser_tests.exe Review URL: https://chromiumcodereview.appspot.com/12033045 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180303 0039d316-1c4b-4281-b951-d872f2087c98
* Disabling nacl_win64 targets when building in target_arch!=ia32 mode.bradnelson@google.com2013-01-211-30/+36
| | | | | | | | | | | | | | | | When building on windows with target_arch=x64, we no longer need win32 targets forced to be 64-bit. This gates out these targets when target_arch!=ia32. (Prior CL dropped the minimal set to break the dependency between these targets and the rest of the build. This eliminates them completely.) BUG=None TEST=None R=jschuh@chromium.org,thestig@chromium.org TBR=darin@chromium.org,abodenha@chromium.org,apatrick@chromium.org,sra@chromium.org,wtc@chromium.org Review URL: https://chromiumcodereview.appspot.com/11929039 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@177959 0039d316-1c4b-4281-b951-d872f2087c98
* Make the Windows sandbox support a normal x64 buildjschuh@chromium.org2013-01-052-26/+32
| | | | | | | | | | I've fixed the dependencies, so we can now support building the sandbox and running the tests as part of a normal Win64 build. BUG=168414 Review URL: https://chromiumcodereview.appspot.com/11788002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@175278 0039d316-1c4b-4281-b951-d872f2087c98
* Base: Update ScopedProcessInformation to use ScopedHandle and restrict Receive()rvargas@google.com2013-01-031-3/+4
| | | | | | | | | | to the span of the callsite. BUG=none TEST=base_unittests Review URL: https://codereview.chromium.org/11636061 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174998 0039d316-1c4b-4281-b951-d872f2087c98
* Sandbox: Don't create an ScopedHandle with an invalid handle.rvargas@chromium.org2012-12-201-1/+2
| | | | | | | | | BUG=166888 TEST=none Review URL: https://chromiumcodereview.appspot.com/11639024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174122 0039d316-1c4b-4281-b951-d872f2087c98
* Sandbox: Verify the return value when changing memory protection.rvargas@google.com2012-11-272-2/+6
| | | | | | | BUG=162073 TEST=none git-svn-id: svn://svn.chromium.org/chrome/trunk/src@169545 0039d316-1c4b-4281-b951-d872f2087c98
* Sandbox: Increase the default timeout of multiprocess tests to 1 minute.rvargas@google.com2012-11-171-1/+1
| | | | | | | | | | | This means that external timeouts (the test framework) are now the dominant factor to detect a hung test. BUG=137652 TEST=none Review URL: https://codereview.chromium.org/11299052 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168336 0039d316-1c4b-4281-b951-d872f2087c98
* Fix memory smashing on the sandbox PolicyRulecpu@chromium.org2012-11-143-10/+52
| | | | | | | | | | | | | | | | | | | | | | | | | PolicyRule copy ctor was not taking into account that the source policy rule could be using some 'constants' memory at the bottom, so adding further opcodes to the new policy rule would overwrite the copied ones. In other words, this pattern PolicyRule pr_orig(ASK_BROKER); pr_orig.AddStringMatch(...); PolicyRule pr_copy(pr_orig); pr_copy.AddStringMatch(...); Was broken. This was not impacting the chrome sbox code because we don't mutate the new rule after copy construction. Acknoledgments to Ashutosh Mehra from Adobe Corp for pointing the bug and providing a test case. BUG=160890 TEST=new unittest added Review URL: https://codereview.chromium.org/11275301 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167571 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 162293 - Enable DEP earlier on Vista and belowmattm@chromium.org2012-10-173-29/+29
| | | | | | | | | | | | | We can't enable DEP at launch prior to Win7, but we can queue an APC to enable immediately after the loader finishes. BUG=147752 Review URL: https://chromiumcodereview.appspot.com/10944015 TBR=jschuh@chromium.org Review URL: https://codereview.chromium.org/11194027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162300 0039d316-1c4b-4281-b951-d872f2087c98
* Enable DEP earlier on Vista and belowjschuh@chromium.org2012-10-173-29/+29
| | | | | | | | | | We can't enable DEP at launch prior to Win7, but we can queue an APC to enable immediately after the loader finishes. BUG=147752 Review URL: https://chromiumcodereview.appspot.com/10944015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162293 0039d316-1c4b-4281-b951-d872f2087c98
* Re-enable the tests for jobless children and add some more to them.pastarmovj@chromium.org2012-10-111-17/+100
| | | | | | | | | | | | | The new tests do aral end-to-end testing that the JOB_NONE flag works as expected. BUG=79091 TEST=sbox_integration_tests Review URL: https://chromiumcodereview.appspot.com/11017012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161245 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 160252 - Make mitigation failures CHECKjschuh@chromium.org2012-10-051-17/+23
| | | | | | | | | | | | This is a temporary change to narrow down failures enabling mitigations on Win8. I'll revert once the cause is determined. BUG=153399 Review URL: https://codereview.chromium.org/11040046 TBR=jschuh@chromium.org Review URL: https://codereview.chromium.org/11026071 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@160419 0039d316-1c4b-4281-b951-d872f2087c98
* Make mitigation failures CHECKjschuh@chromium.org2012-10-041-23/+17
| | | | | | | | | This is a temporary change to narrow down failures enabling mitigations on Win8. I'll revert once the cause is determined. BUG=153399 Review URL: https://codereview.chromium.org/11040046 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@160252 0039d316-1c4b-4281-b951-d872f2087c98
* Temporarily disable failing integration tests on Windowsbartfab@chromium.org2012-10-041-5/+5
| | | | | | | | | | | | | These tests are failing due to timing issues on the slower bots after crrev.com/160133 landed. Julian will fiddle with the timings and re- enable the tests tomorrow. BUG=79091 TBR=pastarmovj@chromium.org Review URL: https://codereview.chromium.org/11030028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@160137 0039d316-1c4b-4281-b951-d872f2087c98
* Add a parameter to the sandbox policy to allow sandboxed process to run ↵pastarmovj@chromium.org2012-10-0410-26/+211
| | | | | | | | | | | | | | | | | | | outside of a job and wire it to a cmd line flag. This is needed for running chrome in Citrix or RemoteApp (Terminal Services) environments. These envoronments both start the main process inside a job spawned by rdpinit.exe (at least in the RemoteApp case) and the process are not allowed to escape it therefore when the job assignment is attempted it failes with ERROR_PERMISSION_DENIED. This is not a problem in Windows 8/Server 2012 because these allow nested jobs so we should only respect this flag for versions older than that. BUG=79091 TEST=Start Chrome as a published app with --allow-no-job and observe it spawning renderer processes properly. Review URL: https://chromiumcodereview.appspot.com/10908171 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@160133 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 159850 - Enable handle tracing in Canary, Dev, and all debug builds ↵alexeypa@google.com2012-10-031-11/+6
| | | | | | | | | | | | | | | of Chrome (Windows only). BUG=131699,153148 Enabling handle tracing for the whole lifetime of a process uncovers to many bugs, causing lots of crashes. A supression or selective enablement mechanism is required to make it work. Review URL: https://chromiumcodereview.appspot.com/11035012 TBR=alexeypa@chromium.org Review URL: https://codereview.chromium.org/11043021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@159914 0039d316-1c4b-4281-b951-d872f2087c98
* Enable handle tracing in Canary, Dev, and all debug builds of Chrome ↵alexeypa@chromium.org2012-10-031-6/+11
| | | | | | | | | | | (Windows only). BUG=131699,153148 Review URL: https://chromiumcodereview.appspot.com/11035012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@159850 0039d316-1c4b-4281-b951-d872f2087c98
* Improve error handling in ApplyProcessMitigationsToCurrentProcessjschuh@chromium.org2012-10-021-7/+15
| | | | | | | BUG=153399 Review URL: https://codereview.chromium.org/11036009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@159632 0039d316-1c4b-4281-b951-d872f2087c98
* Add extra buckets to CrashExitCodes histogram for sandbox terminations.eroman@chromium.org2012-09-281-2/+3
| | | | | | | | BUG=152814 Review URL: https://chromiumcodereview.appspot.com/10981061 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@159215 0039d316-1c4b-4281-b951-d872f2087c98
* Remove GetModuleHandleHelper(), which was only needed for Win2k (which we ↵pkasting@chromium.org2012-09-226-83/+26
| | | | | | | | | | don't support). BUG=none TEST=none Review URL: https://codereview.chromium.org/10951038 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@158165 0039d316-1c4b-4281-b951-d872f2087c98
* Make ProcessMitigationsTest.CheckWin8 work in debug buildsjschuh@chromium.org2012-09-221-11/+15
| | | | | | Review URL: https://chromiumcodereview.appspot.com/10956050 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@158132 0039d316-1c4b-4281-b951-d872f2087c98
* Cleanup: avoid foo ? true : false, part 2.thestig@chromium.org2012-09-195-14/+9
| | | | | | Review URL: https://chromiumcodereview.appspot.com/10942004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@157509 0039d316-1c4b-4281-b951-d872f2087c98
* Add sandbox support for Windows process mitigations jschuh@chromium.org2012-09-1317-309/+767
| | | | | | | BUG=147752 Review URL: https://codereview.chromium.org/10690058 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156657 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 156550 - Add sandbox support for Windows process mitigations jschuh@chromium.org2012-09-1317-746/+309
| | | | | | | | | | BUG=147752 Review URL: https://codereview.chromium.org/10690058 TBR=jschuh@chromium.org Review URL: https://chromiumcodereview.appspot.com/10907217 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156556 0039d316-1c4b-4281-b951-d872f2087c98
* Add sandbox support for Windows process mitigations jschuh@chromium.org2012-09-1317-309/+746
| | | | | | | BUG=147752 Review URL: https://codereview.chromium.org/10690058 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156550 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 156315 - Add sandbox support for Windows process mitigationsjschuh@chromium.org2012-09-1217-738/+304
| | | | | | | | | | BUG=147752 Review URL: https://chromiumcodereview.appspot.com/10690058 TBR=jschuh@chromium.org Review URL: https://chromiumcodereview.appspot.com/10918197 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156322 0039d316-1c4b-4281-b951-d872f2087c98
* Add sandbox support for Windows process mitigationsjschuh@chromium.org2012-09-1217-304/+738
| | | | | | | BUG=147752 Review URL: https://chromiumcodereview.appspot.com/10690058 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156315 0039d316-1c4b-4281-b951-d872f2087c98
* Disable FilePolicyTest, DISABLED_TestReparsePointtbreisacher@chromium.org2012-09-071-1/+2
| | | | | | | | | | BUG=146944 TBR=nsylvain@chromium.org NOTRY=true Review URL: https://chromiumcodereview.appspot.com/10910125 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@155286 0039d316-1c4b-4281-b951-d872f2087c98
* Sandbox: Add support for Windows 8' AppContainer.rvargas@google.com2012-09-0517-82/+665
| | | | | | | | | | | | | Both sandboxes are not fully compatible yet; it is not possible to enable the AppContainer if the process is to be fully sandboxed (USER_LOCKDOWN), but the sandbox is user configurable anyway. BUG=none TEST=sbox_unittests, sbox_integration_tests Review URL: https://chromiumcodereview.appspot.com/10825425 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@154986 0039d316-1c4b-4281-b951-d872f2087c98
* Move STARTUPINFO manipulation into SpawnTargetjschuh@chromium.org2012-08-283-13/+25
| | | | | | Review URL: https://chromiumcodereview.appspot.com/10878071 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@153606 0039d316-1c4b-4281-b951-d872f2087c98
* Sandbox: Disable a test that fails on Win64.rvargas@google.com2012-08-231-0/+2
| | | | | | | | BUG=6944 TEST=none Review URL: https://chromiumcodereview.appspot.com/10860081 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@153035 0039d316-1c4b-4281-b951-d872f2087c98
* Re-enable sandbox ClientFastServer test.jln@chromium.org2012-08-221-3/+0
| | | | | | | | | | BUG=137791 NOTRY=true Review URL: https://chromiumcodereview.appspot.com/10831414 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152806 0039d316-1c4b-4281-b951-d872f2087c98