Upstreaming chrome/common/chrome_* diff.

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"
@@ skipping 124 matching lines @@
 };
 
 base::MessagePump* CreateMessagePumpForUIStub() {
   return new MessagePumpForUIStub();
 };
 
 // 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(base::android::GetExternalStorageDirectory());
-      return true;
+      return base::android::GetExternalStorageDirectory(result);
     }
     case base::DIR_ANDROID_APP_DATA: {
       // For tests, app data is put in external storage.
-      *result = FilePath(base::android::GetExternalStorageDirectory());
-      return true;
+      return base::android::GetExternalStorageDirectory(result);
     }
     default:
       return false;
   }
 }
 
 void InitPathProvider(int key) {
   FilePath path;
   // If failed to override the key, that means the way has not been registered.
   if (GetTestProviderPath(key, &path) && !PathService::Override(key, path))
@@ skipping 25 matching lines @@
 void InitAndroidTestMessageLoop() {
   MessageLoop::InitMessagePumpForUIFactory(&CreateMessagePumpForUIStub);
 }
 
 void InitAndroidTest() {
   InitAndroidTestLogging();
   InitAndroidTestPaths();
   InitAndroidTestMessageLoop();
 }
 }  // namespace base