Enable NPAPI plugins if any plugin policies are set.

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"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/browser/policy/configuration_policy_handler_list_factory.h"
 #include "chrome/browser/policy/device_management_service_configuration.h"
 #include "chrome/common/chrome_paths.h"
 #include "components/policy/core/common/async_policy_provider.h"
 #include "components/policy/core/common/cloud/device_management_service.h"
 #include "components/policy/core/common/configuration_policy_provider.h"
 #include "components/policy/core/common/policy_map.h"
 #include "components/policy/core/common/policy_namespace.h"
 #include "components/policy/core/common/policy_service.h"
 #include "components/policy/core/common/policy_types.h"
 #include "components/signin/core/common/signin_switches.h"
 #include "content/public/browser/browser_thread.h"
+#include "content/public/common/content_switches.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "policy/policy_constants.h"
 
 #if defined(OS_WIN)
 #include "components/policy/core/common/policy_loader_win.h"
 #elif defined(OS_MACOSX)
 #include <CoreFoundation/CoreFoundation.h>
 #include "components/policy/core/common/policy_loader_mac.h"
 #include "components/policy/core/common/preferences_mac.h"
 #elif defined(OS_POSIX) && !defined(OS_ANDROID)
@@ skipping 44 matching lines @@
       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());
 
-  AppendExtraFlagPerPolicy();
+  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::AppendExtraFlagPerPolicy() {
+void ChromeBrowserPolicyConnector::AppendExtraFlagsPerPolicy() {
   PolicyService* policy_service = GetPolicyService();
   PolicyNamespace chrome_ns = PolicyNamespace(POLICY_DOMAIN_CHROME, "");
   const PolicyMap& chrome_policy = policy_service->GetPolicies(chrome_ns);
   const base::Value* policy_value =
       chrome_policy.GetValue(key::kEnableDeprecatedWebBasedSignin);
   bool enabled = false;
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
   if (policy_value && policy_value->GetAsBoolean(&enabled) && enabled) {
     if (!command_line->HasSwitch(switches::kEnableWebBasedSignin))
       command_line->AppendSwitch(switches::kEnableWebBasedSignin);
     // In M41, to fully enable web-based sign in, the kEnableIframeBasedSignin
     // must also be specified.
     if (!command_line->HasSwitch(switches::kEnableIframeBasedSignin))
       command_line->AppendSwitch(switches::kEnableIframeBasedSignin);
   }
+
+  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 };

[Andrew T Wilson (Slow), 2015/02/20 10:28:27]

I suspect checking DisabledPlugins is not needed here (shouldn't by itself
re-enable NPAPI), but it's fine to leave this in under the goal of "casting a
wide net".

+  for (auto policy : plugin_policies) {
+    if (chrome_policy.GetValue(policy)) {
+      command_line->AppendSwitch(switches::kEnableNpapi);
+      break;
+    }
+  }
 }
 
 }  // namespace policy