| Index: extensions/browser/api/bluetooth_socket/bluetooth_socket_apitest.cc
|
| diff --git a/extensions/browser/api/bluetooth_socket/bluetooth_socket_apitest.cc b/extensions/browser/api/bluetooth_socket/bluetooth_socket_apitest.cc
|
| index 1462ed49274f9ab7b4ebf2c690db81dbeff9fba6..1793113aacfc123ae99a3a6de51bd69eb8fae3b0 100644
|
| --- a/extensions/browser/api/bluetooth_socket/bluetooth_socket_apitest.cc
|
| +++ b/extensions/browser/api/bluetooth_socket/bluetooth_socket_apitest.cc
|
| @@ -103,9 +103,9 @@ IN_PROC_BROWSER_TEST_F(BluetoothSocketApiTest, Connect) {
|
|
|
| // Return the right mock device object for the address used by the test,
|
| // return NULL for the "Device not found" test.
|
| - EXPECT_CALL(*mock_adapter_.get(), GetDevice(mock_device1_->GetAddress()))
|
| + EXPECT_CALL(*mock_adapter_, GetDevice(mock_device1_->GetAddress()))
|
| .WillRepeatedly(testing::Return(mock_device1_.get()));
|
| - EXPECT_CALL(*mock_adapter_.get(), GetDevice(std::string("aa:aa:aa:aa:aa:aa")))
|
| + EXPECT_CALL(*mock_adapter_, GetDevice(std::string("aa:aa:aa:aa:aa:aa")))
|
| .WillOnce(testing::Return(static_cast<BluetoothDevice*>(NULL)));
|
|
|
| // Return a mock socket object as a successful result to the connect() call.
|
| @@ -118,12 +118,12 @@ IN_PROC_BROWSER_TEST_F(BluetoothSocketApiTest, Connect) {
|
|
|
| // Since the socket is unpaused, expect a call to Receive() from the socket
|
| // dispatcher. Since there is no data, this will not call its callback.
|
| - EXPECT_CALL(*mock_socket.get(), Receive(testing::_, testing::_, testing::_));
|
| + EXPECT_CALL(*mock_socket, Receive(testing::_, testing::_, testing::_));
|
|
|
| // The test also cleans up by calling Disconnect and Close.
|
| - EXPECT_CALL(*mock_socket.get(), Disconnect(testing::_))
|
| + EXPECT_CALL(*mock_socket, Disconnect(testing::_))
|
| .WillOnce(InvokeCallbackArgument<0>());
|
| - EXPECT_CALL(*mock_socket.get(), Close());
|
| + EXPECT_CALL(*mock_socket, Close());
|
|
|
| // Run the test.
|
| ExtensionTestMessageListener listener("ready", true);
|
| @@ -154,13 +154,13 @@ IN_PROC_BROWSER_TEST_F(BluetoothSocketApiTest, MAYBE_Listen) {
|
| BluetoothAdapter::ServiceOptions service_options;
|
| service_options.name.reset(new std::string("MyServiceName"));
|
| EXPECT_CALL(
|
| - *mock_adapter_.get(),
|
| + *mock_adapter_,
|
| CreateRfcommService(
|
| service_uuid,
|
| testing::Field(&BluetoothAdapter::ServiceOptions::name,
|
| testing::Pointee(testing::Eq("MyServiceName"))),
|
| - testing::_,
|
| - testing::_)).WillOnce(InvokeCallbackArgument<2>(mock_server_socket));
|
| + testing::_, testing::_))
|
| + .WillOnce(InvokeCallbackArgument<2>(mock_server_socket));
|
|
|
| // Since the socket is unpaused, expect a call to Accept() from the socket
|
| // dispatcher. We'll immediately send back another mock socket to represent
|
| @@ -168,10 +168,10 @@ IN_PROC_BROWSER_TEST_F(BluetoothSocketApiTest, MAYBE_Listen) {
|
| // pending.
|
| scoped_refptr<testing::StrictMock<MockBluetoothSocket> > mock_client_socket
|
| = new testing::StrictMock<MockBluetoothSocket>();
|
| - EXPECT_CALL(*mock_server_socket.get(), Accept(testing::_, testing::_))
|
| + EXPECT_CALL(*mock_server_socket, Accept(testing::_, testing::_))
|
| .Times(2)
|
| .WillOnce(
|
| - InvokeCallbackArgument<0>(mock_device1_.get(), mock_client_socket))
|
| + InvokeCallbackArgument<0>(mock_device1_.get(), mock_client_socket))
|
| .WillOnce(testing::Return());
|
|
|
| // Run the test, it sends a ready signal once it's ready for us to dispatch
|
| @@ -191,13 +191,13 @@ IN_PROC_BROWSER_TEST_F(BluetoothSocketApiTest, MAYBE_Listen) {
|
|
|
| // Second stage of tests checks for error conditions, and will clean up
|
| // the existing server and client sockets.
|
| - EXPECT_CALL(*mock_server_socket.get(), Disconnect(testing::_))
|
| + EXPECT_CALL(*mock_server_socket, Disconnect(testing::_))
|
| .WillOnce(InvokeCallbackArgument<0>());
|
| - EXPECT_CALL(*mock_server_socket.get(), Close());
|
| + EXPECT_CALL(*mock_server_socket, Close());
|
|
|
| - EXPECT_CALL(*mock_client_socket.get(), Disconnect(testing::_))
|
| + EXPECT_CALL(*mock_client_socket, Disconnect(testing::_))
|
| .WillOnce(InvokeCallbackArgument<0>());
|
| - EXPECT_CALL(*mock_client_socket.get(), Close());
|
| + EXPECT_CALL(*mock_client_socket, Close());
|
|
|
| EXPECT_TRUE(listener.WaitUntilSatisfied());
|
| listener.Reply("go");
|
|
|