1 files changed, 2 insertions, 11 deletions
diff --git a/base/test/test_support_android.cc b/base/test/test_support_android.cc
index 0a4df2d83..bbb3b0204 100644
--- a/base/test/test_support_android.cc
+++ b/base/test/test_support_android.cc
@@ -2,13 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// This file is included by modules that have host support but android/looper.h is not supported
-// on host. __REMOVED_IN needs to be defined in order for android/looper.h to be compiled.
-#ifndef __BIONIC__
-#define __REMOVED_IN(x) __attribute__((deprecated))
-#endif
 #include <android/looper.h>
-
 #include <stdarg.h>
 #include <string.h>
 
@@ -216,11 +210,8 @@ namespace base {
 
 void InitAndroidTestPaths(const FilePath& test_data_dir) {
   if (g_test_data_dir) {
-    if (test_data_dir == *g_test_data_dir) {
-      return;
-    }
-    LOG(INFO) << "Test data dir was " << *g_test_data_dir
-              << ", attempted change to " << test_data_dir;
+    CHECK(test_data_dir == *g_test_data_dir);
+    return;
   }
   g_test_data_dir = new FilePath(test_data_dir);
   InitPathProvider(DIR_ANDROID_APP_DATA);