commit e91c48c6a244c04622a605adfbc02ec40679c9d1
author aurimas@chromium.org <aurimas@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Wed Oct 03 07:03:33 2012 +0900
committer Qijiang Fan <fqj@google.com> Thu Jun 04 13:27:09 2020 +0900
tree e1d7a17855bcc8198c6f2d97db7142dba48cfb4a
parent 208f05bf30af5d46aa0269b1252b9fda7f17ebb0

Upstreaming chrome/common/chrome_* diff.

Upstreaming chrome/common/chrome_* diff for Android.

BUG=152827


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

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


CrOS-Libchrome-Original-Commit: 18011cb7cb6e6f5e39e8eca7a546e61c8f4af721

base/android/path_utils_unittest.cc

diff --git a/base/android/path_utils_unittest.cc b/base/android/path_utils_unittest.cc
index faa00b5..92728b5 100644
--- a/base/android/path_utils_unittest.cc
+++ b/base/android/path_utils_unittest.cc
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include "base/android/path_utils.h"
+#include "base/file_path.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -15,24 +16,30 @@
   // The string comes from the Java side and depends on the APK
   // we are running in. Assumes that we are packaged in
   // org.chromium.native_test
+  FilePath path;
+  GetDataDirectory(&path);
   EXPECT_STREQ("/data/data/org.chromium.native_test/app_chrome",
-               GetDataDirectory().c_str());
+               path.value().c_str());
 }
 
 TEST_F(PathUtilsTest, TestGetCacheDirectory) {
   // The string comes from the Java side and depends on the APK
   // we are running in. Assumes that we are packaged in
   // org.chromium.native_test
+  FilePath path;
+  GetCacheDirectory(&path);
   EXPECT_STREQ("/data/data/org.chromium.native_test/cache",
-               GetCacheDirectory().c_str());
+               path.value().c_str());
 }
 
 TEST_F(PathUtilsTest, TestGetNativeLibraryDirectory) {
   // The string comes from the Java side and depends on the APK
   // we are running in. Assumes that we are packaged in
   // org.chromium.native_test
+  FilePath path;
+  GetNativeLibraryDirectory(&path);
   EXPECT_STREQ("/data/data/org.chromium.native_test/lib",
-               GetNativeLibraryDirectory().c_str());
+               path.value().c_str());
 }
 
 }  // namespace android