Android: Use external storage for test data.

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/file_path.h"
 #include "base/logging.h"
 #include "base/memory/singleton.h"
 #include "base/message_loop.h"
 #include "base/message_pump_android.h"
 #include "base/path_service.h"
 #include "base/synchronization/waitable_event.h"
 
 namespace {
 
-// The test implementation of AndroidOS stores everything in the following
-// directory.
-const char* kAndroidTestTempDirectory = "/data/local/tmp";
-
 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 102 matching lines @@
   }
 
  protected:
   virtual ~MessagePumpForUIStub() {}
 };
 
 base::MessagePump* CreateMessagePumpForUIStub() {
   return new MessagePumpForUIStub();
 };
 
-// Provides the test path for DIR_MODULE, DIR_CACHE and DIR_ANDROID_APP_DATA.
+// Provides the test path for DIR_MODULE and DIR_ANDROID_APP_DATA.
 bool GetTestProviderPath(int key, FilePath* result) {
   switch (key) {
     case base::DIR_MODULE: {
-      *result = FilePath(kAndroidTestTempDirectory);
+      *result = FilePath(base::android::GetExternalStorageDirectory());
       return true;
     }
     case base::DIR_ANDROID_APP_DATA: {
-      *result = FilePath(kAndroidTestTempDirectory);
+      // For tests we use external storage for app data.

[Mark Mentovai, 2012/08/30 02:52:29]

Don’t say “we.”

[nilesh, 2012/08/30 17:21:55]

Done.

+      *result = FilePath(base::android::GetExternalStorageDirectory());
       return true;
     }
     default:
       return false;
   }
 }
 
 void InitPathProvider(int key) {
   FilePath path;
   // If failed to override the key, that means the way has not been registered.
@@ skipping 13 matching lines @@
                        logging::DISABLE_DCHECK_FOR_NON_OFFICIAL_RELEASE_BUILDS);
   // 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() {
   InitPathProvider(DIR_MODULE);
-  InitPathProvider(DIR_CACHE);
   InitPathProvider(DIR_ANDROID_APP_DATA);
 }
 
 void InitAndroidTestMessageLoop() {
   MessageLoop::InitMessagePumpForUIFactory(&CreateMessagePumpForUIStub);
 }
 
 void InitAndroidTest() {
   InitAndroidTestLogging();
   InitAndroidTestPaths();
   InitAndroidTestMessageLoop();
 }
 }  // namespace base