Plugin Power Saver: Remove racy portion of tests.

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 5f98efcb66db10c686c9e4ffb8de92ffe5bae40a..4ef19aa93ca9d47446f118d97b98b556636b7d83 100644
--- a/chrome/browser/plugins/plugin_power_saver_browsertest.cc
+++ b/chrome/browser/plugins/plugin_power_saver_browsertest.cc
@@ -13,7 +13,6 @@
 #include "base/test/scoped_feature_list.h"
 #include "build/build_config.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
-#include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
@@ -570,10 +569,6 @@ IN_PROC_BROWSER_TEST_F(PluginPowerSaverBrowserTest, BlockTinyPlugins) {
   VerifyPluginIsPlaceholderOnly("tiny_cross_origin_1");
   VerifyPluginIsPlaceholderOnly("tiny_cross_origin_2");
   VerifyPluginIsPlaceholderOnly("completely_obscured");
-
-  TabSpecificContentSettings* tab_specific_content_settings =
-      TabSpecificContentSettings::FromWebContents(GetActiveWebContents());
-  EXPECT_FALSE(tab_specific_content_settings->blocked_plugin_names().empty());

[tommycli, 2017/04/20 18:42:14]

This portion never flaked by coincidence, since VerifyPluginMarkedEssential
waited on some stuff from the renderer long enough to always win the race...

However, once FilterSameOriginTinyPlugin feature is enabled by default, we are
going to consolidate the two tests, so it's worth just removing this racy
portion now.

 }
 
 IN_PROC_BROWSER_TEST_F(PluginPowerSaverBrowserTest, BackgroundTabTinyPlugins) {
@@ -617,16 +612,10 @@ class PluginPowerSaverFilterSameOriginTinyPluginsBrowserTest
   base::test::ScopedFeatureList feature_list;
 };
 
-// Flaky on every platform. crbug.com/680544, crbug.com/682039
 IN_PROC_BROWSER_TEST_F(PluginPowerSaverFilterSameOriginTinyPluginsBrowserTest,
-                       DISABLED_BlockSameOriginTinyPlugin) {
+                       BlockSameOriginTinyPlugin) {
   LoadHTML("/same_origin_tiny_plugin.html");
-
   VerifyPluginIsPlaceholderOnly("tiny_same_origin");
-
-  TabSpecificContentSettings* tab_specific_content_settings =
-      TabSpecificContentSettings::FromWebContents(GetActiveWebContents());
-  EXPECT_FALSE(tab_specific_content_settings->blocked_plugin_names().empty());
 }
 
 // Separate test case with HTML By Default feature flag on.