Implement PluginsPermissionContext and hookup to flash download interception.

chrome/browser/plugins/flash_download_interception.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/plugins/flash_download_interception.h"
 
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/string_util.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
-#include "chrome/browser/plugins/plugins_field_trial.h"
+#include "chrome/browser/permissions/permission_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_features.h"
-#include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "components/navigation_interception/intercept_navigation_throttle.h"
 #include "components/navigation_interception/navigation_params.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/navigation_handle.h"
+#include "content/public/browser/permission_type.h"
+#include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
+#include "third_party/WebKit/public/platform/modules/permissions/permission_status.mojom.h"
 
 using content::BrowserThread;
 using content::NavigationHandle;
 using content::NavigationThrottle;
 
 namespace {
 
 const char kFlashDownloadURL[] = "get.adobe.com/flashplayer";
 
+void DoNothing(blink::mojom::PermissionStatus result) {}

[tommycli, 2016/09/19 16:44:26]

Don't we need to refresh the page after getting the permission? Or is that a
TODO?

[raymes, 2016/09/21 05:46:06]

This happens in FlashPermissionContext::UpdateTabContext. Currently we're just
displaying an infobar which asks the user to refresh the page which we thought
may be better, but we can refresh the page directly if it makes more sense.

[tommycli, 2016/09/23 23:27:26]

Sounds good. The CL as-is makes sense, but I think we will probably want to
refresh directly. At least, that's what Other Browsers do.

Maybe play with it and give me your take?

+
 bool ShouldInterceptNavigation(
     content::WebContents* source,
     const navigation_interception::NavigationParams& params) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  // TODO(crbug.com/626728): Implement permission prompt logic.
+  PermissionManager* manager = PermissionManager::Get(
+      Profile::FromBrowserContext(source->GetBrowserContext()));
+  content::RenderFrameHost* rfh = source->GetMainFrame();

[dominickn, 2016/09/19 05:54:22]

Nit: inline source->GetMainFrame() and use source->GetLastCommitedURL()? Then
you don't need to #include render_frame_host.h

[raymes, 2016/09/21 05:46:05]

Done.

+  manager->RequestPermission(content::PermissionType::PLUGINS, rfh,
+                             rfh->GetLastCommittedURL(), true,
+                             base::Bind(&DoNothing));
+
   return true;
 }
 
 }  // namespace
 
 // static
 std::unique_ptr<NavigationThrottle>
 FlashDownloadInterception::MaybeCreateThrottleFor(NavigationHandle* handle) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   if (!base::FeatureList::IsEnabled(features::kPreferHtmlOverPlugins))
     return nullptr;
 
   if (!handle->HasUserGesture())
     return nullptr;
 
   if (!base::StartsWith(handle->GetURL().GetContent(), kFlashDownloadURL,
                         base::CompareCase::INSENSITIVE_ASCII)) {
     return nullptr;
   }
 
+  GURL page_url = handle->GetWebContents()->GetLastCommittedURL();
+
   Profile* profile = Profile::FromBrowserContext(
       handle->GetWebContents()->GetBrowserContext());
-  HostContentSettingsMap* host_content_settings_map =
-      HostContentSettingsMapFactory::GetForProfile(profile);
-  GURL page_url = handle->GetWebContents()->GetLastCommittedURL();
+  PermissionManager* manager = PermissionManager::Get(profile);
+  blink::mojom::PermissionStatus status = manager->GetPermissionStatus(
+      content::PermissionType::PLUGINS, page_url, page_url);
 
-  std::unique_ptr<base::Value> general_setting =
-      host_content_settings_map->GetWebsiteSetting(
-          page_url, page_url, CONTENT_SETTINGS_TYPE_PLUGINS, std::string(),

[raymes, 2016/09/19 05:40:28]

We need to decide if we should be passing the resource identifier here.

-          nullptr);
-  ContentSetting plugin_setting =
-      content_settings::ValueToContentSetting(general_setting.get());
-  plugin_setting = PluginsFieldTrial::EffectiveContentSetting(
-      CONTENT_SETTINGS_TYPE_PLUGINS, plugin_setting);
-
-  if (plugin_setting != CONTENT_SETTING_DETECT_IMPORTANT_CONTENT)
+  if (status != blink::mojom::PermissionStatus::ASK)

[tommycli, 2016/09/19 16:44:26]

As I understand it, the code was moved because the Permission Manager needs this
content settings check anyways?

[raymes, 2016/09/21 05:46:05]

Correct - the code is pretty much needed there so I think it makes sense just to
call it through there.

     return nullptr;
 
   return base::MakeUnique<navigation_interception::InterceptNavigationThrottle>(
       handle, base::Bind(&ShouldInterceptNavigation), true);
 }