Store USB device permissions in website settings.

chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc

Index: chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
index 8504b44a68e2bcec3cdacf7801f465bc80fdd01f..18a2c7eeaadda6447658320c5599eba1acc9fa91 100644
--- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
+++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
@@ -19,16 +19,16 @@
 #include "chrome/browser/engagement/site_engagement_service.h"
 #include "chrome/browser/engagement/site_engagement_service_factory.h"
 #include "chrome/browser/favicon/favicon_service_factory.h"
-#include "chrome/browser/geolocation/geolocation_permission_context_factory.h"
 #include "chrome/browser/google/google_url_tracker_factory.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/invalidation/profile_invalidation_provider_factory.h"
 #include "chrome/browser/media_galleries/media_galleries_preferences_factory.h"
 #include "chrome/browser/notifications/extension_welcome_notification_factory.h"
-#include "chrome/browser/notifications/notification_permission_context_factory.h"
 #include "chrome/browser/notifications/notifier_state_tracker_factory.h"
 #include "chrome/browser/password_manager/password_manager_setting_migrator_service.h"
 #include "chrome/browser/password_manager/password_store_factory.h"
+#include "chrome/browser/permissions/chooser_context.h"
+#include "chrome/browser/permissions/permission_context.h"
 #include "chrome/browser/plugins/plugin_prefs_factory.h"
 #include "chrome/browser/policy/profile_policy_connector_factory.h"
 #include "chrome/browser/predictors/autocomplete_action_predictor_factory.h"
@@ -111,9 +111,7 @@
 #include "chrome/browser/ui/gesture_prefs_observer_factory_aura.h"
 #endif
 
-#if defined(OS_ANDROID) || defined(OS_CHROMEOS)
-#include "chrome/browser/media/protected_media_identifier_permission_context_factory.h"
-#else
+#if !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
 #include "chrome/browser/signin/cross_device_promo_factory.h"
 #endif
 
@@ -194,10 +192,7 @@ EnsureBrowserContextKeyedServiceFactoriesBuilt() {
 #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION)
   CaptivePortalServiceFactory::GetInstance();
 #endif
-  GeolocationPermissionContextFactory::GetInstance();
-#if defined(OS_ANDROID) || defined(OS_CHROMEOS)
-  ProtectedMediaIdentifierPermissionContextFactory::GetInstance();
-#endif
+  ChooserContext::GetFactories();
 #if defined(ENABLE_PRINT_PREVIEW)
   CloudPrintProxyServiceFactory::GetInstance();
 #endif
@@ -209,7 +204,6 @@ EnsureBrowserContextKeyedServiceFactoriesBuilt() {
 #if defined(ENABLE_EXTENSIONS)
   ExtensionWelcomeNotificationFactory::GetInstance();
 #endif
-  NotificationPermissionContextFactory::GetInstance();

[raymes, 2015/10/29 06:14:41]

How come this stuff has changed?

[Reilly Grant (use Gerrit), 2015/10/29 20:59:59]

Because I like making unrelated changes in a single CL. :P

   NotifierStateTrackerFactory::GetInstance();
 #endif  // defined(ENABLE_NOTIFICATIONS)
   dom_distiller::DomDistillerServiceFactory::GetInstance();
@@ -275,6 +269,7 @@ EnsureBrowserContextKeyedServiceFactoriesBuilt() {
 #endif
   PasswordStoreFactory::GetInstance();
   PasswordManagerSettingMigratorService::Factory::GetInstance();
+  PermissionContext::GetFactories();
 #if !defined(OS_ANDROID)
   PinnedTabServiceFactory::GetInstance();
 #endif