| Index: content/browser/dom_storage/session_storage_namespace_impl.cc
|
| diff --git a/content/browser/dom_storage/session_storage_namespace_impl.cc b/content/browser/dom_storage/session_storage_namespace_impl.cc
|
| index dab20332d533f24fdc4b08e83fcdd13510ce9e47..ee861b2fbf0d3d90edac0f60313d3c58d2b690d6 100644
|
| --- a/content/browser/dom_storage/session_storage_namespace_impl.cc
|
| +++ b/content/browser/dom_storage/session_storage_namespace_impl.cc
|
| @@ -28,7 +28,7 @@ SessionStorageNamespaceImpl::SessionStorageNamespaceImpl(
|
| SessionStorageNamespaceImpl::SessionStorageNamespaceImpl(
|
| SessionStorageNamespaceImpl* master_session_storage_namespace)
|
| : session_(new DOMStorageSession(
|
| - master_session_storage_namespace->session_)) {
|
| + master_session_storage_namespace->session_.get())) {
|
| }
|
|
|
|
|
| @@ -81,7 +81,8 @@ void SessionStorageNamespaceImpl::Merge(
|
| const MergeResultCallback& callback) {
|
| SessionStorageNamespaceImpl* other_impl =
|
| static_cast<SessionStorageNamespaceImpl*>(other);
|
| - session_->Merge(actually_merge, process_id, other_impl->session_, callback);
|
| + session_->Merge(
|
| + actually_merge, process_id, other_impl->session_.get(), callback);
|
| }
|
|
|
| bool SessionStorageNamespaceImpl::IsAliasOf(SessionStorageNamespace* other) {
|
|
|