Improving flat containers interface.

content/browser/devtools/protocol/target_auto_attacher.cc

Index: content/browser/devtools/protocol/target_auto_attacher.cc
diff --git a/content/browser/devtools/protocol/target_auto_attacher.cc b/content/browser/devtools/protocol/target_auto_attacher.cc
index dbccd7b1292946e8f334c65b7d2191ffbe2cf7bb..cad22031f11a5e987ad9f2edeac27feb7fbfd50a 100644
--- a/content/browser/devtools/protocol/target_auto_attacher.cc
+++ b/content/browser/devtools/protocol/target_auto_attacher.cc
@@ -134,7 +134,7 @@ void TargetAutoAttacher::UpdateFrames() {
 }
 
 void TargetAutoAttacher::AgentHostClosed(DevToolsAgentHost* host) {
-  auto_attached_hosts_.erase(host);
+  auto_attached_hosts_.erase(make_scoped_refptr(host));
 }
 
 void TargetAutoAttacher::ReattachServiceWorkers(bool waiting_for_debugger) {
@@ -166,18 +166,16 @@ void TargetAutoAttacher::ReattachTargetsOfType(const Hosts& new_hosts,
                                                const std::string& type,
                                                bool waiting_for_debugger) {
   Hosts old_hosts = auto_attached_hosts_;
-  for (auto& it : old_hosts) {
-    DevToolsAgentHost* host = it.get();
+  for (auto& host : old_hosts) {
     if (host->GetType() == type && new_hosts.find(host) == new_hosts.end()) {
       auto_attached_hosts_.erase(host);
-      detach_callback_.Run(host);
+      detach_callback_.Run(host.get());
     }
   }
-  for (auto& it : new_hosts) {
-    DevToolsAgentHost* host = it.get();
+  for (auto& host : new_hosts) {
     if (old_hosts.find(host) == old_hosts.end()) {
-      if (attach_callback_.Run(host, waiting_for_debugger))
-        auto_attached_hosts_.insert(host);
+      if (attach_callback_.Run(host.get(), waiting_for_debugger))
+        auto_attached_hosts_.insert(host.get());

[danakj, 2017/07/20 16:12:20]

unclear to me why you get the raw pointer to insert here, when the set is
refptrs?

[dyaroshev, 2017/07/20 16:33:02]

Sorry.

     }
   }
 }