Plugin Power Saver: Fix poster-click flaky test.

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 "base/command_line.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.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 "ppapi/shared_impl/ppapi_switches.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
 #include "ui/base/window_open_disposition.h"
 #include "ui/gfx/geometry/point.h"
 
 namespace {
 
 std::string RunTestScript(base::StringPiece test_script,
@@ skipping 67 matching lines @@
   EXPECT_TRUE(PluginLoaded(contents, element_id));
 }
 
 }  // namespace
 
 class PluginPowerSaverBrowserTest : virtual public InProcessBrowserTest {
  public:
   void SetUpCommandLine(base::CommandLine* command_line) override {
     command_line->AppendSwitch(switches::kEnablePluginPowerSaver);
     command_line->AppendSwitch(switches::kEnablePepperTesting);
+    command_line->AppendSwitch(switches::kEnablePluginPlaceholderTesting);
 
     ASSERT_TRUE(ppapi::RegisterPowerSaverTestPlugin(command_line));
   }
 
  protected:
   void LoadHTML(const char* html) {
     std::string url_str = "data:text/html;charset=utf-8,";
     url_str.append(html);
     ui_test_utils::NavigateToURL(browser(), GURL(url_str));
     EXPECT_TRUE(content::WaitForRenderFrameReady(
         GetActiveWebContents()->GetMainFrame()));
   }
 
   content::WebContents* GetActiveWebContents() {
     return browser()->tab_strip_model()->GetActiveWebContents();
   }
 
   // This sends a simulated click at |point| and waits for test plugin to send
   // a status message indicating that it is essential. The test plugin sends a
   // status message during:
   //  - Plugin creation, to handle a plugin freshly created from a poster.
   //  - Peripheral status change.
   //  - In response to the explicit 'getPowerSaverStatus' request, in case the
   //    test has missed the above two events.
   void SimulateClickAndAwaitMarkedEssential(const char* element_id,
                                             const gfx::Point& point) {
+    // Waits for the placeholder to be ready to be clicked first.
+    std::string result = RunTestScript(
+        "function handleEvent(event) {"
+        "  if (event.data === 'placeholderLoaded') {"
+        "    window.domAutomationController.send('ready');"
+        "    plugin.removeEventListener('message', handleEvent);"
+        "  }"
+        "}"
+        "plugin.addEventListener('message', handleEvent);"
+        "if (plugin.hasAttribute('placeholderLoaded')) {"
+        "  window.domAutomationController.send('ready');"
+        "  plugin.removeEventListener('message', handleEvent);"
+        "}",
+        GetActiveWebContents(), element_id);
+    ASSERT_EQ("ready", result);
+
     content::SimulateMouseClickAt(GetActiveWebContents(), 0 /* modifiers */,
                                   blink::WebMouseEvent::ButtonLeft, point);
 
     VerifyPluginMarkedEssential(GetActiveWebContents(), element_id);
   }
 };
 
 IN_PROC_BROWSER_TEST_F(PluginPowerSaverBrowserTest, SmallSameOrigin) {
   LoadHTML(
       "<object id='plugin' data='fake.swf' "
@@ skipping 38 matching lines @@
       "    width='400' height='500'"
       "    poster='snapshot1x.png 1x, snapshot2x.png 2x'></embed>");
 
   EXPECT_FALSE(PluginLoaded(GetActiveWebContents(), "plugin_src"));
   EXPECT_FALSE(PluginLoaded(GetActiveWebContents(), "plugin_srcset"));
   EXPECT_FALSE(PluginLoaded(GetActiveWebContents(), "plugin_legacy_syntax"));
   EXPECT_FALSE(PluginLoaded(GetActiveWebContents(), "plugin_embed_src"));
   EXPECT_FALSE(PluginLoaded(GetActiveWebContents(), "plugin_embed_srcset"));
 }
 
-// flaky: crbug.com/481687
 IN_PROC_BROWSER_TEST_F(PluginPowerSaverBrowserTest,
-                       DISABLED_PluginMarkedEssentialAfterPosterClicked) {
+                       PluginMarkedEssentialAfterPosterClicked) {
   LoadHTML(
       "<object id='plugin' type='application/x-ppapi-tests' "
       "    width='400' height='100' poster='snapshot1x.png'></object>");
   EXPECT_FALSE(PluginLoaded(GetActiveWebContents(), "plugin"));
 
   SimulateClickAndAwaitMarkedEssential("plugin", gfx::Point(50, 50));
 }
 
 IN_PROC_BROWSER_TEST_F(PluginPowerSaverBrowserTest, OriginWhitelisting) {
   LoadHTML(
@@ skipping 34 matching lines @@
 
   EXPECT_FALSE(PluginLoaded(background_contents, "same_origin"));
   EXPECT_FALSE(PluginLoaded(background_contents, "small_cross_origin"));
 
   browser()->tab_strip_model()->SelectNextTab();
   EXPECT_EQ(background_contents, GetActiveWebContents());
 
   VerifyPluginMarkedEssential(background_contents, "same_origin");
   VerifyPluginIsThrottled(background_contents, "small_cross_origin");
 }