Remove base::ScopedPtrHashMap from extensions/.

extensions/renderer/wake_event_page.cc

 // Copyright 2015 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 "extensions/renderer/wake_event_page.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/atomic_sequence_num.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/macros.h"
+#include "base/memory/ptr_util.h"
 #include "content/public/child/worker_thread.h"
 #include "content/public/renderer/render_thread.h"
 #include "extensions/common/extension_messages.h"
 #include "extensions/renderer/object_backed_native_handler.h"
 #include "extensions/renderer/script_context.h"
 #include "extensions/renderer/v8_helpers.h"
 #include "ipc/ipc_message.h"
 #include "ipc/ipc_message_macros.h"
 
 namespace extensions {
@@ skipping 127 matching lines @@
 
 WakeEventPage::WakeEventPage() {}
 
 WakeEventPage::~WakeEventPage() {}
 
 void WakeEventPage::MakeRequest(const std::string& extension_id,
                                 const OnResponseCallback& on_response) {
   static base::AtomicSequenceNumber sequence_number;
   int request_id = sequence_number.GetNext();
   {
-    std::unique_ptr<RequestData> request_data(
-        new RequestData(content::WorkerThread::GetCurrentId(), on_response));
+    std::unique_ptr<RequestData> request_data = base::MakeUnique<RequestData>(
+        content::WorkerThread::GetCurrentId(), on_response);
     base::AutoLock lock(requests_lock_);
-    requests_.set(request_id, std::move(request_data));
+    requests_[request_id] = std::move(request_data);

[Devlin, 2016/12/28 23:34:32]

optional nit: maybe just construct here?

[Avi (use Gerrit), 2016/12/29 00:36:30]

Done.

   }
   message_filter_->Send(
       new ExtensionHostMsg_WakeEventPage(request_id, extension_id));
 }
 
 bool WakeEventPage::OnControlMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(WakeEventPage, message)
     IPC_MESSAGE_HANDLER(ExtensionMsg_WakeEventPageResponse,
                         OnWakeEventPageResponse)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void WakeEventPage::OnWakeEventPageResponse(int request_id, bool success) {
   std::unique_ptr<RequestData> request_data;
   {
     base::AutoLock lock(requests_lock_);
-    request_data = requests_.take(request_id);

[Avi (use Gerrit), 2016/12/28 22:51:19]

FYI, this seems to have been a bug. It removes the scoped pointer, but leaves
the entry in the map, unused forever. There's no reason to abandon rows, so I
changed the code to remove the entry once it retrieves the request.

[Devlin, 2016/12/28 23:34:32]

Ah, that is bad.  It almost certainly should have been take_and_erase().  It's
reasons like these I'm so thrilled we can just use std:: containers now! :)

+    auto it = requests_.find(request_id);
+    request_data = std::move(it->second);
+    requests_.erase(it);
   }
   CHECK(request_data) << "No request with ID " << request_id;

[Devlin, 2016/12/28 23:34:32]

Maybe move this to be:
CHECK(it != requests_.end()) <<...
below line 187?

[Avi (use Gerrit), 2016/12/29 00:36:30]

Done.

   if (request_data->thread_id == 0) {
     // Thread ID of 0 means it wasn't called on a worker thread, so safe to
     // call immediately.
     request_data->on_response.Run(success);
   } else {
     content::WorkerThread::PostTask(
         request_data->thread_id,
         base::Bind(request_data->on_response, success));
   }
 }
 
 }  //  namespace extensions