Make geolocation API and X-Geo header access consistent

chrome/browser/permissions/permission_manager.h

Index: chrome/browser/permissions/permission_manager.h
diff --git a/chrome/browser/permissions/permission_manager.h b/chrome/browser/permissions/permission_manager.h
index bc7e0406f875793d7595f14bc956f43f5f0a0806..7dacc1dc49b72a2f7fba34e2cae9da8f677963dc 100644
--- a/chrome/browser/permissions/permission_manager.h
+++ b/chrome/browser/permissions/permission_manager.h
@@ -28,6 +28,16 @@ class PermissionManager : public KeyedService,
                           public content::PermissionManager,
                           public content_settings::Observer {
  public:
+  // A field trial used to enable the global permissions kill switch.
+  // This is public so permissions that don't yet inherit from
+  // PermissionContextBase can use it.
+  static const char kPermissionsKillSwitchFieldStudy[];
+
+  // The field trial param to enable the global permissions kill switch.
+  // This is public so permissions that don't yet inherit from
+  // PermissionContextBase can use it.
+  static const char kPermissionsKillSwitchBlockedValue[];

[raymes, 2017/01/09 05:47:27]

Hmm, are these meant to be in this CL?

[benwells, 2017/01/09 21:02:22]

Ummm ... no ....

I have no idea how that got here. Removed!

+
   static PermissionManager* Get(Profile* profile);
 
   explicit PermissionManager(Profile* profile);