Revert 281831 "Fix nacl_integration to run 32bit tests with 32bi..."

> Fix nacl_integration to run 32bit tests with 32bit userland and 64bit kernel.
> 
> detect_host_arch.py already knows how to figure this out, so reuse it.
> (It could probably be used in the darwin and maybe even in the windows
> branch too.)
> 
> BUG=368384
> TEST=nacl_integration on http://build.chromium.org/p/chromium.linux/builders/Linux%20Tests%20%28dbg%29%282%29%2832%29/ goes green
> TBR=mseaborn@chromium.org
> 
> Review URL: https://codereview.chromium.org/373253002

Suspect this is causing the failure http://build.chromium.org/p/chromium.win/builders/NaCl%20Tests%20%28x86-64%29/builds/13394

TBR=thakis@chromium.org

Review URL: https://codereview.chromium.org/374383002

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

build/detect_host_arch.py

@@ -10,8 +10,13 @@ import re
 import sys
 
 
-def HostArch():
-  """Returns the host architecture with a predictable string."""
+def main():
+  print DoMain([])
+  return 0
+
+def DoMain(_):
+  """Hook to be called from gyp without starting a separate python
+  interpreter."""
   host_arch = platform.machine()
 
   # Convert machine type to format recognized by gyp.
@@ -31,10 +36,5 @@ def HostArch():
 
   return host_arch
 
-def DoMain(_):
-  """Hook to be called from gyp without starting a separate python
-  interpreter."""
-  return HostArch()
-
 if __name__ == '__main__':
-  print DoMain([])
+  sys.exit(main())

chrome/test/nacl_test_injection/buildbot_chrome_nacl_stage.py

@@ -15,11 +15,6 @@ import sys
 
 import find_chrome
 
-THIS_DIR = os.path.abspath(os.path.dirname(__file__))
-CHROMIUM_DIR = os.path.abspath(os.path.join(THIS_DIR, '..', '..', '..'))
-sys.path.append(os.path.join(CHROMIUM_DIR, 'build'))
-import detect_host_arch
-
 
 # Copied from buildbot/buildbot_lib.py
 def TryToCleanContents(path, file_name_filter=lambda fn: True):
@@ -154,11 +149,17 @@ def BuildAndTest(options):
         bits = 32
     scons = [python, 'scons.py']
   else:
+    p = subprocess.Popen(
+        'uname -m | '
+        'sed -e "s/i.86/ia32/;s/x86_64/x64/;s/amd64/x64/;s/arm.*/arm/"',
+        shell=True, stdout=subprocess.PIPE)
+    (p_stdout, _) = p.communicate()
+    assert p.returncode == 0
     if options.bits == 64:
       bits = 64
     elif options.bits == 32:
       bits = 32
-    elif '64' in detect_host_arch.HostArch():
+    elif p_stdout.find('64') >= 0:
       bits = 64
     else:
       bits = 32