device/bluetooth/test/bluetooth_test_android.h - Issue 2032273002: If location services are turned off, have the BT chooser prompt the user to turn them on.

Side by Side Diff: device/bluetooth/test/bluetooth_test_android.h

Issue 2032273002: If location services are turned off, have the BT chooser prompt the user to turn them on. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkcr

Patch Set: Created 4 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

« device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothAdapter.java ('K') | « device/bluetooth/test/android/java/src/org/chromium/device/bluetooth/Fakes.java ('k') | device/bluetooth/test/bluetooth_test_android.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2015 The Chromium Authors. All rights reserved.	1 // Copyright 2015 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #ifndef DEVICE_BLUETOOTH_TEST_BLUETOOTH_TEST_ANDROID_H_	5 #ifndef DEVICE_BLUETOOTH_TEST_BLUETOOTH_TEST_ANDROID_H_

6 #define DEVICE_BLUETOOTH_TEST_BLUETOOTH_TEST_ANDROID_H_	6 #define DEVICE_BLUETOOTH_TEST_BLUETOOTH_TEST_ANDROID_H_

7	7

8 #include <stdint.h>	8 #include <stdint.h>

9	9

10 #include "base/android/scoped_java_ref.h"	10 #include "base/android/scoped_java_ref.h"

(...skipping 12 matching lines...) Expand all Loading...
23 // Test overrides:	23 // Test overrides:

24 void SetUp() override;	24 void SetUp() override;

25 void TearDown() override;	25 void TearDown() override;

26	26

27 // BluetoothTestBase overrides:	27 // BluetoothTestBase overrides:

28 bool PlatformSupportsLowEnergy() override;	28 bool PlatformSupportsLowEnergy() override;

29 void InitWithDefaultAdapter() override;	29 void InitWithDefaultAdapter() override;

30 void InitWithoutDefaultAdapter() override;	30 void InitWithoutDefaultAdapter() override;

31 void InitWithFakeAdapter() override;	31 void InitWithFakeAdapter() override;

32 bool DenyPermission() override;	32 bool DenyPermission() override;

	33 void TurnOffLocationServices();
	scheib 2016/06/03 20:48:29 Not a Base override, move to just before ForceIlle Not a Base override, move to just before ForceIllegalStateException. I'd been using 'Simulate' as a prefix to make reading tests clear when we were just simulating events etc. So I suggest SimulateLocationServicesOff(). Jeffrey Yasskin 2016/06/06 16:16:56 This isn't really an event, but sure. Show quoted text On 2016/06/03 20:48:29, scheib wrote: > Not a Base override, move to just before ForceIllegalStateException. > > I'd been using 'Simulate' as a prefix to make reading tests clear when we were > just simulating events etc. So I suggest SimulateLocationServicesOff(). This isn't really an event, but sure.
33 BluetoothDevice* SimulateLowEnergyDevice(int device_ordinal) override;	34 BluetoothDevice* SimulateLowEnergyDevice(int device_ordinal) override;

34 void SimulateGattConnection(BluetoothDevice* device) override;	35 void SimulateGattConnection(BluetoothDevice* device) override;

35 void SimulateGattConnectionError(BluetoothDevice* device,	36 void SimulateGattConnectionError(BluetoothDevice* device,

36 BluetoothDevice::ConnectErrorCode) override;	37 BluetoothDevice::ConnectErrorCode) override;

37 void SimulateGattDisconnection(BluetoothDevice* device) override;	38 void SimulateGattDisconnection(BluetoothDevice* device) override;

38 void SimulateGattServicesDiscovered(	39 void SimulateGattServicesDiscovered(

39 BluetoothDevice* device,	40 BluetoothDevice* device,

40 const std::vector<std::string>& uuids) override;	41 const std::vector<std::string>& uuids) override;

41 void SimulateGattServicesDiscoveryError(BluetoothDevice* device) override;	42 void SimulateGattServicesDiscoveryError(BluetoothDevice* device) override;

42 void SimulateGattCharacteristic(BluetoothRemoteGattService* service,	43 void SimulateGattCharacteristic(BluetoothRemoteGattService* service,

(...skipping 115 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
158 int gatt_open_connections_ = 0;	159 int gatt_open_connections_ = 0;

159 BluetoothRemoteGattDescriptor* remembered_ccc_descriptor_ = nullptr;	160 BluetoothRemoteGattDescriptor* remembered_ccc_descriptor_ = nullptr;

160 };	161 };

161	162

162 // Defines common test fixture name. Use TEST_F(BluetoothTest, YourTestName).	163 // Defines common test fixture name. Use TEST_F(BluetoothTest, YourTestName).

163 typedef BluetoothTestAndroid BluetoothTest;	164 typedef BluetoothTestAndroid BluetoothTest;

164	165

165 } // namespace device	166 } // namespace device

166	167

167 #endif // DEVICE_BLUETOOTH_TEST_BLUETOOTH_TEST_ANDROID_H_	168 #endif // DEVICE_BLUETOOTH_TEST_BLUETOOTH_TEST_ANDROID_H_

OLD	NEW