diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-24 15:02:51 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-24 15:02:51 +0000 |
| commit | 9123652116e1261111cfb2306709ee305ffb5bf2 (patch) | |
| tree | 7f53febadf5e99e225b308c0c843e53e39c63b64 /content/browser/fileapi | |
| parent | 478df839eb3260d4b2602c7e6a8f5d6294213eef (diff) | |
| download | chromium_src-9123652116e1261111cfb2306709ee305ffb5bf2.zip chromium_src-9123652116e1261111cfb2306709ee305ffb5bf2.tar.gz chromium_src-9123652116e1261111cfb2306709ee305ffb5bf2.tar.bz2 | |
Revert 138795 - Revert "nss: revert encrypted and origin bound certificates support."
Cleaning up git-svn mess with drover.
TBR=agl@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10451012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138796 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/fileapi')
| -rw-r--r-- | content/browser/fileapi/fileapi_message_filter.cc | 14 | ||||
| -rw-r--r-- | content/browser/fileapi/fileapi_message_filter.h | 2 |
2 files changed, 0 insertions, 16 deletions
diff --git a/content/browser/fileapi/fileapi_message_filter.cc b/content/browser/fileapi/fileapi_message_filter.cc index e5dad26..6d4e050 100644 --- a/content/browser/fileapi/fileapi_message_filter.cc +++ b/content/browser/fileapi/fileapi_message_filter.cc @@ -172,11 +172,6 @@ void FileAPIMessageFilter::UnregisterOperation(int request_id) { FileAPIMessageFilter::~FileAPIMessageFilter() {} -void FileAPIMessageFilter::BadMessageReceived() { - content::RecordAction(UserMetricsAction("BadMessageTerminate_FAMF")); - BrowserMessageFilter::BadMessageReceived(); -} - void FileAPIMessageFilter::OnOpen( int request_id, const GURL& origin_url, fileapi::FileSystemType type, int64 requested_size, bool create) { @@ -468,20 +463,12 @@ void FileAPIMessageFilter::OnAppendBlobDataItem( OnRemoveBlob(url); return; } - if (item.length == 0) { - BadMessageReceived(); - return; - } blob_storage_context_->controller()->AppendBlobDataItem(url, item); } void FileAPIMessageFilter::OnAppendSharedMemory( const GURL& url, base::SharedMemoryHandle handle, size_t buffer_size) { DCHECK(base::SharedMemory::IsHandleValid(handle)); - if (!buffer_size) { - BadMessageReceived(); - return; - } #if defined(OS_WIN) base::SharedMemory shared_memory(handle, true, peer_handle()); #else @@ -706,4 +693,3 @@ FileSystemOperationInterface* FileAPIMessageFilter::GetNewOperation( operations_.AddWithID(operation, request_id); return operation; } - diff --git a/content/browser/fileapi/fileapi_message_filter.h b/content/browser/fileapi/fileapi_message_filter.h index 88b8197..c6d94ed9 100644 --- a/content/browser/fileapi/fileapi_message_filter.h +++ b/content/browser/fileapi/fileapi_message_filter.h @@ -68,8 +68,6 @@ class FileAPIMessageFilter : public content::BrowserMessageFilter { protected: virtual ~FileAPIMessageFilter(); - virtual void BadMessageReceived() OVERRIDE; - private: void OnOpen(int request_id, const GURL& origin_url, |