Revert 142623 - Bluetooth Extension API: Add a discovery API

This change depends on 142617, which broke browser tests on chromeos.

BUG=132597
TEST=simple test added
(events testing coming in a future CL: crbug.com/132616)


Review URL: https://chromiumcodereview.appspot.com/10536159

TBR=bryeung@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10556033

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@142643 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 0 insertions, 42 deletions

diff --git a/chrome/renderer/extensions/extension_dispatcher.cc b/chrome/renderer/extensions/extension_dispatcher.cc
index 2539cfd..add0813 100644
--- a/chrome/renderer/extensions/extension_dispatcher.cc
+++ b/chrome/renderer/extensions/extension_dispatcher.cc
@@ -568,8 +568,6 @@ void ExtensionDispatcher::PopulateSourceMap() {
   source_map_.RegisterSource("devtools", IDR_DEVTOOLS_CUSTOM_BINDINGS_JS);
   source_map_.RegisterSource("experimental.app",
                              IDR_EXPERIMENTAL_APP_CUSTOM_BINDINGS_JS);
-  source_map_.RegisterSource("experimental.bluetooth",
-                             IDR_EXPERIMENTAL_BLUETOOTH_CUSTOM_BINDINGS_JS);
   source_map_.RegisterSource("experimental.mediaGalleries",
                              IDR_MEDIA_GALLERY_CUSTOM_BINDINGS_JS);
   source_map_.RegisterSource("experimental.offscreen",
diff --git a/chrome/renderer/renderer_resources.grd b/chrome/renderer/renderer_resources.grd
index 85675bc..475bf8c 100644
--- a/chrome/renderer/renderer_resources.grd
+++ b/chrome/renderer/renderer_resources.grd
@@ -45,7 +45,6 @@ without changes to the corresponding grd file. fb9 -->
         <include name="IDR_DECLARATIVE_WEBREQUEST_CUSTOM_BINDINGS_JS" file="resources\extensions\declarative_webrequest_custom_bindings.js" type="BINDATA" />
         <include name="IDR_DEVTOOLS_CUSTOM_BINDINGS_JS" file="resources\extensions\devtools_custom_bindings.js" type="BINDATA" />
         <include name="IDR_EXPERIMENTAL_APP_CUSTOM_BINDINGS_JS" file="resources\extensions\experimental.app_custom_bindings.js" type="BINDATA" />
-        <include name="IDR_EXPERIMENTAL_BLUETOOTH_CUSTOM_BINDINGS_JS" file="resources\extensions\experimental.bluetooth_custom_bindings.js" type="BINDATA" />
         <include name="IDR_EXPERIMENTAL_OFFSCREENTABS_CUSTOM_BINDINGS_JS" file="resources\extensions\experimental.offscreenTabs_custom_bindings.js" type="BINDATA" />
         <include name="IDR_EXPERIMENTAL_USB_CUSTOM_BINDINGS_JS" file="resources\extensions\experimental.usb_custom_bindings.js" type="BINDATA" />
         <include name="IDR_EXTENSION_CUSTOM_BINDINGS_JS" file="resources\extensions\extension_custom_bindings.js" type="BINDATA" />
diff --git a/chrome/renderer/resources/extensions/experimental.bluetooth_custom_bindings.js b/chrome/renderer/resources/extensions/experimental.bluetooth_custom_bindings.js
deleted file mode 100644
index 58a8d95..0000000
--- a/chrome/renderer/resources/extensions/experimental.bluetooth_custom_bindings.js
+++ /dev/null
@@ -1,39 +0,0 @@
-// 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.
-
-// Custom bindings for the Bluetooth API.
-
-var chromeHidden = requireNative('chrome_hidden').GetChromeHidden();
-var sendRequest = require('sendRequest').sendRequest;
-
-// Use custom bindings to create an undocumented event listener that will
-// receive events about device discovery and call the event listener that was
-// provided with the request to begin discovery.
-chromeHidden.registerCustomHook('experimental.bluetooth', function(api) {
-  var apiFunctions = api.apiFunctions;
-
-  chromeHidden.bluetooth = {};
-  chromeHidden.bluetooth.handler = null;
-  chromeHidden.bluetooth.onDeviceDiscovered =
-      new chrome.Event("experimental.bluetooth.onDeviceDiscovered");
-
-  function deviceDiscoveredListener(device) {
-    if (chromeHidden.bluetooth.handler != null)
-      chromeHidden.bluetooth.handler(device);
-  }
-  chromeHidden.bluetooth.onDeviceDiscovered.addListener(
-      deviceDiscoveredListener);
-
-  apiFunctions.setHandleRequest('startDiscovery', function() {
-    var args = arguments;
-    if (args.length > 0 && args[0] && args[0].deviceCallback) {
-      chromeHidden.bluetooth.handler = args[0].deviceCallback;
-    }
-    sendRequest(this.name, args, this.definition.parameters);
-  });
-  apiFunctions.setHandleRequest('stopDiscovery', function() {
-    chromeHidden.bluetooth.handler = null;
-    sendRequest(this.name, args, this.definition.parameters);
-  });
-});