Remove WebViewKey in rules registry.

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 "content/public/browser/browser_context.h"
@@ skipping 12 matching lines @@
 #include "content/public/browser/site_instance.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/common/media_stream_request.h"
 #include "content/public/common/page_zoom.h"
 #include "content/public/common/result_codes.h"
 #include "content/public/common/stop_find_action.h"
 #include "content/public/common/url_constants.h"
+#include "extensions/browser/api/declarative/rules_registry_service.h"
 #include "extensions/browser/api/extensions_api_client.h"
 #include "extensions/browser/api/web_request/web_request_api.h"
 #include "extensions/browser/api/web_view/web_view_internal_api.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/browser/guest_view/guest_view_manager.h"
 #include "extensions/browser/guest_view/web_view/web_view_constants.h"
 #include "extensions/browser/guest_view/web_view/web_view_permission_helper.h"
 #include "extensions/browser/guest_view/web_view/web_view_permission_types.h"
 #include "extensions/browser/guest_view/web_view/web_view_renderer_state.h"
 #include "extensions/common/constants.h"
@@ skipping 130 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";
 
+typedef std::pair<int, int> WebViewKey;
+typedef std::map<WebViewKey, int> WebViewKeyToIDMap;
+typedef std::map<int, WebViewKey> IDToWebViewKeyMap;
+static base::LazyInstance<WebViewKeyToIDMap> web_view_key_to_id_map =
+    LAZY_INSTANCE_INITIALIZER;
+static base::LazyInstance<IDToWebViewKeyMap> id_to_web_view_key_map =
+    LAZY_INSTANCE_INITIALIZER;
+
+// static
+void WebViewGuest::GenerateRulesRegistryID(

[Fady Samuel, 2014/11/28 11:34:24]

GetOrGenerateRulesRegistryID

[Xi Han, 2014/11/28 16:12:56]

Done.

+    int embedder_process_id,
+    int webview_instance_id,
+    RulesRegistryService* rules_registry_service,

[Fady Samuel, 2014/11/26 23:39:41]

Pass in a BrowserContext instead.

[Xi Han, 2014/11/27 23:25:26]

Done.

+    int* rules_registry_id) {

[Fady Samuel, 2014/11/26 23:39:41]

return this value instead of making it an output parameter.

[Xi Han, 2014/11/27 23:25:26]

Done.

+  WebViewKey key = std::make_pair(embedder_process_id, webview_instance_id);
+  WebViewKeyToIDMap::iterator it = web_view_key_to_id_map.Get().find(key);
+  if (it != web_view_key_to_id_map.Get().end()) {
+    (*rules_registry_id) = it->second;
+    return;
+  }
+  *rules_registry_id = rules_registry_service->GetNextRulesRegistryId();
+  web_view_key_to_id_map.Get()[key] = *rules_registry_id;
+  id_to_web_view_key_map.Get()[*rules_registry_id] = key;
+}
+
+// static
+int WebViewGuest::GetEmbedderProcessID(int rules_registry_id) {
+  return id_to_web_view_key_map.Get().find(rules_registry_id)->first;
+}
+
+// static
+void WebViewGuest::RemoveRulesRegistryID(int rules_registry_id) {
+  IDToWebViewKeyMap::iterator it =
+      id_to_web_view_key_map.Get().find(rules_registry_id);
+  web_view_key_to_id_map.Get().erase(it->second);
+  id_to_web_view_key_map.Get().erase(it);
+}
+
 // static
 int WebViewGuest::GetViewInstanceId(WebContents* contents) {
   WebViewGuest* guest = FromWebContents(contents);
   if (!guest)
     return guestview::kInstanceIDNone;
 
   return guest->view_instance_id();
 }
 
 const char* WebViewGuest::GetAPINamespace() const {
@@ skipping 612 matching lines @@
           site_url, &partition_domain, &partition_id, &in_memory)) {
     NOTREACHED();
     return;
   }
 
   WebViewRendererState::WebViewInfo web_view_info;
   web_view_info.embedder_process_id = embedder_render_process_id();
   web_view_info.instance_id = view_instance_id();
   web_view_info.partition_id = partition_id;
   web_view_info.embedder_extension_id = embedder_extension_id();
+  WebViewKey key(web_view_info.embedder_process_id, web_view_info.instance_id);
+  web_view_info.rules_registry_id =
+      web_view_key_to_id_map.Get().find(key)->second;
 
   content::BrowserThread::PostTask(
       content::BrowserThread::IO,
       FROM_HERE,
       base::Bind(&WebViewRendererState::AddGuest,
                  base::Unretained(WebViewRendererState::GetInstance()),
                  web_contents()->GetRenderProcessHost()->GetID(),
                  web_contents()->GetRoutingID(),
                  web_view_info));
 }
@@ skipping 394 matching lines @@
   WebViewGuest* guest =
       WebViewGuest::From(embedder_render_process_id(), new_window_instance_id);
   if (!guest)
     return;
 
   if (!allow)
     guest->Destroy();
 }
 
 }  // namespace extensions