Commit: 225144cb6435f564009e88056fbf8bf06df5da9c - system-bt (git)

system/bt

Commit MetaInfo

• Revision: 225144cb6435f564009e88056fbf8bf06df5da9c (tree)
• Zeit: 2017-08-10 03:32:24
• Autor: Jaap Jan Meijer <jjmeijer88@gmai...>
• Commiter: Jaap Jan Meijer

Log Message

vendor_lib: remove test, it's broken and should be reworked

Ändern Zusammenfassung

• delete: vendor_libs/test_vendor_lib/Android.mk
• delete: vendor_libs/test_vendor_lib/BUILD.gn
• delete: vendor_libs/test_vendor_lib/data/controller_properties.json
• delete: vendor_libs/test_vendor_lib/include/command_packet.h
• delete: vendor_libs/test_vendor_lib/include/dual_mode_controller.h
• delete: vendor_libs/test_vendor_lib/include/event_packet.h
• delete: vendor_libs/test_vendor_lib/include/hci_transport.h
• delete: vendor_libs/test_vendor_lib/include/packet.h
• delete: vendor_libs/test_vendor_lib/include/packet_stream.h
• delete: vendor_libs/test_vendor_lib/include/test_channel_transport.h
• delete: vendor_libs/test_vendor_lib/include/vendor_manager.h
• delete: vendor_libs/test_vendor_lib/scripts/build_and_run.sh
• delete: vendor_libs/test_vendor_lib/scripts/test_channel.py
• delete: vendor_libs/test_vendor_lib/src/bt_vendor.cc
• delete: vendor_libs/test_vendor_lib/src/command_packet.cc
• delete: vendor_libs/test_vendor_lib/src/dual_mode_controller.cc
• delete: vendor_libs/test_vendor_lib/src/event_packet.cc
• delete: vendor_libs/test_vendor_lib/src/hci_transport.cc
• delete: vendor_libs/test_vendor_lib/src/packet.cc
• delete: vendor_libs/test_vendor_lib/src/packet_stream.cc
• delete: vendor_libs/test_vendor_lib/src/test_channel_transport.cc
• delete: vendor_libs/test_vendor_lib/src/vendor_manager.cc
• delete: vendor_libs/test_vendor_lib/test/hci_transport_unittest.cc
• delete: vendor_libs/test_vendor_lib/test/packet_stream_unittest.cc

Diff

--- a/vendor_libs/test_vendor_lib/Android.mk
+++ /dev/null
@@ -1,77 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-# test-vendor shared library for target
-# ========================================================
-include $(CLEAR_VARS)
-
-BT_DIR := $(TOP_DIR)system/bt
-
-LOCAL_SRC_FILES := \
-    src/bt_vendor.cc \
-    src/command_packet.cc \
-    src/dual_mode_controller.cc \
-    src/event_packet.cc \
-    src/hci_transport.cc \
-    src/packet.cc \
-    src/packet_stream.cc \
-    src/test_channel_transport.cc \
-    src/vendor_manager.cc
-
-# We pull in gtest because base/files/file_util.h, which is used to read the
-# controller properties file, needs gtest/gtest_prod.h.
-LOCAL_C_INCLUDES := \
-    $(LOCAL_PATH)/include \
-    $(BT_DIR) \
-    $(BT_DIR)/hci/include \
-    $(BT_DIR)/stack/include \
-    $(BT_DIR)/third_party/gtest/include
-
-LOCAL_SHARED_LIBRARIES := \
-    liblog \
-    libchrome
-
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_MODULE := test-vendor
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-
-LOCAL_CFLAGS += $(bluetooth_CFLAGS)
-LOCAL_CONLYFLAGS += $(bluetooth_CONLYFLAGS)
-LOCAL_CPPFLAGS += $(bluetooth_CPPFLAGS)
-
-include $(BUILD_SHARED_LIBRARY)
-
-# test-vendor unit tests for host
-# ========================================================
-ifeq ($(HOST_OS), linux)
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := \
-    src/command_packet.cc \
-    src/event_packet.cc \
-    src/hci_transport.cc \
-    src/packet.cc \
-    src/packet_stream.cc \
-    test/hci_transport_unittest.cc \
-    test/packet_stream_unittest.cc
-
-LOCAL_C_INCLUDES := \
-    $(LOCAL_PATH)/include \
-    $(BT_DIR) \
-    $(BT_DIR)/hci/include \
-    $(BT_DIR)/stack/include
-
-LOCAL_SHARED_LIBRARIES := \
-    liblog \
-    libchrome
-
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_MODULE := test-vendor_test_host
-LOCAL_MODULE_TAGS := tests
-
-LOCAL_CFLAGS += $(bluetooth_CFLAGS)
-LOCAL_CONLYFLAGS += $(bluetooth_CONLYFLAGS)
-LOCAL_CPPFLAGS += $(bluetooth_CPPFLAGS)
-
-include $(BUILD_HOST_NATIVE_TEST)
-endif

--- a/vendor_libs/test_vendor_lib/BUILD.gn
+++ /dev/null
@@ -1,55 +0,0 @@
-shared_library("test_vendor_lib") {
-  sources = [
-    "src/bt_vendor.cc",
-    "src/command_packet.cc",
-    "src/dual_mode_controller.cc",
-    "src/event_packet.cc",
-    "src/hci_transport.cc",
-    "src/packet.cc",
-    "src/packet_stream.cc",
-    "src/test_channel_transport.cc",
-    "src/vendor_manager.cc",
-  ]
-
-  include_dirs = [
-    "include",
-    "//",
-
-    # TODO(dennischeng): Ideally we should need to have the lines below for
-    # indirect includes.
-    "//stack/include",
-    "//third_party/libchrome:base",
-  ]
-}
-
-executable("test_vendor_lib_test") {
-  testonly = true
-  sources = [
-    "src/command_packet.cc",
-    "src/event_packet.cc",
-    "src/packet.cc",
-    "src/packet_stream.cc",
-    "test/hci_transport_unittest.cc",
-    "test/packet_stream_unittest.cc",
-  ]
-
-  include_dirs = [
-    "include",
-    "//",
-    "//btcore/include",
-    "//hci/include",
-    "//stack/include",
-  ]
-
-  deps = [
-    "//third_party/googletest:gtest_main",
-    "//third_party/libchrome:base",
-    "//vendor_libs/test_vendor_lib",
-  ]
-
-  libs = [
-    "-lpthread",
-    "-lrt",
-    "-ldl",
-  ]
-}

--- a/vendor_libs/test_vendor_lib/data/controller_properties.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "AclDataPacketSize": "1024",
-  "ScoDataPacketSize": "255",
-  "NumAclDataPackets": "10",
-  "NumScoDataPackets": "10",
-  "Version": "4",
-  "Revision": "0",
-  "LmpPalVersion": "0",
-  "ManufacturerName": "0",
-  "LmpPalSubversion": "0",
-  "MaximumPageNumber": "0",
-  "BdAddress": "123456"
-}

--- a/vendor_libs/test_vendor_lib/include/command_packet.h
+++ /dev/null
@@ -1,80 +0,0 @@
-//
-// Copyright 2015 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-#pragma once
-
-#include <cstdint>
-#include <vector>
-
-#include "base/macros.h"
-#include "vendor_libs/test_vendor_lib/include/packet.h"
-
-namespace test_vendor_lib {
-
-// The following is specified in the Bluetooth Core Specification Version 4.2,
-// Volume 2, Part E, Section 5.4.1 (page 470). Command Packets begin with a 3
-// octet header formatted as follows:
-// - Opcode: 2 octets
-//   - Opcode Group Field (OGF): Upper bits 10-15
-//   - Opcode Command Field (OCF): Lower bits 0-9
-// - Payload size (in octets): 1 octet
-// The header is followed by the payload, which contains command specific
-// parameters and has a maximum size of 255 octets. Valid command opcodes are
-// defined in stack/include/hcidefs.h. The OGF ranges from 0x00 to 0x3F, with
-// 0x3F reserved for vendor-specific debug functions. The OCF ranges from
-// 0x0000 to 0x03FF. Note that the payload size is the size in octets of the
-// command parameters and not the number of parameters. Finally, although the
-// parameters contained in the payload are command specific (including the size
-// and number of parameters), each parameter will be an integer number of octets
-// in size.
-class CommandPacket : public Packet {
- public:
-  CommandPacket();
-
-  virtual ~CommandPacket() override = default;
-
-  // Returns the command opcode as defined in stack/include/hcidefs.h.
-  // See the Bluetooth Core Specification Version 4.2, Volume 2, Part E,
-  // Section 7 for more information about each HCI commands and for a listing
-  // of their specific opcodes/OGF and OCF values.
-  uint16_t GetOpcode() const;
-
-  // Returns the 6 bit opcode group field that specifies the general category of
-  // the command. The OGF can be one of seven values:
-  // - 0x01: Link control commands
-  // - 0x02: Link policy commands
-  // - 0x03: Controller and baseband commands
-  // - 0x04: Informational parameters commands
-  // - 0x05: Status parameters commands
-  // - 0x06: Testing commands
-  // - 0x08: Low energy controller commands
-  // The upper 2 bits will be zero filled.
-  uint8_t GetOGF() const;
-
-  // Returns the 10 bit opcode command field that specifies an exact command
-  // within an opcode group field. The upper 6 bits will be zero filled.
-  uint16_t GetOCF() const;
-
-  // Size in octets of a command packet header, which consists of a 2 octet
-  // opcode and a 1 octet payload size.
-  static const size_t kCommandHeaderSize = 3;
-
- private:
-  // Disallow any copies of the singleton to be made.
-  DISALLOW_COPY_AND_ASSIGN(CommandPacket);
-};
-
-}  // namespace test_vendor_lib

--- a/vendor_libs/test_vendor_lib/include/dual_mode_controller.h
+++ /dev/null
@@ -1,369 +0,0 @@
-//
-// Copyright 2015 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-#pragma once
-
-#include <cstdint>
-#include <memory>
-#include <string>
-#include <vector>
-#include <unordered_map>
-
-#include "base/json/json_value_converter.h"
-#include "base/time/time.h"
-#include "vendor_libs/test_vendor_lib/include/command_packet.h"
-#include "vendor_libs/test_vendor_lib/include/hci_transport.h"
-#include "vendor_libs/test_vendor_lib/include/test_channel_transport.h"
-
-namespace test_vendor_lib {
-
-// Emulates a dual mode BR/EDR + LE controller by maintaining the link layer
-// state machine detailed in the Bluetooth Core Specification Version 4.2,
-// Volume 6, Part B, Section 1.1 (page 30). Provides methods corresponding to
-// commands sent by the HCI. These methods will be registered as callbacks from
-// a controller instance with the HciHandler. To implement a new Bluetooth
-// command, simply add the method declaration below, with return type void and a
-// single const std::vector<uint8_t>& argument. After implementing the
-// method, simply register it with the HciHandler using the SET_HANDLER macro in
-// the controller's default constructor. Be sure to name your method after the
-// corresponding Bluetooth command in the Core Specification with the prefix
-// "Hci" to distinguish it as a controller command.
-class DualModeController {
- public:
-  class Properties {
-   public:
-    // TODO(dennischeng): Add default initialization and use that to instantiate
-    // a default configured controller if the config file is invalid or not
-    // provided.
-    Properties(const std::string& file_name);
-
-    // Aggregates and returns the result for the Read Local Extended Features
-    // command. This result contains the |maximum_page_number_| property (among
-    // other things not in the Properties object). See the Bluetooth Core
-    // Specification Version 4.2, Volume 2, Part E, Section 7.4.4 (page 792).
-    const std::vector<uint8_t> GetBdAddress();
-
-    // Aggregates and returns the result for the Read Buffer Size command. This
-    // result consists of the |acl_data_packet_size_|, |sco_data_packet_size_|,
-    // |num_acl_data_packets_|, and |num_sco_data_packets_| properties. See the
-    // Bluetooth Core Specification Version 4.2, Volume 2, Part E, Section 7.4.5
-    // (page 794).
-    const std::vector<uint8_t> GetBufferSize();
-
-    // Returns the result for the Read BD_ADDR command. This result is the
-    // |bd_address_| property. See the Bluetooth Core Specification Version
-    // 4.2, Volume 2, Part E, Section 7.4.6 (page 796).
-    const std::vector<uint8_t> GetLocalExtendedFeatures(uint8_t page_number);
-
-    // Returns the result for the Read Local Name command. See the Bluetooth
-    // Core Specification Version 4.2, Volume 2, Part E, Section 7.3.12
-    // (page 664).
-    const std::vector<uint8_t> GetLocalName();
-
-    // Returns the result for the Read Local Supported Commands command. See the
-    // Bluetooth Core Specification Version 4.2, Volume 2, Part E, Section 7.4.2
-    // (page 790).
-    const std::vector<uint8_t> GetLocalSupportedCommands();
-
-    // Aggregates and returns the Read Local Version Information result. This
-    // consists of the |version_|, |revision_|, |lmp_pal_version_|,
-    // |manufacturer_name_|, and |lmp_pal_subversion_|. See the Bluetooth Core
-    // Specification Version 4.2, Volume 2, Part E, Section 7.4.1 (page 788).
-    const std::vector<uint8_t> GetLocalVersionInformation();
-
-    static void RegisterJSONConverter(
-        base::JSONValueConverter<Properties>* converter);
-
-   private:
-    uint16_t acl_data_packet_size_;
-    uint8_t sco_data_packet_size_;
-    uint16_t num_acl_data_packets_;
-    uint16_t num_sco_data_packets_;
-    uint8_t version_;
-    uint16_t revision_;
-    uint8_t lmp_pal_version_;
-    uint16_t manufacturer_name_;
-    uint16_t lmp_pal_subversion_;
-    uint8_t maximum_page_number_;
-    uint8_t local_supported_commands_size_;
-    uint8_t local_name_size_;
-    std::vector<uint8_t> bd_address_;
-  };
-
-  // Sets all of the methods to be used as callbacks in the HciHandler.
-  DualModeController();
-
-  ~DualModeController() = default;
-
-  // Preprocesses the command, primarily checking testh channel hooks. If
-  // possible, dispatches the corresponding controller method corresponding to
-  // carry out the command.
-  void HandleCommand(std::unique_ptr<CommandPacket> command_packet);
-
-  // Dispatches the test channel action corresponding to the command specified
-  // by |name|.
-  void HandleTestChannelCommand(const std::string& name,
-                                const std::vector<std::string>& args);
-
-  // Sets the controller Handle* methods as callbacks for the transport to call
-  // when data is received.
-  void RegisterHandlersWithHciTransport(HciTransport& transport);
-
-  // Sets the test channel handler with the transport dedicated to test channel
-  // communications.
-  void RegisterHandlersWithTestChannelTransport(
-      TestChannelTransport& transport);
-
-  // Sets the callback to be used for sending events back to the HCI.
-  // TODO(dennischeng): Once PostDelayedTask works, get rid of this and only use
-  // |RegisterDelayedEventChannel|.
-  void RegisterEventChannel(
-      std::function<void(std::unique_ptr<EventPacket>)> send_event);
-
-  void RegisterDelayedEventChannel(
-      std::function<void(std::unique_ptr<EventPacket>, base::TimeDelta)>
-          send_event);
-
-  // Controller commands. For error codes, see the Bluetooth Core Specification,
-  // Version 4.2, Volume 2, Part D (page 370).
-
-  // OGF: 0x0003
-  // OCF: 0x0003
-  // Bluetooth Core Specification Version 4.2 Volume 2 Part E 7.3.2
-  void HciReset(const std::vector<uint8_t>& args);
-
-  // OGF: 0x0004
-  // OGF: 0x0005
-  // Bluetooth Core Specification Version 4.2 Volume 2 Part E 7.4.5
-  void HciReadBufferSize(const std::vector<uint8_t>& args);
-
-  // OGF: 0x0003
-  // OCF: 0x0033
-  // Bluetooth Core Specification Version 4.2 Volume 2 Part E 7.3.39
-  void HciHostBufferSize(const std::vector<uint8_t>& args);
-
-  // OGF: 0x0004
-  // OCF: 0x0001
-  // Bluetooth Core Specification Version 4.2 Volume 2 Part E 7.4.1
-  void HciReadLocalVersionInformation(const std::vector<uint8_t>& args);
-
-  // OGF: 0x0004
-  // OCF: 0x0009
-  // Bluetooth Core Specification Version 4.2 Volume 2 Part E 7.4.6
-  void HciReadBdAddr(const std::vector<uint8_t>& args);
-
-  // OGF: 0x0004
-  // OCF: 0x0002
-  // Bluetooth Core Specification Version 4.2 Volume 2 Part E 7.4.2
-  void HciReadLocalSupportedCommands(const std::vector<uint8_t>& args);
-
-  // OGF: 0x0004
-  // OCF: 0x0004
-  // Bluetooth Core Specification Version 4.2 Volume 2 Part E 7.4.4
-  void HciReadLocalExtendedFeatures(const std::vector<uint8_t>& args);
-
-  // OGF: 0x0003
-  // OCF: 0x0056
-  // Bluetooth Core Specification Version 4.2 Volume 2 Part E 7.3.59
-  void HciWriteSimplePairingMode(const std::vector<uint8_t>& args);
-
-  // OGF: 0x0003
-  // OCF: 0x006D
-  // Bluetooth Core Specification Version 4.2 Volume 2 Part E 7.3.79
-  void HciWriteLeHostSupport(const std::vector<uint8_t>& args);
-
-  // OGF: 0x0003
-  // OCF: 0x0001
-  // Bluetooth Core Specification Version 4.2 Volume 2 Part E 7.3.1
-  void HciSetEventMask(const std::vector<uint8_t>& args);
-
-  // OGF: 0x0003
-  // OCF: 0x0045
-  // Bluetooth Core Specification Version 4.2 Volume 2 Part E 7.3.50
-   void HciWriteInquiryMode(const std::vector<uint8_t>& args);
-
-  // OGF: 0x0003
-  // OCF: 0x0047
-  // Bluetooth Core Specification Version 4.2 Volume 2 Part E 7.3.52
-   void HciWritePageScanType(const std::vector<uint8_t>& args);
-
-  // OGF: 0x0003
-  // OCF: 0x0043
-  // Bluetooth Core Specification Version 4.2 Volume 2 Part E 7.3.48
-  void HciWriteInquiryScanType(const std::vector<uint8_t>& args);
-
-  // OGF: 0x0003
-  // OCF: 0x0024
-  // Bluetooth Core Specification Version 4.2 Volume 2 Part E 7.3.26
-  void HciWriteClassOfDevice(const std::vector<uint8_t>& args);
-
-  // OGF: 0x0003
-  // OCF: 0x0018
-  // Bluetooth Core Specification Version 4.2 Volume 2 Part E 7.3.16
-  void HciWritePageTimeout(const std::vector<uint8_t>& args);
-
-  // OGF: 0x0002
-  // OCF: 0x000F
-  // Bluetooth Core Specification Version 4.2 Volume 2 Part E 7.2.12
-  void HciWriteDefaultLinkPolicySettings(const std::vector<uint8_t>& args);
-
-  // OGF: 0x0003
-  // OCF: 0x0014
-  // Bluetooth Core Specification Version 4.2 Volume 2 Part E 7.3.12
-  void HciReadLocalName(const std::vector<uint8_t>& args);
-
-  // OGF: 0x0003
-  // OCF: 0x0013
-  // Bluetooth Core Specification Version 4.2 Volume 2 Part E 7.3.11
-  void HciWriteLocalName(const std::vector<uint8_t>& args);
-
-  // OGF: 0x0003
-  // OCF: 0x0052
-  // Bluetooth Core Specification Version 4.2 Volume 2 Part E 7.3.56
-  void HciWriteExtendedInquiryResponse(const std::vector<uint8_t>& args);
-
-  // OGF: 0x0003
-  // OCF: 0x0026
-  // Bluetooth Core Specification Version 4.2 Volume 2 Part E 7.3.28
-  void HciWriteVoiceSetting(const std::vector<uint8_t>& args);
-
-  // OGF: 0x0003
-  // OCF: 0x003A
-  // Bluetooth Core Specification Version 4.2 Volume 2 Part E 7.3.45
-    void HciWriteCurrentIacLap(const std::vector<uint8_t>& args);
-
-  // OGF: 0x0003
-  // OCF: 0x001E
-  // Bluetooth Core Specification Version 4.2 Volume 2 Part E 7.3.22
-   void HciWriteInquiryScanActivity(const std::vector<uint8_t>& args);
-
-  // OGF: 0x0003
-  // OCF: 0x001A
-  // Bluetooth Core Specification Version 4.2 Volume 2 Part E 7.3.18
-  void HciWriteScanEnable(const std::vector<uint8_t>& args);
-
-  // OGF: 0x0003
-  // OCF: 0x0005
-  // Bluetooth Core Specification Version 4.2 Volume 2 Part E 7.3.3
-  void HciSetEventFilter(const std::vector<uint8_t>& args);
-
-  // OGF: 0x0001
-  // OCF: 0x0001
-  // Bluetooth Core Specification Version 4.2 Volume 2 Part E 7.1.1
-  void HciInquiry(const std::vector<uint8_t>& args);
-
-  // OGF: 0x0001
-  // OCF: 0x0002
-  // Bluetooth Core Specification Version 4.2 Volume 2 Part E 7.1.2
-  void HciInquiryCancel(const std::vector<uint8_t>& args);
-
-  // OGF: 0x0003
-  // OCF: 0x0012
-  // Bluetooth Core Specification Version 4.2 Volume 2 Part E 7.3.10
-  void HciDeleteStoredLinkKey(const std::vector<uint8_t>& args);
-
-  // OGF: 0x0001
-  // OCF: 0x0019
-  // Bluetooth Core Specification Version 4.2 Volume 2 Part E 7.1.19
-  void HciRemoteNameRequest(const std::vector<uint8_t>& args);
-
-  // Test Channel commands:
-
-  // Clears all test channel modifications.
-  void TestChannelClear(const std::vector<std::string>& args);
-
-  // Sets the response delay for events to 0.
-  void TestChannelClearEventDelay(const std::vector<std::string>& args);
-
-  // Discovers a fake device.
-  void TestChannelDiscover(const std::vector<std::string>& args);
-
-  // Causes events to be sent after a delay.
-  void TestChannelSetEventDelay(const std::vector<std::string>& args);
-
-  // Causes all future HCI commands to timeout.
-  void TestChannelTimeoutAll(const std::vector<std::string>& args);
-
- private:
-  // Current link layer state of the controller.
-  enum State {
-    kStandby,  // Not receiving/transmitting any packets from/to other devices.
-    kInquiry,  // The controller is discovering other nearby devices.
-  };
-
-  enum TestChannelState {
-    kNone,  // The controller is running normally.
-    kTimeoutAll,  // All commands should time out, i.e. send no response.
-    kDelayedResponse,  // Event responses are sent after a delay.
-  };
-
-  // Creates a command complete event and sends it back to the HCI.
-  void SendCommandComplete(uint16_t command_opcode,
-                           const std::vector<uint8_t>& return_parameters) const;
-
-  // Sends a command complete event with no return parameters. This event is
-  // typically sent for commands that can be completed immediately.
-  void SendCommandCompleteSuccess(uint16_t command_opcode) const;
-
-  // Creates a command status event and sends it back to the HCI.
-  void SendCommandStatus(uint8_t status, uint16_t command_opcode) const;
-
-  // Sends a command status event with default event parameters.
-  void SendCommandStatusSuccess(uint16_t command_opcode) const;
-
-  // Sends an inquiry response for a fake device.
-  void SendInquiryResult() const;
-
-  // Sends an extended inquiry response for a fake device.
-  void SendExtendedInquiryResult(const std::string& name,
-                                 const std::string& address) const;
-
-  void SetEventDelay(int64_t delay);
-
-  // Callback provided to send events from the controller back to the HCI.
-  std::function<void(std::unique_ptr<EventPacket>)> send_event_;
-
-  std::function<void(std::unique_ptr<EventPacket>, base::TimeDelta)>
-      send_delayed_event_;
-
-  // Maintains the commands to be registered and used in the HciHandler object.
-  // Keys are command opcodes and values are the callbacks to handle each
-  // command.
-  std::unordered_map<uint16_t, std::function<void(const std::vector<uint8_t>&)>>
-      active_hci_commands_;
-
-  std::unordered_map<std::string,
-                     std::function<void(const std::vector<std::string>&)>>
-      active_test_channel_commands_;
-
-  // Specifies the format of Inquiry Result events to be returned during the
-  // Inquiry command.
-  // 0x00: Standard Inquiry Result event format (default).
-  // 0x01: Inquiry Result format with RSSI.
-  // 0x02 Inquiry Result with RSSI format or Extended Inquiry Result format.
-  // 0x03-0xFF: Reserved.
-  uint8_t inquiry_mode_;
-
-  State state_;
-
-  Properties properties_;
-
-  TestChannelState test_channel_state_;
-
-  DISALLOW_COPY_AND_ASSIGN(DualModeController);
-};
-
-}  // namespace test_vendor_lib

--- a/vendor_libs/test_vendor_lib/include/event_packet.h
+++ /dev/null
@@ -1,161 +0,0 @@
-//
-// Copyright 2015 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-#pragma once
-
-#include <cstdint>
-#include <memory>
-#include <vector>
-
-#include "base/logging.h"
-#include "vendor_libs/test_vendor_lib/include/packet.h"
-
-namespace test_vendor_lib {
-
-// The following is specified in the Bluetooth Core Specification Version 4.2,
-// Volume 2, Part E, Section 5.4.4 (page 477). Event Packets begin with a 2
-// octet header formatted as follows:
-// - Event code: 1 octet
-// - Payload size (in octets): 1 octet
-// The header is followed by the payload, which contains event specific
-// parameters and has a maximum size of 255 octets. Valid event codes are
-// listed in stack/include/hcidefs.h. They can range from 0x00 to 0xFF, with
-// 0xFF reserved for vendor specific debug events. Note the payload size
-// describes the total size of the event parameters and not the number of
-// parameters. The event parameters contained in the payload will be an integer
-// number of octets in size. Each flavor of event packet is created via a static
-// factory function that takes the event type-specific parameters and returns an
-// initialized event packet from that data.
-class EventPacket : public Packet {
- public:
-  virtual ~EventPacket() override = default;
-
-  uint8_t GetEventCode() const;
-
-  // Static functions for creating event packets:
-
-  // Creates and returns a command complete event packet. See the Bluetooth
-  // Core Specification Version 4.2, Volume 2, Part E, Section 7.7.14 (page 861)
-  // for more information about the command complete event.
-  // Event Parameters:
-  //   |num_hci_command_packets|
-  //     Indicates the number of HCI command packets the host can send to the
-  //     controller. If |num_hci_command_packets| is 0, the controller would
-  //     like to stop receiving commands from the host (to indicate
-  //     readiness again, the controller sends a command complete event with
-  //     |command_opcode| to 0x0000 (no op) and |num_hci_command_packets| > 1).
-  //   |command_opcode|
-  //     The opcode of the command that caused this event.
-  //   |return_parameters|
-  //     Contains any event specific parameters that should
-  //     be sent to the host.
-  static std::unique_ptr<EventPacket> CreateCommandCompleteEvent(
-      uint8_t num_hci_command_packets, uint16_t command_opcode,
-      const std::vector<uint8_t>& event_return_parameters);
-
-  // Creates and returns a command complete event packet. See the Bluetooth
-  // Core Specification Version 4.2, Volume 2, Part E, Section 7.7.15 (page 862)
-  // for more information about the command complete event.
-  // Event Parameters:
-  //   Status
-  //     0x00: Command currently in pending.
-  //     0x01-0xFF: Command failed.
-  //   |num_hci_command_packets|
-  //     Indicates the number of HCI command packets the host can send to the
-  //     controller. If |num_hci_command_packets| is 0, the controller would
-  //     like to stop receiving commands from the host (to indicate
-  //     readiness again, the controller sends a command complete event with
-  //     |command_opcode| to 0x0000 (no op) and |num_hci_command_packets| > 1).
-  //   |command_opcode|
-  //     The opcode of the command that caused this event.
-  static std::unique_ptr<EventPacket> CreateCommandStatusEvent(
-      uint8_t status, uint8_t num_hci_command_packets, uint16_t command_opcode);
-
-  // Creates and returns an inquiry result event packet. See the Bluetooth
-  // Core Specification Version 4.2, Volume 2, Part E, Section 7.7.2 (page 844)
-  // for more information about the command complete event.
-  // Event Parameters:
-  //   Num Responses (1 octet)
-  //     0xXX: Number of responses from the inquiry.
-  //   Bd Addresses (6 octets * Num Responses)
-  //     0xXXXXXXXXXXX: Bd Address for each device which responded.
-  //   Page Scan Repetition Mode (1 octet * Num Responses)
-  //     0x00: R0
-  //     0x01: R1
-  //     0x02: R2
-  //     0x03-0xFF: Reserved.
-  //   Reserved 1 (1 octet * Num Responses)
-  //     Originally Page Scan Period Mode parameter. No longer in use.
-  //   Reserved 2 (1 octet * Num Responses)
-  //     Originally Page Scan Mode parameter. No longer in use.
-  //   Class of Device (3 octet * Num Responses)
-  //     0xXXXXXX: Class of device.
-  //   Clock Offset (2 octet * Num Responses)
-  //     Bits 14-0: Bits 16-2 of CLKNslave-CLK.
-  //     Bits 15: Reserved.
-  static std::unique_ptr<EventPacket> CreateInquiryResultEvent(
-      uint8_t num_responses, const std::vector<uint8_t>& bd_addresses,
-      const std::vector<uint8_t>& page_scan_repetition_mode,
-      const std::vector<uint8_t>& page_scan_period_mode,
-      const std::vector<uint8_t>& page_scan_mode,
-      const std::vector<uint8_t>& class_of_device,
-      const std::vector<uint8_t>& clock_offset);
-
-  // Creates and returns an inquiry result event packet. See the Bluetooth
-  // Core Specification Version 4.2, Volume 2, Part E, Section 7.7.38 (page 896)
-  // for more information about the command complete event.
-  // Event Parameters:
-  //   Num Responses (1 octet)
-  //     0x01: Always contains a single response.
-  //   Bd Addresses (6 octets * Num Responses)
-  //     0xXXXXXXXXXXX: Bd Address for each device which responded.
-  //   Page Scan Repetition Mode (1 octet * Num Responses)
-  //     0x00: R0
-  //     0x01: R1
-  //     0x02: R2
-  //     0x03-0xFF: Reserved.
-  //   Reserved 1 (1 octet * Num Responses)
-  //     Originally Page Scan Period Mode parameter. No longer in use.
-  //   Class of Device (3 octet * Num Responses)
-  //     0xXXXXXX: Class of device.
-  //   Clock Offset (2 octet * Num Responses)
-  //     Bits 14-0: Bits 16-2 of CLKNslave-CLK.
-  //     Bits 15: Reserved.
-  //   RSSI (1 octet)
-  //     0xXX: Ranges from -127 to +20. Units are dBm.
-  //  Extended Inquiry Response (240 octets)
-  //    Defined in Volumne 2, Part C, Section 8. Also see the Supplement to the
-  //    Bluetooth Core Specificiation for data type definitions and formats.
-  static std::unique_ptr<EventPacket> CreateExtendedInquiryResultEvent(
-      const std::vector<uint8_t>& bd_address,
-      const std::vector<uint8_t>& page_scan_repetition_mode,
-      const std::vector<uint8_t>& page_scan_period_mode,
-      const std::vector<uint8_t>& class_of_device,
-      const std::vector<uint8_t>& clock_offset,
-      const std::vector<uint8_t>& rssi,
-      const std::vector<uint8_t>& extended_inquiry_response);
-
-  // Size in octets of a data packet header, which consists of a 1 octet
-  // event code and a 1 octet payload size.
-  static const size_t kEventHeaderSize = 2;
-
- private:
-  // Takes in the event parameters in |payload|. These parameters vary by event
-  // and are detailed in the Bluetooth Core Specification.
-  EventPacket(uint8_t event_code, const std::vector<uint8_t>& payload);
-};
-
-}  // namespace test_vendor_lib

--- a/vendor_libs/test_vendor_lib/include/hci_transport.h
+++ /dev/null
@@ -1,134 +0,0 @@
-//
-// Copyright 2015 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-#pragma once
-
-#include <functional>
-#include <memory>
-#include <list>
-
-extern "C" {
-#include <sys/epoll.h>
-}  // extern "C"
-
-#include "base/files/scoped_file.h"
-#include "base/memory/weak_ptr.h"
-#include "base/message_loop/message_loop.h"
-#include "base/time/time.h"
-#include "vendor_libs/test_vendor_lib/include/command_packet.h"
-#include "vendor_libs/test_vendor_lib/include/event_packet.h"
-#include "vendor_libs/test_vendor_lib/include/packet.h"
-#include "vendor_libs/test_vendor_lib/include/packet_stream.h"
-
-namespace test_vendor_lib {
-
-// Manages communication channel between HCI and the controller by providing the
-// socketing mechanisms for reading/writing between the HCI and the controller.
-class HciTransport : public base::MessageLoopForIO::Watcher {
- public:
-  HciTransport();
-
-  virtual ~HciTransport() = default;
-
-  void CloseHciFd();
-
-  void CloseVendorFd();
-
-  int GetHciFd() const;
-
-  int GetVendorFd() const;
-
-  // Creates the underlying socketpair to be used as a communication channel
-  // between the HCI and the vendor library/controller. Returns false if an
-  // error occurs.
-  bool SetUp();
-
-  // Sets the callback that is run when command packets are received.
-  void RegisterCommandHandler(
-      std::function<void(std::unique_ptr<CommandPacket>)> callback);
-
-  // Posts the event onto |outbound_events_| to be written sometime in the
-  // future when the vendor file descriptor is ready for writing.
-  void PostEventResponse(std::unique_ptr<EventPacket> event);
-
-  // Posts the event onto |outbound_events_| after |delay| ms. A call to
-  // |PostEventResponse| with |delay| 0 is equivalent to a call to |PostEvent|.
-  void PostDelayedEventResponse(std::unique_ptr<EventPacket> event,
-                                base::TimeDelta delay);
-
- private:
-  // Wrapper class for sending events on a delay. The TimeStampedEvent object
-  // takes ownership of a given event packet.
-  class TimeStampedEvent {
-   public:
-    TimeStampedEvent(std::unique_ptr<EventPacket> event, base::TimeDelta delay);
-
-    // Using this constructor is equivalent to calling the 2-argument
-    // constructor with a |delay| of 0. It is used to generate event responses
-    // with no delay.
-    TimeStampedEvent(std::unique_ptr<EventPacket> event);
-
-    const base::TimeTicks& GetTimeStamp() const;
-
-    const EventPacket& GetEvent();
-
-   private:
-    std::shared_ptr<EventPacket> event_;
-
-    // The time associated with the event, indicating the earliest time at which
-    // |event_| will be sent.
-    base::TimeTicks time_stamp_;
-  };
-
-  // base::MessageLoopForIO::Watcher overrides:
-  void OnFileCanReadWithoutBlocking(int fd) override;
-
-  void OnFileCanWriteWithoutBlocking(int fd) override;
-
-  // Reads in a command packet and calls the command ready callback,
-  // |command_handler_|, passing ownership of the command packet to the handler.
-  void ReceiveReadyCommand() const;
-
-  void AddEventToOutboundEvents(std::unique_ptr<TimeStampedEvent> event);
-
-  // Write queue for sending events to the HCI. Event packets are removed from
-  // the queue and written when write-readiness is signalled by the message
-  // loop. After being written, the event packets are destructed.
-  std::list<std::unique_ptr<TimeStampedEvent>> outbound_events_;
-
-  // Callback executed in ReceiveReadyCommand() to pass the incoming command
-  // over to the handler for further processing.
-  std::function<void(std::unique_ptr<CommandPacket>)> command_handler_;
-
-  // For performing packet-based IO.
-  PacketStream packet_stream_;
-
-  // The two ends of the socketpair. |hci_fd_| is handed back to the HCI in
-  // bt_vendor.cc and |vendor_fd_| is used by |packet_stream_| to receive/send
-  // data from/to the HCI. Both file descriptors are owned and managed by the
-  // transport object, although |hci_fd_| can be closed by the HCI in
-  // TestVendorOp().
-  std::unique_ptr<base::ScopedFD> hci_fd_;
-  std::unique_ptr<base::ScopedFD> vendor_fd_;
-
-  // This should remain the last member so it'll be destroyed and invalidate
-  // its weak pointers before any other members are destroyed.
-  base::WeakPtrFactory<HciTransport> weak_ptr_factory_;
-
-  DISALLOW_COPY_AND_ASSIGN(HciTransport);
-};
-
-}  // namespace test_vendor_lib

--- a/vendor_libs/test_vendor_lib/include/packet.h
+++ /dev/null
@@ -1,78 +0,0 @@
-//
-// Copyright 2015 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-#pragma once
-
-#include <cstdint>
-#include <vector>
-
-extern "C" {
-#include "hci/include/hci_hal.h"
-}  // extern "C"
-
-namespace test_vendor_lib {
-
-// Abstract base class that is subclassed to provide type-specifc accessors on
-// data. Manages said data's memory and guarantees the data's persistence for IO
-// operations.
-class Packet {
- public:
-  virtual ~Packet() = default;
-
-  // Returns the size in octets of the entire packet, which consists of the type
-  // octet, the header, and the payload.
-  size_t GetPacketSize() const;
-
-  const std::vector<uint8_t>& GetPayload() const;
-
-  uint8_t GetPayloadSize() const;
-
-  const std::vector<uint8_t>& GetHeader() const;
-
-  uint8_t GetHeaderSize() const;
-
-  serial_data_type_t GetType() const;
-
-  // Validates the packet by checking that the payload size in the header is
-  // accurate. If the size is not valid, returns false. Otherwise, the data in
-  // |header| and |payload| is copied into |header_| and |payload_|
-  // respectively. If an error occurs while the data is being copied, the
-  // contents of |header| and |payload| are guaranteed to be preserved. The
-  // packet object will assume ownership of the copied data for its entire
-  // lifetime.
-  bool Encode(const std::vector<uint8_t>& header,
-              const std::vector<uint8_t>& payload);
-
- protected:
-  // Constructs an empty packet of type |type|. A call to Encode() shall be made
-  // to check and fill in the packet's data.
-  Packet(serial_data_type_t type);
-
- private:
-  // Underlying containers for storing the actual packet, broken down into the
-  // packet header and the packet payload. Data is copied into the vectors
-  // during the constructor and becomes accessible (read only) to children
-  // through GetHeader() and GetPayload().
-  std::vector<uint8_t> header_;
-
-  std::vector<uint8_t> payload_;
-
-  // The packet type is one of DATA_TYPE_ACL, DATA_TYPE_COMMAND,
-  // DATA_TYPE_EVENT, or DATA_TYPE_SCO.
-  serial_data_type_t type_;
-};
-
-}  // namespace test_vendor_lib

--- a/vendor_libs/test_vendor_lib/include/packet_stream.h
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-// Copyright 2015 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-#pragma once
-
-#include <cstdint>
-#include <vector>
-#include <memory>
-
-#include "vendor_libs/test_vendor_lib/include/command_packet.h"
-#include "vendor_libs/test_vendor_lib/include/event_packet.h"
-#include "vendor_libs/test_vendor_lib/include/packet.h"
-
-namespace test_vendor_lib {
-
-// Provides abstractions for IO with Packet objects. Used to receive commands
-// and data from the HCI and to send controller events back to the host.
-class PacketStream {
- public:
-  PacketStream() = default;
-
-  virtual ~PacketStream() = default;
-
-  // Reads a command packet from the file descriptor at |fd| and returns the
-  // packet back to the caller, along with the responsibility of managing the
-  // packet.
-  std::unique_ptr<CommandPacket> ReceiveCommand(int fd) const;
-
-  // Reads a single octet from |fd| and interprets it as a packet type octet.
-  // Validates the type octet for correctness.
-  serial_data_type_t ReceivePacketType(int fd) const;
-
-  // Sends an event to file descriptor |fd|. The ownership of the event is left
-  // with the caller.
-  bool SendEvent(const EventPacket& event, int fd) const;
-
- private:
-  // Checks if |type| is in the valid range from DATA_TYPE_COMMAND to
-  // DATA_TYPE_SCO.
-  bool ValidateTypeOctet(serial_data_type_t type) const;
-
-  // Attempts to receive |num_octets_to_receive| into |destination| from |fd|,
-  // returning false if an error occurs.
-  bool ReceiveAll(std::vector<uint8_t>& destination,
-                  size_t num_octets_to_receive, int fd) const;
-
-  // Attempts to send |num_octets_to_send| from |source| to |fd|, returning
-  // false if an error occurs.
-  bool SendAll(const std::vector<uint8_t>& source, size_t num_octets_to_send,
-               int fd) const;
-};
-
-}  // namespace test_vendor_lib

--- a/vendor_libs/test_vendor_lib/include/test_channel_transport.h
+++ /dev/null
@@ -1,77 +0,0 @@
-//
-// Copyright 2015 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-#pragma once
-
-#include <string>
-#include <memory>
-
-#include "base/files/scoped_file.h"
-#include "base/message_loop/message_loop.h"
-
-namespace test_vendor_lib {
-
-// Manages communications between test channel and the controller. Mirrors the
-// HciTransport for the test channel.
-class TestChannelTransport : public base::MessageLoopForIO::Watcher {
- public:
-  TestChannelTransport(bool enabled, int port);
-
-  ~TestChannelTransport() = default;
-
-  // Waits for a connection request from the test channel program and
-  // allocates the file descriptor to watch for run-time parameters at. This
-  // file descriptor gets stored in |fd_|.
-  bool SetUp();
-
-  int GetFd();
-
-  // Because it imposes a different flow of work, the test channel must be
-  // actively enabled to be used. |enabled_| is set by the vendor manager.
-  bool IsEnabled();
-
-  // Turns the test channel off for use in circumstances where an error occurs
-  // and leaving the channel on would crash Bluetooth (e.g. if the test channel
-  // is unable to bind to its socket, Bluetooth should still start without the
-  // channel enabled).
-  void Disable();
-
-  // Sets the callback that fires when data is read in
-  // |OnFileCanReadWithoutBlocking|.
-  void RegisterCommandHandler(
-      std::function<void(const std::string&, const std::vector<std::string>&)>
-          callback);
-
- private:
-  // base::MessageLoopForIO::Watcher overrides:
-  void OnFileCanReadWithoutBlocking(int fd) override;
-
-  void OnFileCanWriteWithoutBlocking(int fd) override;
-
-  std::function<void(const std::string&, const std::vector<std::string>&)>
-      command_handler_;
-
-  // File descriptor to watch for test hook data.
-  std::unique_ptr<base::ScopedFD> fd_;
-
-  // TODO(dennischeng): Get port and enabled flag from a config file.
-  int port_;
-  bool enabled_;
-
-  DISALLOW_COPY_AND_ASSIGN(TestChannelTransport);
-};
-
-}  // namespace test_vendor_lib

--- a/vendor_libs/test_vendor_lib/include/vendor_manager.h
+++ /dev/null
@@ -1,118 +0,0 @@
-//
-// Copyright 2015 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-#include "base/macros.h"
-#include "base/memory/weak_ptr.h"
-#include "base/threading/thread.h"
-#include "base/time/time.h"
-#include "hci/include/bt_vendor_lib.h"
-#include "vendor_libs/test_vendor_lib/include/dual_mode_controller.h"
-#include "vendor_libs/test_vendor_lib/include/event_packet.h"
-#include "vendor_libs/test_vendor_lib/include/hci_transport.h"
-#include "vendor_libs/test_vendor_lib/include/test_channel_transport.h"
-
-#include <memory>
-
-namespace test_vendor_lib {
-
-// Contains the three core objects that make up the test vendor library: the
-// HciTransport for communication, the HciHandler for processing commands, and
-// the Controller for actual command implementations. The VendorManager shall
-// operate as a global singleton and be used in bt_vendor.cc to perform vendor
-// specific operations, via |vendor_callbacks_|, and to provide access to the
-// test controller by setting up a message loop (on another thread) that the HCI
-// will talk to and controller methods will execute on.
-class VendorManager {
- public:
-  // Functions that operate on the global manager instance. Initialize()
-  // is called by the vendor library's TestVendorInitialize() function to create
-  // the global manager and must be called before Get() and CleanUp().
-  // CleanUp() should be called when a call to TestVendorCleanUp() is made
-  // since the global manager should live throughout the entire time the test
-  // vendor library is in use.
-  static void CleanUp();
-
-  static VendorManager* Get();
-
-  static void Initialize();
-
-  void CloseHciFd();
-
-  int GetHciFd() const;
-
-  const bt_vendor_callbacks_t& GetVendorCallbacks() const;
-
-  // Stores a copy of the vendor specific configuration callbacks passed into
-  // the vendor library from the HCI in TestVendorInit().
-  void SetVendorCallbacks(const bt_vendor_callbacks_t& callbacks);
-
-  // Returns true if |thread_| is able to be started and the
-  // StartingWatchingOnThread() task has been posted to the task runner.
-  bool Run();
-
- private:
-  VendorManager();
-
-  ~VendorManager() = default;
-
-  // Posts a callback to |thread_|'s task runner. Equivalent to calling
-  // |PostDelayedTask| with a delay of 0.
-  bool PostTask(const base::Closure& task);
-
-  // Posts a callback to be run after |delay| ms (or longer) have passed.
-  bool PostDelayedTask(const base::Closure& task, base::TimeDelta delay);
-
-  // Starts watching for incoming data from the HCI and the test hook.
-  void StartWatchingOnThread();
-
-  // Creates the HCI's communication channel and overrides IO callbacks to
-  // receive and send packets.
-  HciTransport transport_;
-
-  // The controller object that provides implementations of Bluetooth commands.
-  DualModeController controller_;
-
-  // The two test channel objects that perform functions corresponding to the
-  // HciTransport and HciHandler.
-  TestChannelTransport test_channel_transport_;
-
-  // Configuration callbacks provided by the HCI for use in TestVendorOp().
-  bt_vendor_callbacks_t vendor_callbacks_;
-
-  // True if the underlying message loop (in |thread_|) is running.
-  bool running_;
-
-  // Dedicated thread for managing the message loop to receive and send packets
-  // from the HCI and to receive additional parameters from the test hook file
-  // descriptor.
-  base::Thread thread_;
-
-  // Used to handle further watching of the vendor's/test channel's file
-  // descriptor after WatchFileDescriptor() is called.
-  base::MessageLoopForIO::FileDescriptorWatcher hci_watcher_;
-
-  // Used to handle further watching of the test channel's file descriptor after
-  // WatchFileDescriptor() is called.
-  base::MessageLoopForIO::FileDescriptorWatcher test_channel_watcher_;
-
-  // This should remain the last member so it'll be destroyed and invalidate
-  // its weak pointers before any other members are destroyed.
-  base::WeakPtrFactory<VendorManager> weak_ptr_factory_;
-
-  DISALLOW_COPY_AND_ASSIGN(VendorManager);
-};
-
-}  // namespace test_vendor_lib

--- a/vendor_libs/test_vendor_lib/scripts/build_and_run.sh
+++ /dev/null
@@ -1,127 +0,0 @@
-#!/bin/bash
-
-#
-# Copyright 2015 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# Builds and pushes the test vendor library to a connected device and starts
-# logcat with project-specific tag filters. If the --test-channel flag is set,
-# logcat is started in a separate process and the test channel is run in the
-# current shell. The kTestChannelEnabled flag must be set in the vendor manager
-# if the test channel is to be used. Also ensure that 'lunch' has been run for
-# the appropriate device.
-
-if [[ "$#" -ne 2 && "$#" -ne 4 ]]; then
-  echo "Usage:"
-  echo "./build_and_run.sh [/path/to/aosp] [device_name] or"
-  echo "./build_and_run.sh [/path/to/aosp] [device_name] --test-channel [port]"
-  exit 1
-fi
-
-# Exit the script if any command fails.
-set -e
-
-# The home directory for AOSP.
-AOSP_ABS=$1
-# The name of the device to build for.
-DEVICE=$2
-
-# The location of Bluetooth within AOSP.
-BT_REL=/system/bt
-BT_ABS=${AOSP_ABS}${BT_REL}
-
-# The location of the test vendor library.
-TEST_VENDOR_LIB_REL=/vendor_libs/test_vendor_lib
-TEST_VENDOR_LIB_ABS=${BT_ABS}${TEST_VENDOR_LIB_REL}
-
-DEVICE_TARGET_REL=/out/target/product
-DEVICE_TARGET_ABS=${AOSP_ABS}${DEVICE_TARGET_REL}
-
-VENDOR_SYMBOLS_REL=/symbols/system/vendor/lib
-VENDOR_SYMBOLS_ABS=${DEVICE_TARGET_ABS}/${DEVICE}/${VENDOR_SYMBOLS_REL}
-
-# The name of the object built by the test vendor library.
-TEST_VENDOR_LIB=test-vendor.so
-# The name of the regular vendor object to be replaced by $TEST_VENDOR_LIB.
-VENDOR_LIB=libbt-vendor.so
-# The config file specifying controller properties.
-CONTROLLER_PROPERTIES=controller_properties.json
-
-if [[ "$#" -eq 4 && $3 == "--test-channel" ]]; then
-  TEST_CHANNEL_PORT=$4
-  TEST_CHANNEL_REL=/scripts
-  TEST_CHANNEL_ABS=${TEST_VENDOR_LIB_ABS}${TEST_CHANNEL_REL}
-
-  # Start logcat in a subshell.
-  x-terminal-emulator -e "scripts/build_and_run.sh ${AOSP_ABS} ${DEVICE}"
-
-  echo "Setting up build environment."
-  cd ${AOSP_ABS}
-  source build/envsetup.sh
-
-  # Forward local port to the same port on the device.
-  echo "Forwarding port ${TEST_CHANNEL_PORT} to device."
-  adb forward tcp:${TEST_CHANNEL_PORT} tcp:${TEST_CHANNEL_PORT}
-
-  # Turn Bluetooth on. Requires user approval via a dialog on the device.
-  echo "Enabling Bluetooth. Please see dialog on device."
-  adb shell am start -a android.bluetooth.adapter.action.REQUEST_ENABLE
-
-  # Start the test channel once Bluetooth is on and logcat has started.
-  read -p "Press [ENTER] once Bluetooth is enabling AND logcat has started."
-
-  # Start the test channel.
-  python ${TEST_CHANNEL_ABS}/test_channel.py localhost ${TEST_CHANNEL_PORT}
-else
-  echo "Setting up build environment."
-  cd ${AOSP_ABS}
-  source build/envsetup.sh
-
-  echo "Navigating to test vendor library: ${TEST_VENDOR_LIB_ABS}"
-  cd ${TEST_VENDOR_LIB_ABS}
-
-  echo "Building test vendor library."
-  mm
-
-  echo "Remounting device rootfs."
-  adb shell mount -o remount,rw /
-  adb remount
-
-  # Replace the actual vendor library with the test vendor library.
-  mv ${DEVICE_TARGET_ABS}/${DEVICE}/system/lib/${TEST_VENDOR_LIB} \
-    ${VENDOR_SYMBOLS_ABS}/${VENDOR_LIB}
-
-  # Push the test vendor library to the device.
-  echo "Pushing the test vendor library to device: $DEVICE"
-  adb push ${VENDOR_SYMBOLS_ABS}/${VENDOR_LIB} /vendor/lib
-
-  echo "Pushing controller properties."
-  adb push ${TEST_VENDOR_LIB_ABS}/data/${CONTROLLER_PROPERTIES} /etc/bluetooth/
-
-  echo "Pushing libevent."
-  adb push ${DEVICE_TARGET_ABS}/${DEVICE}/system/lib/libevent.so /system/lib/
-
-  echo "Pushing libchrome."
-  adb push ${DEVICE_TARGET_ABS}/${DEVICE}/system/lib/libchrome.so /system/lib/
-
-  # Clear logcat.
-  adb logcat -c
-
-  # Run logcat with filters.
-  adb logcat bt_btif:D bt_btif_core:D bt_hci:D bt_main:D bt_vendor:D \
-   bte_logmsg:D command_packet:D dual_mode_controller:D event_packet:D \
-   hci_transport:D hci_handler:D packet:D packet_stream:D \
-   test_channel_transport:D vendor_manager:D *:S
-fi

--- a/vendor_libs/test_vendor_lib/scripts/test_channel.py
+++ /dev/null
@@ -1,247 +0,0 @@
-#
-# Copyright 2015 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-"""Script for sending testing parameters and commands to a Bluetooth device.
-
-This script provides a simple shell interface for sending data at run-time to a
-Bluetooth device. It is intended to be used in tandem with the test vendor
-library project.
-
-Usage:
-  Option A: Script
-    1. Run build_and_run.sh in scripts/ with the --test-channel flag set and the
-    port to use for the test channel.
-  Option B: Manual
-    1. Choose a port to use for the test channel. Use 'adb forward tcp:<port>
-    tcp:<port>' to forward the port to the device.
-    2. In a separate shell, build and push the test vendor library to the device
-    using the script mentioned in option A (i.e. without the --test-channel flag
-    set).
-    3. Once logcat has started, turn Bluetooth on from the device.
-    4. Run this program, in the shell from step 1,  the port, also from step 1,
-    as arguments.
-"""
-
-#!/usr/bin/env python
-
-import cmd
-import random
-import socket
-import string
-import struct
-import sys
-
-DEVICE_NAME_LENGTH = 6
-DEVICE_ADDRESS_LENGTH = 6
-
-# Used to generate fake device names and addresses during discovery.
-def generate_random_name():
-  return ''.join(random.SystemRandom().choice(string.ascii_uppercase + \
-    string.digits) for _ in range(DEVICE_NAME_LENGTH))
-
-def generate_random_address():
-  return ''.join(random.SystemRandom().choice(string.digits) for _ in \
-    range(DEVICE_ADDRESS_LENGTH))
-
-class Connection(object):
-  """Simple wrapper class for a socket object.
-
-  Attributes:
-    socket: The underlying socket created for the specified address and port.
-  """
-
-  def __init__(self, port):
-    self._socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-    self._socket.connect(('localhost', port))
-
-  def close(self):
-    self._socket.close()
-
-  def send(self, data):
-    self._socket.sendall(data)
-
-class TestChannel(object):
-  """Checks outgoing commands and sends them once verified.
-
-  Attributes:
-    connection: The connection to the test vendor library that commands are sent
-    on.
-  """
-
-  def __init__(self, port):
-    self._connection = Connection(port)
-    self._discovered_devices = DeviceManager()
-
-  def discover_new_device(self, name=None, address=None):
-    device = Device(name, address)
-    self._discovered_devices.add_device(device)
-    return device
-
-  def close(self):
-    self._connection.close()
-
-  def send_command(self, name, args):
-    name_size = len(name)
-    args_size = len(args)
-    self.lint_command(name, args, name_size, args_size)
-    encoded_name = chr(name_size) + name
-    encoded_args = chr(args_size) + ''.join(chr(len(arg)) + arg for arg in args)
-    command = encoded_name + encoded_args
-    self._connection.send(command)
-
-  def lint_command(self, name, args, name_size, args_size):
-    assert name_size == len(name) and args_size == len(args)
-    try:
-      name.encode('utf-8')
-      for arg in args:
-        arg.encode('utf-8')
-    except UnicodeError:
-      print 'Unrecognized characters.'
-      raise
-    if name_size > 255 or args_size > 255:
-      raise ValueError  # Size must be encodable in one octet.
-    for arg in args:
-      if len(arg) > 255:
-        raise ValueError  # Size must be encodable in one octet.
-
-class DeviceManager(object):
-  """Maintains the active fake devices that have been "discovered".
-
-  Attributes:
-    device_list: Maps device addresses (keys) to devices (values).
-  """
-
-  def __init__(self):
-    self.device_list = {}
-
-  def add_device(self, device):
-    self.device_list[device.get_address()] = device
-
-class Device(object):
-  """A fake device to be returned in inquiry and scan results. Note that if an
-  explicit name or address is not provided, a random string of characters
-  is used.
-
-  Attributes:
-    name: The device name for use in extended results.
-    address: The BD address of the device.
-  """
-
-  def __init__(self, name=None, address=None):
-    # TODO(dennischeng): Generate device properties more robustly.
-    self._name = generate_random_name() if name is None else name
-    self._address = generate_random_address() if address is None else address
-
-  def get_name(self):
-    return self._name
-
-  def get_address(self):
-    return self._address
-
-class TestChannelShell(cmd.Cmd):
-  """Shell for sending test channel data to controller.
-
-  Manages the test channel to the controller and defines a set of commands the
-  user can send to the controller as well. These commands are processed parallel
-  to commands sent from the device stack and used to provide additional
-  debugging/testing capabilities.
-
-  Attributes:
-    test_channel: The communication channel to send data to the controller.
-  """
-
-  def __init__(self, test_channel):
-    print 'Type \'help\' for more information.'
-    cmd.Cmd.__init__(self)
-    self._test_channel = test_channel
-
-  def do_clear(self, args):
-    """
-    Arguments: None.
-    Resets the controller to its original, unmodified state.
-    """
-    self._test_channel.send_command('CLEAR', [])
-
-  def do_clear_event_delay(self, args):
-    """
-    Arguments: None.
-    Clears the response delay set by set_event_delay.
-    """
-    self._test_channel.send_command('CLEAR_EVENT_DELAY', args.split())
-
-  def do_discover(self, args):
-    """
-    Arguments: name_1 name_2 ...
-    Sends an inquiry result for named device(s). If no names are provided, a
-    random name is used instead.
-    """
-    if len(args) == 0:
-      args = generate_random_name()
-    device_list = [self._test_channel.discover_new_device(arg) for arg in \
-                   args.split()]
-    device_names_and_addresses = []
-    for device in device_list:
-      device_names_and_addresses.append(device.get_name())
-      device_names_and_addresses.append(device.get_address())
-    self._test_channel.send_command('DISCOVER', device_names_and_addresses)
-
-  def do_set_event_delay(self, args):
-    """
-    Arguments: interval_in_ms
-    Sets the response delay for all event packets sent from the controller back
-    to the HCI.
-    """
-    self._test_channel.send_command('SET_EVENT_DELAY', args.split())
-
-  def do_timeout_all(self, args):
-    """
-    Arguments: None.
-    Causes all HCI commands to timeout.
-    """
-    self._test_channel.send_command('TIMEOUT_ALL', [])
-
-  def do_quit(self, args):
-    """
-    Arguments: None.
-    Exits the test channel.
-    """
-    self._test_channel.send_command('CLOSE_TEST_CHANNEL', [])
-    self._test_channel.close()
-    print 'Goodbye.'
-    return True
-
-def main(argv):
-  if len(argv) != 2:
-    print 'Usage: python test_channel.py [port]'
-    return
-  try:
-    port = int(argv[1])
-  except ValueError:
-    print 'Error parsing port.'
-  else:
-    try:
-      test_channel = TestChannel(port)
-    except socket.error, e:
-      print 'Error connecting to socket: %s' % e
-    except:
-      print 'Error creating test channel (check argument).'
-    else:
-      test_channel_shell = TestChannelShell(test_channel)
-      test_channel_shell.prompt = '$ '
-      test_channel_shell.cmdloop()
-
-if __name__ == '__main__':
-  main(sys.argv)

--- a/vendor_libs/test_vendor_lib/src/bt_vendor.cc
+++ /dev/null
@@ -1,107 +0,0 @@
-//
-// Copyright 2015 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-#define LOG_TAG "bt_vendor"
-
-#include "vendor_manager.h"
-
-#include "base/logging.h"
-
-extern "C" {
-#include "osi/include/log.h"
-
-#include <unistd.h>
-}  // extern "C"
-
-namespace test_vendor_lib {
-
-// Initializes vendor manager for test controller. |p_cb| are the callbacks to
-// be in TestVendorOp(). |local_bdaddr| points to the address of the Bluetooth
-// device. Returns 0 on success, -1 on error.
-static int TestVendorInitialize(const bt_vendor_callbacks_t* p_cb,
-                                unsigned char* /* local_bdaddr */) {
-  LOG_INFO(LOG_TAG, "Initializing test controller.");
-  CHECK(p_cb);
-
-  VendorManager::Initialize();
-  VendorManager* manager = VendorManager::Get();
-  manager->SetVendorCallbacks(*(const_cast<bt_vendor_callbacks_t*>(p_cb)));
-  return manager->Run() ? 0 : -1;
-}
-
-// Vendor specific operations. |opcode| is the opcode for Bluedroid's vendor op
-// definitions. |param| points to operation specific arguments. Return value is
-// dependent on the operation invoked, or -1 on error.
-static int TestVendorOp(bt_vendor_opcode_t opcode, void* param) {
-  LOG_INFO(LOG_TAG, "Opcode received in vendor library: %d", opcode);
-
-  VendorManager* manager = VendorManager::Get();
-  CHECK(manager);
-
-  switch (opcode) {
-    case BT_VND_OP_POWER_CTRL: {
-      LOG_INFO(LOG_TAG, "Doing op: BT_VND_OP_POWER_CTRL");
-      int* state = static_cast<int*>(param);
-      if (*state == BT_VND_PWR_OFF)
-        LOG_INFO(LOG_TAG, "Turning Bluetooth off.");
-      else if (*state == BT_VND_PWR_ON)
-        LOG_INFO(LOG_TAG, "Turning Bluetooth on.");
-      return 0;
-    }
-
-    // Give the HCI its fd to communicate with the HciTransport.
-    case BT_VND_OP_USERIAL_OPEN: {
-      LOG_INFO(LOG_TAG, "Doing op: BT_VND_OP_USERIAL_OPEN");
-      int* fd_list = static_cast<int*>(param);
-      fd_list[0] = manager->GetHciFd();
-      LOG_INFO(LOG_TAG, "Setting HCI's fd to: %d", fd_list[0]);
-      return 1;
-    }
-
-    // Close the HCI's file descriptor.
-    case BT_VND_OP_USERIAL_CLOSE:
-      LOG_INFO(LOG_TAG, "Doing op: BT_VND_OP_USERIAL_CLOSE");
-      LOG_INFO(LOG_TAG, "Closing HCI's fd (fd: %d)", manager->GetHciFd());
-      manager->CloseHciFd();
-      return 1;
-
-    case BT_VND_OP_FW_CFG:
-      LOG_INFO(LOG_TAG, "Unsupported op: BT_VND_OP_FW_CFG");
-      manager->GetVendorCallbacks().fwcfg_cb(BT_VND_OP_RESULT_FAIL);
-      return -1;
-
-    default:
-      LOG_INFO(LOG_TAG, "Op not recognized.");
-      return -1;
-  }
-  return 0;
-}
-
-// Closes the vendor interface and cleans up the global vendor manager object.
-static void TestVendorCleanUp(void) {
-  LOG_INFO(LOG_TAG, "Cleaning up vendor library.");
-  VendorManager::CleanUp();
-}
-
-}  // namespace test_vendor_lib
-
-// Entry point of DLib.
-const bt_vendor_interface_t BLUETOOTH_VENDOR_LIB_INTERFACE = {
-  sizeof(bt_vendor_interface_t),
-  test_vendor_lib::TestVendorInitialize,
-  test_vendor_lib::TestVendorOp,
-  test_vendor_lib::TestVendorCleanUp
-};

--- a/vendor_libs/test_vendor_lib/src/command_packet.cc
+++ /dev/null
@@ -1,43 +0,0 @@
-//
-// Copyright 2015 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-#define LOG_TAG "command_packet"
-
-#include "vendor_libs/test_vendor_lib/include/command_packet.h"
-
-extern "C" {
-#include "hci/include/hci_hal.h"
-#include "osi/include/log.h"
-#include "stack/include/hcidefs.h"
-}  // extern "C"
-
-namespace test_vendor_lib {
-
-CommandPacket::CommandPacket() : Packet(DATA_TYPE_COMMAND) {}
-
-uint16_t CommandPacket::GetOpcode() const {
-  return 0 | (GetHeader()[0] | (GetHeader()[1] << 8));
-}
-
-uint8_t CommandPacket::GetOGF() const {
-  return HCI_OGF(GetOpcode());
-}
-
-uint16_t CommandPacket::GetOCF() const {
-  return HCI_OCF(GetOpcode());
-}
-
-}  // namespace test_vendor_lib

--- a/vendor_libs/test_vendor_lib/src/dual_mode_controller.cc
+++ /dev/null
@@ -1,561 +0,0 @@
-//
-// Copyright 2015 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-#define LOG_TAG "dual_mode_controller"
-
-#include "vendor_libs/test_vendor_lib/include/dual_mode_controller.h"
-
-#include "base/logging.h"
-#include "base/files/file_util.h"
-#include "base/json/json_reader.h"
-#include "base/values.h"
-#include "vendor_libs/test_vendor_lib/include/event_packet.h"
-#include "vendor_libs/test_vendor_lib/include/hci_transport.h"
-
-extern "C" {
-#include "stack/include/hcidefs.h"
-#include "osi/include/log.h"
-}  // extern "C"
-
-namespace {
-
-// Included in certain events to indicate success (specific to the event
-// context).
-const uint8_t kSuccessStatus = 0;
-
-// The default number encoded in event packets to indicate to the HCI how many
-// command packets it can send to the controller.
-const uint8_t kNumHciCommandPackets = 1;
-
-// The location of the config file loaded to populate controller attributes.
-const std::string kControllerPropertiesFile =
-    "/etc/bluetooth/controller_properties.json";
-
-// Inquiry modes for specifiying inquiry result formats.
-const uint8_t kStandardInquiry = 0x00;
-const uint8_t kRssiInquiry = 0x01;
-const uint8_t kExtendedOrRssiInquiry = 0x02;
-
-// The bd address of another (fake) device.
-const std::vector<uint8_t> kOtherDeviceBdAddress = {6, 5, 4, 3, 2, 1};
-
-// Fake inquiry response for a fake device.
-const std::vector<uint8_t> kPageScanRepetitionMode = {0};
-const std::vector<uint8_t> kPageScanPeriodMode = {0};
-const std::vector<uint8_t> kPageScanMode = {0};
-const std::vector<uint8_t> kClassOfDevice = {1, 2, 3};
-const std::vector<uint8_t> kClockOffset = {1, 2};
-
-void LogCommand(const char* command) {
-  LOG_INFO(LOG_TAG, "Controller performing command: %s", command);
-}
-
-// Functions used by JSONValueConverter to read stringified JSON into Properties
-// object.
-bool ParseUint8t(const base::StringPiece& value, uint8_t* field) {
-  *field = std::stoi(value.as_string());
-  return true;
-}
-
-bool ParseUint16t(const base::StringPiece& value, uint16_t* field) {
-  *field = std::stoi(value.as_string());
-  return true;
-}
-
-bool ParseUint8tVector(const base::StringPiece& value,
-                              std::vector<uint8_t>* field) {
-  for (char& c : value.as_string())
-    field->push_back(c - '0');
-  return true;
-}
-
-}  // namespace
-
-namespace test_vendor_lib {
-
-void DualModeController::SendCommandComplete(
-    uint16_t command_opcode,
-    const std::vector<uint8_t>& return_parameters) const {
-  std::unique_ptr<EventPacket> command_complete =
-      EventPacket::CreateCommandCompleteEvent(
-          kNumHciCommandPackets, command_opcode, return_parameters);
-  send_event_(std::move(command_complete));
-}
-
-void DualModeController::SendCommandCompleteSuccess(
-    uint16_t command_opcode) const {
-  SendCommandComplete(command_opcode, {kSuccessStatus});
-}
-
-void DualModeController::SendCommandStatus(uint8_t status,
-                                           uint16_t command_opcode) const {
-  std::unique_ptr<EventPacket> command_status =
-      EventPacket::CreateCommandStatusEvent(status, kNumHciCommandPackets,
-                                            command_opcode);
-  send_event_(std::move(command_status));
-}
-
-void DualModeController::SendCommandStatusSuccess(
-    uint16_t command_opcode) const {
-  SendCommandStatus(kSuccessStatus, command_opcode);
-}
-
-void DualModeController::SendInquiryResult() const {
-  std::unique_ptr<EventPacket> inquiry_result =
-      EventPacket::CreateInquiryResultEvent(
-          1, kOtherDeviceBdAddress, kPageScanRepetitionMode,
-          kPageScanPeriodMode, kPageScanMode, kClassOfDevice, kClockOffset);
-  send_event_(std::move(inquiry_result));
-}
-
-void DualModeController::SendExtendedInquiryResult(
-    const std::string& name, const std::string& address) const {
-  std::vector<uint8_t> rssi = {0};
-  std::vector<uint8_t> extended_inquiry_data = {name.length() + 1, 0x09};
-  std::copy(name.begin(), name.end(),
-            std::back_inserter(extended_inquiry_data));
-  std::vector<uint8_t> bd_address(address.begin(), address.end());
-  // TODO(dennischeng): Use constants for parameter sizes, here and elsewhere.
-  while (extended_inquiry_data.size() < 240) {
-    extended_inquiry_data.push_back(0);
-  }
-  std::unique_ptr<EventPacket> extended_inquiry_result =
-      EventPacket::CreateExtendedInquiryResultEvent(
-          bd_address, kPageScanRepetitionMode, kPageScanPeriodMode,
-          kClassOfDevice, kClockOffset, rssi, extended_inquiry_data);
-  send_event_(std::move(extended_inquiry_result));
-}
-
-DualModeController::DualModeController()
-    : state_(kStandby),
-      test_channel_state_(kNone),
-      properties_(kControllerPropertiesFile) {
-#define SET_HANDLER(opcode, method) \
-  active_hci_commands_[opcode] =    \
-      std::bind(&DualModeController::method, this, std::placeholders::_1);
-  SET_HANDLER(HCI_RESET, HciReset);
-  SET_HANDLER(HCI_READ_BUFFER_SIZE, HciReadBufferSize);
-  SET_HANDLER(HCI_HOST_BUFFER_SIZE, HciHostBufferSize);
-  SET_HANDLER(HCI_READ_LOCAL_VERSION_INFO, HciReadLocalVersionInformation);
-  SET_HANDLER(HCI_READ_BD_ADDR, HciReadBdAddr);
-  SET_HANDLER(HCI_READ_LOCAL_SUPPORTED_CMDS, HciReadLocalSupportedCommands);
-  SET_HANDLER(HCI_READ_LOCAL_EXT_FEATURES, HciReadLocalExtendedFeatures);
-  SET_HANDLER(HCI_WRITE_SIMPLE_PAIRING_MODE, HciWriteSimplePairingMode);
-  SET_HANDLER(HCI_WRITE_LE_HOST_SUPPORT, HciWriteLeHostSupport);
-  SET_HANDLER(HCI_SET_EVENT_MASK, HciSetEventMask);
-  SET_HANDLER(HCI_WRITE_INQUIRY_MODE, HciWriteInquiryMode);
-  SET_HANDLER(HCI_WRITE_PAGESCAN_TYPE, HciWritePageScanType);
-  SET_HANDLER(HCI_WRITE_INQSCAN_TYPE, HciWriteInquiryScanType);
-  SET_HANDLER(HCI_WRITE_CLASS_OF_DEVICE, HciWriteClassOfDevice);
-  SET_HANDLER(HCI_WRITE_PAGE_TOUT, HciWritePageTimeout);
-  SET_HANDLER(HCI_WRITE_DEF_POLICY_SETTINGS, HciWriteDefaultLinkPolicySettings);
-  SET_HANDLER(HCI_READ_LOCAL_NAME, HciReadLocalName);
-  SET_HANDLER(HCI_CHANGE_LOCAL_NAME, HciWriteLocalName);
-  SET_HANDLER(HCI_WRITE_EXT_INQ_RESPONSE, HciWriteExtendedInquiryResponse);
-  SET_HANDLER(HCI_WRITE_VOICE_SETTINGS, HciWriteVoiceSetting);
-  SET_HANDLER(HCI_WRITE_CURRENT_IAC_LAP, HciWriteCurrentIacLap);
-  SET_HANDLER(HCI_WRITE_INQUIRYSCAN_CFG, HciWriteInquiryScanActivity);
-  SET_HANDLER(HCI_WRITE_SCAN_ENABLE, HciWriteScanEnable);
-  SET_HANDLER(HCI_SET_EVENT_FILTER, HciSetEventFilter);
-  SET_HANDLER(HCI_INQUIRY, HciInquiry);
-  SET_HANDLER(HCI_INQUIRY_CANCEL, HciInquiryCancel);
-  SET_HANDLER(HCI_DELETE_STORED_LINK_KEY, HciDeleteStoredLinkKey);
-  SET_HANDLER(HCI_RMT_NAME_REQUEST, HciRemoteNameRequest);
-#undef SET_HANDLER
-
-#define SET_TEST_HANDLER(command_name, method)  \
-  active_test_channel_commands_[command_name] = \
-      std::bind(&DualModeController::method, this, std::placeholders::_1);
-  SET_TEST_HANDLER("CLEAR", TestChannelClear);
-  SET_TEST_HANDLER("CLEAR_EVENT_DELAY", TestChannelClearEventDelay);
-  SET_TEST_HANDLER("DISCOVER", TestChannelDiscover);
-  SET_TEST_HANDLER("SET_EVENT_DELAY", TestChannelSetEventDelay);
-  SET_TEST_HANDLER("TIMEOUT_ALL", TestChannelTimeoutAll);
-#undef SET_TEST_HANDLER
-}
-
-void DualModeController::RegisterHandlersWithHciTransport(
-    HciTransport& transport) {
-  transport.RegisterCommandHandler(std::bind(&DualModeController::HandleCommand,
-                                             this, std::placeholders::_1));
-}
-
-void DualModeController::RegisterHandlersWithTestChannelTransport(
-    TestChannelTransport& transport) {
-  transport.RegisterCommandHandler(
-      std::bind(&DualModeController::HandleTestChannelCommand, this,
-                std::placeholders::_1, std::placeholders::_2));
-}
-
-void DualModeController::HandleTestChannelCommand(
-    const std::string& name, const std::vector<std::string>& args) {
-  if (active_test_channel_commands_.count(name) == 0)
-    return;
-  active_test_channel_commands_[name](args);
-}
-
-void DualModeController::HandleCommand(
-    std::unique_ptr<CommandPacket> command_packet) {
-  uint16_t opcode = command_packet->GetOpcode();
-  LOG_INFO(LOG_TAG, "Command opcode: 0x%04X, OGF: 0x%04X, OCF: 0x%04X", opcode,
-           command_packet->GetOGF(), command_packet->GetOCF());
-
-  // The command hasn't been registered with the handler yet. There is nothing
-  // to do.
-  if (active_hci_commands_.count(opcode) == 0)
-    return;
-  else if (test_channel_state_ == kTimeoutAll)
-    return;
-  active_hci_commands_[opcode](command_packet->GetPayload());
-}
-
-void DualModeController::RegisterEventChannel(
-    std::function<void(std::unique_ptr<EventPacket>)> callback) {
-  send_event_ = callback;
-}
-
-void DualModeController::RegisterDelayedEventChannel(
-    std::function<void(std::unique_ptr<EventPacket>, base::TimeDelta)>
-        callback) {
-  send_delayed_event_ = callback;
-  SetEventDelay(0);
-}
-
-void DualModeController::SetEventDelay(int64_t delay) {
-  if (delay < 0)
-    delay = 0;
-  send_event_ = std::bind(send_delayed_event_, std::placeholders::_1,
-                          base::TimeDelta::FromMilliseconds(delay));
-}
-
-void DualModeController::TestChannelClear(
-    const std::vector<std::string>& args) {
-  LogCommand("TestChannel Clear");
-  test_channel_state_ = kNone;
-  SetEventDelay(0);
-}
-
-void DualModeController::TestChannelDiscover(
-    const std::vector<std::string>& args) {
-  LogCommand("TestChannel Discover");
-  for (size_t i = 0; i < args.size()-1; i+=2)
-    SendExtendedInquiryResult(args[i], args[i+1]);
-}
-
-void DualModeController::TestChannelTimeoutAll(
-    const std::vector<std::string>& args) {
-  LogCommand("TestChannel Timeout All");
-  test_channel_state_ = kTimeoutAll;
-}
-
-void DualModeController::TestChannelSetEventDelay(
-    const std::vector<std::string>& args) {
-  LogCommand("TestChannel Set Event Delay");
-  test_channel_state_ = kDelayedResponse;
-  SetEventDelay(std::stoi(args[0]));
-}
-
-void DualModeController::TestChannelClearEventDelay(
-    const std::vector<std::string>& args) {
-  LogCommand("TestChannel Clear Event Delay");
-  test_channel_state_ = kNone;
-  SetEventDelay(0);
-}
-
-void DualModeController::HciReset(const std::vector<uint8_t>& /* args */) {
-  LogCommand("Reset");
-  state_ = kStandby;
-  SendCommandCompleteSuccess(HCI_RESET);
-}
-
-void DualModeController::HciReadBufferSize(
-    const std::vector<uint8_t>& /* args */) {
-  LogCommand("Read Buffer Size");
-  SendCommandComplete(HCI_READ_BUFFER_SIZE, properties_.GetBufferSize());
-}
-
-void DualModeController::HciHostBufferSize(
-    const std::vector<uint8_t>& /* args */) {
-  LogCommand("Host Buffer Size");
-  SendCommandCompleteSuccess(HCI_HOST_BUFFER_SIZE);
-}
-
-void DualModeController::HciReadLocalVersionInformation(
-                 const std::vector<uint8_t>& /* args */) {
-  LogCommand("Read Local Version Information");
-  SendCommandComplete(HCI_READ_LOCAL_VERSION_INFO,
-                      properties_.GetLocalVersionInformation());
-}
-
-void DualModeController::HciReadBdAddr(const std::vector<uint8_t>& /* args */) {
-  LogCommand("Read Bd Addr");
-  std::vector<uint8_t> bd_address_with_status = properties_.GetBdAddress();
-  bd_address_with_status.insert(bd_address_with_status.begin(),
-                                kSuccessStatus);
-  SendCommandComplete(HCI_READ_BD_ADDR, bd_address_with_status);
-}
-
-void DualModeController::HciReadLocalSupportedCommands(
-    const std::vector<uint8_t>& /* args */) {
-  LogCommand("Read Local Supported Commands");
-  SendCommandComplete(HCI_READ_LOCAL_SUPPORTED_CMDS,
-                      properties_.GetLocalSupportedCommands());
-}
-
-void DualModeController::HciReadLocalExtendedFeatures(
-    const std::vector<uint8_t>& args) {
-  LogCommand("Read Local Extended Features");
-  SendCommandComplete(HCI_READ_LOCAL_EXT_FEATURES,
-                      properties_.GetLocalExtendedFeatures(args[0]));
-}
-
-void DualModeController::HciWriteSimplePairingMode(
-    const std::vector<uint8_t>& /* args */) {
-  LogCommand("Write Simple Pairing Mode");
-  SendCommandCompleteSuccess(HCI_WRITE_SIMPLE_PAIRING_MODE);
-}
-
-void DualModeController::HciWriteLeHostSupport(
-    const std::vector<uint8_t>& /* args */) {
-  LogCommand("Write Le Host Support");
-  SendCommandCompleteSuccess(HCI_WRITE_LE_HOST_SUPPORT);
-}
-
-void DualModeController::HciSetEventMask(
-    const std::vector<uint8_t>& /* args */) {
-  LogCommand("Set Event Mask");
-  SendCommandCompleteSuccess(HCI_SET_EVENT_MASK);
-}
-
-void DualModeController::HciWriteInquiryMode(const std::vector<uint8_t>& args) {
-  LogCommand("Write Inquiry Mode");
-  CHECK(args.size() == 1);
-  inquiry_mode_ = args[0];
-  SendCommandCompleteSuccess(HCI_WRITE_INQUIRY_MODE);
-}
-
-void DualModeController::HciWritePageScanType(
-    const std::vector<uint8_t>& /* args */) {
-  LogCommand("Write Page Scan Type");
-  SendCommandCompleteSuccess(HCI_WRITE_PAGESCAN_TYPE);
-}
-
-void DualModeController::HciWriteInquiryScanType(
-    const std::vector<uint8_t>& /* args */) {
-  LogCommand("Write Inquiry Scan Type");
-  SendCommandCompleteSuccess(HCI_WRITE_INQSCAN_TYPE);
-}
-
-void DualModeController::HciWriteClassOfDevice(
-    const std::vector<uint8_t>& /* args */) {
-  LogCommand("Write Class Of Device");
-  SendCommandCompleteSuccess(HCI_WRITE_CLASS_OF_DEVICE);
-}
-
-void DualModeController::HciWritePageTimeout(
-    const std::vector<uint8_t>& /* args */) {
-  LogCommand("Write Page Timeout");
-  SendCommandCompleteSuccess(HCI_WRITE_PAGE_TOUT);
-}
-
-void DualModeController::HciWriteDefaultLinkPolicySettings(
-    const std::vector<uint8_t>& /* args */) {
-  LogCommand("Write Default Link Policy Settings");
-  SendCommandCompleteSuccess(HCI_WRITE_DEF_POLICY_SETTINGS);
-}
-
-void DualModeController::HciReadLocalName(
-    const std::vector<uint8_t>& /* args */) {
-  LogCommand("Get Local Name");
-  SendCommandComplete(HCI_READ_LOCAL_NAME, properties_.GetLocalName());
-}
-
-void DualModeController::HciWriteLocalName(
-    const std::vector<uint8_t>& /* args */) {
-  LogCommand("Write Local Name");
-  SendCommandCompleteSuccess(HCI_CHANGE_LOCAL_NAME);
-}
-
-void DualModeController::HciWriteExtendedInquiryResponse(
-    const std::vector<uint8_t>& /* args */) {
-  LogCommand("Write Extended Inquiry Response");
-  SendCommandCompleteSuccess(HCI_WRITE_EXT_INQ_RESPONSE);
-}
-
-void DualModeController::HciWriteVoiceSetting(
-    const std::vector<uint8_t>& /* args */) {
-  LogCommand("Write Voice Setting");
-  SendCommandCompleteSuccess(HCI_WRITE_VOICE_SETTINGS);
-}
-
-void DualModeController::HciWriteCurrentIacLap(
-    const std::vector<uint8_t>& /* args */) {
-  LogCommand("Write Current IAC LAP");
-  SendCommandCompleteSuccess(HCI_WRITE_CURRENT_IAC_LAP);
-}
-
-void DualModeController::HciWriteInquiryScanActivity(
-    const std::vector<uint8_t>& /* args */) {
-  LogCommand("Write Inquiry Scan Activity");
-  SendCommandCompleteSuccess(HCI_WRITE_INQUIRYSCAN_CFG);
-}
-
-void DualModeController::HciWriteScanEnable(
-    const std::vector<uint8_t>& /* args */) {
-  LogCommand("Write Scan Enable");
-  SendCommandCompleteSuccess(HCI_WRITE_SCAN_ENABLE);
-}
-
-void DualModeController::HciSetEventFilter(
-    const std::vector<uint8_t>& /* args */) {
-  LogCommand("Set Event Filter");
-  SendCommandCompleteSuccess(HCI_SET_EVENT_FILTER);
-}
-
-void DualModeController::HciInquiry(const std::vector<uint8_t>& /* args */) {
-  LogCommand("Inquiry");
-  state_ = kInquiry;
-  SendCommandStatusSuccess(HCI_INQUIRY);
-  switch (inquiry_mode_) {
-    case (kStandardInquiry):
-      SendInquiryResult();
-      break;
-
-    case (kRssiInquiry):
-      LOG_INFO(LOG_TAG, "RSSI Inquiry Mode currently not supported.");
-      break;
-
-    case (kExtendedOrRssiInquiry):
-      SendExtendedInquiryResult("FooBar", "123456");
-      break;
-  }
-}
-
-void DualModeController::HciInquiryCancel(
-    const std::vector<uint8_t>& /* args */) {
-  LogCommand("Inquiry Cancel");
-  CHECK(state_ == kInquiry);
-  state_ = kStandby;
-  SendCommandCompleteSuccess(HCI_INQUIRY_CANCEL);
-}
-
-void DualModeController::HciDeleteStoredLinkKey(
-    const std::vector<uint8_t>& args) {
-  LogCommand("Delete Stored Link Key");
-  /* Check the last octect in |args|. If it is 0, delete only the link key for
-   * the given BD_ADDR. If is is 1, delete all stored link keys. */
-  SendCommandComplete(HCI_DELETE_STORED_LINK_KEY, {1});
-}
-
-void DualModeController::HciRemoteNameRequest(
-    const std::vector<uint8_t>& args) {
-  LogCommand("Remote Name Request");
-  SendCommandStatusSuccess(HCI_RMT_NAME_REQUEST);
-}
-
-DualModeController::Properties::Properties(const std::string& file_name)
-    : local_supported_commands_size_(64), local_name_size_(248) {
-  std::string properties_raw;
-  if (!base::ReadFileToString(base::FilePath(file_name), &properties_raw))
-    LOG_INFO(LOG_TAG, "Error reading controller properties from file.");
-
-  scoped_ptr<base::Value> properties_value_ptr =
-      base::JSONReader::Read(properties_raw);
-  if (properties_value_ptr.get() == nullptr)
-    LOG_INFO(LOG_TAG,
-             "Error controller properties may consist of ill-formed JSON.");
-
-  // Get the underlying base::Value object, which is of type
-  // base::Value::TYPE_DICTIONARY, and read it into member variables.
-  base::Value& properties_dictionary = *(properties_value_ptr.get());
-  base::JSONValueConverter<DualModeController::Properties> converter;
-
-  if (!converter.Convert(properties_dictionary, this))
-    LOG_INFO(LOG_TAG,
-             "Error converting JSON properties into Properties object.");
-}
-
-const std::vector<uint8_t> DualModeController::Properties::GetBufferSize() {
-  return std::vector<uint8_t>(
-      {kSuccessStatus, acl_data_packet_size_, acl_data_packet_size_ >> 8,
-       sco_data_packet_size_, num_acl_data_packets_, num_acl_data_packets_ >> 8,
-       num_sco_data_packets_, num_sco_data_packets_ >> 8});
-}
-
-const std::vector<uint8_t>
-DualModeController::Properties::GetLocalVersionInformation() {
-  return std::vector<uint8_t>({kSuccessStatus, version_, revision_,
-                               revision_ >> 8, lmp_pal_version_,
-                               manufacturer_name_, manufacturer_name_ >> 8,
-                               lmp_pal_subversion_, lmp_pal_subversion_ >> 8});
-}
-
-const std::vector<uint8_t> DualModeController::Properties::GetBdAddress() {
-  return bd_address_;
-}
-
-const std::vector<uint8_t>
-DualModeController::Properties::GetLocalExtendedFeatures(uint8_t page_number) {
-  return std::vector<uint8_t>({kSuccessStatus, page_number,
-                               maximum_page_number_, 0xFF, 0xFF, 0xFF, 0xFF,
-                               0xFF, 0xFF, 0xFF, 0xFF});
-}
-
-const std::vector<uint8_t>
-DualModeController::Properties::GetLocalSupportedCommands() {
-  std::vector<uint8_t> local_supported_commands;
-  local_supported_commands.push_back(kSuccessStatus);
-  for (uint8_t i = 0; i < local_supported_commands_size_; ++i)
-    local_supported_commands.push_back(0xFF);
-  return local_supported_commands;
-}
-
-const std::vector<uint8_t> DualModeController::Properties::GetLocalName() {
-  std::vector<uint8_t> local_name;
-  local_name.push_back(kSuccessStatus);
-  for (uint8_t i = 0; i < local_name_size_; ++i)
-    local_name.push_back(0xFF);
-  return local_name;
-}
-
-// static
-void DualModeController::Properties::RegisterJSONConverter(
-    base::JSONValueConverter<DualModeController::Properties>* converter) {
-  // TODO(dennischeng): Use RegisterIntField() here?
-#define REGISTER_UINT8_T(field_name, field) \
-  converter->RegisterCustomField<uint8_t>(  \
-      field_name, &DualModeController::Properties::field, &ParseUint8t);
-#define REGISTER_UINT16_T(field_name, field) \
-  converter->RegisterCustomField<uint16_t>(  \
-      field_name, &DualModeController::Properties::field, &ParseUint16t);
-  REGISTER_UINT16_T("AclDataPacketSize", acl_data_packet_size_);
-  REGISTER_UINT8_T("ScoDataPacketSize", sco_data_packet_size_);
-  REGISTER_UINT16_T("NumAclDataPackets", num_acl_data_packets_);
-  REGISTER_UINT16_T("NumScoDataPackets", num_sco_data_packets_);
-  REGISTER_UINT8_T("Version", version_);
-  REGISTER_UINT16_T("Revision", revision_);
-  REGISTER_UINT8_T("LmpPalVersion", lmp_pal_version_);
-  REGISTER_UINT16_T("ManufacturerName", manufacturer_name_);
-  REGISTER_UINT16_T("LmpPalSubversion", lmp_pal_subversion_);
-  REGISTER_UINT8_T("MaximumPageNumber", maximum_page_number_);
-  converter->RegisterCustomField<std::vector<uint8_t>>(
-      "BdAddress", &DualModeController::Properties::bd_address_,
-      &ParseUint8tVector);
-#undef REGISTER_UINT8_T
-#undef REGISTER_UINT16_T
-}
-
-}  // namespace test_vendor_lib

--- a/vendor_libs/test_vendor_lib/src/event_packet.cc
+++ /dev/null
@@ -1,131 +0,0 @@
-//
-// Copyright 2015 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-#define LOG_TAG "event_packet"
-
-#define VECTOR_COPY_TO_END(source, destination) \
-  std::copy(source.begin(), source.end(), std::back_inserter(destination));
-
-#include "vendor_libs/test_vendor_lib/include/event_packet.h"
-
-extern "C" {
-#include "osi/include/log.h"
-#include "stack/include/hcidefs.h"
-}  // extern "C"
-
-namespace test_vendor_lib {
-
-EventPacket::EventPacket(uint8_t event_code,
-                         const std::vector<uint8_t>& payload)
-    : Packet(DATA_TYPE_EVENT) {
-  Encode({event_code, static_cast<uint8_t>(payload.size())}, payload);
-}
-
-uint8_t EventPacket::GetEventCode() const {
-  return GetHeader()[0];
-}
-
-// static
-std::unique_ptr<EventPacket> EventPacket::CreateCommandCompleteEvent(
-    uint8_t num_hci_command_packets, uint16_t command_opcode,
-    const std::vector<uint8_t>& event_return_parameters) {
-  size_t payload_size = sizeof(num_hci_command_packets) +
-                        sizeof(command_opcode) + event_return_parameters.size();
-
-  std::vector<uint8_t> payload;
-  payload.reserve(payload_size);
-  payload.push_back(num_hci_command_packets);
-  payload.push_back(command_opcode);
-  payload.push_back(command_opcode >> 8);
-  VECTOR_COPY_TO_END(event_return_parameters, payload);
-
-  return std::unique_ptr<EventPacket>(
-      new EventPacket(HCI_COMMAND_COMPLETE_EVT, payload));
-}
-
-// static
-std::unique_ptr<EventPacket> EventPacket::CreateCommandStatusEvent(
-    uint8_t status, uint8_t num_hci_command_packets, uint16_t command_opcode) {
-  size_t payload_size =
-      sizeof(status) + sizeof(num_hci_command_packets) + sizeof(command_opcode);
-
-  std::vector<uint8_t> payload;
-  payload.reserve(payload_size);
-  payload.push_back(status);
-  payload.push_back(num_hci_command_packets);
-  payload.push_back(command_opcode);
-  payload.push_back(command_opcode >> 8);
-
-  return std::unique_ptr<EventPacket>(
-      new EventPacket(HCI_COMMAND_STATUS_EVT, payload));
-}
-
-//static
-std::unique_ptr<EventPacket> EventPacket::CreateInquiryResultEvent(
-    uint8_t num_responses, const std::vector<uint8_t>& bd_addresses,
-    const std::vector<uint8_t>& page_scan_repetition_mode,
-    const std::vector<uint8_t>& page_scan_period_mode,
-    const std::vector<uint8_t>& page_scan_mode,
-    const std::vector<uint8_t>& class_of_device,
-    const std::vector<uint8_t>& clock_offset) {
-  size_t payload_size = sizeof(num_responses) + bd_addresses.size() +
-                        page_scan_repetition_mode.size() +
-                        page_scan_period_mode.size() + page_scan_mode.size() +
-                        class_of_device.size() + clock_offset.size();
-
-  std::vector<uint8_t> payload;
-  payload.reserve(payload_size);
-  payload.push_back(num_responses);
-  VECTOR_COPY_TO_END(bd_addresses, payload);
-  VECTOR_COPY_TO_END(page_scan_repetition_mode, payload);
-  VECTOR_COPY_TO_END(page_scan_mode, payload);
-  VECTOR_COPY_TO_END(class_of_device, payload);
-  VECTOR_COPY_TO_END(clock_offset, payload);
-
-  return std::unique_ptr<EventPacket>(
-      new EventPacket(HCI_INQUIRY_RESULT_EVT, payload));
-}
-
-//static
-std::unique_ptr<EventPacket> EventPacket::CreateExtendedInquiryResultEvent(
-    const std::vector<uint8_t>& bd_address,
-    const std::vector<uint8_t>& page_scan_repetition_mode,
-    const std::vector<uint8_t>& page_scan_period_mode,
-    const std::vector<uint8_t>& class_of_device,
-    const std::vector<uint8_t>& clock_offset,
-    const std::vector<uint8_t>& rssi,
-    const std::vector<uint8_t>& extended_inquiry_response) {
-  size_t payload_size =
-      1 + bd_address.size() + page_scan_repetition_mode.size() +
-      page_scan_period_mode.size() + class_of_device.size() +
-      clock_offset.size() + rssi.size() + extended_inquiry_response.size();
-
-  std::vector<uint8_t> payload;
-  payload.reserve(payload_size);
-  payload.push_back(1);  // Each extended inquiry result contains one device.
-  VECTOR_COPY_TO_END(bd_address, payload);
-  VECTOR_COPY_TO_END(page_scan_repetition_mode, payload);
-  VECTOR_COPY_TO_END(page_scan_period_mode, payload);
-  VECTOR_COPY_TO_END(class_of_device, payload);
-  VECTOR_COPY_TO_END(clock_offset, payload);
-  VECTOR_COPY_TO_END(rssi, payload);
-  VECTOR_COPY_TO_END(extended_inquiry_response, payload);
-
-  return std::unique_ptr<EventPacket>(
-      new EventPacket(HCI_EXTENDED_INQUIRY_RESULT_EVT, payload));
-}
-
-}  // namespace test_vendor_lib

--- a/vendor_libs/test_vendor_lib/src/hci_transport.cc
+++ /dev/null
@@ -1,173 +0,0 @@
-//
-// Copyright 2015 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-#define LOG_TAG "hci_transport"
-
-#include "vendor_libs/test_vendor_lib/include/hci_transport.h"
-
-#include "base/logging.h"
-#include "base/bind.h"
-#include "base/thread_task_runner_handle.h"
-
-extern "C" {
-#include <inttypes.h>
-#include <sys/socket.h>
-#include "stack/include/hcidefs.h"
-#include "osi/include/log.h"
-}  // extern "C"
-
-namespace test_vendor_lib {
-
-HciTransport::HciTransport() : weak_ptr_factory_(this) {}
-
-void HciTransport::CloseHciFd() {
-  hci_fd_.reset(nullptr);
-}
-
-void HciTransport::CloseVendorFd() {
-  vendor_fd_.reset(nullptr);
-}
-
-int HciTransport::GetHciFd() const {
-  return hci_fd_->get();
-}
-
-int HciTransport::GetVendorFd() const {
-  return vendor_fd_->get();
-}
-
-bool HciTransport::SetUp() {
-  int socketpair_fds[2];
-  // TODO(dennischeng): Use SOCK_SEQPACKET here.
-  const int success = socketpair(AF_LOCAL, SOCK_STREAM, 0, socketpair_fds);
-  if (success < 0)
-    return false;
-  hci_fd_.reset(new base::ScopedFD(socketpair_fds[0]));
-  vendor_fd_.reset(new base::ScopedFD(socketpair_fds[1]));
-  return true;
-}
-
-void HciTransport::OnFileCanReadWithoutBlocking(int fd) {
-  CHECK(fd == GetVendorFd());
-  LOG_INFO(LOG_TAG, "Event ready in HciTransport on fd: %d.", fd);
-
-  const serial_data_type_t packet_type = packet_stream_.ReceivePacketType(fd);
-  switch (packet_type) {
-    case (DATA_TYPE_COMMAND): {
-      ReceiveReadyCommand();
-      break;
-    }
-
-    case (DATA_TYPE_ACL): {
-      LOG_INFO(LOG_TAG, "ACL data packets not currently supported.");
-      break;
-    }
-
-    case (DATA_TYPE_SCO): {
-      LOG_INFO(LOG_TAG, "SCO data packets not currently supported.");
-      break;
-    }
-
-    // TODO(dennischeng): Add debug level assert here.
-    default: {
-      LOG_INFO(LOG_TAG, "Error received an invalid packet type from the HCI.");
-      break;
-    }
-  }
-}
-
-void HciTransport::ReceiveReadyCommand() const {
-  std::unique_ptr<CommandPacket> command =
-      packet_stream_.ReceiveCommand(GetVendorFd());
-  LOG_INFO(LOG_TAG, "Received command packet.");
-  command_handler_(std::move(command));
-}
-
-void HciTransport::RegisterCommandHandler(
-    std::function<void(std::unique_ptr<CommandPacket>)> callback) {
-  command_handler_ = callback;
-}
-
-void HciTransport::OnFileCanWriteWithoutBlocking(int fd) {
-  CHECK(fd == GetVendorFd());
-  if (!outbound_events_.empty()) {
-    base::TimeTicks current_time = base::TimeTicks::Now();
-    // Check outbound events for events that can be sent, i.e. events with a
-    // timestamp before the current time. Stop sending events when
-    // |packet_stream_| fails writing.
-    for (auto it = outbound_events_.begin(); it != outbound_events_.end();) {
-      if ((*it)->GetTimeStamp() > current_time) {
-        ++it;
-        continue;
-      }
-      if (!packet_stream_.SendEvent((*it)->GetEvent(), fd))
-        return;
-      it = outbound_events_.erase(it);
-    }
-  }
-}
-
-void HciTransport::AddEventToOutboundEvents(
-    std::unique_ptr<TimeStampedEvent> event) {
-  outbound_events_.push_back(std::move(event));
-}
-
-void HciTransport::PostEventResponse(std::unique_ptr<EventPacket> event) {
-  AddEventToOutboundEvents(
-      std::make_unique<TimeStampedEvent>(std::move(event)));
-}
-
-void HciTransport::PostDelayedEventResponse(std::unique_ptr<EventPacket> event,
-                                            base::TimeDelta delay) {
-  // TODO(dennischeng): When it becomes available for MessageLoopForIO, use the
-  // thread's task runner to post |PostEventResponse| as a delayed task, being
-  // sure to CHECK the appropriate task runner attributes using
-  // base::ThreadTaskRunnerHandle.
-
-  // The system does not support high resolution timing and the clock could be
-  // as coarse as ~15.6 ms so the event is sent without a delay to avoid
-  // inconsistent event responses.
-  if (!base::TimeTicks::IsHighResolution()) {
-    LOG_INFO(LOG_TAG,
-              "System does not support high resolution timing. Sending event "
-              "without delay.");
-    PostEventResponse(std::move(event));
-  }
-
-  LOG_INFO(LOG_TAG, "Posting event response with delay of %" PRId64 " ms.",
-           delay.InMilliseconds());
-
-  AddEventToOutboundEvents(
-      std::make_unique<TimeStampedEvent>(std::move(event), delay));
-}
-
-HciTransport::TimeStampedEvent::TimeStampedEvent(
-    std::unique_ptr<EventPacket> event, base::TimeDelta delay)
-    : event_(std::move(event)), time_stamp_(base::TimeTicks::Now() + delay) {}
-
-HciTransport::TimeStampedEvent::TimeStampedEvent(
-    std::unique_ptr<EventPacket> event)
-    : event_(std::move(event)), time_stamp_(base::TimeTicks::UnixEpoch()) {}
-
-const base::TimeTicks& HciTransport::TimeStampedEvent::GetTimeStamp() const {
-  return time_stamp_;
-}
-
-const EventPacket& HciTransport::TimeStampedEvent::GetEvent() {
-  return *(event_.get());
-}
-
-}  // namespace test_vendor_lib

--- a/vendor_libs/test_vendor_lib/src/packet.cc
+++ /dev/null
@@ -1,69 +0,0 @@
-//
-// Copyright 2015 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-#define LOG_TAG "packet"
-
-#include "vendor_libs/test_vendor_lib/include/packet.h"
-
-#include "base/logging.h"
-
-#include <algorithm>
-
-extern "C" {
-#include "osi/include/log.h"
-}  // extern "C"
-
-namespace test_vendor_lib {
-
-Packet::Packet(serial_data_type_t type) : type_(type) {}
-
-bool Packet::Encode(const std::vector<uint8_t>& header,
-                    const std::vector<uint8_t>& payload) {
-  if (header.back() != payload.size())
-    return false;
-  header_ = header;
-  payload_ = payload;
-  return true;
-}
-
-const std::vector<uint8_t>& Packet::GetHeader() const {
-  // Every packet must have a header.
-  CHECK(GetHeaderSize() > 0);
-  return header_;
-}
-
-uint8_t Packet::GetHeaderSize() const {
-  return header_.size();
-}
-
-size_t Packet::GetPacketSize() const {
-  // Add one for the type octet.
-  return 1 + header_.size() + payload_.size();
-}
-
-const std::vector<uint8_t>& Packet::GetPayload() const {
-  return payload_;
-}
-
-uint8_t Packet::GetPayloadSize() const {
-  return payload_.size();
-}
-
-serial_data_type_t Packet::GetType() const {
-  return type_;
-}
-
-}  // namespace test_vendor_lib

--- a/vendor_libs/test_vendor_lib/src/packet_stream.cc
+++ /dev/null
@@ -1,134 +0,0 @@
-//
-// Copyright 2015 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-#define LOG_TAG "packet_stream"
-
-#include "vendor_libs/test_vendor_lib/include/packet_stream.h"
-
-#include "base/logging.h"
-
-extern "C" {
-#include <errno.h>
-#include <unistd.h>
-
-#include "osi/include/log.h"
-}  // extern "C"
-
-namespace test_vendor_lib {
-
-std::unique_ptr<CommandPacket> PacketStream::ReceiveCommand(int fd) const {
-  std::vector<uint8_t> header;
-  std::vector<uint8_t> payload;
-
-  if (!ReceiveAll(header, CommandPacket::kCommandHeaderSize, fd)) {
-    LOG_ERROR(LOG_TAG, "Error: receiving command header.");
-    return std::unique_ptr<CommandPacket>(nullptr);
-  }
-
-  if (!ReceiveAll(payload, header.back(), fd)) {
-    LOG_ERROR(LOG_TAG, "Error: receiving command payload.");
-    return std::unique_ptr<CommandPacket>(nullptr);
-  }
-
-  std::unique_ptr<CommandPacket> command(new CommandPacket());
-  if (!command->Encode(header, payload)) {
-    LOG_ERROR(LOG_TAG, "Error: encoding command packet.");
-    command.reset(nullptr);
-  }
-  return command;
-}
-
-serial_data_type_t PacketStream::ReceivePacketType(int fd) const {
-  LOG_INFO(LOG_TAG, "Receiving packet type.");
-
-  std::vector<uint8_t> raw_type_octet;
-
-  if (!ReceiveAll(raw_type_octet, 1, fd)) {
-    // TODO(dennischeng): Proper error handling.
-    LOG_ERROR(LOG_TAG, "Error: Could not receive packet type.");
-  }
-
-  // Check that the type octet received is in the valid range, i.e. the packet
-  // must be a command or data packet.
-  const serial_data_type_t type =
-      static_cast<serial_data_type_t>(raw_type_octet[0]);
-  if (!ValidateTypeOctet(type)) {
-    // TODO(dennischeng): Proper error handling.
-    LOG_ERROR(LOG_TAG, "Error: Received invalid packet type.");
-  }
-  return type;
-}
-
-bool PacketStream::SendEvent(const EventPacket& event, int fd) const {
-  LOG_INFO(LOG_TAG, "Sending event with event code: 0x%04X",
-           event.GetEventCode());
-  LOG_INFO(LOG_TAG, "Sending event with size: %zu octets",
-           event.GetPacketSize());
-
-  if (!SendAll({static_cast<uint8_t>(event.GetType())}, 1, fd)) {
-    LOG_ERROR(LOG_TAG, "Error: Could not send event type.");
-    return false;
-  }
-
-  if (!SendAll(event.GetHeader(), event.GetHeaderSize(), fd)) {
-    LOG_ERROR(LOG_TAG, "Error: Could not send event header.");
-    return false;
-  }
-
-  if (!SendAll(event.GetPayload(), event.GetPayloadSize(), fd)) {
-    LOG_ERROR(LOG_TAG, "Error: Could not send event payload.");
-    return false;
-  }
-  return true;
-}
-
-bool PacketStream::ValidateTypeOctet(serial_data_type_t type) const {
-  LOG_INFO(LOG_TAG, "Signal octet is 0x%02X.", type);
-  // The only types of packets that should be received from the HCI are command
-  // packets and data packets.
-  return (type >= DATA_TYPE_COMMAND) && (type <= DATA_TYPE_SCO);
-}
-
-bool PacketStream::ReceiveAll(std::vector<uint8_t>& destination,
-                              size_t num_octets_to_receive, int fd) const {
-  destination.resize(num_octets_to_receive);
-  size_t octets_remaining = num_octets_to_receive;
-  while (octets_remaining > 0) {
-    const int num_octets_received =
-        read(fd, &destination[num_octets_to_receive - octets_remaining],
-             octets_remaining);
-    if (num_octets_received < 0)
-      return false;
-    octets_remaining -= num_octets_received;
-  }
-  return true;
-}
-
-bool PacketStream::SendAll(const std::vector<uint8_t>& source,
-                           size_t num_octets_to_send, int fd) const {
-  CHECK(source.size() >= num_octets_to_send);
-  size_t octets_remaining = num_octets_to_send;
-  while (octets_remaining > 0) {
-    const int num_octets_sent = write(
-        fd, &source[num_octets_to_send - octets_remaining], octets_remaining);
-    if (num_octets_sent < 0)
-      return false;
-    octets_remaining -= num_octets_sent;
-  }
-  return true;
-}
-
-}  // namespace test_vendor_lib

--- a/vendor_libs/test_vendor_lib/src/test_channel_transport.cc
+++ /dev/null
@@ -1,138 +0,0 @@
-//
-// Copyright 2015 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-#define LOG_TAG "test_channel_transport"
-
-#include "vendor_libs/test_vendor_lib/include/test_channel_transport.h"
-
-#include "base/logging.h"
-
-extern "C" {
-#include "osi/include/log.h"
-
-#include <sys/socket.h>
-#include <netinet/in.h>
-}  // extern "C"
-
-namespace test_vendor_lib {
-
-TestChannelTransport::TestChannelTransport(bool enabled, int port)
-    : enabled_(enabled), port_(port) {}
-
-bool TestChannelTransport::SetUp() {
-  CHECK(enabled_);
-
-  struct sockaddr_in listen_address, test_channel_address;
-  int sockaddr_in_size = sizeof(struct sockaddr_in);
-  int listen_fd = -1;
-  int accept_fd = -1;
-  memset(&listen_address, 0, sockaddr_in_size);
-  memset(&test_channel_address, 0, sockaddr_in_size);
-
-  if ((listen_fd = socket(AF_INET, SOCK_STREAM, 0)) < 0) {
-    LOG_INFO(LOG_TAG, "Error creating socket for test channel.");
-    return false;
-  }
-
-  LOG_INFO(LOG_TAG, "port: %d", port_);
-  listen_address.sin_family = AF_INET;
-  listen_address.sin_port = htons(port_);
-  listen_address.sin_addr.s_addr = htonl(INADDR_ANY);
-
-  if (bind(listen_fd, reinterpret_cast<sockaddr*>(&listen_address),
-           sockaddr_in_size) < 0) {
-    LOG_INFO(LOG_TAG, "Error binding test channel listener socket to address.");
-    close(listen_fd);
-    return false;
-  }
-
-  if (listen(listen_fd, 1) < 0) {
-    LOG_INFO(LOG_TAG, "Error listening for test channel.");
-    close(listen_fd);
-    return false;
-  }
-
-  if ((accept_fd =
-           accept(listen_fd, reinterpret_cast<sockaddr*>(&test_channel_address),
-                  &sockaddr_in_size)) < 0) {
-    LOG_INFO(LOG_TAG, "Error accepting test channel connection.");
-    close(listen_fd);
-    return false;
-  }
-
-  fd_.reset(new base::ScopedFD(accept_fd));
-  return GetFd() >= 0;
-}
-
-int TestChannelTransport::GetFd() {
-  return fd_->get();
-}
-
-bool TestChannelTransport::IsEnabled() {
-  return enabled_;
-}
-
-// base::MessageLoopForIO::Watcher overrides:
-void TestChannelTransport::OnFileCanReadWithoutBlocking(int fd) {
-  CHECK(fd == GetFd());
-
-  LOG_INFO(LOG_TAG, "Event ready in TestChannelTransport on fd: %d", fd);
-  uint8_t command_name_size = 0;
-  read(fd, &command_name_size, 1);
-  std::vector<uint8_t> command_name_raw;
-  command_name_raw.resize(command_name_size);
-  read(fd, &command_name_raw[0], command_name_size);
-  std::string command_name(command_name_raw.begin(), command_name_raw.end());
-  LOG_INFO(LOG_TAG, "Received command from test channel: %s",
-           command_name.data());
-
-  if (command_name == "CLOSE_TEST_CHANNEL") {
-    fd_.reset(nullptr);
-    return;
-  }
-
-  uint8_t num_args = 0;
-  read(fd, &num_args, 1);
-  LOG_INFO(LOG_TAG, "num_args: %d", num_args);
-  std::vector<std::string> args;
-  for (uint8_t i = 0; i < num_args; ++i) {
-    uint8_t arg_size = 0;
-    read(fd, &arg_size, 1);
-    std::vector<uint8_t> arg;
-    arg.resize(arg_size);
-    read(fd, &arg[0], arg_size);
-    args.push_back(std::string(arg.begin(), arg.end()));
-  }
-
-  for (size_t i = 0; i < args.size(); ++i)
-    LOG_INFO(LOG_TAG, "Command argument %zu: %s", i, args[i].data());
-
-  command_handler_(command_name, args);
-}
-
-void TestChannelTransport::OnFileCanWriteWithoutBlocking(int fd) {}
-
-void TestChannelTransport::RegisterCommandHandler(
-    std::function<void(const std::string&, const std::vector<std::string>&)>
-        callback) {
-  command_handler_ = callback;
-}
-
-void TestChannelTransport::Disable() {
-  enabled_ = false;
-}
-
-}  // namespace test_vendor_lib {

--- a/vendor_libs/test_vendor_lib/src/vendor_manager.cc
+++ /dev/null
@@ -1,149 +0,0 @@
-//
-// Copyright 2015 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-#define LOG_TAG "vendor_manager"
-
-#include "vendor_manager.h"
-
-#include "base/bind.h"
-#include "base/logging.h"
-
-extern "C" {
-#include "osi/include/log.h"
-}  // extern "C"
-
-namespace test_vendor_lib {
-
-VendorManager* g_manager = nullptr;
-
-// static
-void VendorManager::CleanUp() {
-  delete g_manager;
-  g_manager = nullptr;
-}
-
-// static
-VendorManager* VendorManager::Get() {
-  // Initialize should have been called already.
-  CHECK(g_manager);
-  return g_manager;
-}
-
-// static
-void VendorManager::Initialize() {
-  CHECK(!g_manager);
-  g_manager = new VendorManager();
-}
-
-VendorManager::VendorManager()
-    : running_(false),
-      test_channel_transport_(true, 6111),
-      thread_("TestVendorLibrary"),
-      weak_ptr_factory_(this) {}
-
-bool VendorManager::Run() {
-  CHECK(!running_);
-
-  if (!transport_.SetUp()) {
-    LOG_ERROR(LOG_TAG, "Error setting up transport object.");
-    return false;
-  }
-
-  if (test_channel_transport_.IsEnabled()) {
-    LOG_INFO(LOG_TAG, "Test channel is enabled.");
-
-    if (test_channel_transport_.SetUp()) {
-      controller_.RegisterHandlersWithTestChannelTransport(
-          test_channel_transport_);
-    } else {
-      LOG_ERROR(LOG_TAG,
-                "Error setting up test channel object, continuing without it.");
-      test_channel_transport_.Disable();
-    }
-  } else {
-    LOG_INFO(LOG_TAG, "Test channel is disabled.");
-  }
-
-  controller_.RegisterHandlersWithHciTransport(transport_);
-  // TODO(dennischeng): Register PostDelayedEventResponse instead.
-  controller_.RegisterDelayedEventChannel(
-      std::bind(&HciTransport::PostDelayedEventResponse, &transport_,
-                std::placeholders::_1, std::placeholders::_2));
-
-  running_ = true;
-  if (!thread_.StartWithOptions(
-          base::Thread::Options(base::MessageLoop::TYPE_IO, 0))) {
-    LOG_ERROR(LOG_TAG, "Error starting TestVendorLibrary thread.");
-    running_ = false;
-    return false;
-  }
-
-  if (!PostTask(base::Bind(&VendorManager::StartWatchingOnThread,
-                           weak_ptr_factory_.GetWeakPtr()))) {
-    LOG_ERROR(LOG_TAG, "Error posting StartWatchingOnThread to task runner.");
-    running_ = false;
-    return false;
-  }
-
-  return true;
-}
-
-void VendorManager::StartWatchingOnThread() {
-  CHECK(running_);
-  CHECK(base::MessageLoopForIO::IsCurrent());
-
-  if (!base::MessageLoopForIO::current()->WatchFileDescriptor(
-          transport_.GetVendorFd(), true,
-          base::MessageLoopForIO::WATCH_READ_WRITE, &hci_watcher_,
-          &transport_)) {
-    LOG_ERROR(LOG_TAG, "Error watching vendor fd.");
-    return;
-  }
-
-  if (test_channel_transport_.IsEnabled())
-    if (!base::MessageLoopForIO::current()->WatchFileDescriptor(
-            test_channel_transport_.GetFd(), true,
-            base::MessageLoopForIO::WATCH_READ, &test_channel_watcher_,
-            &test_channel_transport_))
-      LOG_ERROR(LOG_TAG, "Error watching test channel fd.");
-}
-
-bool VendorManager::PostTask(const base::Closure& task) {
-  return PostDelayedTask(task, base::TimeDelta::FromMilliseconds(0));
-}
-
-bool VendorManager::PostDelayedTask(const base::Closure& task,
-                                    base::TimeDelta delay) {
-  return thread_.task_runner()->PostDelayedTask(FROM_HERE, task, delay);
-}
-
-void VendorManager::SetVendorCallbacks(const bt_vendor_callbacks_t& callbacks) {
-  vendor_callbacks_ = callbacks;
-}
-
-const bt_vendor_callbacks_t& VendorManager::GetVendorCallbacks() const {
-  return vendor_callbacks_;
-}
-
-void VendorManager::CloseHciFd() {
-  transport_.CloseHciFd();
-}
-
-int VendorManager::GetHciFd() const {
-  return transport_.GetHciFd();
-}
-
-}  // namespace test_vendor_lib

--- a/vendor_libs/test_vendor_lib/test/hci_transport_unittest.cc
+++ /dev/null
@@ -1,140 +0,0 @@
-//
-// Copyright 2015 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-#include "vendor_libs/test_vendor_lib/include/command_packet.h"
-#include "vendor_libs/test_vendor_lib/include/hci_transport.h"
-
-#include "base/bind.h"
-#include "base/message_loop/message_loop.h"
-#include "base/threading/thread.h"
-
-#include <gtest/gtest.h>
-#include <functional>
-#include <mutex>
-
-extern "C" {
-#include "stack/include/hcidefs.h"
-}  // extern "C"
-
-namespace {
-const std::vector<uint8_t> stub_command({DATA_TYPE_COMMAND,
-                                         static_cast<uint8_t>(HCI_RESET),
-                                         static_cast<uint8_t>(HCI_RESET >> 8),
-                                         0});
-
-const int kMultiIterations = 10000;
-
-void WriteStubCommand(int fd) {
-  write(fd, &stub_command[0], stub_command.size());
-}
-
-}  // namespace
-
-namespace test_vendor_lib {
-
-class HciTransportTest : public ::testing::Test {
- public:
-  HciTransportTest()
-      : command_callback_count_(0),
-        thread_("HciTransportTest"),
-        weak_ptr_factory_(this) {
-    SetUpTransport();
-    StartThread();
-    PostStartWatchingOnThread();
-  }
-
-  ~HciTransportTest() {
-    transport_.CloseHciFd();
-  }
-
-  void CommandCallback(std::unique_ptr<CommandPacket> command) {
-    ++command_callback_count_;
-    // Ensure that the received packet matches the stub command.
-    EXPECT_EQ(DATA_TYPE_COMMAND, command->GetType());
-    EXPECT_EQ(HCI_RESET, command->GetOpcode());
-    EXPECT_EQ(0, command->GetPayloadSize());
-    transport_.CloseVendorFd();
-  }
-
-  void MultiCommandCallback(std::unique_ptr<CommandPacket> command) {
-    ++command_callback_count_;
-    // Ensure that the received packet matches the stub command.
-    EXPECT_EQ(DATA_TYPE_COMMAND, command->GetType());
-    EXPECT_EQ(HCI_RESET, command->GetOpcode());
-    EXPECT_EQ(0, command->GetPayloadSize());
-    if (command_callback_count_ == kMultiIterations)
-      transport_.CloseVendorFd();
-  }
-
- protected:
-  // Tracks the number of commands received.
-  int command_callback_count_;
-  base::Thread thread_;
-  HciTransport transport_;
-  base::MessageLoopForIO::FileDescriptorWatcher watcher_;
-  base::WeakPtrFactory<HciTransportTest> weak_ptr_factory_;
-
- private:
-  // Workaround because ASSERT cannot be used directly in a constructor
-  void SetUpTransport() {
-    ASSERT_TRUE(transport_.SetUp());
-  }
-
-  void StartThread() {
-    ASSERT_TRUE(thread_.StartWithOptions(
-        base::Thread::Options(base::MessageLoop::TYPE_IO, 0)));
-  }
-
-  void PostStartWatchingOnThread() {
-    thread_.task_runner()->PostTask(
-        FROM_HERE, base::Bind(&HciTransportTest::StartWatchingOnThread,
-                              weak_ptr_factory_.GetWeakPtr()));
-  }
-
-  void StartWatchingOnThread() {
-    base::MessageLoopForIO* loop =
-        static_cast<base::MessageLoopForIO*>(thread_.message_loop());
-    ASSERT_TRUE(loop);
-    ASSERT_TRUE(loop->WatchFileDescriptor(
-        transport_.GetVendorFd(), true,
-        base::MessageLoopForIO::WATCH_READ_WRITE, &watcher_, &transport_));
-  }
-};
-
-TEST_F(HciTransportTest, SingleCommandCallback) {
-  transport_.RegisterCommandHandler(std::bind(
-      &HciTransportTest::CommandCallback, this, std::placeholders::_1));
-  EXPECT_EQ(0, command_callback_count_);
-  WriteStubCommand(transport_.GetHciFd());
-  thread_.Stop();  // Wait for the command handler to finish.
-  EXPECT_EQ(1, command_callback_count_);
-}
-
-TEST_F(HciTransportTest, MultiCommandCallback) {
-  transport_.RegisterCommandHandler(std::bind(
-      &HciTransportTest::MultiCommandCallback, this, std::placeholders::_1));
-  EXPECT_EQ(0, command_callback_count_);
-  WriteStubCommand(transport_.GetHciFd());
-  for (int i = 1; i < kMultiIterations; ++i)
-    WriteStubCommand(transport_.GetHciFd());
-  thread_.Stop();  // Wait for the command handler to finish.
-  EXPECT_EQ(kMultiIterations, command_callback_count_);
-}
-
-// TODO(dennischeng): Add tests for PostEventResponse and
-// PostDelayedEventResponse.
-
-}  // namespace test_vendor_lib

--- a/vendor_libs/test_vendor_lib/test/packet_stream_unittest.cc
+++ /dev/null
@@ -1,151 +0,0 @@
-//
-// Copyright 2015 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-#include "vendor_libs/test_vendor_lib/include/packet_stream.h"
-#include "vendor_libs/test_vendor_lib/include/command_packet.h"
-#include "vendor_libs/test_vendor_lib/include/event_packet.h"
-#include "vendor_libs/test_vendor_lib/include/packet.h"
-
-#include <gtest/gtest.h>
-#include <cstdint>
-#include <memory>
-#include <vector>
-
-extern "C" {
-#include "hci/include/hci_hal.h"
-#include "stack/include/hcidefs.h"
-
-#include <sys/socket.h>
-}  // extern "C"
-
-namespace {
-const char small_payload[] = "foo bar baz";
-const char large_payload[] =
-  "Aristotle's principles will then be no more principles to him, than those "
-  "of Epicurus and the Stoics: let this diversity of opinions be propounded "
-  "to, and laid before him; he will himself choose, if he be able; if not, "
-  "he will remain in doubt.";
-}  // namespace
-
-namespace test_vendor_lib {
-
-class PacketStreamTest : public ::testing::Test {
- public:
-  PacketStreamTest() {
-    socketpair(AF_LOCAL, SOCK_STREAM, 0, socketpair_fds_);
-    CheckSocketpairInit();
-  }
-
-  ~PacketStreamTest() {
-    close(socketpair_fds_[0]);
-    close(socketpair_fds_[1]);
-  }
-
-  void CheckedReceiveCommand(const char* payload, uint16_t opcode) {
-    uint8_t payload_size = strlen(payload);
-    std::vector<uint8_t> packet;
-
-    packet.push_back(DATA_TYPE_COMMAND);
-    packet.push_back(opcode);
-    packet.push_back(opcode >> 8);
-    packet.push_back(payload_size);
-
-    // Set the packet's payload.
-    for (int i = 0; i < payload_size; ++i)
-      packet.push_back(payload[i]);
-
-    // Send the packet to |packet_stream_|.
-    write(socketpair_fds_[1], &packet[1], packet.size());
-
-    // Read the command packet.
-    std::unique_ptr<CommandPacket> command =
-        packet_stream_.ReceiveCommand(socketpair_fds_[0]);
-
-    const std::vector<uint8_t> received_payload = command->GetPayload();
-
-    // Validate the packet by checking that it's the appropriate size and then
-    // checking each byte.
-    EXPECT_EQ(packet.size(), command->GetPacketSize());
-    EXPECT_EQ(DATA_TYPE_COMMAND, command->GetType());
-    EXPECT_EQ(opcode, command->GetOpcode());
-    EXPECT_EQ(payload_size, command->GetPayloadSize());
-    for (int i = 0; i < payload_size; ++i)
-      EXPECT_EQ(packet[4 + i], received_payload[i]);
-  }
-
-  void CheckedSendEvent(std::unique_ptr<EventPacket> event) {
-    EXPECT_TRUE(packet_stream_.SendEvent(*(event.get()), socketpair_fds_[0]));
-
-    // Read the packet sent by |packet_stream_|.
-    uint8_t event_header[3];
-    read(socketpair_fds_[1], event_header, 3);
-
-    uint8_t return_parameters_size = event_header[2];
-    uint8_t return_parameters[return_parameters_size];
-    read(socketpair_fds_[1], return_parameters, sizeof(return_parameters));
-
-    const std::vector<uint8_t> expected_payload = event->GetPayload();
-
-    // Validate the packet by checking that it's the
-    // appropriate size and then checking each byte.
-    EXPECT_EQ(event->GetPacketSize(),
-              sizeof(event_header) + sizeof(return_parameters));
-    EXPECT_EQ(DATA_TYPE_EVENT, event_header[0]);
-    EXPECT_EQ(event->GetEventCode(), event_header[1]);
-    EXPECT_EQ(event->GetPayloadSize(), return_parameters_size);
-    for (int i = 0; i < return_parameters_size; ++i)
-      EXPECT_EQ(expected_payload[i], return_parameters[i]);
-  }
-
- protected:
-  PacketStream packet_stream_;
-
-  int socketpair_fds_[2];
-
- private:
-  // Workaround because ASSERT cannot be used directly in a constructor
-  void CheckSocketpairInit() {
-    ASSERT_TRUE(socketpair_fds_[0] > 0);
-    ASSERT_TRUE(socketpair_fds_[1] > 0);
-  }
-
-};
-
-TEST_F(PacketStreamTest, ReceivePacketType) {
-  serial_data_type_t command_type = DATA_TYPE_COMMAND;
-  write(socketpair_fds_[1], &command_type, 1);
-  EXPECT_EQ(command_type, packet_stream_.ReceivePacketType(socketpair_fds_[0]));
-}
-
-TEST_F(PacketStreamTest, ReceiveEmptyCommand) {
-  CheckedReceiveCommand("", HCI_RESET);
-}
-
-TEST_F(PacketStreamTest, ReceiveSmallCommand) {
-  CheckedReceiveCommand(small_payload, HCI_RESET);
-}
-
-TEST_F(PacketStreamTest, ReceiveLargeCommand) {
-  CheckedReceiveCommand(large_payload, HCI_RESET);
-}
-
-TEST_F(PacketStreamTest, SendEvent) {
-  const std::vector<uint8_t> return_parameters = {0};
-  CheckedSendEvent(
-      EventPacket::CreateCommandCompleteEvent(1, HCI_RESET, return_parameters));
-}
-
-}  // namespace test_vendor_lib