2 files changed, 2 insertions, 8 deletions
diff --git a/Source/WebKit/android/WebCoreSupport/WebCookieJar.cpp b/Source/WebKit/android/WebCoreSupport/WebCookieJar.cpp
index b33cbc2..0af3cc2 100644
--- a/Source/WebKit/android/WebCoreSupport/WebCookieJar.cpp
+++ b/Source/WebKit/android/WebCoreSupport/WebCookieJar.cpp
@@ -123,6 +123,7 @@ void WebCookieJar::cleanup(bool isPrivateBrowsing)
     MutexLocker lock(instanceMutex);
     scoped_refptr<WebCookieJar>* instancePtr = instance(isPrivateBrowsing);
     *instancePtr = 0;
+    removeFileOrDirectory(databaseDirectory(isPrivateBrowsing).c_str());
 }
 
 WebCookieJar::WebCookieJar(const std::string& databaseFilePath)
@@ -130,10 +131,6 @@ WebCookieJar::WebCookieJar(const std::string& databaseFilePath)
     , m_databaseFilePath(databaseFilePath)
     , m_allowCookies(true) {}
 
-WebCookieJar::~WebCookieJar() {
-    removeFileOrDirectory(m_databaseFilePath.c_str());
-}
-
 void WebCookieJar::initCookieStore() {
     MutexLocker lock(m_cookieStoreInitializeMutex);
     if (m_cookieStoreInitialized)
@@ -183,8 +180,7 @@ int WebCookieJar::CanSetCookie(const GURL&, const GURL&, const std::string&) con
 
 net::CookieStore* WebCookieJar::cookieStore()
 {
-    if (!m_cookieStoreInitialized)
-        initCookieStore();
+    initCookieStore();
     return m_cookieStore.get();
 }
 
diff --git a/Source/WebKit/android/WebCoreSupport/WebCookieJar.h b/Source/WebKit/android/WebCoreSupport/WebCookieJar.h
index 25d9e78..7ade9d0 100644
--- a/Source/WebKit/android/WebCoreSupport/WebCookieJar.h
+++ b/Source/WebKit/android/WebCoreSupport/WebCookieJar.h
@@ -66,9 +66,7 @@ public:
     int getNumCookiesInDatabase();
 
 private:
-    friend class base::RefCountedThreadSafe<WebCookieJar>;
     WebCookieJar(const std::string& databaseFilePath);
-    ~WebCookieJar();
     void initCookieStore();
 
 private: