Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(51)

Unified Diff: content/browser/dom_storage/dom_storage_context_impl.cc

Issue 506083002: Remove implicit conversions from scoped_refptr to T* in content/browser/dom_storage/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | content/browser/dom_storage/dom_storage_namespace.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/dom_storage/dom_storage_context_impl.cc
diff --git a/content/browser/dom_storage/dom_storage_context_impl.cc b/content/browser/dom_storage/dom_storage_context_impl.cc
index 93cdb7bff7ab6a6ec00bbc1a07b72bd39a980367..79be9676a24745b5e3457acf53bc601b292a4db5 100644
--- a/content/browser/dom_storage/dom_storage_context_impl.cc
+++ b/content/browser/dom_storage/dom_storage_context_impl.cc
@@ -278,7 +278,7 @@ void DOMStorageContextImpl::DeleteSessionNamespace(
} else {
if (should_persist_data)
it->second->set_must_persist_at_shutdown(true);
- MaybeShutdownSessionNamespace(it->second);
+ MaybeShutdownSessionNamespace(it->second.get());
}
}
@@ -485,11 +485,11 @@ DOMStorageContextImpl::MergeSessionStorage(
StorageNamespaceMap::const_iterator it = namespaces_.find(namespace1_id);
if (it == namespaces_.end())
return SessionStorageNamespace::MERGE_RESULT_NAMESPACE_NOT_FOUND;
- DOMStorageNamespace* ns1 = it->second;
+ DOMStorageNamespace* ns1 = it->second.get();
it = namespaces_.find(namespace2_id);
if (it == namespaces_.end())
return SessionStorageNamespace::MERGE_RESULT_NAMESPACE_NOT_FOUND;
- DOMStorageNamespace* ns2 = it->second;
+ DOMStorageNamespace* ns2 = it->second.get();
return ns1->Merge(actually_merge, process_id, ns2, this);
}
« no previous file with comments | « no previous file | content/browser/dom_storage/dom_storage_namespace.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698