Revert of Fix BluetoothAdapterProfileChromeOS lifecycle management

device/bluetooth/bluetooth_socket_chromeos_unittest.cc

 // Copyright 2014 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 "base/bind.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop/message_loop.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/fake_bluetooth_adapter_client.h"
 #include "chromeos/dbus/fake_bluetooth_agent_manager_client.h"
@@ skipping 89 matching lines @@
 
   void SuccessCallback() {
     ++success_callback_count_;
     message_loop_.Quit();
   }
 
   void ErrorCallback(const std::string& message) {
     ++error_callback_count_;
     last_message_ = message;
 
-    if (message_loop_.is_running())
-      message_loop_.Quit();
+    message_loop_.Quit();
   }
 
   void ConnectToServiceSuccessCallback(scoped_refptr<BluetoothSocket> socket) {
     ++success_callback_count_;
     last_socket_ = socket;
 
     message_loop_.Quit();
   }
 
   void SendSuccessCallback(int bytes_sent) {
@@ skipping 430 matching lines @@
                  base::Unretained(this)),
       base::Bind(&BluetoothSocketChromeOSTest::ErrorCallback,
                  base::Unretained(this)));
   message_loop_.Run();
 
   EXPECT_EQ(0U, success_callback_count_);
   EXPECT_EQ(2U, error_callback_count_);
   EXPECT_TRUE(last_socket_.get() == NULL);
 }
 
-TEST_F(BluetoothSocketChromeOSTest, SocketListenTwice) {
-  adapter_->CreateRfcommService(
-      BluetoothUUID(FakeBluetoothProfileManagerClient::kRfcommUuid),
-      BluetoothAdapter::ServiceOptions(),
-      base::Bind(&BluetoothSocketChromeOSTest::CreateServiceSuccessCallback,
-                 base::Unretained(this)),
-      base::Bind(&BluetoothSocketChromeOSTest::ErrorCallback,
-                 base::Unretained(this)));
-
-  message_loop_.Run();
-
-  EXPECT_EQ(1U, success_callback_count_);
-  EXPECT_EQ(0U, error_callback_count_);
-  EXPECT_TRUE(last_socket_.get() != NULL);
-
-  // Take control of this socket.
-  scoped_refptr<BluetoothSocket> server_socket;
-  server_socket.swap(last_socket_);
-
-  server_socket->Accept(
-      base::Bind(&BluetoothSocketChromeOSTest::AcceptSuccessCallback,
-                 base::Unretained(this)),
-      base::Bind(&BluetoothSocketChromeOSTest::ErrorCallback,
-                 base::Unretained(this)));
-
-  server_socket->Close();
-
-  server_socket = NULL;
-
-  message_loop_.RunUntilIdle();
-
-  EXPECT_EQ(1U, success_callback_count_);
-  EXPECT_EQ(1U, error_callback_count_);
-
-  adapter_->CreateRfcommService(
-      BluetoothUUID(FakeBluetoothProfileManagerClient::kRfcommUuid),
-      BluetoothAdapter::ServiceOptions(),
-      base::Bind(&BluetoothSocketChromeOSTest::CreateServiceSuccessCallback,
-                 base::Unretained(this)),
-      base::Bind(&BluetoothSocketChromeOSTest::ErrorCallback,
-                 base::Unretained(this)));
-
-  message_loop_.Run();
-
-  EXPECT_EQ(2U, success_callback_count_);
-  EXPECT_EQ(1U, error_callback_count_);
-  EXPECT_TRUE(last_socket_.get() != NULL);
-
-  // Take control of this socket.
-  server_socket.swap(last_socket_);
-
-  server_socket->Accept(
-      base::Bind(&BluetoothSocketChromeOSTest::AcceptSuccessCallback,
-                 base::Unretained(this)),
-      base::Bind(&BluetoothSocketChromeOSTest::ErrorCallback,
-                 base::Unretained(this)));
-
-  server_socket->Close();
-
-  server_socket = NULL;
-
-  message_loop_.RunUntilIdle();
-
-  EXPECT_EQ(2U, success_callback_count_);
-  EXPECT_EQ(2U, error_callback_count_);
-}
-
 }  // namespace chromeos