summaryrefslogtreecommitdiffstats
path: root/base/test
diff options
context:
space:
mode:
authornileshagrawal@chromium.org <nileshagrawal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-28 19:36:25 +0000
committernileshagrawal@chromium.org <nileshagrawal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-28 19:36:25 +0000
commit2b4922836f6933efabf6bd50c2006e1e1bf1a16e (patch)
treeff8117d50dabd4ef5a6aeeb6efd2dd4f7546bca9 /base/test
parenta1d660bfa7166332552497177f622ceb8503c171 (diff)
downloadchromium_src-2b4922836f6933efabf6bd50c2006e1e1bf1a16e.zip
chromium_src-2b4922836f6933efabf6bd50c2006e1e1bf1a16e.tar.gz
chromium_src-2b4922836f6933efabf6bd50c2006e1e1bf1a16e.tar.bz2
Remove ANDROID_APK_TEST_TARGET
It is always true now and can be replaced with OS_ANDROID. BUG=125059 TEST= Review URL: https://chromiumcodereview.appspot.com/10690019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144775 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/test')
-rw-r--r--base/test/test_suite.cc4
-rw-r--r--base/test/test_support_android.cc8
2 files changed, 2 insertions, 10 deletions
diff --git a/base/test/test_suite.cc b/base/test/test_suite.cc
index 67ea0a4..0a34ec3 100644
--- a/base/test/test_suite.cc
+++ b/base/test/test_suite.cc
@@ -143,9 +143,9 @@ void TestSuite::PreInitialize(int argc, char** argv,
gtk_init_check(&argc, &argv);
#endif // defined(TOOLKIT_GTK)
- // On Android when building tests as apks, AtExitManager is created in
+ // On Android, AtExitManager is created in
// testing/android/native_test_wrapper.cc before main() is called.
-#if !defined(ANDROID_APK_TEST_TARGET)
+#if !defined(OS_ANDROID)
if (create_at_exit_manager)
at_exit_manager_.reset(new base::AtExitManager);
#endif
diff --git a/base/test/test_support_android.cc b/base/test/test_support_android.cc
index 78d292f..259c59f 100644
--- a/base/test/test_support_android.cc
+++ b/base/test/test_support_android.cc
@@ -144,14 +144,6 @@ bool GetTestProviderPath(int key, FilePath* result) {
*result = FilePath(kAndroidTestTempDirectory);
return true;
}
-#if !defined(ANDROID_APK_TEST_TARGET)
- // When running as executable we need to use /data/local/tmp as the
- // cache directory.
- case base::DIR_CACHE: {
- *result = FilePath(kAndroidTestTempDirectory);
- return true;
- }
-#endif // !defined(ANDROID_APK_TEST_TARGET)
case base::DIR_ANDROID_APP_DATA: {
*result = FilePath(kAndroidTestTempDirectory);
return true;