Make geolocation API and X-Geo header access consistent

chrome/browser/permissions/permission_manager.h

 // Copyright 2015 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_MANAGER_H_
 #define CHROME_BROWSER_PERMISSIONS_PERMISSION_MANAGER_H_
 
 #include <unordered_map>
 
 #include "base/callback_forward.h"
@@ skipping 10 matching lines @@
 class Profile;
 
 namespace content {
 enum class PermissionType;
 };  // namespace content
 
 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);
   ~PermissionManager() override;
 
   // content::PermissionManager implementation.
   int RequestPermission(
       content::PermissionType permission,
       content::RenderFrameHost* render_frame_host,
       const GURL& requesting_origin,
@@ skipping 72 matching lines @@
                      std::unique_ptr<PermissionContextBase>,
                      PermissionTypeHash>
       permission_contexts_;
 
   base::WeakPtrFactory<PermissionManager> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PermissionManager);
 };
 
 #endif // CHROME_BROWSER_PERMISSIONS_PERMISSION_MANAGER_H_