Revert 140786 - Enable PPAPINaCl GLIBC browser_tests.

NOTE: NaCl CL to update untrusted.gypi must go in first.

BUG=127699
TEST=this is a test


Review URL: https://chromiumcodereview.appspot.com/10409032

TBR=bradchen@google.com
Review URL: https://chromiumcodereview.appspot.com/10543028

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

9 files changed, 31 insertions, 105 deletions

diff --git a/chrome/browser/nacl_host/test/nacl_gdb_browsertest.cc b/chrome/browser/nacl_host/test/nacl_gdb_browsertest.cc
index ff4658a..ec356708 100644
--- a/chrome/browser/nacl_host/test/nacl_gdb_browsertest.cc
+++ b/chrome/browser/nacl_host/test/nacl_gdb_browsertest.cc
@@ -17,13 +17,13 @@ static const FilePath::CharType kMockNaClGdb[] =
     FILE_PATH_LITERAL("mock_nacl_gdb");
 #endif
 
-class NaClGdbTest : public PPAPINaClNewlibTest {
+class NaClGdbTest : public PPAPINaClTest {
  public:
   NaClGdbTest() {
   }
 
   void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
-    PPAPINaClNewlibTest::SetUpCommandLine(command_line);
+    PPAPINaClTest::SetUpCommandLine(command_line);
 
     FilePath mock_nacl_gdb;
     EXPECT_TRUE(PathService::Get(base::DIR_EXE, &mock_nacl_gdb));
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index edec257..ec20164 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -2555,7 +2555,7 @@
             '../ppapi/tests/test_case.html',
             '../ppapi/tests/test_case.html.mock-http-headers',
             '../ppapi/tests/test_page.css',
-            '../ppapi/native_client/tests/ppapi_tests/ppapi_nacl_tests_newlib.nmf',
+            '../ppapi/native_client/tests/ppapi_tests/test_case.nmf',
           ],
         },
         {
diff --git a/chrome/test/ui/ppapi_uitest.cc b/chrome/test/ui/ppapi_uitest.cc
index b00e2a7..bec766d 100644
--- a/chrome/test/ui/ppapi_uitest.cc
+++ b/chrome/test/ui/ppapi_uitest.cc
@@ -332,6 +332,9 @@ void OutOfProcessPPAPITest::SetUpCommandLine(CommandLine* command_line) {
   command_line->AppendSwitch(switches::kPpapiOutOfProcess);
 }
 
+PPAPINaClTest::PPAPINaClTest() {
+}
+
 void PPAPINaClTest::SetUpCommandLine(CommandLine* command_line) {
   PPAPITestBase::SetUpCommandLine(command_line);
 
@@ -345,17 +348,13 @@ void PPAPINaClTest::SetUpCommandLine(CommandLine* command_line) {
 }
 
 // Append the correct mode and testcase string
-std::string PPAPINaClNewlibTest::BuildQuery(const std::string& base,
+std::string PPAPINaClTest::BuildQuery(const std::string& base,
                                       const std::string& test_case) {
-  return StringPrintf("%smode=nacl_newlib&testcase=%s", base.c_str(),
+  return StringPrintf("%smode=nacl&testcase=%s", base.c_str(),
                       test_case.c_str());
 }
 
-// Append the correct mode and testcase string
-std::string PPAPINaClGLibcTest::BuildQuery(const std::string& base,
-                                      const std::string& test_case) {
-  return StringPrintf("%smode=nacl_glibc&testcase=%s", base.c_str(),
-                      test_case.c_str());
+PPAPINaClTestDisallowedSockets::PPAPINaClTestDisallowedSockets() {
 }
 
 void PPAPINaClTestDisallowedSockets::SetUpCommandLine(
@@ -374,7 +373,7 @@ void PPAPINaClTestDisallowedSockets::SetUpCommandLine(
 std::string PPAPINaClTestDisallowedSockets::BuildQuery(
     const std::string& base,
     const std::string& test_case) {
-  return StringPrintf("%smode=nacl_newlib&testcase=%s", base.c_str(),
+  return StringPrintf("%smode=nacl&testcase=%s", base.c_str(),
                       test_case.c_str());
 }
 
@@ -442,10 +441,7 @@ std::string PPAPINaClTestDisallowedSockets::BuildQuery(
 
 // NaCl based PPAPI tests
 #define TEST_PPAPI_NACL_VIA_HTTP(test_name) \
-    IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, test_name) { \
-      RunTestViaHTTP(STRIP_PREFIXES(test_name)); \
-    } \
-    IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, test_name) { \
+    IN_PROC_BROWSER_TEST_F(PPAPINaClTest, test_name) { \
       RunTestViaHTTP(STRIP_PREFIXES(test_name)); \
     }
 
@@ -457,28 +453,19 @@ std::string PPAPINaClTestDisallowedSockets::BuildQuery(
 
 // NaCl based PPAPI tests with SSL server
 #define TEST_PPAPI_NACL_WITH_SSL_SERVER(test_name) \
-    IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, test_name) { \
-      RunTestWithSSLServer(STRIP_PREFIXES(test_name)); \
-    } \
-    IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, test_name) { \
+    IN_PROC_BROWSER_TEST_F(PPAPINaClTest, test_name) { \
       RunTestWithSSLServer(STRIP_PREFIXES(test_name)); \
     }
 
 // NaCl based PPAPI tests with WebSocket server
 #define TEST_PPAPI_NACL_VIA_HTTP_WITH_WS(test_name) \
-    IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, test_name) { \
-      RunTestWithWebSocketServer(STRIP_PREFIXES(test_name)); \
-    } \
-    IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, test_name) { \
+    IN_PROC_BROWSER_TEST_F(PPAPINaClTest, test_name) { \
       RunTestWithWebSocketServer(STRIP_PREFIXES(test_name)); \
     }
 
 // NaCl based PPAPI tests requiring an Audio device.
 #define TEST_PPAPI_NACL_VIA_HTTP_WITH_AUDIO_OUTPUT(test_name) \
-    IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, test_name) { \
-      RunTestViaHTTPIfAudioOutputAvailable(STRIP_PREFIXES(test_name)); \
-    } \
-    IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, test_name) { \
+    IN_PROC_BROWSER_TEST_F(PPAPINaClTest, test_name) { \
       RunTestViaHTTPIfAudioOutputAvailable(STRIP_PREFIXES(test_name)); \
     }
 #endif
diff --git a/chrome/test/ui/ppapi_uitest.h b/chrome/test/ui/ppapi_uitest.h
index ec58aba..da9e3d5 100644
--- a/chrome/test/ui/ppapi_uitest.h
+++ b/chrome/test/ui/ppapi_uitest.h
@@ -68,28 +68,21 @@ class OutOfProcessPPAPITest : public PPAPITest {
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE;
 };
 
-// NaCl plugin test runner for Newlib runtime.
+// NaCl plugin test runner.
 class PPAPINaClTest : public PPAPITestBase {
  public:
-  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE;
-};
+  PPAPINaClTest();
 
-// NaCl plugin test runner for Newlib runtime.
-class PPAPINaClNewlibTest : public PPAPINaClTest {
- public:
-  virtual std::string BuildQuery(const std::string& base,
-                                 const std::string& test_case) OVERRIDE;
-};
+  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE;
 
-// NaCl plugin test runner for GNU-libc runtime.
-class PPAPINaClGLibcTest : public PPAPINaClTest {
- public:
   virtual std::string BuildQuery(const std::string& base,
                                  const std::string& test_case) OVERRIDE;
 };
 
 class PPAPINaClTestDisallowedSockets : public PPAPITestBase {
  public:
+  PPAPINaClTestDisallowedSockets();
+
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE;
 
   virtual std::string BuildQuery(const std::string& base,
diff --git a/native_client_sdk/src/tools/create_nmf.py b/native_client_sdk/src/tools/create_nmf.py
index 84c6f53..3c33b2a 100755
--- a/native_client_sdk/src/tools/create_nmf.py
+++ b/native_client_sdk/src/tools/create_nmf.py
@@ -239,12 +239,12 @@ class NmfUtils(object):
 
   def _GenerateManifest(self, runnable=True):
     '''Create a JSON formatted dict containing the files
-
+    
     NaCl will map url requests based on architecture.  The startup NEXE
     can always be found under the top key PROGRAM.  Additional files are under
     the FILES key further mapped by file name.  In the case of 'runnable' the
     PROGRAM key is populated with urls pointing the runnable-ld.so which acts
-    as the startup nexe.  The application itself, is then placed under the
+    as the startup nexe.  The application itself, is then placed under the 
     FILES key mapped as 'main.exe' instead of it's original name so that the
     loader can find it.'''
     manifest = { FILES_KEY: {}, PROGRAM_KEY: {} }
@@ -263,10 +263,6 @@ class NmfUtils(object):
 
       # For the main nexes:
       if need.endswith('.nexe') and need in self.main_files:
-        # Ensure that the nexe name is relative, not absolute.
-        # We assume that the nexe and the corresponding nmf file are
-        # installed in the same directory.
-        urlinfo[URL_KEY] = os.path.basename(urlinfo[URL_KEY])
         # Place it under program if we aren't using the runnable-ld.so.
         if not runnable:
           manifest[PROGRAM_KEY][archinfo.arch] = urlinfo
diff --git a/ppapi/native_client/native_client.gyp b/ppapi/native_client/native_client.gyp
index c34d6b5..df3007e3 100644
--- a/ppapi/native_client/native_client.gyp
+++ b/ppapi/native_client/native_client.gyp
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 The Chromium Authors. All rights reserved.
+# Copyright (c) 2011 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.
 
@@ -16,8 +16,6 @@
              '../../native_client/src/untrusted/pthread/pthread.gyp:pthread_lib',
              '../../native_client/src/untrusted/irt_stub/irt_stub.gyp:ppapi_stub_lib',
           ],
-          # Here we copy linker scripts out of the Native Client repository.
-          # These are source, not build artifacts.
           'copies': [
             {
               'destination': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32',
@@ -32,20 +30,6 @@
               ],
             },
             {
-              'destination': '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32',
-              'files': [
-                  '<(DEPTH)/native_client/src/untrusted/irt_stub/libppapi.a',
-                  '<(DEPTH)/native_client/src/untrusted/irt_stub/libppapi.so',
-              ],
-            },
-            {
-              'destination': '<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib64',
-              'files': [
-                  '<(DEPTH)/native_client/src/untrusted/irt_stub/libppapi.a',
-                  '<(DEPTH)/native_client/src/untrusted/irt_stub/libppapi.so',
-              ],
-            },
-            {
               'destination': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/libarm',
               'files': [
                 '<(DEPTH)/native_client/src/untrusted/irt_stub/libppapi.a',
diff --git a/ppapi/native_client/tests/ppapi_tests/ppapi_nacl_tests_newlib.nmf b/ppapi/native_client/tests/ppapi_tests/ppapi_nacl_tests_newlib.nmf
deleted file mode 100644
index f0bb249..0000000
--- a/ppapi/native_client/tests/ppapi_tests/ppapi_nacl_tests_newlib.nmf
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "program": {
-    "x86-64": {"url": "ppapi_nacl_tests_newlib_x64.nexe"},
-    "x86-32": {"url": "ppapi_nacl_tests_newlib_x32.nexe"},
-    "arm": {"url": "ppapi_nacl_tests_newlib_arm.nexe"}
-  }
-}
diff --git a/ppapi/ppapi_untrusted.gyp b/ppapi/ppapi_untrusted.gyp
index 1817dca..57fe4a1 100644
--- a/ppapi/ppapi_untrusted.gyp
+++ b/ppapi/ppapi_untrusted.gyp
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 The Chromium Authors. All rights reserved.
+# Copyright (c) 2011 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.
 
@@ -17,7 +17,7 @@
       'type': 'none',
       'variables': {
         'nlib_target': 'libppapi_cpp.a',
-        'build_glibc': 1,
+        'build_glibc': 0,
         'build_newlib': 1,
         'sources': [
           '<@(cpp_source_files)',
@@ -39,14 +39,8 @@
        ],
       'variables': {
         'nexe_target': 'ppapi_nacl_tests',
-        'build_glibc': 1,
+        'build_glibc': 0,
         'build_newlib': 1,
-        # NOTE: Use /lib, not /lib64 here; it is a symbolic link which
-        # doesn't work on Windows.
-        'libdir_glibc64': '>(nacl_glibc_tc_root)/x86_64-nacl/lib',
-        'libdir_glibc32': '>(nacl_glibc_tc_root)/x86_64-nacl/lib32',
-        'nacl_objdump': '>(nacl_glibc_tc_root)/bin/x86_64-nacl-objdump',
-        'nmf_glibc%': '<(PRODUCT_DIR)/>(nexe_target)_glibc.nmf',
         'include_dirs': [
           'lib/gl/include',
           '..',
@@ -61,6 +55,10 @@
           '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libppapi_cpp.a',
           '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libppapi.a',
         ],
+        'extra_deps32': [
+          '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libppapi_cpp.a',
+          '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libppapi.a',
+        ],
         'extra_deps_newlib64': [
           '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libppapi_cpp.a',
           '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libppapi.a',
@@ -86,26 +84,6 @@
           '<@(test_nacl_source_files)',
         ],
       },
-      'actions': [
-        {
-          'action_name': 'Generate GLIBC NMF and copy libs',
-          'inputs': ['>(out_glibc64)', '>(out_glibc32)'],
-          # NOTE: There is no explicit dependency for the lib32
-          # and lib64 directories created in the PRODUCT_DIR.
-          # They are created as a side-effect of NMF creation.
-          'outputs': ['>(nmf_glibc)'],
-          'action': [
-            'python',
-            '<(DEPTH)/native_client_sdk/src/tools/create_nmf.py',
-            '>@(_inputs)',
-            '--objdump=>(nacl_objdump)',
-            '--library-path=>(libdir_glibc64)',
-            '--library-path=>(libdir_glibc32)',
-            '--output=>(nmf_glibc)',
-            '--stage-dependencies=<(PRODUCT_DIR)',
-          ],
-        },
-      ],
     },
   ],
 }
diff --git a/ppapi/tests/test_case.html b/ppapi/tests/test_case.html
index a9d0879..d395f13 100644
--- a/ppapi/tests/test_case.html
+++ b/ppapi/tests/test_case.html
@@ -197,14 +197,9 @@ onload = function() {
   var mode = ExtractSearchParameter("mode");
   document.title = 'Test ' + testcase;
   var obj;
-  if (mode == "nacl_newlib") {
+  if (mode == "nacl") {
     obj = document.createElement("EMBED");
-    obj.setAttribute("src", "ppapi_nacl_tests_newlib.nmf");
-    obj.setAttribute("type", "application/x-nacl");
-    obj.setAttribute("mode", mode);
-  } else if (mode == "nacl_glibc") {
-    obj = document.createElement("EMBED");
-    obj.setAttribute("src", "ppapi_nacl_tests_glibc.nmf");
+    obj.setAttribute("src", "test_case.nmf");
     obj.setAttribute("type", "application/x-nacl");
     obj.setAttribute("mode", mode);
   } else {