diff options
| author | earthdok@chromium.org <earthdok@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-06 16:50:14 +0000 |
|---|---|---|
| committer | earthdok@chromium.org <earthdok@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-06 16:50:14 +0000 |
| commit | 5cb096f565b7af2e785ea660afcdd9f77714f78b (patch) | |
| tree | 29b579e4cb7212ca0b1d31687f9c26369fba69a9 /device/bluetooth/test/mock_bluetooth_discovery_session.h | |
| parent | fb0a2206f206d6acc30c283c098690b70006b11e (diff) | |
| download | chromium_src-5cb096f565b7af2e785ea660afcdd9f77714f78b.zip chromium_src-5cb096f565b7af2e785ea660afcdd9f77714f78b.tar.gz chromium_src-5cb096f565b7af2e785ea660afcdd9f77714f78b.tar.bz2 | |
Revert 255262 "Migrate chrome.bluetooth API backend to use devic..."
Reverted due to memory leaks.
> Migrate chrome.bluetooth API backend to use device::BluetoothDiscoverySession.
>
> Modified chrome.bluetooth API code to use the new discovery session API for
> device discovery.
>
> BUG=346982
> TEST=1. unit_tests, browser_tests
> 2. Use multiple running extension instances with the bluetooth permission and check for the following behavior:
> - Only one session per extension. Calling chrome.bluetooth.stopDiscovery from one running app should fail if that app never called chrome.bluetooth.startDiscovery.
> - An app's discovery sessions should get cleaned up if that app crashes or unloads.
> - Use bt_console and run "power off". This should cause all discovery sessions that have been assigned to apps to get marked as inactive. Verify by requesting a new discovery session from apps, which should succeed.
>
> Review URL: https://codereview.chromium.org/179123008
TBR=armansito@chromium.org
BUG=349942
Review URL: https://codereview.chromium.org/188663003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@255372 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'device/bluetooth/test/mock_bluetooth_discovery_session.h')
| -rw-r--r-- | device/bluetooth/test/mock_bluetooth_discovery_session.h | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/device/bluetooth/test/mock_bluetooth_discovery_session.h b/device/bluetooth/test/mock_bluetooth_discovery_session.h deleted file mode 100644 index 98f2125..0000000 --- a/device/bluetooth/test/mock_bluetooth_discovery_session.h +++ /dev/null @@ -1,32 +0,0 @@ -// Copyright 2014 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 DEVICE_BLUETOOTH_TEST_MOCK_BLUETOOTH_DISCOVERY_SESSION_H_ -#define DEVICE_BLUETOOTH_TEST_MOCK_BLUETOOTH_DISCOVERY_SESSION_H_ - -#include "base/callback.h" -#include "device/bluetooth/bluetooth_discovery_session.h" -#include "testing/gmock/include/gmock/gmock.h" - -namespace device { - -class BluetoothAdapter; - -class MockBluetoothDiscoverySession : public BluetoothDiscoverySession { - public: - MockBluetoothDiscoverySession(); - virtual ~MockBluetoothDiscoverySession(); - - MOCK_CONST_METHOD0(IsActive, bool()); - MOCK_METHOD2(Stop, - void(const base::Closure& callback, - const ErrorCallback& error_callback)); - - private: - DISALLOW_COPY_AND_ASSIGN(MockBluetoothDiscoverySession); -}; - -} // namespac device - -#endif // DEVICE_BLUETOOTH_TEST_MOCK_BLUETOOTH_DISCOVERY_SESSION_H_ |