Whitelisting exts and plugins from cross-site document blocking

content/child/site_isolation_policy.h

Index: content/child/site_isolation_policy.h
diff --git a/content/child/site_isolation_policy.h b/content/child/site_isolation_policy.h
index bf816a967b4298e60c485a6434d7fcdc75e01472..ec5d889409d3b471acb55d60aaf4306d1fbb1b0c 100644
--- a/content/child/site_isolation_policy.h
+++ b/content/child/site_isolation_policy.h
@@ -54,6 +54,8 @@ namespace content {
 
 class CONTENT_EXPORT SiteIsolationPolicy {
  public:
+  // Set activation flag for the UMA data collection for this renderer process.
+  static void SetPolicyEnabled(bool enabled);
 
   // Records the bookkeeping data about the HTTP header information for the
   // request identified by |request_id|. The bookkeeping data is used by
@@ -63,6 +65,7 @@ class CONTENT_EXPORT SiteIsolationPolicy {
                                  GURL& frame_origin,
                                  GURL& response_url,
                                  ResourceType::Type resource_type,
+                                 int origin_pid,
                                  const webkit_glue::ResourceResponseInfo& info);
 
   // Examines the first network packet in case response_url is registered as a
@@ -167,6 +170,10 @@ private:
   // decision. The key is a request id maintained by ResourceDispatcher.
   static RequestIdToResultMap* GetRequestIdToResultMap();
 
+  // This is false by default, but enables UMA logging and cross-site document
+  // blocking.
+  static bool g_policy_enabled;
+
   // Never needs to be constructed/destructed.
   SiteIsolationPolicy() {}
   ~SiteIsolationPolicy() {}