| Index: chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/TestTabModelDirectory.java
|
| diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/TestTabModelDirectory.java b/chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/TestTabModelDirectory.java
|
| index 8567c14133965c17ec0cafc85468b7348f179526..aaf951da2cddaae62db850de039268e78e199a16 100644
|
| --- a/chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/TestTabModelDirectory.java
|
| +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/TestTabModelDirectory.java
|
| @@ -7,6 +7,7 @@ package org.chromium.chrome.browser.tabmodel;
|
| import android.content.Context;
|
| import android.util.Base64;
|
|
|
| +import org.chromium.base.FileUtils;
|
| import org.chromium.base.Log;
|
| import org.chromium.base.StreamUtil;
|
|
|
| @@ -213,7 +214,7 @@ public class TestTabModelDirectory {
|
| public TestTabModelDirectory(
|
| Context context, String baseDirectoryName, String subdirectoryName) throws Exception {
|
| mTestingDirectory = new File(context.getCacheDir(), baseDirectoryName);
|
| - if (mTestingDirectory.exists()) recursivelyDelete(mTestingDirectory);
|
| + if (mTestingDirectory.exists()) FileUtils.recursivelyDeleteFile(mTestingDirectory);
|
| if (!mTestingDirectory.mkdirs()) {
|
| Log.e(TAG, "Failed to create: " + mTestingDirectory.getName());
|
| }
|
| @@ -242,7 +243,7 @@ public class TestTabModelDirectory {
|
|
|
| /** Nukes all the testing data. */
|
| public void tearDown() throws Exception {
|
| - recursivelyDelete(mTestingDirectory);
|
| + FileUtils.recursivelyDeleteFile(mTestingDirectory);
|
| }
|
|
|
| /** Returns the base data directory. */
|
| @@ -262,17 +263,4 @@ public class TestTabModelDirectory {
|
| StreamUtil.closeQuietly(outputStream);
|
| }
|
| }
|
| -
|
| - private void recursivelyDelete(File currentFile) throws Exception {
|
| - if (currentFile.isDirectory()) {
|
| - File[] files = currentFile.listFiles();
|
| - if (files != null) {
|
| - for (File file : files) {
|
| - recursivelyDelete(file);
|
| - }
|
| - }
|
| - }
|
| -
|
| - if (!currentFile.delete()) Log.e(TAG, "Failed to delete: " + currentFile);
|
| - }
|
| }
|
|
|