Have Permission{Manager,Service} use Origin.

chrome/browser/permissions/permission_context_base.h

 // Copyright 2014 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.
 
 #ifndef CHROME_BROWSER_PERMISSIONS_PERMISSION_CONTEXT_BASE_H_
 #define CHROME_BROWSER_PERMISSIONS_PERMISSION_CONTEXT_BASE_H_
 
 #include "base/callback.h"
 #include "base/containers/scoped_ptr_hash_map.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "build/build_config.h"
 #include "chrome/browser/ui/website_settings/permission_bubble_request.h"
 #include "components/content_settings/core/common/content_settings.h"
 #include "components/content_settings/core/common/content_settings_types.h"
 #include "components/keyed_service/core/keyed_service.h"
 #include "content/public/browser/permission_type.h"
-#include "url/gurl.h"
+#include "url/origin.h"
 
 #if defined(OS_ANDROID)
 class PermissionQueueController;
 #endif
 class PermissionRequestID;
 class Profile;
 
 namespace content {
 class WebContents;
 }
@@ skipping 38 matching lines @@
 
   // The field trial param to enable the global permissions kill switch.
   // This is public for testing purposes.
   static const char kPermissionsKillSwitchBlockedValue[];
 
   // The renderer is requesting permission to push messages.
   // When the answer to a permission request has been determined, |callback|
   // should be called with the result.
   virtual void RequestPermission(content::WebContents* web_contents,
                                  const PermissionRequestID& id,
-                                 const GURL& requesting_frame,
+                                 const url::Origin& requesting_origin,
                                  const BrowserPermissionCallback& callback);
 
   // Returns whether the permission has been granted, denied...
   virtual ContentSetting GetPermissionStatus(
-      const GURL& requesting_origin,
-      const GURL& embedding_origin) const;
+      const url::Origin& requesting_origin,
+      const url::Origin& embedding_origin) const;
 
   // Resets the permission to its default value.
-  virtual void ResetPermission(const GURL& requesting_origin,
-                               const GURL& embedding_origin);
+  virtual void ResetPermission(const url::Origin& requesting_origin,
+                               const url::Origin& embedding_origin);
 
   // Withdraw an existing permission request, no op if the permission request
   // was already cancelled by some other means.
   virtual void CancelPermissionRequest(content::WebContents* web_contents,
                                        const PermissionRequestID& id);
 
   // Whether the kill switch has been enabled for this permission.
   // public for permissions that do not use RequestPermission, like
   // camera and microphone, and for testing.
   bool IsPermissionKillSwitchOn() const;
 
  protected:
   // Decide whether the permission should be granted.
   // Calls PermissionDecided if permission can be decided non-interactively,
   // or NotifyPermissionSet if permission decided by presenting an infobar.
   virtual void DecidePermission(content::WebContents* web_contents,
                                 const PermissionRequestID& id,
-                                const GURL& requesting_origin,
-                                const GURL& embedding_origin,
+                                const url::Origin& requesting_origin,
+                                const url::Origin& embedding_origin,
                                 const BrowserPermissionCallback& callback);
 
   // Called when permission is granted without interactively asking the user.
   void PermissionDecided(const PermissionRequestID& id,
-                         const GURL& requesting_origin,
-                         const GURL& embedding_origin,
+                         const url::Origin& requesting_origin,
+                         const url::Origin& embedding_origin,
                          const BrowserPermissionCallback& callback,
                          bool persist,
                          ContentSetting content_setting);
 
   virtual void NotifyPermissionSet(const PermissionRequestID& id,
-                                   const GURL& requesting_origin,
-                                   const GURL& embedding_origin,
+                                   const url::Origin& requesting_origin,
+                                   const url::Origin& embedding_origin,
                                    const BrowserPermissionCallback& callback,
                                    bool persist,
                                    ContentSetting content_setting);
 
   // Implementors can override this method to update the icons on the
   // url bar with the result of the new permission.
   virtual void UpdateTabContext(const PermissionRequestID& id,
-                                const GURL& requesting_origin,
+                                const url::Origin& requesting_origin,
                                 bool allowed) {}
 
 #if defined(OS_ANDROID)
   // Return an instance of the infobar queue controller, creating it if needed.
   PermissionQueueController* GetQueueController();
 #endif
 
   // Returns the profile associated with this permission context.
   Profile* profile() const;
 
   // Store the decided permission as a content setting.
   // virtual since the permission might be stored with different restrictions
   // (for example for desktop notifications).
-  virtual void UpdateContentSetting(const GURL& requesting_origin,
-                                    const GURL& embedding_origin,
+  virtual void UpdateContentSetting(const url::Origin& requesting_origin,
+                                    const url::Origin& embedding_origin,
                                     ContentSetting content_setting);
 
   // Whether the permission should be restricted to secure origins.
   virtual bool IsRestrictedToSecureOrigins() const = 0;
 
   content::PermissionType permission_type() const { return permission_type_; }
   ContentSettingsType content_settings_type() const {
     return content_settings_type_;
   }
 
  private:
   // Called when a bubble is no longer used so it can be cleaned up.
   void CleanUpBubble(const PermissionRequestID& id);
 
   Profile* profile_;
   const content::PermissionType permission_type_;
   const ContentSettingsType content_settings_type_;
 #if defined(OS_ANDROID)
   scoped_ptr<PermissionQueueController> permission_queue_controller_;
 #endif
   base::ScopedPtrHashMap<std::string, scoped_ptr<PermissionBubbleRequest>>
       pending_bubbles_;
 
   // Must be the last member, to ensure that it will be
   // destroyed first, which will invalidate weak pointers
   base::WeakPtrFactory<PermissionContextBase> weak_factory_;
 };
 
 #endif  // CHROME_BROWSER_PERMISSIONS_PERMISSION_CONTEXT_BASE_H_