unlink(filename);
}
-bool WebRequestContext::cleanupPrivateBrowsingFiles(const std::string& databaseDirectory, const std::string& cacheDirectory)
+bool WebRequestContext::cleanupPrivateBrowsingFiles()
{
// This is called on the UI thread.
MutexLocker lock(privateBrowsingContextMutex);
if (!privateBrowsingContext || privateBrowsingContext->HasOneRef()) {
privateBrowsingContext = 0;
- std::string cookiePath(databaseDirectory);
+ std::string cookiePath = getDatabaseDirectory();
cookiePath.append(kCookiesDatabaseFilenamePrivate);
removeFileOrDirectory(cookiePath.c_str());
- std::string cachePath(cacheDirectory);
+ std::string cachePath = getCacheDirectory();
cachePath.append(kCacheDirectoryPrivate);
removeFileOrDirectory(cachePath.c_str());
return true;
static WebRequestContext* get(bool isPrivateBrowsing);
// These methods are threadsafe.
- static bool cleanupPrivateBrowsingFiles(const std::string& databaseDirectory, const std::string& cacheDirectory);
+ static bool cleanupPrivateBrowsingFiles();
static void setUserAgent(WTF::String);
static void setAcceptLanguage(WTF::String);
bool allowCookies();
GET_NATIVE_VIEW(env, obj)->moveSelection(x, y);
}
-static jboolean nativeCleanupPrivateBrowsingFiles(
- JNIEnv *env, jobject obj, jstring databaseDirectoryJString, jstring cacheDirectoryJString) {
+static jboolean nativeCleanupPrivateBrowsingFiles(JNIEnv*, jobject)
+{
#if USE(CHROME_NETWORK_STACK)
- jboolean isCopy;
- const char* cString = env->GetStringUTFChars(databaseDirectoryJString, &isCopy);
- std::string databaseDirectory(cString);
- if (isCopy == JNI_TRUE)
- env->ReleaseStringUTFChars(databaseDirectoryJString, cString);
- cString = env->GetStringUTFChars(cacheDirectoryJString, &isCopy);
- std::string cacheDirectory(cString);
- if (isCopy == JNI_TRUE)
- env->ReleaseStringUTFChars(cacheDirectoryJString, cString);
- return WebRequestContext::cleanupPrivateBrowsingFiles(databaseDirectory, cacheDirectory);
+ return WebRequestContext::cleanupPrivateBrowsingFiles();
#else
return JNI_FALSE;
#endif
(void*) nativeMoveGeneration },
{ "nativeMoveSelection", "(II)V",
(void*) nativeMoveSelection },
- { "nativeCleanupPrivateBrowsingFiles", "(Ljava/lang/String;Ljava/lang/String;)Z",
+ { "nativeCleanupPrivateBrowsingFiles", "()Z",
(void*) nativeCleanupPrivateBrowsingFiles },
{ "nativePointInNavCache", "(III)Z",
(void*) nativePointInNavCache },