diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-08-08 14:30:41 +0200 |
|---|---|---|
| committer | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-08-12 13:49:54 +0200 |
| commit | ab0a50979b9eb4dfa3320eff7e187e41efedf7a9 (patch) | |
| tree | 498dfb8a97ff3361a9f7486863a52bb4e26bb898 /chromium/content/browser/dom_storage/dom_storage_namespace.cc | |
| parent | 4ce69f7403811819800e7c5ae1318b2647e778d1 (diff) | |
Update Chromium to beta version 37.0.2062.68
Change-Id: I188e3b5aff1bec75566014291b654eb19f5bc8ca
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'chromium/content/browser/dom_storage/dom_storage_namespace.cc')
| -rw-r--r-- | chromium/content/browser/dom_storage/dom_storage_namespace.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chromium/content/browser/dom_storage/dom_storage_namespace.cc b/chromium/content/browser/dom_storage/dom_storage_namespace.cc index ac1e2f89cd0..d36147f076e 100644 --- a/chromium/content/browser/dom_storage/dom_storage_namespace.cc +++ b/chromium/content/browser/dom_storage/dom_storage_namespace.cc @@ -16,8 +16,8 @@ #include "content/browser/dom_storage/dom_storage_context_impl.h" #include "content/browser/dom_storage/dom_storage_task_runner.h" #include "content/browser/dom_storage/session_storage_database.h" -#include "content/common/child_process_host_impl.h" #include "content/common/dom_storage/dom_storage_types.h" +#include "content/public/common/child_process_host.h" namespace content { @@ -247,14 +247,14 @@ DOMStorageNamespace::GetAreaHolder(const GURL& origin) { } void DOMStorageNamespace::AddTransactionLogProcessId(int process_id) { - DCHECK(process_id != ChildProcessHostImpl::kInvalidChildProcessId); + DCHECK(process_id != ChildProcessHost::kInvalidUniqueID); DCHECK(transactions_.count(process_id) == 0); TransactionData* transaction_data = new TransactionData; transactions_[process_id] = transaction_data; } void DOMStorageNamespace::RemoveTransactionLogProcessId(int process_id) { - DCHECK(process_id != ChildProcessHostImpl::kInvalidChildProcessId); + DCHECK(process_id != ChildProcessHost::kInvalidUniqueID); DCHECK(transactions_.count(process_id) == 1); delete transactions_[process_id]; transactions_.erase(process_id); @@ -353,7 +353,7 @@ SessionStorageNamespace::MergeResult DOMStorageNamespace::Merge( } bool DOMStorageNamespace::IsLoggingRenderer(int process_id) { - DCHECK(process_id != ChildProcessHostImpl::kInvalidChildProcessId); + DCHECK(process_id != ChildProcessHost::kInvalidUniqueID); if (transactions_.count(process_id) < 1) return false; return !transactions_[process_id]->max_log_size_exceeded; |