summaryrefslogtreecommitdiffstats
path: root/device/bluetooth/bluetooth_device_win.cc
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-28 21:48:31 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-28 21:48:31 +0000
commit68d595c6ba0e7a9cb64c0c2d9e313591c9510895 (patch)
tree6e248c46c0458965dbd1e68f6a478e06cb49b7cc /device/bluetooth/bluetooth_device_win.cc
parent9467d4017392a1e39387aa479bdd23a61f3ca54f (diff)
downloadchromium_src-68d595c6ba0e7a9cb64c0c2d9e313591c9510895.zip
chromium_src-68d595c6ba0e7a9cb64c0c2d9e313591c9510895.tar.gz
chromium_src-68d595c6ba0e7a9cb64c0c2d9e313591c9510895.tar.bz2
Revert 196990 "Bluetooth: gather usage metrics"
Broke this test on the CrOs main waterfall bots: MetricsLogTest.RecordEnvironment: [19521:19521:0428/105537:1031147919:FATAL:dbus_thread_manager.cc(562)] Check failed: g_dbus_thread_manager. DBusThreadManager::Get() called before Initialize() [0x7fd74d7ce060] base::debug::StackTrace::StackTrace() [0x7fd74d8085ab] logging::LogMessage::~LogMessage() [0x7fd744a60cfe] chromeos::DBusThreadManager::Get() [0x000003d84f8f] chromeos::BluetoothAdapterChromeOS::BluetoothAdapterChromeOS() [0x000003d82c19] device::BluetoothAdapterFactory::GetAdapter() [0x0000026f1274] MetricsLog::RecordEnvironmentProto() [0x0000026f0bf2] MetricsLog::RecordEnvironment() [0x0000013ad864] MetricsLogTest::TestRecordEnvironment() [0x0000013a95d1] MetricsLogTest_RecordEnvironment_Test::TestBody() [0x000002f37967] testing::internal::HandleSehExceptionsInMethodIfSupported<>() [0x000002f35132] testing::internal::HandleExceptionsInMethodIfSupported<>() [0x000002f2a4e6] testing::Test::Run() [0x000002f2ad0a] testing::TestInfo::Run() [0x000002f2b438] testing::TestCase::Run() [0x000002f303e3] testing::internal::UnitTestImpl::RunAllTests() [0x000002f3876e] testing::internal::HandleSehExceptionsInMethodIfSupported<>() [0x000002f358f7] testing::internal::HandleExceptionsInMethodIfSupported<>() [0x000002f2eeb2] testing::UnitTest::Run() [0x0000045f17ac] base::TestSuite::Run() [0x0000042fe020] content::UnitTestTestSuite::Run() [0x00000306ea62] main [0x7fd73e27b76d] __libc_start_ > Bluetooth: gather usage metrics > > BUG=233820 > TEST=chrome:///histograms > R=isherman@chromium.org, satorux@chromium.org, youngki@chromium.org > > Review URL: https://codereview.chromium.org/13872017 TBR=keybuk@chromium.org Review URL: https://codereview.chromium.org/14001008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@196993 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'device/bluetooth/bluetooth_device_win.cc')
-rw-r--r--device/bluetooth/bluetooth_device_win.cc12
1 files changed, 0 insertions, 12 deletions
diff --git a/device/bluetooth/bluetooth_device_win.cc b/device/bluetooth/bluetooth_device_win.cc
index 7779166..cfe9ac9 100644
--- a/device/bluetooth/bluetooth_device_win.cc
+++ b/device/bluetooth/bluetooth_device_win.cc
@@ -71,18 +71,6 @@ std::string BluetoothDeviceWin::GetAddress() const {
return address_;
}
-uint16 BluetoothDeviceWin::GetVendorID() const {
- return 0;
-}
-
-uint16 BluetoothDeviceWin::GetProductID() const {
- return 0;
-}
-
-uint16 BluetoothDeviceWin::GetDeviceID() const {
- return 0;
-}
-
bool BluetoothDeviceWin::IsPaired() const {
return paired_;
}