diff options
author | henrika@chromium.org <henrika@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-26 14:27:37 +0000 |
---|---|---|
committer | henrika@chromium.org <henrika@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-26 14:27:37 +0000 |
commit | 6ac9e31faff1f1181cff814f1ac1b48280c442f9 (patch) | |
tree | 570e8338884151e21f13120f22de90f3a37e5e7b /chrome/browser/extensions/test_extension_system.cc | |
parent | ef9d2743e03420d43095f66bc1925a16ce53635b (diff) | |
download | chromium_src-6ac9e31faff1f1181cff814f1ac1b48280c442f9.zip chromium_src-6ac9e31faff1f1181cff814f1ac1b48280c442f9.tar.gz chromium_src-6ac9e31faff1f1181cff814f1ac1b48280c442f9.tar.bz2 |
Revert 184607
> Remove socket_map_.size() == 0 CHECK.
>
> Remove socket_map_.size() == 0 CHECK because this causes the browser to
> crash during the shutdown if the user closes the browser without releasing
> the bluetooth socket, which I assume could happen for careless apps that did
> not properly disconnect the sockets using chrome.bluetooth.disconnect().
>
> Also I re-implemented the bluetooth socket management using API resource manager, instead of relying on bluetooth event router.
>
> BUG=135470
> TBR=sky@chromium.org
>
>
> Review URL: https://chromiumcodereview.appspot.com/12320016
TBR=youngki@chromium.org
Review URL: https://codereview.chromium.org/12328107
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@184642 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/test_extension_system.cc')
-rw-r--r-- | chrome/browser/extensions/test_extension_system.cc | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/chrome/browser/extensions/test_extension_system.cc b/chrome/browser/extensions/test_extension_system.cc index 021b0ef..4efca4f 100644 --- a/chrome/browser/extensions/test_extension_system.cc +++ b/chrome/browser/extensions/test_extension_system.cc @@ -159,11 +159,6 @@ RulesRegistryService* TestExtensionSystem::rules_registry_service() { return NULL; } -ApiResourceManager<BluetoothSocketResource>* -TestExtensionSystem::bluetooth_socket_resource_manager() { - return NULL; -} - ApiResourceManager<SerialConnection>* TestExtensionSystem::serial_connection_manager() { return NULL; |