Fix event page process cleanup when running in --isolate-extensions mode.

extensions/browser/process_manager.cc

 // Copyright 2013 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/browser/process_manager.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 551 matching lines @@
                  extension_id,
                  sequence_id),
       base::TimeDelta::FromMilliseconds(g_event_page_suspending_time_msec));
 }
 
 void ProcessManager::OnNetworkRequestStarted(
     content::RenderFrameHost* render_frame_host,
     uint64_t request_id) {
   ExtensionHost* host = GetBackgroundHostForExtension(
       GetExtensionID(render_frame_host));
-  auto result = pending_network_requests_.insert(request_id);
+  if (!host)
+    return;
+
+  auto result = pending_network_requests_.insert(
+      make_pair(request_id, host->extension()->id()));

[Devlin, 2016/05/31 22:45:30]

unrelated - why doesn't make_pair need the std:: specifier?

[nasko, 2016/06/01 21:22:19]

Done.

   DCHECK(result.second) << "Duplicate network request IDs.";
-  if (host && IsFrameInExtensionHost(host, render_frame_host)) {
+
+  if (IsFrameInExtensionHost(host, render_frame_host)) {
     IncrementLazyKeepaliveCount(host->extension());
     host->OnNetworkRequestStarted(request_id);
   }
 }
 
 void ProcessManager::OnNetworkRequestDone(
     content::RenderFrameHost* render_frame_host,
     uint64_t request_id) {
   ExtensionHost* host = GetBackgroundHostForExtension(
       GetExtensionID(render_frame_host));
-  if (host && IsFrameInExtensionHost(host, render_frame_host)) {
+  if (host && IsFrameInExtensionHost(host, render_frame_host))
     host->OnNetworkRequestDone(request_id);

[Devlin, 2016/05/31 22:45:30]

Are we going to have the same problem here with only conditionally reporting the
request as done?  It looks like the OnNetworkRequest(Started|Done) forwards to a
notification, which is used in
chrome/browser/chromeos/power/extension_event_observer.cc to do more
keep-aliving :(

[nasko, 2016/06/01 21:22:19]

There were a bunch of problems with this version of the code. I've hopefully
fixed them and it should account for the extra keep-aliving in other places.

-    if (pending_network_requests_.erase(request_id))
-      DecrementLazyKeepaliveCount(host->extension());
-  }
+
+  auto result = pending_network_requests_.find(request_id);
+  if (result == pending_network_requests_.end())
+    return;
+
+  DecrementLazyKeepaliveCount(result->second);
+  pending_network_requests_.erase(request_id);
 }
 
 void ProcessManager::CancelSuspend(const Extension* extension) {
   bool& is_closing = background_page_data_[extension->id()].is_closing;
   ExtensionHost* host = GetBackgroundHostForExtension(extension->id());
   if (host && is_closing) {
     is_closing = false;
     host->render_process_host()->Send(
         new ExtensionMsg_CancelSuspend(extension->id()));
     // This increment / decrement is to simulate an instantaneous event. This
@@ skipping 377 matching lines @@
   if (extension && !IncognitoInfo::IsSplitMode(extension)) {
     BrowserContext* original_context =
         ExtensionsBrowserClient::Get()->GetOriginalContext(browser_context());
     return ProcessManager::Get(original_context)->GetSiteInstanceForURL(url);
   }
 
   return ProcessManager::GetSiteInstanceForURL(url);
 }
 
 }  // namespace extensions