Getting rid of more webview memory leaks.

extensions/browser/guest_view/web_view/web_view_guest.cc

 // Copyright 2014 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/guest_view/web_view/web_view_guest.h"
 
 #include "base/message_loop/message_loop.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/browsing_data/storage_partition_http_cache_data_remover.h"
@@ skipping 148 matching lines @@
     }
     *persist_storage = true;
   } else {
     *storage_partition_id = partition_str;
     *persist_storage = false;
   }
 }
 
 void RemoveWebViewEventListenersOnIOThread(
     void* profile,
-    const std::string& extension_id,
     int embedder_process_id,
     int view_instance_id) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
   ExtensionWebRequestEventRouter::GetInstance()->RemoveWebViewEventListeners(
       profile,
-      extension_id,
       embedder_process_id,
       view_instance_id);
 }
 
 double ConvertZoomLevelToZoomFactor(double zoom_level) {
   double zoom_factor = content::ZoomLevelToZoomFactor(zoom_level);
   // Because the conversion from zoom level to zoom factor isn't perfect, the
   // resulting zoom factor is rounded to the nearest 6th decimal place.
   zoom_factor = round(zoom_factor * 1000000) / 1000000;
   return zoom_factor;
 }
 
 }  // namespace
 
+using WebViewKey = std::pair<int, int>;
+using WebViewKeyToIDMap = std::map<WebViewKey, int>;
+static base::LazyInstance<WebViewKeyToIDMap> web_view_key_to_id_map =

[lazyboy, 2015/06/05 23:09:55]

should we put these inside anonymous namespace?

[paulmeyer, 2015/06/08 17:53:59]

Not sure. I didn't actually write this one, I just moved it from below. I'll put
it into the namespace above.

+    LAZY_INSTANCE_INITIALIZER;
+
+// static
+void WebViewGuest::CleanUp(int embedder_process_id, int view_instance_id) {
+  GuestViewBase::CleanUp(embedder_process_id, view_instance_id);
+
+  auto rph = content::RenderProcessHost::FromID(embedder_process_id);
+  auto browser_context = rph->GetBrowserContext();

[lazyboy, 2015/06/05 23:09:55]

If I remember correctly, we were using auto only for
SomeClass::From* when the return type is SomeClass* or SomeClass&

Also this makes the code hard to follow imo.

[paulmeyer, 2015/06/08 17:53:59]

I was under the impression that auto should/can be used whenever the type is
clear from the right-hand-side, like in this case where I am using
GetBrowserContext(), and the type is BrowserContext. I think that that is clear
enough.

+
+  // Clean up rules registries for the WebView.
+  WebViewKey key(embedder_process_id, view_instance_id);
+  auto it = web_view_key_to_id_map.Get().find(key);
+  if (it != web_view_key_to_id_map.Get().end()) {
+    auto rules_registry_id = it->second;
+    web_view_key_to_id_map.Get().erase(it);
+    RulesRegistryService::Get(browser_context)->
+        RemoveRulesRegistriesByID(rules_registry_id);
+  }
+
+  // Clean up web request event listeners for the WebView.
+  content::BrowserThread::PostTask(
+      content::BrowserThread::IO,
+      FROM_HERE,
+      base::Bind(
+          &RemoveWebViewEventListenersOnIOThread,
+          browser_context,
+          embedder_process_id,
+          view_instance_id));
+}
+
 // static
 GuestViewBase* WebViewGuest::Create(content::WebContents* owner_web_contents) {
   return new WebViewGuest(owner_web_contents);
 }
 
 // static
 bool WebViewGuest::GetGuestPartitionConfigForSite(
     const GURL& site,
     std::string* partition_domain,
     std::string* partition_name,
@@ skipping 11 matching lines @@
   // The partition name is user supplied value, which we have encoded when the
   // URL was created, so it needs to be decoded.
   *partition_name =
       net::UnescapeURLComponent(site.query(), net::UnescapeRule::NORMAL);
   return true;
 }
 
 // static
 const char WebViewGuest::Type[] = "webview";
 
-using WebViewKey = std::pair<int, int>;
-using WebViewKeyToIDMap = std::map<WebViewKey, int>;
-static base::LazyInstance<WebViewKeyToIDMap> web_view_key_to_id_map =
-    LAZY_INSTANCE_INITIALIZER;
-
 // static
 int WebViewGuest::GetOrGenerateRulesRegistryID(
     int embedder_process_id,
     int webview_instance_id) {
   bool is_web_view = embedder_process_id && webview_instance_id;
   if (!is_web_view)
     return RulesRegistryService::kDefaultRulesRegistryID;
 
   WebViewKey key = std::make_pair(embedder_process_id, webview_instance_id);
   auto it = web_view_key_to_id_map.Get().find(key);
@@ skipping 141 matching lines @@
 }
 
 void WebViewGuest::EmbedderFullscreenToggled(bool entered_fullscreen) {
   is_embedder_fullscreen_ = entered_fullscreen;
   // If the embedder has got out of fullscreen, we get out of fullscreen
   // mode as well.
   if (!entered_fullscreen)
     SetFullscreenState(false);
 }
 
-void WebViewGuest::EmbedderWillBeDestroyed() {
-  // Clean up rules registries for the webview.
-  RulesRegistryService::Get(browser_context())
-      ->RemoveRulesRegistriesByID(rules_registry_id_);
-  WebViewKey key(owner_web_contents()->GetRenderProcessHost()->GetID(),
-                 view_instance_id());
-  web_view_key_to_id_map.Get().erase(key);
-
-  content::BrowserThread::PostTask(
-      content::BrowserThread::IO,
-      FROM_HERE,
-      base::Bind(
-          &RemoveWebViewEventListenersOnIOThread,
-          browser_context(),
-          owner_host(),
-          owner_web_contents()->GetRenderProcessHost()->GetID(),
-          view_instance_id()));
-}
-
 const char* WebViewGuest::GetAPINamespace() const {
   return webview::kAPINamespace;
 }
 
 int WebViewGuest::GetTaskPrefix() const {
   return IDS_EXTENSION_TASK_MANAGER_WEBVIEW_TAG_PREFIX;
 }
 
 void WebViewGuest::GuestDestroyed() {
   // Clean up custom context menu items for this guest.
@@ skipping 1019 matching lines @@
     scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue());
     DispatchEventToView(
         new GuestViewEvent(webview::kEventExitFullscreen, args.Pass()));
   }
   // Since we changed fullscreen state, sending a Resize message ensures that
   // renderer/ sees the change.
   web_contents()->GetRenderViewHost()->WasResized();
 }
 
 }  // namespace extensions