Applied changes to chromium tree for new NaCl toolchain directories.

native_client_sdk/src/tools/lib/tests/get_shared_deps_test.py

 #!/usr/bin/env python
 # Copyright 2014 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.
 
 import os
 import shutil
 import subprocess
 import sys
 import tempfile
@@ skipping 25 matching lines @@
     if '.so.' in name:
       name = name.rsplit('.', 1)[0]
     names.append(name)
   return names
 
 
 class TestGetNeeded(unittest.TestCase):
   def setUp(self):
     self.tempdir = None
     toolchain = os.path.join(CHROME_SRC, 'native_client', 'toolchain')
-    self.toolchain = os.path.join(toolchain, '%s_x86' % getos.GetPlatform())
+    self.toolchain = os.path.join(toolchain, '%s_x86' % getos.GetPlatform(),
+                                  'nacl_x86_glibc')
     self.objdump = os.path.join(self.toolchain, 'bin', 'i686-nacl-objdump')
     if os.name == 'nt':
       self.objdump += '.exe'
     self.Mktemp()
     self.dyn_nexe = self.createTestNexe('test_dynamic_x86_32.nexe', 'i686')
     self.dyn_deps = set(['libc.so', 'runnable-ld.so',
                          'libgcc_s.so', 'libpthread.so'])
 
   def tearDown(self):
     if self.tempdir:
@@ skipping 69 matching lines @@
 
     needed = get_shared_deps.GetNeeded([self.dyn_nexe],
                                        lib_path=lib_path,
                                        objdump=self.objdump)
     for arch in needed.itervalues():
       self.assertEqual(arch, 'x86-32')
 
 
 if __name__ == '__main__':
   unittest.main()