Bluetooth: remove private members from BluetoothAdapter

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 38 matching lines @@
   virtual void SetUpOnMainThread() OVERRIDE {
     SetUpMockAdapter();
   }
 
   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>(
-        kAdapterAddress, kName);
+    mock_adapter_ = new testing::StrictMock<MockBluetoothAdapter>;

[youngki, 2013/04/02 12:30:31]

I think using an empty parenthesis is prevalent (i.e. new
testing::StrictMock<MockBluetoothAdapter>(); )

https://code.google.com/p/chromium/codesearch#search/&q=testing::StrictMock%3...

https://code.google.com/p/chromium/codesearch#search/&q=testing::StrictMock%3...

[keybuk, 2013/04/02 19:03:09]

Done.

     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 */));
     device2_.reset(new testing::NiceMock<MockBluetoothDevice>(
         mock_adapter_, "d2", "21:22:23:24:25:26",
         false /* paired */, true /* bonded */, false /* connected */));
   }
 
@@ skipping 65 matching lines @@
     const std::string& name,
     const BluetoothDevice::SocketCallback& callback) {
   scoped_refptr<device::MockBluetoothSocket> socket =
       new device::MockBluetoothSocket();
   callback.Run(socket);
 }
 
 }  // namespace
 
 IN_PROC_BROWSER_TEST_F(BluetoothApiTest, OnAdapterStateChanged) {
+  EXPECT_CALL(*mock_adapter_, address())
+      .WillOnce(testing::Return(kAdapterAddress));
+  EXPECT_CALL(*mock_adapter_, name())
+      .WillOnce(testing::Return(kName));
   EXPECT_CALL(*mock_adapter_, IsPresent())
       .WillOnce(testing::Return(false));
   EXPECT_CALL(*mock_adapter_, IsPowered())
       .WillOnce(testing::Return(true));
   EXPECT_CALL(*mock_adapter_, IsDiscovering())
       .WillOnce(testing::Return(false));
 
   scoped_refptr<api::BluetoothGetAdapterStateFunction> get_adapter_state;
   get_adapter_state = setupFunction(new api::BluetoothGetAdapterStateFunction);
 
@@ skipping 148 matching lines @@
   EXPECT_TRUE(discovery_stopped.WaitUntilSatisfied());
 
   SetUpMockAdapter();
   event_router()->DeviceAdded(mock_adapter_, device2_.get());
   discovery_stopped.Reply("go");
 
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
 }
 
 IN_PROC_BROWSER_TEST_F(BluetoothApiTest, DiscoveryInProgress) {
+  EXPECT_CALL(*mock_adapter_, address())
+      .WillOnce(testing::Return(kAdapterAddress));
+  EXPECT_CALL(*mock_adapter_, name())
+      .WillOnce(testing::Return(kName));
   EXPECT_CALL(*mock_adapter_, IsPresent())
       .WillOnce(testing::Return(true));
   EXPECT_CALL(*mock_adapter_, IsPowered())
       .WillOnce(testing::Return(true));
 
   // Fake that the adapter is discovering
   EXPECT_CALL(*mock_adapter_, IsDiscovering())
       .WillOnce(testing::Return(true));
   event_router()->AdapterDiscoveringChanged(mock_adapter_, true);
 
@@ skipping 31 matching lines @@
 
 IN_PROC_BROWSER_TEST_F(BluetoothApiTest, Events) {
   ResultCatcher catcher;
   catcher.RestrictToProfile(browser()->profile());
 
   // Load and wait for setup
   ExtensionTestMessageListener listener("ready", true);
   ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("bluetooth/events")));
   EXPECT_TRUE(listener.WaitUntilSatisfied());
 
+  EXPECT_CALL(*mock_adapter_, address())
+      .WillOnce(testing::Return(kAdapterAddress));
+  EXPECT_CALL(*mock_adapter_, name())
+      .WillOnce(testing::Return(kName));
   EXPECT_CALL(*mock_adapter_, IsPresent())
       .WillOnce(testing::Return(false));
   EXPECT_CALL(*mock_adapter_, IsPowered())
       .WillOnce(testing::Return(false));
   EXPECT_CALL(*mock_adapter_, IsDiscovering())
       .WillOnce(testing::Return(false));
   event_router()->AdapterPoweredChanged(mock_adapter_, false);
 
+  EXPECT_CALL(*mock_adapter_, address())
+      .WillOnce(testing::Return(kAdapterAddress));
+  EXPECT_CALL(*mock_adapter_, name())
+      .WillOnce(testing::Return(kName));
   EXPECT_CALL(*mock_adapter_, IsPresent())
       .WillOnce(testing::Return(true));
   EXPECT_CALL(*mock_adapter_, IsPowered())
       .WillOnce(testing::Return(true));
   EXPECT_CALL(*mock_adapter_, IsDiscovering())
       .WillOnce(testing::Return(true));
   event_router()->AdapterPresentChanged(mock_adapter_, true);
 
+  EXPECT_CALL(*mock_adapter_, address())
+      .WillOnce(testing::Return(kAdapterAddress));
+  EXPECT_CALL(*mock_adapter_, name())
+      .WillOnce(testing::Return(kName));
   EXPECT_CALL(*mock_adapter_, IsPresent())
       .WillOnce(testing::Return(true));
   EXPECT_CALL(*mock_adapter_, IsPowered())
       .WillOnce(testing::Return(true));
   EXPECT_CALL(*mock_adapter_, IsDiscovering())
       .WillOnce(testing::Return(true));
   event_router()->AdapterDiscoveringChanged(mock_adapter_, true);
 
   listener.Reply("go");
 
@@ skipping 81 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_;
 }