Add NaCl smoke test to browser_tests.

chrome/test/ppapi/ppapi_test.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/test/ppapi/ppapi_test.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
@@ skipping 148 matching lines @@
 
 void PPAPITestBase::RunTestAndReload(const std::string& test_case) {
   GURL url = GetTestFileUrl(test_case);
   RunTestURL(url);
   // If that passed, we simply run the test again, which navigates again.
   RunTestURL(url);
 }
 
 void PPAPITestBase::RunTestViaHTTP(const std::string& test_case) {
   FilePath document_root;
-  ASSERT_TRUE(GetHTTPDocumentRoot(&document_root));
+  ASSERT_TRUE(ui_test_utils::GetRelativeBuildDirectory(&document_root));
   RunHTTPTestServer(document_root, test_case, "");
 }
 
 void PPAPITestBase::RunTestWithSSLServer(const std::string& test_case) {
   FilePath document_root;
-  ASSERT_TRUE(GetHTTPDocumentRoot(&document_root));
+  ASSERT_TRUE(ui_test_utils::GetRelativeBuildDirectory(&document_root));
   net::TestServer test_server(net::BaseTestServer::HTTPSOptions(),
                               document_root);
   ASSERT_TRUE(test_server.Start());
   uint16_t port = test_server.host_port_pair().port();
   RunHTTPTestServer(document_root, test_case,
                     StringPrintf("ssl_server_port=%d", port));
 }
 
 void PPAPITestBase::RunTestWithWebSocketServer(const std::string& test_case) {
   FilePath websocket_root_dir;
   ASSERT_TRUE(
       PathService::Get(content::DIR_LAYOUT_TESTS, &websocket_root_dir));
   content::TestWebSocketServer server;
   int port = server.UseRandomPort();
   ASSERT_TRUE(server.Start(websocket_root_dir));
   FilePath http_document_root;
-  ASSERT_TRUE(GetHTTPDocumentRoot(&http_document_root));
+  ASSERT_TRUE(ui_test_utils::GetRelativeBuildDirectory(&http_document_root));
   RunHTTPTestServer(http_document_root, test_case,
                     StringPrintf("websocket_port=%d", port));
 }
 
 void PPAPITestBase::RunTestIfAudioOutputAvailable(
     const std::string& test_case) {
   if (IsAudioOutputAvailable()) {
     RunTest(test_case);
   } else {
     LOG(WARNING) << "PPAPITest: " << test_case <<
@@ skipping 46 matching lines @@
                               document_root);
   ASSERT_TRUE(test_server.Start());
   std::string query = BuildQuery("files/test_case.html?", test_case);
   if (!extra_params.empty())
     query = StringPrintf("%s&%s", query.c_str(), extra_params.c_str());
 
   GURL url = test_server.GetURL(query);
   RunTestURL(url);
 }
 
-bool PPAPITestBase::GetHTTPDocumentRoot(FilePath* document_root) {
-  // For HTTP tests, we use the output DIR to grab the generated files such
-  // as the NEXEs.
-  FilePath exe_dir = CommandLine::ForCurrentProcess()->GetProgram().DirName();
-  FilePath src_dir;
-  if (!PathService::Get(base::DIR_SOURCE_ROOT, &src_dir))
-    return false;
-
-  // TestServer expects a path relative to source. So we must first
-  // generate absolute paths to SRC and EXE and from there generate
-  // a relative path.
-  if (!exe_dir.IsAbsolute()) file_util::AbsolutePath(&exe_dir);
-  if (!src_dir.IsAbsolute()) file_util::AbsolutePath(&src_dir);
-  if (!exe_dir.IsAbsolute())
-    return false;
-  if (!src_dir.IsAbsolute())
-    return false;
-
-  size_t match, exe_size, src_size;
-  std::vector<FilePath::StringType> src_parts, exe_parts;
-
-  // Determine point at which src and exe diverge, and create a relative path.
-  exe_dir.GetComponents(&exe_parts);
-  src_dir.GetComponents(&src_parts);
-  exe_size = exe_parts.size();
-  src_size = src_parts.size();
-  for (match = 0; match < exe_size && match < src_size; ++match) {
-    if (exe_parts[match] != src_parts[match])
-      break;
-  }
-  for (size_t tmp_itr = match; tmp_itr < src_size; ++tmp_itr) {
-    *document_root = document_root->Append(FILE_PATH_LITERAL(".."));
-  }
-  for (; match < exe_size; ++match) {
-    *document_root = document_root->Append(exe_parts[match]);
-  }
-  return true;
-}
-
 PPAPITest::PPAPITest() {
 }
 
 void PPAPITest::SetUpCommandLine(CommandLine* command_line) {
   PPAPITestBase::SetUpCommandLine(command_line);
 
   // Append the switch to register the pepper plugin.
   // library name = <out dir>/<test_name>.<library_extension>
   // MIME type = application/x-ppapi-<test_name>
   FilePath plugin_dir;
@@ skipping 62 matching lines @@
 }
 
 // Append the correct mode and testcase string
 std::string PPAPINaClTestDisallowedSockets::BuildQuery(
     const std::string& base,
     const std::string& test_case) {
   return StringPrintf("%smode=nacl_newlib&testcase=%s", base.c_str(),
                       test_case.c_str());
 }