Bluetooth: clean up BluetoothDevice

chrome/browser/extensions/api/bluetooth/bluetooth_apitest.cc

 // Copyright (c) 2012 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.
 
 #include <string.h>
 
 #include "base/stringprintf.h"
 #include "chrome/browser/extensions/api/bluetooth/bluetooth_api.h"
 #include "chrome/browser/extensions/api/bluetooth/bluetooth_event_router.h"
 #include "chrome/browser/extensions/api/permissions/permissions_api.h"
@@ skipping 42 matching lines @@
   virtual void CleanUpOnMainThread() OVERRIDE {
     EXPECT_CALL(*mock_adapter_, RemoveObserver(testing::_));
   }
 
   void SetUpMockAdapter() {
     // The browser will clean this up when it is torn down
     mock_adapter_ = new testing::StrictMock<MockBluetoothAdapter>();
     event_router()->SetAdapterForTest(mock_adapter_);
 
     device1_.reset(new testing::NiceMock<MockBluetoothDevice>(
-        mock_adapter_, "d1", "11:12:13:14:15:16",
-        true /* paired */, false /* bonded */, true /* connected */));
+        mock_adapter_, 0, "d1", "11:12:13:14:15:16",
+        true /* paired */, true /* connected */));
     device2_.reset(new testing::NiceMock<MockBluetoothDevice>(
-        mock_adapter_, "d2", "21:22:23:24:25:26",
-        false /* paired */, true /* bonded */, false /* connected */));
+        mock_adapter_, 0, "d2", "21:22:23:24:25:26",
+        false /* paired */, false /* connected */));
   }
 
   template <class T>
   T* setupFunction(T* function) {
     function->set_extension(empty_extension_.get());
     function->set_has_callback(true);
     return function;
   }
 
  protected:
@@ skipping 413 matching lines @@
   PermissionsRequestFunction::SetIgnoreUserGestureForTests(true);
 
   EXPECT_CALL(*mock_adapter_, GetDevice(device1_->address()))
       .WillOnce(testing::Return(device1_.get()));
   EXPECT_CALL(*device1_,
               ConnectToService(testing::_, testing::_))
       .WillOnce(testing::Invoke(CallConnectToServiceCallback));
 
   EXPECT_TRUE(RunExtensionTest("bluetooth/permissions")) << message_;
 }