Merge 83754 - blob_storage_controller.cc assert from this bug was caused by the fact that worker ...

content/browser/child_process_security_policy.h

 // Copyright (c) 2011 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.
 
 #ifndef CONTENT_BROWSER_CHILD_PROCESS_SECURITY_POLICY_H_
 #define CONTENT_BROWSER_CHILD_PROCESS_SECURITY_POLICY_H_
 
 #pragma once
 
 #include <map>
@@ skipping 48 matching lines @@
   // Schemes listed as disabled take precedence over Web-safe schemes.
   void RegisterDisabledSchemes(const std::set<std::string>& schemes);
 
   // Returns true iff |scheme| is listed as a disabled scheme.
   bool IsDisabledScheme(const std::string& scheme);
 
   // Upon creation, child processes should register themselves by calling this
   // this method exactly once.
   void Add(int child_id);
 
+  // Upon creation, worker thread child processes should register themselves by
+  // calling this this method exactly once. Workers that are not shared will
+  // inherit permissions from their parent renderer process identified with
+  // |main_render_process_id|.
+  void AddWorker(int worker_child_id, int main_render_process_id);
+
   // Upon destruction, child processess should unregister themselves by caling
   // this method exactly once.
   void Remove(int child_id);
 
   // Whenever the browser processes commands the child process to request a URL,
   // it should call this method to grant the child process the capability to
   // request the URL.
   void GrantRequestURL(int child_id, const GURL& url);
 
   // Whenever the user picks a file from a <input type="file"> element, the
@@ skipping 65 matching lines @@
 
  private:
   friend class ChildProcessSecurityPolicyInProcessBrowserTest;
   FRIEND_TEST_ALL_PREFIXES(ChildProcessSecurityPolicyInProcessBrowserTest,
                            NoLeak);
 
   class SecurityState;
 
   typedef std::set<std::string> SchemeSet;
   typedef std::map<int, SecurityState*> SecurityStateMap;
+  typedef std::map<int, int> WorkerToMainProcessMap;
 
   // Obtain an instance of ChildProcessSecurityPolicy via GetInstance().
   ChildProcessSecurityPolicy();
   friend struct DefaultSingletonTraits<ChildProcessSecurityPolicy>;
 
-  // You must acquire this lock before reading or writing any members of this
+  // Adds child process during registration.
+  void AddChild(int child_id);
+
+  // Determines if certain permissions were granted for a file to given child
+  // process. |permissions| must be a bit-set of base::PlatformFileFlags.
+  bool ChildProcessHasPermissionsForFile(int child_id,
+                                         const FilePath& file,
+                                         int permissions);
+
+    // You must acquire this lock before reading or writing any members of this
   // class.  You must not block while holding this lock.
   base::Lock lock_;
 
   // These schemes are white-listed for all child processes.  This set is
   // protected by |lock_|.
   SchemeSet web_safe_schemes_;
 
   // These schemes do not actually represent retrievable URLs.  For example,
   // the the URLs in the "about" scheme are aliases to other URLs.  This set is
   // protected by |lock_|.
   SchemeSet pseudo_schemes_;
 
   // These schemes are disabled by policy, and child processes are always
   // denied permission to request them. This overrides |web_safe_schemes_|.
   // This set is protected by |lock_|.
   SchemeSet disabled_schemes_;
 
   // This map holds a SecurityState for each child process.  The key for the
   // map is the ID of the ChildProcessHost.  The SecurityState objects are
   // owned by this object and are protected by |lock_|.  References to them must
   // not escape this class.
   SecurityStateMap security_state_;
 
+  // This maps keeps the record of which js worker thread child process
+  // corresponds to which main js thread child process.
+  WorkerToMainProcessMap worker_map_;
+
   DISALLOW_COPY_AND_ASSIGN(ChildProcessSecurityPolicy);
 };
 
 #endif  // CONTENT_BROWSER_CHILD_PROCESS_SECURITY_POLICY_H_