Re-enable the BrokerProcess.OpenFileRW test on Android.

Review URL: https://chromiumcodereview.appspot.com/14305010

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

1 files changed, 3 insertions, 11 deletions

diff --git a/sandbox/linux/services/broker_process_unittest.cc b/sandbox/linux/services/broker_process_unittest.cc
index ae14ad7..78fcd2e 100644
--- a/sandbox/linux/services/broker_process_unittest.cc
+++ b/sandbox/linux/services/broker_process_unittest.cc
@@ -280,21 +280,13 @@ TEST(BrokerProcess, OpenCpuinfoNoClientCheck) {
   // expected.
 }
 
-// Disabled until we implement a mkstemp that doesn't require JNI.
-TEST(BrokerProcess, DISABLE_ON_ANDROID(OpenFileRW)) {
+TEST(BrokerProcess, OpenFileRW) {
   const char basename[] = "BrokerProcessXXXXXX";
   char template_name[2048];
-#if defined(OS_ANDROID)
-  base::FilePath cache_directory;
-  ASSERT_TRUE(base::android::GetCacheDirectory(&cache_directory));
-  ssize_t length = snprintf(template_name, sizeof(template_name),
-                            "%s%s",
-                            cache_directory.value().c_str(), basename);
-  ASSERT_LT(length, static_cast<ssize_t>(sizeof(template_name)));
-#else
+  // On Android, this file will end up in
+  // /data/local/tmp/BrokerProcessXXXXXX, which is OK.
   strncpy(template_name, basename, sizeof(basename) - 1);
   template_name[sizeof(basename) - 1] = '\0';
-#endif
   int tempfile = mkstemp(template_name);
   ASSERT_GE(tempfile, 0);
   char tempfile_name[2048];