Revert of 👔 Reland of Move side-loaded test data /sdcard -> /sdcard/gtestdata

base/test/test_support_android.cc

 // Copyright (c) 2012 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.
 
 #include <stdarg.h>
 #include <string.h>
 
 #include "base/android/path_utils.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/singleton.h"
 #include "base/message_loop/message_loop.h"
 #include "base/message_loop/message_pump_android.h"
 #include "base/path_service.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/test/multiprocess_test.h"
 
 namespace {
 
-base::FilePath* g_test_data_dir = nullptr;
-
 struct RunState {
   RunState(base::MessagePump::Delegate* delegate, int run_depth)
       : delegate(delegate),
         run_depth(run_depth),
         should_quit(false) {
   }
 
   base::MessagePump::Delegate* delegate;
 
   // Used to count how many Run() invocations are on the stack.
@@ skipping 94 matching lines @@
 
   void ScheduleDelayedWork(const base::TimeTicks& delayed_work_time) override {
     Waitable::GetInstance()->Signal();
   }
 };
 
 std::unique_ptr<base::MessagePump> CreateMessagePumpForUIStub() {
   return std::unique_ptr<base::MessagePump>(new MessagePumpForUIStub());
 };
 
-// Provides the test path for DIR_SOURCE_ROOT and DIR_ANDROID_APP_DATA.
+// Provides the test path for DIR_MODULE and DIR_ANDROID_APP_DATA.
 bool GetTestProviderPath(int key, base::FilePath* result) {
   switch (key) {
-    case base::DIR_ANDROID_APP_DATA:
-    case base::DIR_SOURCE_ROOT:
-      CHECK(g_test_data_dir != nullptr);
-      *result = *g_test_data_dir;
-      return true;
+    case base::DIR_ANDROID_APP_DATA: {
+      // For tests, app data is put in external storage.
+      return base::android::GetExternalStorageDirectory(result);
+    }
     default:
       return false;
   }
 }
 
 void InitPathProvider(int key) {
   base::FilePath path;
   // If failed to override the key, that means the way has not been registered.
   if (GetTestProviderPath(key, &path) && !PathService::Override(key, path))
     PathService::RegisterProvider(&GetTestProviderPath, key, key + 1);
 }
 
 }  // namespace
 
 namespace base {
 
 void InitAndroidTestLogging() {
   logging::LoggingSettings settings;
   settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG;
   logging::InitLogging(settings);
   // To view log output with IDs and timestamps use "adb logcat -v threadtime".
   logging::SetLogItems(false,    // Process ID
                        false,    // Thread ID
                        false,    // Timestamp
                        false);   // Tick count
 }
 
-void InitAndroidTestPaths(const FilePath& test_data_dir) {
-  if (g_test_data_dir) {
-    CHECK(test_data_dir == *g_test_data_dir);
-    return;
-  }
-  g_test_data_dir = new FilePath(test_data_dir);
-  InitPathProvider(DIR_SOURCE_ROOT);
+void InitAndroidTestPaths() {
+  InitPathProvider(DIR_MODULE);
   InitPathProvider(DIR_ANDROID_APP_DATA);
 }
 
 void InitAndroidTestMessageLoop() {
   if (!MessageLoop::InitMessagePumpForUIFactory(&CreateMessagePumpForUIStub))
     LOG(INFO) << "MessagePumpForUIFactory already set, unable to override.";
 }
 
 void InitAndroidTest() {
   if (!base::AndroidIsChildProcess()) {
     InitAndroidTestLogging();
+    InitAndroidTestPaths();
   }
   InitAndroidTestMessageLoop();
 }
 }  // namespace base