Revert of mandoline filesystem: Save cookie data to the mojo:filesystem.

mojo/tools/mopy/gtest.py

 # 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 logging
 import os
 import Queue
 import re
 import subprocess
 import sys
@@ skipping 115 matching lines @@
   if hasattr(exception, 'output'):
     print exception.output
   print str(exception)
   print 72 * "-"
 
 
 def _build_command_line(config, args, apptest):
   """Build the apptest command line. This value isn't executed on Android."""
   paths = Paths(config)
   # On Linux, always run tests with xvfb, but not for --gtest_list_tests.
-  not_list_tests = not "--gtest_list_tests" in args
-  use_xvfb = config.target_os == Config.OS_LINUX and not_list_tests
-  xvfb_prefix = [paths.xvfb, paths.build_dir] if use_xvfb else []
-  data_dir = ["--use-temporary-user-data-dir"] if not_list_tests else []
-  return xvfb_prefix + [paths.mojo_runner] + data_dir + args + [apptest]
+  use_xvfb = (config.target_os == Config.OS_LINUX and
+              not "--gtest_list_tests" in args)
+  prefix = [paths.xvfb, paths.build_dir] if use_xvfb else []
+  return prefix + [paths.mojo_runner] + args + [apptest]
 
 
 # TODO(msw): Determine proper test timeout durations (starting small).
 def _run_test_with_timeout(config, shell, args, apptest, timeout_in_seconds=10):
   """Run the test with a timeout; return the output or raise an exception."""
   result = Queue.Queue()
   thread = threading.Thread(target=_run_test,
                             args=(config, shell, args, apptest, result))
   thread.start()
   process_or_shell = result.get()
@@ skipping 36 matching lines @@
       (r, w) = os.pipe()
       with os.fdopen(r, "r") as rf:
         with os.fdopen(w, "w") as wf:
           arguments = args + [apptest]
           shell.StartActivity('MojoShellActivity', arguments, wf, wf.close)
           output = rf.read()
   except Exception as e:
     output = e.output if hasattr(e, 'output') else ""
     exception = str(e)
   result.put((output, exception))