Enable NPAPI if policy has plugin policies.

chrome/browser/policy/chrome_browser_policy_connector.cc

Index: chrome/browser/policy/chrome_browser_policy_connector.cc
diff --git a/chrome/browser/policy/chrome_browser_policy_connector.cc b/chrome/browser/policy/chrome_browser_policy_connector.cc
index cb8d071b006eb9b6a1c423e6c88ac756b0a1f588..df1b348d54e8a3346dd8f385904b70c204b091be 100644
--- a/chrome/browser/policy/chrome_browser_policy_connector.cc
+++ b/chrome/browser/policy/chrome_browser_policy_connector.cc
@@ -88,8 +88,6 @@ void ChromeBrowserPolicyConnector::Init(
 
   BrowserPolicyConnector::Init(
       local_state, request_context, device_management_service.Pass());
-
-  AppendExtraFlagsPerPolicy();
 }
 
 ConfigurationPolicyProvider*
@@ -123,28 +121,4 @@ ConfigurationPolicyProvider*
 #endif
 }
 
-void ChromeBrowserPolicyConnector::AppendExtraFlagsPerPolicy() {
-  PolicyService* policy_service = GetPolicyService();
-  PolicyNamespace chrome_ns = PolicyNamespace(POLICY_DOMAIN_CHROME, "");
-  const PolicyMap& chrome_policy = policy_service->GetPolicies(chrome_ns);
-  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
-
-  if (command_line->HasSwitch(switches::kEnableNpapi))
-    return;
-
-  // The list of Plugin related policies that re-enable NPAPI. Remove once NPAPI
-  // is dead.
-  const std::string plugin_policies[] = { key::kEnabledPlugins,
-                                          key::kPluginsAllowedForUrls,
-                                          key::kPluginsBlockedForUrls,
-                                          key::kDisabledPluginsExceptions,
-                                          key::kDisabledPlugins };
-  for (auto policy : plugin_policies) {
-    if (chrome_policy.GetValue(policy)) {
-      command_line->AppendSwitch(switches::kEnableNpapi);
-      break;
-    }
-  }
-}
-
 }  // namespace policy