Fix the bug that webview guest cannot load script of a SharedWorker.

chrome/browser/extensions/extension_renderer_state.h

Index: chrome/browser/extensions/extension_renderer_state.h
diff --git a/chrome/browser/extensions/extension_renderer_state.h b/chrome/browser/extensions/extension_renderer_state.h
index 59349afb9024277ab29f5c3153e27944abbb9fca..35d94244e57e7333923246a4a13fa44c4a5bb60c 100644
--- a/chrome/browser/extensions/extension_renderer_state.h
+++ b/chrome/browser/extensions/extension_renderer_state.h
@@ -42,6 +42,10 @@ class ExtensionRendererState {
   bool GetWebViewInfo(int guest_process_id, int guest_routing_id,
                       WebViewInfo* webview_info);
 
+  // Looks up the partition info for the embedder <webview> for a given guest
+  // process. Called on the IO thread.
+  bool GetWebViewPartitionID(int guest_process_id, std::string* partition_id);
+
   // Looks up the tab and window ID for a given request. Returns true if we have
   // the IDs in our map. Called on the IO thread.
   bool GetTabAndWindowId(
@@ -61,6 +65,8 @@ class ExtensionRendererState {
   typedef std::pair<int, int> TabAndWindowId;
   typedef std::map<RenderId, TabAndWindowId> TabAndWindowIdMap;
   typedef std::map<RenderId, WebViewInfo> WebViewInfoMap;
+  typedef std::pair<std::string, int> PartitionID;

[Fady Samuel, 2014/06/16 22:02:32]

Pairs are less readable. I think it would be preferable to do a struct.

struct WebViewPartitionInfo {
  int web_view_count;
  std::string partition_id;
};

[Xi Han, 2014/06/17 13:42:30]

Good idea, thanks.

+  typedef std::map<int, PartitionID> WebViewPartitionIDMap;
 
   ExtensionRendererState();
   ~ExtensionRendererState();
@@ -73,12 +79,14 @@ class ExtensionRendererState {
 
   // Adds or removes a <webview> guest render process from the set.
   void AddWebView(int render_process_host_id, int routing_id,
+                  const std::string& partition_id,

[Fady Samuel, 2014/06/16 22:02:32]

Unnecessary.

[Xi Han, 2014/06/17 13:42:30]

Good catch!

                   const WebViewInfo& webview_info);
   void RemoveWebView(int render_process_host_id, int routing_id);
 
   TabObserver* observer_;
   TabAndWindowIdMap map_;
   WebViewInfoMap webview_info_map_;
+  WebViewPartitionIDMap webview_partition_id_map_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionRendererState);
 };