Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4554)

Unified Diff: chrome/browser/extensions/api/bluetooth/bluetooth_apitest.cc

Issue 293063015: Bluetooth: remove Out of Band Pairing APIs (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/api/bluetooth/bluetooth_apitest.cc
diff --git a/chrome/browser/extensions/api/bluetooth/bluetooth_apitest.cc b/chrome/browser/extensions/api/bluetooth/bluetooth_apitest.cc
index a567584afae503db67825db0abcc71862e0634df..da71a42b03abbaed6303e32811b8d98e5cab0055 100644
--- a/chrome/browser/extensions/api/bluetooth/bluetooth_apitest.cc
+++ b/chrome/browser/extensions/api/bluetooth/bluetooth_apitest.cc
@@ -15,7 +15,6 @@
#include "chrome/browser/ui/browser.h"
#include "chrome/test/base/ui_test_utils.h"
#include "device/bluetooth/bluetooth_adapter.h"
-#include "device/bluetooth/bluetooth_out_of_band_pairing_data.h"
#include "device/bluetooth/bluetooth_uuid.h"
#include "device/bluetooth/test/mock_bluetooth_adapter.h"
#include "device/bluetooth/test/mock_bluetooth_device.h"
@@ -27,7 +26,6 @@
using device::BluetoothAdapter;
using device::BluetoothDevice;
using device::BluetoothDiscoverySession;
-using device::BluetoothOutOfBandPairingData;
using device::BluetoothProfile;
using device::BluetoothUUID;
using device::MockBluetoothAdapter;
@@ -138,40 +136,11 @@ class TestBluetoothAddProfileFunction
BluetoothProfile* profile_;
};
-// This is the canonical UUID for the short UUID 0010.
-static const char kOutOfBandPairingDataHash[] = "0123456789ABCDEh";
-static const char kOutOfBandPairingDataRandomizer[] = "0123456789ABCDEr";
-
-static BluetoothOutOfBandPairingData GetOutOfBandPairingData() {
- BluetoothOutOfBandPairingData data;
- memcpy(&(data.hash), kOutOfBandPairingDataHash,
- device::kBluetoothOutOfBandPairingDataSize);
- memcpy(&(data.randomizer), kOutOfBandPairingDataRandomizer,
- device::kBluetoothOutOfBandPairingDataSize);
- return data;
-}
-
-static bool CallClosure(const base::Closure& callback) {
- callback.Run();
- return true;
-}
-
-static bool CallErrorClosure(const BluetoothDevice::ErrorCallback& callback) {
- callback.Run();
- return true;
-}
-
static void StopDiscoverySessionCallback(const base::Closure& callback,
const base::Closure& error_callback) {
callback.Run();
}
-static void CallOutOfBandPairingDataCallback(
- const BluetoothAdapter::BluetoothOutOfBandPairingDataCallback& callback,
- const BluetoothAdapter::ErrorCallback& error_callback) {
- callback.Run(GetOutOfBandPairingData());
-}
-
} // namespace
IN_PROC_BROWSER_TEST_F(BluetoothApiTest, Profiles) {
@@ -265,81 +234,6 @@ IN_PROC_BROWSER_TEST_F(BluetoothApiTest, GetAdapterState) {
EXPECT_EQ(kAdapterAddress, state.address);
}
-IN_PROC_BROWSER_TEST_F(BluetoothApiTest, GetLocalOutOfBandPairingData) {
- EXPECT_CALL(*mock_adapter_,
- ReadLocalOutOfBandPairingData(testing::_, testing::_))
- .WillOnce(testing::Invoke(CallOutOfBandPairingDataCallback));
-
- scoped_refptr<api::BluetoothGetLocalOutOfBandPairingDataFunction>
- get_oob_function(setupFunction(
- new api::BluetoothGetLocalOutOfBandPairingDataFunction));
-
- scoped_ptr<base::Value> result(utils::RunFunctionAndReturnSingleResult(
- get_oob_function.get(), "[]", browser()));
-
- base::DictionaryValue* dict;
- EXPECT_TRUE(result->GetAsDictionary(&dict));
-
- base::BinaryValue* binary_value;
- EXPECT_TRUE(dict->GetBinary("hash", &binary_value));
- EXPECT_STREQ(kOutOfBandPairingDataHash,
- std::string(binary_value->GetBuffer(), binary_value->GetSize()).c_str());
- EXPECT_TRUE(dict->GetBinary("randomizer", &binary_value));
- EXPECT_STREQ(kOutOfBandPairingDataRandomizer,
- std::string(binary_value->GetBuffer(), binary_value->GetSize()).c_str());
-
- // Try again with an error
- testing::Mock::VerifyAndClearExpectations(mock_adapter_);
- EXPECT_CALL(*mock_adapter_,
- ReadLocalOutOfBandPairingData(
- testing::_,
- testing::Truly(CallClosure)));
-
- get_oob_function =
- setupFunction(new api::BluetoothGetLocalOutOfBandPairingDataFunction);
-
- std::string error(utils::RunFunctionAndReturnError(
- get_oob_function.get(), "[]", browser()));
- EXPECT_FALSE(error.empty());
-}
-
-IN_PROC_BROWSER_TEST_F(BluetoothApiTest, SetOutOfBandPairingData) {
- EXPECT_CALL(*mock_adapter_, GetDevice(device1_->GetAddress()))
- .WillOnce(testing::Return(device1_.get()));
- EXPECT_CALL(*device1_,
- ClearOutOfBandPairingData(testing::Truly(CallClosure),
- testing::_));
-
- std::string params = base::StringPrintf(
- "[{\"deviceAddress\":\"%s\"}]", device1_->GetAddress().c_str());
-
- scoped_refptr<api::BluetoothSetOutOfBandPairingDataFunction> set_oob_function;
- set_oob_function = setupFunction(
- new api::BluetoothSetOutOfBandPairingDataFunction);
- // There isn't actually a result.
- (void) utils::RunFunctionAndReturnSingleResult(
- set_oob_function.get(), params, browser());
-
- // Try again with an error
- testing::Mock::VerifyAndClearExpectations(mock_adapter_);
- testing::Mock::VerifyAndClearExpectations(device1_.get());
- EXPECT_CALL(*mock_adapter_, GetDevice(device1_->GetAddress()))
- .WillOnce(testing::Return(device1_.get()));
- EXPECT_CALL(
- *device1_,
- ClearOutOfBandPairingData(testing::_, testing::Truly(CallErrorClosure)));
-
- set_oob_function = setupFunction(
- new api::BluetoothSetOutOfBandPairingDataFunction);
- std::string error(utils::RunFunctionAndReturnError(
- set_oob_function.get(), params, browser()));
- EXPECT_FALSE(error.empty());
-
- // TODO(bryeung): Also test setting the data when there is support for
- // ArrayBuffers in the arguments to the RunFunctionAnd* methods.
- // crbug.com/132796
-}
-
IN_PROC_BROWSER_TEST_F(BluetoothApiTest, DeviceEvents) {
ResultCatcher catcher;
catcher.RestrictToProfile(browser()->profile());
« no previous file with comments | « chrome/browser/extensions/api/bluetooth/bluetooth_api.cc ('k') | chrome/common/extensions/api/bluetooth.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698