Hookup the plugin placeholder to the Flash permission prompt

chrome/browser/permissions/permissions_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 "chrome/browser/permissions/permissions_browsertest.h"
 
 #include "base/command_line.h"
 #include "chrome/browser/permissions/permission_request_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
@@ skipping 12 matching lines @@
 void PermissionsBrowserTest::SetUpOnMainThread() {
   InProcessBrowserTest::SetUpOnMainThread();
 
   PermissionRequestManager* manager = PermissionRequestManager::FromWebContents(
       browser()->tab_strip_model()->GetActiveWebContents());
   prompt_factory_.reset(new MockPermissionPromptFactory(manager));
   manager->DisplayPendingRequests();
 
   ASSERT_TRUE(embedded_test_server()->Start());
 
-  ui_test_utils::NavigateToURL(browser(),
-                               embedded_test_server()->GetURL(test_url()));
+  ui_test_utils::NavigateToURL(browser(), GetTestUrl());
 }
 
 void PermissionsBrowserTest::TearDownOnMainThread() {
   prompt_factory_.reset();
 
   InProcessBrowserTest::TearDownOnMainThread();
 }
 
 bool PermissionsBrowserTest::RunScriptReturnBool(const std::string& script) {
   bool result;
   EXPECT_TRUE(content::ExecuteScriptAndExtractBool(
       GetWebContents()->GetMainFrame(), script, &result));
   return result;
 }
 
 content::WebContents* PermissionsBrowserTest::GetWebContents() {
   return browser()->tab_strip_model()->GetActiveWebContents();
 }
 
+GURL PermissionsBrowserTest::GetTestUrl() {
+  return embedded_test_server()->GetURL(test_url());
+}
+
 void PermissionsBrowserTest::CommonFailsBeforeRequesting() {
   EXPECT_EQ(0, prompt_factory()->total_request_count());
   // Dismiss any prompts if they are shown when using the feature.
   prompt_factory()->set_response_type(PermissionRequestManager::DISMISS);
   EXPECT_FALSE(FeatureUsageSucceeds());
 }
 
 void PermissionsBrowserTest::CommonFailsIfDismissed() {
   EXPECT_EQ(0, prompt_factory()->total_request_count());
   prompt_factory()->set_response_type(PermissionRequestManager::DISMISS);
   TriggerPrompt();
 
+  EXPECT_FALSE(FeatureUsageSucceeds());
   EXPECT_EQ(1, prompt_factory()->total_request_count());
-  EXPECT_FALSE(FeatureUsageSucceeds());
 }
 
 void PermissionsBrowserTest::CommonFailsIfBlocked() {
   EXPECT_EQ(0, prompt_factory()->total_request_count());
   prompt_factory()->set_response_type(PermissionRequestManager::DENY_ALL);
   TriggerPrompt();
 
+  EXPECT_FALSE(FeatureUsageSucceeds());
   EXPECT_EQ(1, prompt_factory()->total_request_count());
-  EXPECT_FALSE(FeatureUsageSucceeds());
 }
 
 void PermissionsBrowserTest::CommonSucceedsIfAllowed() {
   EXPECT_EQ(0, prompt_factory()->total_request_count());
   prompt_factory()->set_response_type(PermissionRequestManager::ACCEPT_ALL);
   TriggerPrompt();
 
+  EXPECT_TRUE(FeatureUsageSucceeds());
   EXPECT_EQ(1, prompt_factory()->total_request_count());
-  EXPECT_TRUE(FeatureUsageSucceeds());
 }