Revert 221736 "[android] Adds constants.GetOutDirectory() and co..."

trunk/src/build/android/pylib/host_driven/test_case.py

 # Copyright 2013 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.
 
 """Base class for host-driven test cases.
 
 This test case is intended to serve as the base class for any host-driven
 test cases. It is similar to the Python unitttest module in that test cases
 inherit from this class and add methods which will be run as tests.
 
@@ skipping 50 matching lines @@
             cleanup_test_files):
     self.device_id = device
     self.shard_index = shard_index
     self.adb = android_commands.AndroidCommands(self.device_id)
     self.push_deps = push_deps
     self.cleanup_test_files = cleanup_test_files
 
   def TearDown(self):
     pass
 
-  # TODO(craigdh): Remove GetOutDir once references have been removed
-  # downstream.
   def GetOutDir(self):
-    return constants.GetOutDirectory()
+    return os.path.join(os.environ['CHROME_SRC'], 'out',
+                        constants.GetBuildType())
 
   def Run(self):
     logging.info('Running host-driven test: %s', self.tagged_name)
     # Get the test method on the derived class and execute it
     return getattr(self, self.test_name)()
 
   def __RunJavaTest(self, test, test_pkg, additional_flags=None):
     """Runs a single Java test in a Java TestRunner.
 
     Args:
@@ skipping 67 matching lines @@
     overall_result.AddResult(
         test_result.InstrumentationTestResult(
             self.tagged_name, test_type, start_ms, duration_ms, log=log))
     return overall_result
 
   def __str__(self):
     return self.tagged_name
 
   def __repr__(self):
     return self.tagged_name