[HBD] Only use Plugin Content Settings for Flash.

chrome/browser/plugins/plugin_power_saver_browsertest.cc

Index: chrome/browser/plugins/plugin_power_saver_browsertest.cc
diff --git a/chrome/browser/plugins/plugin_power_saver_browsertest.cc b/chrome/browser/plugins/plugin_power_saver_browsertest.cc
index 48739e5f85784baa43d9f11d032a604e2b6a0003..770ed2b365da3d7337f20acd959de0b17b59519e 100644
--- a/chrome/browser/plugins/plugin_power_saver_browsertest.cc
+++ b/chrome/browser/plugins/plugin_power_saver_browsertest.cc
@@ -31,7 +31,6 @@
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "net/test/embedded_test_server/http_request.h"
 #include "net/test/embedded_test_server/http_response.h"
-#include "ppapi/shared_impl/ppapi_switches.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/window_open_disposition.h"
@@ -274,11 +273,7 @@ class PluginPowerSaverBrowserTest : public InProcessBrowserTest {
   }
 
   void SetUpCommandLine(base::CommandLine* command_line) override {
-    command_line->AppendSwitch(switches::kEnablePepperTesting);
     command_line->AppendSwitch(switches::kEnablePluginPlaceholderTesting);
-    command_line->AppendSwitchASCII(
-        switches::kOverridePluginPowerSaverForTesting, "ignore-list");
-
     ASSERT_TRUE(ppapi::RegisterPowerSaverTestPlugin(command_line));
 
     // Allows us to use the same reference image on HiDPI/Retina displays.
@@ -293,6 +288,9 @@ class PluginPowerSaverBrowserTest : public InProcessBrowserTest {
     // Although this is redundant with the Field Trial testing configuration,
     // the official builders don't use those, so we also enable it here.
     feature_list.InitAndEnableFeature(features::kBlockSmallContent);
+
+    // Disable HTML5 By Default feature to test Plugin Power Saver specifically.
+    feature_list.InitAndDisableFeature(features::kPreferHtmlOverPlugins);
   }
 
  protected:
@@ -726,6 +724,7 @@ class PluginPowerSaverAllowTinyBrowserTest
     : public PluginPowerSaverBrowserTest {
  public:
   void SetUpInProcessBrowserTestFixture() override {
+    PluginPowerSaverBrowserTest::SetUpInProcessBrowserTestFixture();
     feature_list.InitAndDisableFeature(features::kBlockSmallContent);
   }