Enable NaCl UI test to test basic integration between Chrome and NaCl

Contains NaCl roll as well to pick up the test data.

TBR=noelallen

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

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

DEPS

@@ -7,7 +7,7 @@ vars = {
   "webkit_revision": "76202",
   "chromium_git": "http://git.chromium.org/git",
   "swig_revision": "69281",
-  "nacl_revision": "4177",
+  "nacl_revision": "4182",
   "libjingle_revision": "50",
   "libvpx_revision": "65287",
   "ffmpeg_revision": "71842",

chrome/test/nacl/nacl_ui_test.cc

@@ -12,8 +12,8 @@
 
 namespace {
 // NOTE: The base URL of each HTML file is specified in nacl_test.
-const FilePath::CharType kSrpcHwHtmlFileName[] =
-  FILE_PATH_LITERAL("srpc_hw.html");
+const FilePath::CharType kPPAPIHwHtmlFileName[] =
+  FILE_PATH_LITERAL("srpc_hw_ppapi.html");
 const FilePath::CharType kSrpcBasicHtmlFileName[] =
   FILE_PATH_LITERAL("srpc_basic.html");
 const FilePath::CharType kSrpcSockAddrHtmlFileName[] =
@@ -41,8 +41,8 @@ TEST_F(NaClUITest, ServerTest) {
   RunTest(test_file, TestTimeouts::action_max_timeout_ms());
 }
 
-TEST_F(NaClUITest, DISABLED_SrpcHelloWorld) {
-  FilePath test_file(kSrpcHwHtmlFileName);
+TEST_F(NaClUITest, PPAPIHelloWorld) {
+  FilePath test_file(kPPAPIHwHtmlFileName);
   RunTest(test_file, TestTimeouts::action_max_timeout_ms());
 }
 
@@ -77,8 +77,8 @@ TEST_F(NaClUITest, DISABLED_NpapiHwTest) {
   RunTest(test_file, TestTimeouts::action_max_timeout_ms());
 }
 
-TEST_F(NaClUITest, DISABLED_MultiarchTest) {
-  FilePath test_file(kSrpcHwHtmlFileName);
-  RunMultiarchTest(test_file, TestTimeouts::action_max_timeout_ms());
-}
+// TEST_F(NaClUITest, DISABLED_MultiarchTest) {
+//   FilePath test_file(kSrpcHwHtmlFileName);
+//   RunMultiarchTest(test_file, TestTimeouts::action_max_timeout_ms());
+// }