GitLab

Since I didn't land this before the NaCl proxy move to chrome, I had to incorporate the proxy changes that were in http://codereview.chromium.org/7714041/

After PDF lands, I should be able to remove backwards-compat code.

BUG=80696
TEST=ppapi tests, manual test of PDF plugin

Review URL: http://codereview.chromium.org/7718004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98684 0039d316-1c4b-4281-b951-d872f2087c98