Remove implicit conversions from scoped_refptr to T* in content/browser/dom_storage/

content/browser/dom_storage/dom_storage_context_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/dom_storage/dom_storage_context_impl.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/file_util.h"
 #include "base/files/file_enumerator.h"
@@ skipping 260 matching lines @@
     DCHECK(it->second->num_aliases() == 0);
     DCHECK(alias_master->alias_master_namespace() == NULL);
     if (should_persist_data)
       alias_master->set_must_persist_at_shutdown(true);
     if (it->second->DecrementMasterAliasCount())
       MaybeShutdownSessionNamespace(alias_master);
     namespaces_.erase(namespace_id);
   } else {
     if (should_persist_data)
       it->second->set_must_persist_at_shutdown(true);
-    MaybeShutdownSessionNamespace(it->second);
+    MaybeShutdownSessionNamespace(it->second.get());
   }
 }
 
 void DOMStorageContextImpl::MaybeShutdownSessionNamespace(
     DOMStorageNamespace* ns) {
   if (ns->num_aliases() > 0 || !ns->ready_for_deletion_pending_aliases())
     return;
   DCHECK_EQ(ns->num_aliases(), 0);
   DCHECK(ns->alias_master_namespace() == NULL);
   std::string persistent_namespace_id =  ns->persistent_namespace_id();
@@ skipping 186 matching lines @@
 
 SessionStorageNamespace::MergeResult
 DOMStorageContextImpl::MergeSessionStorage(
     int64 namespace1_id, bool actually_merge, int process_id,
     int64 namespace2_id) {
   DCHECK_NE(kLocalStorageNamespaceId, namespace1_id);
   DCHECK_NE(kLocalStorageNamespaceId, namespace2_id);
   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);
 }
 
 }  // namespace content