Clean-up refactoring of chrome_content_browser_client to use GetPermissionContext consistently.

chrome/browser/chrome_content_browser_client.cc

 // Copyright (c) 2012 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/chrome_content_browser_client.h"
 
 #include <set>
 #include <utility>
 #include <vector>
 
@@ skipping 614 matching lines @@
 PermissionContextBase* GetPermissionContext(Profile* profile,
     content::PermissionType permission) {
   switch (permission) {
     case content::PERMISSION_MIDI_SYSEX:
       return MidiPermissionContextFactory::GetForProfile(profile);
     case content::PERMISSION_NOTIFICATIONS:
 #if defined(ENABLE_NOTIFICATIONS)
       return DesktopNotificationServiceFactory::GetForProfile(profile);
 #else
       NOTIMPLEMENTED();
+      break;
 #endif
     case content::PERMISSION_GEOLOCATION:
       return GeolocationPermissionContextFactory::GetForProfile(profile);
     case content::PERMISSION_PROTECTED_MEDIA_IDENTIFIER:
 #if defined(OS_ANDROID) || defined(OS_CHROMEOS)
       return ProtectedMediaIdentifierPermissionContextFactory::GetForProfile(
           profile);
 #else
       NOTIMPLEMENTED();
       break;
 #endif
     case content::PERMISSION_PUSH_MESSAGING:
       return gcm::PushMessagingPermissionContextFactory::GetForProfile(profile);
     case content::PERMISSION_NUM:
       NOTREACHED() << "Invalid RequestPermission for " << permission;
       break;
   }
   return nullptr;
 }
 
+// Helper method to translate from Permissions to ContentSettings
+ContentSettingsType PermissionToContentSetting(

[Nico, 2015/02/04 16:43:32]

nit: feels like this could be somewhere in content, close to the permissiontype
type (i realize you're just moving this around in this file)

[timvolodine, 2015/02/05 18:19:04]

ack, for now think we can keep it here as it's only used in this file.

+    content::PermissionType permission) {
+  switch (permission) {
+    case content::PERMISSION_MIDI_SYSEX:
+      return CONTENT_SETTINGS_TYPE_MIDI_SYSEX;
+    case content::PERMISSION_PUSH_MESSAGING:
+      return CONTENT_SETTINGS_TYPE_PUSH_MESSAGING;
+    case content::PERMISSION_NOTIFICATIONS:
+      return CONTENT_SETTINGS_TYPE_NOTIFICATIONS;
+    case content::PERMISSION_GEOLOCATION:
+      return CONTENT_SETTINGS_TYPE_GEOLOCATION;
+#if defined(OS_ANDROID) || defined(OS_CHROMEOS)
+    case content::PERMISSION_PROTECTED_MEDIA_IDENTIFIER:
+      return CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER;
+#endif
+    default:
+      NOTREACHED() << "Unknown content setting for permission " << permission;
+      return CONTENT_SETTINGS_TYPE_DEFAULT;
+  }
+}
+
 }  // namespace
 
 namespace chrome {
 
 ChromeContentBrowserClient::ChromeContentBrowserClient()
     : prerender_tracker_(NULL),
       weak_factory_(this) {
 #if defined(ENABLE_PLUGINS)
   for (size_t i = 0; i < arraysize(kPredefinedAllowedDevChannelOrigins); ++i)
     allowed_dev_channel_origins_.insert(kPredefinedAllowedDevChannelOrigins[i]);
@@ skipping 1236 matching lines @@
 
 void ChromeContentBrowserClient::RequestPermission(
     content::PermissionType permission,
     content::WebContents* web_contents,
     int bridge_id,
     const GURL& requesting_frame,
     bool user_gesture,
     const base::Callback<void(bool)>& result_callback) {
   int render_process_id = web_contents->GetRenderProcessHost()->GetID();
   int render_view_id = web_contents->GetRenderViewHost()->GetRoutingID();
-  Profile* profile =
-      Profile::FromBrowserContext(web_contents->GetBrowserContext());
-
   const PermissionRequestID request_id(render_process_id,
                                        render_view_id,
                                        bridge_id,
                                        requesting_frame);
+  Profile* profile =
+      Profile::FromBrowserContext(web_contents->GetBrowserContext());
+  PermissionContextBase* context = GetPermissionContext(profile, permission);
 
-  switch (permission) {
-    case content::PERMISSION_MIDI_SYSEX:
-      MidiPermissionContextFactory::GetForProfile(profile)
-          ->RequestPermission(web_contents,
-                              request_id,
-                              requesting_frame,
-                              user_gesture,
-                              result_callback);
-      break;
-    case content::PERMISSION_NOTIFICATIONS:
-#if defined(ENABLE_NOTIFICATIONS)
-      DesktopNotificationServiceFactory::GetForProfile(profile)
-          ->RequestNotificationPermission(web_contents,
-                                          request_id,
-                                          requesting_frame,
-                                          user_gesture,
-                                          result_callback);
-#else
-      NOTIMPLEMENTED();
-#endif
-      break;
-    case content::PERMISSION_GEOLOCATION:
-      GeolocationPermissionContextFactory::GetForProfile(profile)
-          ->RequestPermission(web_contents,
-                              request_id,
-                              requesting_frame.GetOrigin(),
-                              user_gesture,
-                              result_callback);
-      break;
-    case content::PERMISSION_PROTECTED_MEDIA_IDENTIFIER:
-#if defined(OS_ANDROID) || defined(OS_CHROMEOS)
-      ProtectedMediaIdentifierPermissionContextFactory::GetForProfile(profile)
-          ->RequestPermission(web_contents,
-                              request_id,
-                              requesting_frame.GetOrigin(),
-                              user_gesture,
-                              result_callback);
-#else
-      NOTIMPLEMENTED();
-#endif
-      break;
-    case content::PERMISSION_PUSH_MESSAGING:
-      gcm::PushMessagingPermissionContextFactory::GetForProfile(profile)
-          ->RequestPermission(web_contents,
-                              request_id,
-                              requesting_frame.GetOrigin(),
-                              user_gesture,
-                              result_callback);
-      break;
-    case content::PERMISSION_NUM:
-      NOTREACHED() << "Invalid RequestPermission for " << permission;
-      break;
-  }
+  if (!context)
+    return;
+
+  context->RequestPermission(web_contents, request_id, requesting_frame,
+                             user_gesture, result_callback);
 }
 
 content::PermissionStatus ChromeContentBrowserClient::GetPermissionStatus(
     content::PermissionType permission,
     content::BrowserContext* browser_context,
     const GURL& requesting_origin,
     const GURL& embedding_origin) {
   DCHECK(browser_context);
   Profile* profile = Profile::FromBrowserContext(browser_context);
   PermissionContextBase* context = GetPermissionContext(profile, permission);
@@ skipping 22 matching lines @@
                            embedding_origin.GetOrigin());
 }
 
 void ChromeContentBrowserClient::CancelPermissionRequest(
     content::PermissionType permission,
     content::WebContents* web_contents,
     int bridge_id,
     const GURL& requesting_frame) {
   int render_process_id = web_contents->GetRenderProcessHost()->GetID();
   int render_view_id = web_contents->GetRenderViewHost()->GetRoutingID();
-
   const PermissionRequestID request_id(render_process_id,
                                        render_view_id,
                                        bridge_id,
                                        requesting_frame);
   Profile* profile =
       Profile::FromBrowserContext(web_contents->GetBrowserContext());
-  switch (permission) {
-    case content::PERMISSION_MIDI_SYSEX:
-      MidiPermissionContextFactory::GetForProfile(profile)
-          ->CancelPermissionRequest(web_contents, request_id);
-      break;
-    case content::PERMISSION_NOTIFICATIONS:
-#if defined(ENABLE_NOTIFICATIONS)
-      DesktopNotificationServiceFactory::GetForProfile(profile)
-          ->CancelPermissionRequest(web_contents, request_id);
-#else
-      NOTIMPLEMENTED();
-#endif
-      break;
-    case content::PERMISSION_GEOLOCATION:
-      GeolocationPermissionContextFactory::GetForProfile(profile)
-          ->CancelPermissionRequest(web_contents, request_id);
-      break;
-    case content::PERMISSION_PROTECTED_MEDIA_IDENTIFIER:
-#if defined(OS_ANDROID) || defined(OS_CHROMEOS)
-      ProtectedMediaIdentifierPermissionContextFactory::GetForProfile(profile)
-          ->CancelPermissionRequest(web_contents, request_id);
-#else
-      NOTIMPLEMENTED();
-#endif
-      break;
-    case content::PERMISSION_PUSH_MESSAGING:
-      NOTIMPLEMENTED() << "CancelPermission not implemented for " << permission;
-      break;
-    case content::PERMISSION_NUM:
-      NOTREACHED() << "Invalid CancelPermission for " << permission;
-      break;
-  }
-}
-
-// Helper method to translate from Permissions to ContentSettings
-static ContentSettingsType PermissionToContentSetting(
-    content::PermissionType permission) {
-  switch (permission) {
-    case content::PERMISSION_MIDI_SYSEX:
-      return CONTENT_SETTINGS_TYPE_MIDI_SYSEX;
-    case content::PERMISSION_PUSH_MESSAGING:
-      return CONTENT_SETTINGS_TYPE_PUSH_MESSAGING;
-    case content::PERMISSION_NOTIFICATIONS:
-      return CONTENT_SETTINGS_TYPE_NOTIFICATIONS;
-    case content::PERMISSION_GEOLOCATION:
-      return CONTENT_SETTINGS_TYPE_GEOLOCATION;
-#if defined(OS_ANDROID) || defined(OS_CHROMEOS)
-    case content::PERMISSION_PROTECTED_MEDIA_IDENTIFIER:
-      return CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER;
-#endif
-    default:
-      NOTREACHED() << "Unknown content setting for permission " << permission;
-      return CONTENT_SETTINGS_TYPE_DEFAULT;
-  }
+  PermissionContextBase* context = GetPermissionContext(profile, permission);
+  if (!context)
+    return;
+  context->CancelPermissionRequest(web_contents, request_id);
 }
 
 void ChromeContentBrowserClient::RegisterPermissionUsage(
     content::PermissionType permission,
     content::WebContents* web_contents,
     const GURL& frame_url,
     const GURL& main_frame_url) {
   Profile::FromBrowserContext(web_contents->GetBrowserContext())
       ->GetHostContentSettingsMap()
       ->UpdateLastUsage(
@@ skipping 579 matching lines @@
       switches::kDisableWebRtcEncryption,
     };
     to_command_line->CopySwitchesFrom(from_command_line,
                                       kWebRtcDevSwitchNames,
                                       arraysize(kWebRtcDevSwitchNames));
   }
 }
 #endif  // defined(ENABLE_WEBRTC)
 
 }  // namespace chrome