Plugin Power Saver: Fix browsertest in official builds.

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 271 matching lines @@
     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 {
+    feature_list.InitAndEnableFeature(features::kBlockSmallContent);

[Nico, 2016/09/19 22:44:42]

maybe add a comment for why this is needed

[tommycli, 2016/09/19 23:10:07]

Done.

+  }
+
  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);
       browser()->window()->SetBounds(bounds);
     }
@@ skipping 94 matching lines @@
     // Flaky on Windows and Asan bots. See crbug.com/549285.
     return false;
 #elif defined(OS_CHROMEOS)
     // Because ChromeOS cannot use software rendering and the pixel tests
     // continue to flake with hardware acceleration, disable these on ChromeOS.
     return false;
 #else
     return true;
 #endif
   }
+
+ private:
+  base::test::ScopedFeatureList feature_list;
 };
 
 IN_PROC_BROWSER_TEST_F(PluginPowerSaverBrowserTest, EssentialPlugins) {
   LoadHTML(
       "<object id='small_same_origin' data='fake.swf' "
       "    type='application/x-ppapi-tests' width='400' height='100'>"
       "</object>"
       "<object id='small_same_origin_poster' data='fake.swf' "
       "    type='application/x-ppapi-tests' width='400' height='100' "
       "    poster='click_me.png'>"
@@ skipping 312 matching lines @@
       "<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");
 }