Bluetooth: remove enable-experimental-bluetooth flag

BUG=221813
TEST=device_unittests,
 verify Bluetooth options still available on Chrome OS

Review URL: https://chromiumcodereview.appspot.com/15024005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@201871 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 3 insertions, 30 deletions

diff --git a/device/bluetooth/bluetooth_adapter_factory.cc b/device/bluetooth/bluetooth_adapter_factory.cc
index 9e8e75a..5959ca4 100644
--- a/device/bluetooth/bluetooth_adapter_factory.cc
+++ b/device/bluetooth/bluetooth_adapter_factory.cc
@@ -7,15 +7,12 @@
 #include <vector>
 
 #include "base/bind.h"
-#include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
-#include "chromeos/chromeos_switches.h"
 #include "device/bluetooth/bluetooth_adapter.h"
 
 #if defined(OS_CHROMEOS)
-#include "device/bluetooth/bluetooth_adapter_chromeos.h"
 #include "device/bluetooth/bluetooth_adapter_experimental_chromeos.h"
 #elif defined(OS_WIN)
 #include "device/bluetooth/bluetooth_adapter_win.h"
@@ -77,16 +74,9 @@ bool BluetoothAdapterFactory::IsBluetoothAdapterAvailable() {
 void BluetoothAdapterFactory::GetAdapter(const AdapterCallback& callback) {
   if (!default_adapter.Get().get()) {
 #if defined(OS_CHROMEOS)
-    if (CommandLine::ForCurrentProcess()->HasSwitch(
-        chromeos::switches::kEnableExperimentalBluetooth)) {
-      chromeos::BluetoothAdapterExperimentalChromeOS* new_adapter =
-          new chromeos::BluetoothAdapterExperimentalChromeOS();
-      default_adapter.Get() = new_adapter->weak_ptr_factory_.GetWeakPtr();
-    } else {
-      chromeos::BluetoothAdapterChromeOS* new_adapter =
-          new chromeos::BluetoothAdapterChromeOS();
-      default_adapter.Get() = new_adapter->weak_ptr_factory_.GetWeakPtr();
-    }
+    chromeos::BluetoothAdapterExperimentalChromeOS* new_adapter =
+        new chromeos::BluetoothAdapterExperimentalChromeOS();
+    default_adapter.Get() = new_adapter->weak_ptr_factory_.GetWeakPtr();
 #elif defined(OS_WIN)
     BluetoothAdapterWin* new_adapter = new BluetoothAdapterWin(
         base::Bind(&RunAdapterCallbacks));
diff --git a/device/bluetooth/bluetooth_experimental_chromeos_unittest.cc b/device/bluetooth/bluetooth_experimental_chromeos_unittest.cc
index 0dc3ad5..0a137c8 100644
--- a/device/bluetooth/bluetooth_experimental_chromeos_unittest.cc
+++ b/device/bluetooth/bluetooth_experimental_chromeos_unittest.cc
@@ -2,10 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
-#include "chromeos/chromeos_switches.h"
 #include "chromeos/dbus/fake_bluetooth_adapter_client.h"
 #include "chromeos/dbus/fake_bluetooth_device_client.h"
 #include "chromeos/dbus/mock_dbus_thread_manager_without_gmock.h"
@@ -210,11 +208,6 @@ class TestPairingDelegate : public BluetoothDevice::PairingDelegate {
 class BluetoothExperimentalChromeOSTest : public testing::Test {
  public:
   virtual void SetUp() {
-    if (!CommandLine::ForCurrentProcess()->HasSwitch(
-            chromeos::switches::kEnableExperimentalBluetooth))
-      CommandLine::ForCurrentProcess()->AppendSwitch(
-          chromeos::switches::kEnableExperimentalBluetooth);
-
     mock_dbus_thread_manager_ =
         new MockDBusThreadManagerWithoutGMock();
     DBusThreadManager::InitializeForTesting(mock_dbus_thread_manager_);
diff --git a/device/bluetooth/bluetooth_profile_chromeos_unittest.cc b/device/bluetooth/bluetooth_profile_chromeos_unittest.cc
index 620116c..a1d623f8 100644
--- a/device/bluetooth/bluetooth_profile_chromeos_unittest.cc
+++ b/device/bluetooth/bluetooth_profile_chromeos_unittest.cc
@@ -2,9 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/command_line.h"
 #include "base/message_loop.h"
-#include "chromeos/chromeos_switches.h"
 #include "chromeos/dbus/fake_bluetooth_device_client.h"
 #include "chromeos/dbus/fake_bluetooth_profile_manager_client.h"
 #include "chromeos/dbus/fake_bluetooth_profile_service_provider.h"
@@ -40,11 +38,6 @@ class BluetoothProfileChromeOSTest : public testing::Test {
         last_device_(NULL) {}
 
   virtual void SetUp() {
-    if (!CommandLine::ForCurrentProcess()->HasSwitch(
-            chromeos::switches::kEnableExperimentalBluetooth))
-      CommandLine::ForCurrentProcess()->AppendSwitch(
-          chromeos::switches::kEnableExperimentalBluetooth);
-
     mock_dbus_thread_manager_ =
         new MockDBusThreadManagerWithoutGMock();
     DBusThreadManager::InitializeForTesting(mock_dbus_thread_manager_);
diff --git a/device/device.gyp b/device/device.gyp
index 68cb89d..4999705 100644
--- a/device/device.gyp
+++ b/device/device.gyp
@@ -171,14 +171,11 @@
         '../testing/gtest.gyp:gtest',
       ],
       'sources': [
-        'bluetooth/bluetooth_adapter_chromeos_unittest.cc',
-        'bluetooth/bluetooth_adapter_devices_chromeos_unittest.cc',
         'bluetooth/bluetooth_adapter_mac_unittest.mm',
         'bluetooth/bluetooth_adapter_win_unittest.cc',
         'bluetooth/bluetooth_device_win_unittest.cc',
         'bluetooth/bluetooth_experimental_chromeos_unittest.cc',
         'bluetooth/bluetooth_profile_chromeos_unittest.cc',
-        'bluetooth/bluetooth_service_record_chromeos_unittest.cc',
         'bluetooth/bluetooth_service_record_mac_unittest.mm',
         'bluetooth/bluetooth_service_record_win_unittest.cc',
         'bluetooth/bluetooth_task_manager_win_unittest.cc',