Enable NPAPI if policy has plugin policies.

chrome/browser/policy/chrome_browser_policy_connector.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 "chrome/browser/policy/chrome_browser_policy_connector.h"
 
 #include <string>
 
 #include "base/callback.h"
 #include "base/command_line.h"
@@ skipping 70 matching lines @@
   scoped_ptr<DeviceManagementService::Configuration> configuration(
       new DeviceManagementServiceConfiguration(
           BrowserPolicyConnector::GetDeviceManagementUrl()));
   scoped_ptr<DeviceManagementService> device_management_service(
       new DeviceManagementService(configuration.Pass()));
   device_management_service->ScheduleInitialization(
       kServiceInitializationStartupDelay);
 
   BrowserPolicyConnector::Init(
       local_state, request_context, device_management_service.Pass());
-
-  AppendExtraFlagsPerPolicy();
 }
 
 ConfigurationPolicyProvider*
     ChromeBrowserPolicyConnector::CreatePlatformProvider() {
 #if defined(OS_WIN)
   scoped_ptr<AsyncPolicyLoader> loader(PolicyLoaderWin::Create(
       BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE),
       kRegistryChromePolicyKey));
   return new AsyncPolicyProvider(GetSchemaRegistry(), loader.Pass());
 #elif defined(OS_MACOSX)
@@ skipping 13 matching lines @@
   } else {
     return NULL;
   }
 #elif defined(OS_ANDROID)
   return new PolicyProviderAndroid();
 #else
   return NULL;
 #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