[HBD] Add Plugins permission type and PermissionContext

chrome/browser/permissions/permission_manager.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 "chrome/browser/permissions/permission_manager.h"
 
 #include <stddef.h>

[dominickn, 2016/09/14 07:18:42]

Nit: this should probably #include <memory> for std::unique_ptr

[raymes, 2016/09/15 03:40:30]

Done.

 
 #include "base/callback.h"
 #include "base/memory/ptr_util.h"
 #include "build/build_config.h"
 #include "chrome/browser/background_sync/background_sync_permission_context.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/media/midi_permission_context.h"
 #include "chrome/browser/media/webrtc/media_stream_device_permission_context.h"
 #include "chrome/browser/notifications/notification_permission_context.h"
 #include "chrome/browser/permissions/permission_context_base.h"
 #include "chrome/browser/permissions/permission_manager_factory.h"
 #include "chrome/browser/permissions/permission_request_id.h"
 #include "chrome/browser/permissions/permission_uma_util.h"
+#include "chrome/browser/plugins/plugins_permission_context.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/storage/durable_storage_permission_context.h"
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "chrome/common/features.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "content/public/browser/permission_type.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/web_contents.h"
 
@@ skipping 61 matching lines @@
       return CONTENT_SETTINGS_TYPE_DURABLE_STORAGE;
     case PermissionType::MIDI:
       // This will hit the NOTREACHED below.
       break;
     case PermissionType::AUDIO_CAPTURE:
       return CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC;
     case PermissionType::VIDEO_CAPTURE:
       return CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA;
     case PermissionType::BACKGROUND_SYNC:
       return CONTENT_SETTINGS_TYPE_BACKGROUND_SYNC;
+    case PermissionType::PLUGINS:
+      return CONTENT_SETTINGS_TYPE_PLUGINS;
     case PermissionType::NUM:
       // This will hit the NOTREACHED below.
       break;
   }
 
   NOTREACHED() << "Unknown content setting for permission "
                << static_cast<int>(permission);
   return CONTENT_SETTINGS_TYPE_DEFAULT;
 }
 
@@ skipping 100 matching lines @@
 // static
 PermissionManager* PermissionManager::Get(Profile* profile) {
   return PermissionManagerFactory::GetForProfile(profile);
 }
 
 PermissionManager::PermissionManager(Profile* profile)
     : profile_(profile),
       weak_ptr_factory_(this) {
   permission_contexts_[PermissionType::MIDI_SYSEX] =
       base::WrapUnique(new MidiPermissionContext(profile));
   permission_contexts_[PermissionType::PUSH_MESSAGING] =

[dominickn, 2016/09/14 07:18:43]

base::WrapUnique is dispreferred in favour of
base::MakeUnique<PluginsPermissionContext>(profile). While you're here, could
you change all of the WrapUniques to MakeUniques?

[raymes, 2016/09/15 03:40:30]

Done.

       base::WrapUnique(new NotificationPermissionContext(
           profile, PermissionType::PUSH_MESSAGING));
   permission_contexts_[PermissionType::NOTIFICATIONS] =
       base::WrapUnique(new NotificationPermissionContext(
           profile, PermissionType::NOTIFICATIONS));
 #if !BUILDFLAG(ANDROID_JAVA_UI)
   permission_contexts_[PermissionType::GEOLOCATION] =
       base::WrapUnique(new GeolocationPermissionContext(profile));
 #else
   permission_contexts_[PermissionType::GEOLOCATION] =
       base::WrapUnique(new GeolocationPermissionContextAndroid(profile));
 #endif
 #if defined(OS_CHROMEOS) || defined(OS_ANDROID)
   permission_contexts_[PermissionType::PROTECTED_MEDIA_IDENTIFIER] =
       base::WrapUnique(new ProtectedMediaIdentifierPermissionContext(profile));
 #endif
   permission_contexts_[PermissionType::DURABLE_STORAGE] =
       base::WrapUnique(new DurableStoragePermissionContext(profile));
   permission_contexts_[PermissionType::AUDIO_CAPTURE] =
       base::WrapUnique(new MediaStreamDevicePermissionContext(
           profile, content::PermissionType::AUDIO_CAPTURE,
           CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC));
   permission_contexts_[PermissionType::VIDEO_CAPTURE] =
       base::WrapUnique(new MediaStreamDevicePermissionContext(
           profile, content::PermissionType::VIDEO_CAPTURE,
           CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA));
   permission_contexts_[PermissionType::BACKGROUND_SYNC] =
       base::WrapUnique(new BackgroundSyncPermissionContext(profile));
+  permission_contexts_[PermissionType::PLUGINS] =
+      base::WrapUnique(new PluginsPermissionContext(profile));
 }
 
 PermissionManager::~PermissionManager() {
   if (!subscriptions_.IsEmpty())
     HostContentSettingsMapFactory::GetForProfile(profile_)
         ->RemoveObserver(this);
 }
 
 int PermissionManager::RequestPermission(
     PermissionType permission,
@@ skipping 212 matching lines @@
     // Add the callback to |callbacks| which will be run after the loop to
     // prevent re-entrance issues.
     callbacks.push_back(
         base::Bind(subscription->callback,
                    ContentSettingToPermissionStatus(new_value)));
   }
 
   for (const auto& callback : callbacks)
     callback.Run();
 }