summaryrefslogtreecommitdiffstats
path: root/chrome/browser/in_process_webkit
diff options
context:
space:
mode:
authormaruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-25 01:34:14 +0000
committermaruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-25 01:34:14 +0000
commit687c5ac1a02ba5b75150713ac3c70cf5875d6273 (patch)
tree4b361de9329d354aac5aa358f2b075098ebde049 /chrome/browser/in_process_webkit
parent4f3edf1d4231f09d486adbb56172ac6391589236 (diff)
downloadchromium_src-687c5ac1a02ba5b75150713ac3c70cf5875d6273.zip
chromium_src-687c5ac1a02ba5b75150713ac3c70cf5875d6273.tar.gz
chromium_src-687c5ac1a02ba5b75150713ac3c70cf5875d6273.tar.bz2
Reverts 42520 and 42477. It back red again when adding this change back.
TEST=valgrind test: unit should turn green BUG=38398 BUG=39177 Review URL: http://codereview.chromium.org/1313003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42569 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/in_process_webkit')
-rw-r--r--chrome/browser/in_process_webkit/dom_storage_context.cc14
-rw-r--r--chrome/browser/in_process_webkit/dom_storage_context.h7
2 files changed, 0 insertions, 21 deletions
diff --git a/chrome/browser/in_process_webkit/dom_storage_context.cc b/chrome/browser/in_process_webkit/dom_storage_context.cc
index bea4611..279ecb5 100644
--- a/chrome/browser/in_process_webkit/dom_storage_context.cc
+++ b/chrome/browser/in_process_webkit/dom_storage_context.cc
@@ -190,11 +190,6 @@ void DOMStorageContext::DeleteLocalStorageFile(const FilePath& file_path) {
file_util::Delete(file_path, false);
}
-void DOMStorageContext::DeleteLocalStorageForOrigin(const string16& origin_id) {
- DCHECK(ChromeThread::CurrentlyOn(ChromeThread::WEBKIT));
- DeleteLocalStorageFile(GetLocalStorageFilePath(origin_id));
-}
-
void DOMStorageContext::DeleteAllLocalStorageFiles() {
DCHECK(ChromeThread::CurrentlyOn(ChromeThread::WEBKIT));
@@ -269,12 +264,3 @@ void DOMStorageContext::ClearLocalState(const FilePath& profile_path,
}
}
}
-
-FilePath DOMStorageContext::GetLocalStorageFilePath(
- const string16& origin_id) const {
- FilePath storageDir = webkit_context_->data_path().Append(
- DOMStorageContext::kLocalStorageDirectory);
- FilePath::StringType id =
- webkit_glue::WebStringToFilePathString(origin_id);
- return storageDir.Append(id.append(kLocalStorageExtension));
-}
diff --git a/chrome/browser/in_process_webkit/dom_storage_context.h b/chrome/browser/in_process_webkit/dom_storage_context.h
index 2b9e1d1..81276c2 100644
--- a/chrome/browser/in_process_webkit/dom_storage_context.h
+++ b/chrome/browser/in_process_webkit/dom_storage_context.h
@@ -9,7 +9,6 @@
#include <set>
#include "base/file_path.h"
-#include "base/string16.h"
#include "base/time.h"
class DOMStorageArea;
@@ -71,9 +70,6 @@ class DOMStorageContext {
// Deletes a single local storage file.
void DeleteLocalStorageFile(const FilePath& file_path);
- // Deletes the local storage file for the given origin.
- void DeleteLocalStorageForOrigin(const string16& origin_id);
-
// Deletes all local storage files.
void DeleteAllLocalStorageFiles();
@@ -87,9 +83,6 @@ class DOMStorageContext {
static void ClearLocalState(const FilePath& profile_path,
const char* url_scheme_to_be_skipped);
- // Get the file name of the local storage file for the given origin.
- FilePath GetLocalStorageFilePath(const string16& origin_id) const;
-
private:
// Get the local storage instance. The object is owned by this class.
DOMStorageNamespace* CreateLocalStorage();