Merge "Fix StrictMode violation in WebsiteSettingsActivity"
diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java
index 41e7356..d30ffb2 100644
--- a/src/com/android/browser/Controller.java
+++ b/src/com/android/browser/Controller.java
@@ -255,7 +255,7 @@
             // we can treat it as a new Browser, remove the old session cookies.
             CookieManager.getInstance().removeSessionCookie();
             // remove any incognito files
-            WebView.cleanupPrivateBrowsingFiles(mActivity);
+            WebView.cleanupPrivateBrowsingFiles();
             final Bundle extra = intent.getExtras();
             // Create an initial tab.
             // If the intent is ACTION_VIEW and data is not null, the Browser is
@@ -289,7 +289,7 @@
         } else {
             mUi.updateTabs(mTabControl.getTabs());
             if (!restoreIncognitoTabs) {
-                WebView.cleanupPrivateBrowsingFiles(mActivity);
+                WebView.cleanupPrivateBrowsingFiles();
             }
             // TabControl.restoreState() will create a new tab even if
             // restoring the state fails.
@@ -2178,7 +2178,7 @@
         Tab newtab = mTabControl.getTab(currentIndex);
         setActiveTab(newtab);
         if (!mTabControl.hasAnyOpenIncognitoTabs()) {
-            WebView.cleanupPrivateBrowsingFiles(mActivity);
+            WebView.cleanupPrivateBrowsingFiles();
         }
     }