| Index: device/bluetooth/bluetooth_service_record_unittest.cc
|
| diff --git a/chrome/browser/chromeos/bluetooth/bluetooth_service_record_unittest.cc b/device/bluetooth/bluetooth_service_record_unittest.cc
|
| similarity index 85%
|
| rename from chrome/browser/chromeos/bluetooth/bluetooth_service_record_unittest.cc
|
| rename to device/bluetooth/bluetooth_service_record_unittest.cc
|
| index 11bcd98f1fac7025f8155caab85c541b8da2c1e8..b59474f54ae20bd2a1911cb616d975fd7f8b5141 100644
|
| --- a/chrome/browser/chromeos/bluetooth/bluetooth_service_record_unittest.cc
|
| +++ b/device/bluetooth/bluetooth_service_record_unittest.cc
|
| @@ -4,11 +4,12 @@
|
|
|
| #include <string>
|
|
|
| +#include "base/base_paths.h"
|
| +#include "base/basictypes.h"
|
| #include "base/file_path.h"
|
| #include "base/file_util.h"
|
| #include "base/path_service.h"
|
| -#include "chrome/browser/chromeos/bluetooth/bluetooth_service_record.h"
|
| -#include "chrome/common/chrome_paths.h"
|
| +#include "device/bluetooth/bluetooth_service_record.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| namespace {
|
| @@ -19,14 +20,16 @@ static const char* kSerialUuid = "00001101-0000-1000-8000-00805f9b34fb";
|
|
|
| } // namespace
|
|
|
| -namespace chromeos {
|
| +namespace device {
|
|
|
| class BluetoothServiceRecordTest : public testing::Test {
|
| public:
|
| FilePath GetTestDataFilePath(const char* file) {
|
| FilePath path;
|
| - PathService::Get(chrome::DIR_TEST_DATA, &path);
|
| - path = path.AppendASCII("chromeos");
|
| + PathService::Get(base::DIR_SOURCE_ROOT, &path);
|
| + path = path.AppendASCII("device");
|
| + path = path.AppendASCII("test");
|
| + path = path.AppendASCII("data");
|
| path = path.AppendASCII("bluetooth");
|
| path = path.AppendASCII(file);
|
| return path;
|
| @@ -41,7 +44,7 @@ TEST_F(BluetoothServiceRecordTest, RfcommService) {
|
| EXPECT_EQ(kAddress, service_record.address());
|
| EXPECT_EQ("Headset Audio Gateway", service_record.name());
|
| EXPECT_TRUE(service_record.SupportsRfcomm());
|
| - EXPECT_EQ((uint8_t)12, service_record.rfcomm_channel());
|
| + EXPECT_EQ((uint8)12, service_record.rfcomm_channel());
|
| EXPECT_EQ(kCustomUuid, service_record.uuid());
|
| }
|
|
|
| @@ -72,4 +75,4 @@ TEST_F(BluetoothServiceRecordTest, CleanUuid) {
|
| EXPECT_EQ("", invalid_service_record.uuid());
|
| }
|
|
|
| -} // namespace chromeos
|
| +} // namespace device
|
|
|