<webview>: Implement WebRequest API

chrome/browser/webview/webview_guest.cc

Index: chrome/browser/webview/webview_guest.cc
diff --git a/chrome/browser/webview/webview_guest.cc b/chrome/browser/webview/webview_guest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..977af017251ee4fb5b8464ac6862ec735c8f1e37
--- /dev/null
+++ b/chrome/browser/webview/webview_guest.cc
@@ -0,0 +1,82 @@
+// Copyright (c) 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 "chrome/browser/webview/webview_guest.h"
+
+#include "base/lazy_instance.h"
+#include "chrome/browser/extensions/api/web_request/web_request_api.h"
+#include "content/public/browser/browser_thread.h"
+#include "content/public/browser/render_process_host.h"
+#include "content/public/browser/site_instance.h"
+#include "content/public/browser/web_contents.h"
+
+using content::WebContents;
+
+namespace chrome {
+
+namespace {
+
+typedef std::map<int, WebViewGuest*> WebViewGuestMap;
+typedef std::map<void*, WebViewGuestMap> WebViewProfileMap;
+static base::LazyInstance<WebViewProfileMap> g_webview_profile_map =

[sky, 2013/05/22 00:44:18]

This isn't global, it's static to this file so no g_

[Fady Samuel, 2013/05/23 04:37:38]

Done.

+    LAZY_INSTANCE_INITIALIZER;
+
+void RemoveWebViewEventListenersOnIOThread(
+    void* profile,
+    const std::string& extension_id,
+    int embedder_process_id,
+    int web_view_instance_id) {
+  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
+  ExtensionWebRequestEventRouter::GetInstance()->RemoveWebViewEventListeners(
+      profile, extension_id, embedder_process_id, web_view_instance_id);
+}
+
+}  // namespace
+
+WebViewGuest::WebViewGuest(WebContents* guest_web_contents,
+                           WebContents* embedder_web_contents,
+                           const std::string& extension_id)
+    : WebContentsObserver(guest_web_contents),
+      embedder_web_contents_(embedder_web_contents),
+      extension_id_(extension_id) {
+  profile_ = guest_web_contents->GetBrowserContext();

[sky, 2013/05/22 00:44:18]

Member initialize profile_ everything you can.

[Fady Samuel, 2013/05/23 04:37:38]

Done.

+  instance_id_ = guest_web_contents->GetEmbeddedInstanceID();
+  // We cache the embedder's process ID and routing ID here as the embedder
+  // may be destroyed prior to the destruction of the guest.
+  embedder_render_process_id_ =
+      embedder_web_contents->GetRenderProcessHost()->GetID();
+  g_webview_profile_map.Get()[profile_].insert(
+      std::make_pair(instance_id_, this));
+}
+
+WebViewGuest::~WebViewGuest() {
+  g_webview_profile_map.Get()[profile_].erase(instance_id_);
+  if (!g_webview_profile_map.Get()[profile_].size())

[sky, 2013/05/22 00:44:18]

.empty()

[Fady Samuel, 2013/05/23 04:37:38]

Done.

+    g_webview_profile_map.Get().erase(profile_);
+}
+
+// static
+WebViewGuest* WebViewGuest::From(void* profile, int instance_id) {
+  WebViewProfileMap* profile_map = g_webview_profile_map.Pointer();
+  WebViewProfileMap::iterator it = profile_map->find(profile);
+  if (it == profile_map->end())
+    return NULL;
+  const WebViewGuestMap& guest_map = it->second;
+  WebViewGuestMap::const_iterator guest_it = guest_map.find(instance_id);
+  return guest_it == guest_map.end() ? NULL : guest_it->second;
+}
+
+void WebViewGuest::WebContentsDestroyed(WebContents* web_contents) {
+  content::BrowserThread::PostTask(
+      content::BrowserThread::IO,
+      FROM_HERE,
+      base::Bind(
+          &RemoveWebViewEventListenersOnIOThread,
+          profile_, extension_id_,
+          embedder_render_process_id_,
+          instance_id_));
+  delete this;

[sky, 2013/05/22 00:44:18]

Who owns this object? If this object owns its own lifetime then the destructor
should be private. If it doesn't, how do you know someone else isn't referring
to this object when you delete here? Additionally you have the web_contents
here, so if this is the only place you delete this object you could use the
webcontents supplied to this function.

[Fady Samuel, 2013/05/23 04:37:38]

Made destructor private.

+}
+
+}  // namespace chrome