Alter the design of the bootstrap sandbox to only take over the bootstrap port of children when nec…

content/browser/bootstrap_sandbox_mac.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 "content/browser/bootstrap_sandbox_mac.h"
 
 #include "base/logging.h"
 #include "base/mac/mac_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
@@ skipping 22 matching lines @@
       const ChildProcessData& data) OVERRIDE;
   virtual void BrowserChildProcessCrashed(
       const ChildProcessData& data) OVERRIDE;
 
  private:
   friend struct DefaultSingletonTraits<BootstrapSandboxPolicy>;
   BootstrapSandboxPolicy();
   virtual ~BootstrapSandboxPolicy();
 
   void RegisterSandboxPolicies();
-  void RegisterNPAPIPolicy();
 
   scoped_ptr<sandbox::BootstrapSandbox> sandbox_;
 };
 
 BootstrapSandboxPolicy* BootstrapSandboxPolicy::GetInstance() {
   return Singleton<BootstrapSandboxPolicy>::get();
 }
 
 void BootstrapSandboxPolicy::BrowserChildProcessHostDisconnected(
       const ChildProcessData& data) {
@@ skipping 10 matching lines @@
   CHECK(sandbox_.get());
   BrowserChildProcessObserver::Add(this);
   RegisterSandboxPolicies();
 }
 
 BootstrapSandboxPolicy::~BootstrapSandboxPolicy() {
   BrowserChildProcessObserver::Remove(this);
 }
 
 void BootstrapSandboxPolicy::RegisterSandboxPolicies() {
-  RegisterNPAPIPolicy();
-}
-
-void BootstrapSandboxPolicy::RegisterNPAPIPolicy() {
-  sandbox::BootstrapSandboxPolicy policy;
-  policy.default_rule = sandbox::Rule(sandbox::POLICY_ALLOW);
-  policy.rules[kBootstrapPortNameForNPAPIPlugins] =
-      sandbox::Rule(sandbox_->real_bootstrap_port());
-  sandbox_->RegisterSandboxPolicy(SANDBOX_TYPE_NPAPI, policy);
 }
 
 }  // namespace
 
 bool ShouldEnableBootstrapSandbox() {
   return base::mac::IsOSMountainLionOrEarlier() ||
          base::mac::IsOSMavericks();
 }
 
 sandbox::BootstrapSandbox* GetBootstrapSandbox() {
   return BootstrapSandboxPolicy::GetInstance()->sandbox();
 }
 
 }  // namespace content