[HBD] Only use Plugin Content Settings for Flash.

chrome/browser/plugins/plugin_power_saver_browsertest.cc

 // Copyright 2015 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 <stdint.h>
 #include <string>
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/stl_util.h"
@@ skipping 13 matching lines @@
 #include "content/public/browser/readback_types.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/ppapi_test_utils.h"
 #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"
 #include "ui/display/display.h"
 #include "ui/display/display_switches.h"
 #include "ui/display/screen.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/geometry/point.h"
 
 namespace {
@@ skipping 222 matching lines @@
     InProcessBrowserTest::SetUpOnMainThread();
     ASSERT_TRUE(embedded_test_server()->Start());
 
     embedded_test_server()->ServeFilesFromDirectory(
         ui_test_utils::GetTestFilePath(
             base::FilePath(FILE_PATH_LITERAL("plugin_power_saver")),
             base::FilePath()));
   }
 
   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.
     command_line->AppendSwitchASCII(switches::kForceDeviceScaleFactor, "1");
 
     // The pixel tests run more reliably in software mode.
     if (PixelTestsEnabled())
       command_line->AppendSwitch(switches::kDisableGpu);
   }
 
   void SetUpInProcessBrowserTestFixture() override {
     // 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:
   void LoadHTML(const std::string& html) {
     if (PixelTestsEnabled()) {
       gfx::Rect bounds(gfx::Rect(0, 0, kBrowserWidth, kBrowserHeight));
       gfx::Rect screen_bounds =
           display::Screen::GetScreen()->GetPrimaryDisplay().bounds();
       ASSERT_GT(screen_bounds.width(), kBrowserWidth);
       ASSERT_GT(screen_bounds.height(), kBrowserHeight);
@@ skipping 413 matching lines @@
   VerifyPluginMarkedEssential(GetActiveWebContents(), "expand_to_essential");
 }
 
 // Separate test case that allows tiny plugins. This requires a separate test
 // case, because we need to initialize the renderer with a different feature
 // setting.
 class PluginPowerSaverAllowTinyBrowserTest
     : public PluginPowerSaverBrowserTest {
  public:
   void SetUpInProcessBrowserTestFixture() override {
+    PluginPowerSaverBrowserTest::SetUpInProcessBrowserTestFixture();
     feature_list.InitAndDisableFeature(features::kBlockSmallContent);
   }
 
  private:
   base::test::ScopedFeatureList feature_list;
 };
 
 IN_PROC_BROWSER_TEST_F(PluginPowerSaverAllowTinyBrowserTest,
                        EssentialTinyPlugins) {
   LoadHTML(
       "<object id='tiny_cross_origin_1' data='http://a.com/fake.swf' "
       "    type='application/x-ppapi-tests' width='3' height='3'>"
       "</object>"
       "<object id='tiny_cross_origin_2' data='http://a.com/fake.swf' "
       "    type='application/x-ppapi-tests' width='1' height='1'>"
       "</object>");
 
   VerifyPluginMarkedEssential(GetActiveWebContents(), "tiny_cross_origin_1");
   VerifyPluginMarkedEssential(GetActiveWebContents(), "tiny_cross_origin_2");
 }