Revert of [HBD] Intercept Flash navigations in popup windows.

chrome/browser/plugins/flash_permission_browsertest.cc

 // Copyright 2016 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/base_switches.h"
 #include "base/command_line.h"
-#include "base/memory/ptr_util.h"
 #include "base/path_service.h"
 #include "chrome/browser/permissions/permissions_browsertest.h"
 #include "chrome/browser/ui/website_settings/mock_permission_prompt_factory.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "components/variations/variations_switches.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/ppapi_test_utils.h"
@@ skipping 59 matching lines @@
 }
 
 IN_PROC_BROWSER_TEST_F(FlashPermissionBrowserTest, CommonFailsIfBlocked) {
   CommonFailsIfBlocked();
 }
 
 IN_PROC_BROWSER_TEST_F(FlashPermissionBrowserTest, CommonSucceedsIfAllowed) {
   CommonSucceedsIfAllowed();
 }
 
-IN_PROC_BROWSER_TEST_F(FlashPermissionBrowserTest, SucceedsInPopupWindow) {
-  // Spawn the same page in a popup window and wait for it to finish loading.
-  content::WebContents* original_contents = GetWebContents();
-  ASSERT_TRUE(RunScriptReturnBool("spawnPopupAndAwaitLoad();"));
-
-  // Assert that the popup's WebContents is now the active one.
-  ASSERT_NE(original_contents, GetWebContents());
-
-  PermissionRequestManager* manager = PermissionRequestManager::FromWebContents(
-      GetWebContents());
-  auto popup_prompt_factory =
-      base::MakeUnique<MockPermissionPromptFactory>(manager);
-  manager->DisplayPendingRequests();
-
-  EXPECT_EQ(0, popup_prompt_factory->total_request_count());
-  popup_prompt_factory->set_response_type(PermissionRequestManager::ACCEPT_ALL);
-  // FlashPermissionContext::UpdateTabContext will reload the page, we'll have
-  // to wait until it is ready.
-  PageReloadWaiter reload_waiter(GetWebContents());
-  EXPECT_TRUE(RunScriptReturnBool("triggerPrompt();"));
-  EXPECT_TRUE(reload_waiter.Wait());
-
-  EXPECT_TRUE(FeatureUsageSucceeds());
-  EXPECT_EQ(1, popup_prompt_factory->total_request_count());
-
-  // Shut down the popup window tab, as the normal test teardown assumes there
-  // is only one test tab.
-  popup_prompt_factory.reset();
-  GetWebContents()->Close();
-}
-
 IN_PROC_BROWSER_TEST_F(FlashPermissionBrowserTest, TriggerPromptViaNewWindow) {
   EXPECT_EQ(0, prompt_factory()->total_request_count());
   prompt_factory()->set_response_type(PermissionRequestManager::ACCEPT_ALL);
   EXPECT_TRUE(RunScriptReturnBool("triggerPromptViaNewWindow();"));
 
   EXPECT_TRUE(FeatureUsageSucceeds());
   EXPECT_EQ(1, prompt_factory()->total_request_count());
 }
 
 IN_PROC_BROWSER_TEST_F(FlashPermissionBrowserTest,
@@ skipping 35 matching lines @@
       browser(), GURL("file://" + test_path.AsUTF8Unsafe() + test_url()));
   CommonFailsIfBlocked();
   EXPECT_EQ(1, prompt_factory()->total_request_count());
 
   // Navigate to a second URL to verify it's blocked on all file: URLs.
   ui_test_utils::NavigateToURL(
       browser(),
       GURL("file://" + test_path.AsUTF8Unsafe() + "/permissions/flash2.html"));
   EXPECT_FALSE(FeatureUsageSucceeds());
 }