Implement midi permissions on top of the new common permission classes

chrome/browser/content_settings/permission_infobar_delegate.cc

Index: chrome/browser/content_settings/permission_infobar_delegate.cc
diff --git a/chrome/browser/services/gcm/permission_infobar_delegate.cc b/chrome/browser/content_settings/permission_infobar_delegate.cc
similarity index 84%
rename from chrome/browser/services/gcm/permission_infobar_delegate.cc
rename to chrome/browser/content_settings/permission_infobar_delegate.cc
index 5c8627f62b7486036917393fe9f683e10a1faa84..574d901393fe816f1c45fe64180ff15b67386381 100644
--- a/chrome/browser/services/gcm/permission_infobar_delegate.cc
+++ b/chrome/browser/content_settings/permission_infobar_delegate.cc
@@ -2,23 +2,21 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/services/gcm/permission_infobar_delegate.h"
+#include "chrome/browser/content_settings/permission_infobar_delegate.h"
 
 #include "chrome/browser/content_settings/permission_queue_controller.h"
 #include "components/infobars/core/infobar.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
-namespace gcm {
-
 PermissionInfobarDelegate::~PermissionInfobarDelegate() {
 }
 
 PermissionInfobarDelegate::PermissionInfobarDelegate(
     PermissionQueueController* controller,
     const PermissionRequestID& id,
-    const GURL& requesting_frame)
-    : controller_(controller), id_(id), requesting_frame_(requesting_frame) {
+    const GURL& requesting_origin)
+    : controller_(controller), id_(id), requesting_origin_(requesting_origin) {
 }
 
 void PermissionInfobarDelegate::InfoBarDismissed() {
@@ -49,8 +47,7 @@ bool PermissionInfobarDelegate::Cancel() {
 void PermissionInfobarDelegate::SetPermission(bool update_content_setting,
                                               bool allowed) {
   controller_->OnPermissionSet(
-      id_, requesting_frame_,
-      InfoBarService::WebContentsFromInfoBar(infobar())->GetURL(),
+      id_, requesting_origin_,
+      InfoBarService::WebContentsFromInfoBar(infobar())->GetURL().GetOrigin(),

[Michael van Ouwerkerk, 2014/07/04 10:34:32]

Also GetLastCommittedURL here.

[Miguel Garcia, 2014/07/04 12:09:52]

Done.

       update_content_setting, allowed);
 }
-}  // namespace gcm