Cleanup from webkit merge.
Disable failing NaClUITest.SrpcBasicTest and add back in test
expectation that was erroneously removed.

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