Plugin Power Saver: Remove racy portion of tests.

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"
 #include "base/strings/string_piece.h"
 #include "base/strings/stringprintf.h"
 #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"
 #include "chrome/common/chrome_features.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/test_switches.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "components/zoom/zoom_controller.h"
@@ skipping 536 matching lines @@
   VerifyPluginIsThrottled(GetActiveWebContents(), "plugin");
 }
 
 IN_PROC_BROWSER_TEST_F(PluginPowerSaverBrowserTest, BlockTinyPlugins) {
   LoadHTML("/block_tiny_plugins.html");
 
   VerifyPluginMarkedEssential(GetActiveWebContents(), "tiny_same_origin");
   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) {
   content::WebContents* background_contents =
       LoadHTMLInBackgroundTab("/background_tab_tiny_plugins.html");
   EXPECT_FALSE(PluginLoaded(background_contents, "tiny"));
 
   ActivateTab(background_contents);
   VerifyPluginIsPlaceholderOnly("tiny");
 }
@@ skipping 23 matching lines @@
     // Although this is redundant with the Field Trial testing configuration,
     // the official builders don't read that.
     feature_list.InitWithFeatures({features::kFilterSameOriginTinyPlugin},
                                   {features::kPreferHtmlOverPlugins});
   }
 
  private:
   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.
 class PluginPowerSaverPreferHtmlBrowserTest
     : public PluginPowerSaverBrowserTest {
  public:
   void SetUpInProcessBrowserTestFixture() override {
     // Although this is redundant with the Field Trial testing configuration,
     // the official builders don't read that.
     feature_list.InitAndEnableFeature(features::kPreferHtmlOverPlugins);
   }
 
  private:
   base::test::ScopedFeatureList feature_list;
 };
 
 IN_PROC_BROWSER_TEST_F(PluginPowerSaverPreferHtmlBrowserTest,
                        ThrottlePluginsOnAllowContentSetting) {
   HostContentSettingsMap* content_settings_map =
       HostContentSettingsMapFactory::GetForProfile(browser()->profile());
 
   content_settings_map->SetDefaultContentSetting(CONTENT_SETTINGS_TYPE_PLUGINS,
                                                  CONTENT_SETTING_ALLOW);
   LoadPeripheralPlugin();
   VerifyPluginIsThrottled(GetActiveWebContents(), "plugin");
 }