| Index: chrome/test/android/javatests/src/org/chromium/chrome/test/util/ApplicationData.java
|
| diff --git a/chrome/test/android/javatests/src/org/chromium/chrome/test/util/ApplicationData.java b/chrome/test/android/javatests/src/org/chromium/chrome/test/util/ApplicationData.java
|
| index 3c039f31f5cea68d492fa1a60e10d454d5d60361..84b6e77727dc24d2583b59da1f7064650bb0375b 100644
|
| --- a/chrome/test/android/javatests/src/org/chromium/chrome/test/util/ApplicationData.java
|
| +++ b/chrome/test/android/javatests/src/org/chromium/chrome/test/util/ApplicationData.java
|
| @@ -84,11 +84,9 @@ public final class ApplicationData {
|
| */
|
| private static boolean removeAppData(String appDir) {
|
| File[] files = new File(appDir).listFiles();
|
| - if (files == null)
|
| - return true;
|
| + if (files == null) return true;
|
| for (File file : files) {
|
| - if (!file.getAbsolutePath().endsWith("/lib") && !removeFile(file))
|
| - return false;
|
| + if (!file.getAbsolutePath().endsWith("/lib") && !removeFile(file)) return false;
|
| }
|
| return true;
|
| }
|
| @@ -103,11 +101,9 @@ public final class ApplicationData {
|
| private static boolean removeFile(File file) {
|
| if (file.isDirectory()) {
|
| File[] files = file.listFiles();
|
| - if (files == null)
|
| - return true;
|
| + if (files == null) return true;
|
| for (File sub_file : files) {
|
| - if (!removeFile(sub_file))
|
| - return false;
|
| + if (!removeFile(sub_file)) return false;
|
| }
|
| }
|
| return file.delete();
|
|
|