Plugin Power Saver: Overhaul plugin-power-saver flags. Show in UI.

chrome/renderer/chrome_content_renderer_client.cc

 // Copyright (c) 2012 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/renderer/chrome_content_renderer_client.h"
 
 #include "base/command_line.h"
 #include "base/debug/crash_logging.h"
 #include "base/logging.h"
 #include "base/metrics/field_trial.h"
@@ skipping 741 matching lines @@
             ? CONTENT_SETTINGS_TYPE_JAVASCRIPT
             : CONTENT_SETTINGS_TYPE_PLUGINS;
 
     if ((status_value ==
              ChromeViewHostMsg_GetPluginInfo_Status::kUnauthorized ||
          status_value == ChromeViewHostMsg_GetPluginInfo_Status::kBlocked) &&
         observer->IsPluginTemporarilyAllowed(identifier)) {
       status_value = ChromeViewHostMsg_GetPluginInfo_Status::kAllowed;
     }
 
-#if defined(ENABLE_PLUGINS)
-    if (status_value == ChromeViewHostMsg_GetPluginInfo_Status::kAllowed &&
-        base::CommandLine::ForCurrentProcess()->HasSwitch(
-            switches::kEnablePluginPowerSaver)) {
-      status_value =
-          ChromeViewHostMsg_GetPluginInfo_Status::kPlayImportantContent;
-    }
-#endif
-
 #if defined(OS_WIN)
     // In Windows we need to check if we can load NPAPI plugins.
     // For example, if the render view is in the Ash desktop, we should not.
-    if (status_value == ChromeViewHostMsg_GetPluginInfo_Status::kAllowed &&
+    // If user is on ALLOW or DETECT setting, loading needs to be blocked here.
+    if ((status_value == ChromeViewHostMsg_GetPluginInfo_Status::kAllowed ||
+         status_value ==
+             ChromeViewHostMsg_GetPluginInfo_Status::kPlayImportantContent) &&
         info.type == content::WebPluginInfo::PLUGIN_TYPE_NPAPI) {
         if (observer->AreNPAPIPluginsBlocked())
           status_value =
               ChromeViewHostMsg_GetPluginInfo_Status::kNPAPINotSupported;
     }
 #endif
 
     auto create_blocked_plugin =
         [&render_frame, &frame, &params, &info, &identifier, &group_name](
             int template_id, const base::string16& message) {
@@ skipping 856 matching lines @@
   if (mime_type == content::kBrowserPluginMimeType) {
     return new extensions::ExtensionsGuestViewContainer(render_frame);
   } else {
     return new extensions::MimeHandlerViewContainer(
         render_frame, mime_type, original_url);
   }
 #else
   return NULL;
 #endif
 }