Add a kill switch for all of Web Bluetooth.

content/public/browser/content_browser_client.h

 // 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.
 
 #ifndef CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_
 #define CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_
 
 #include <stddef.h>
 
 #include <map>
@@ skipping 400 matching lines @@
   virtual bool AllowWebRTCIdentityCache(const GURL& url,
                                         const GURL& first_party_url,
                                         ResourceContext* context);
 #endif  // defined(ENABLE_WEBRTC)
 
   // Allow the embedder to control whether we can use <keygen>.
   virtual bool AllowKeygen(const GURL& url, content::ResourceContext* context);
 
   // Allow the embedder to control whether we can use Web Bluetooth.
   // TODO(crbug.com/589228): Replace this with a use of the permission system.
-  virtual bool AllowWebBluetooth(content::BrowserContext* browser_context,
-                                 const url::Origin& requesting_origin,
-                                 const url::Origin& embedding_origin);
+  enum class AllowWebBluetoothResult {
+    ALLOW,
+    BLOCK_POLICY,
+    BLOCK_KILL_SWITCH,

[jam, 2016/03/29 18:06:18]

can we keep the "kill switch" concept out of content, since it's a chrome level
thing? the webkit mapping says "Web Bluetooth permission globally disabled", so
perhaps this can be BLOCK_GLOBALLY_DISABLED?

[Jeffrey Yasskin, 2016/03/29 23:13:04]

Sure, unless Kendra wants to argue that it ought to be a content/web-level
thing. I've made this change assuming she won't.

[kcarattini, 2016/03/30 00:45:59]

No argument here.

+  };
+  virtual AllowWebBluetoothResult AllowWebBluetooth(
+      content::BrowserContext* browser_context,
+      const url::Origin& requesting_origin,
+      const url::Origin& embedding_origin);
 
   // Allow the embedder to override the request context based on the URL for
   // certain operations, like cookie access. Returns nullptr to indicate the
   // regular request context should be used.
   // This is called on the IO thread.
   virtual net::URLRequestContext* OverrideRequestContextForURL(
       const GURL& url, ResourceContext* context);
 
   // Allow the embedder to specify a string version of the storage partition
   // config with a site.
@@ skipping 343 matching lines @@
   // Allows an embedder to provide its own ExternalVideoSurfaceContainer
   // implementation.  Return nullptr to disable external surface video.
   virtual ExternalVideoSurfaceContainer*
   OverrideCreateExternalVideoSurfaceContainer(WebContents* web_contents);
 #endif
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_