Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(109)

Unified Diff: device/bluetooth/bluetooth_utils_unittest.cc

Issue 11075006: Moved bluetooth adapter files to device/bluetooth/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: renamed 'bluetooth' target to 'device_bluetooth'. Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: device/bluetooth/bluetooth_utils_unittest.cc
diff --git a/chrome/browser/chromeos/bluetooth/bluetooth_utils_unittest.cc b/device/bluetooth/bluetooth_utils_unittest.cc
similarity index 91%
rename from chrome/browser/chromeos/bluetooth/bluetooth_utils_unittest.cc
rename to device/bluetooth/bluetooth_utils_unittest.cc
index 6dad3a05e5dc7df0cf8b56849d66264466b1bcfc..0e05f8ea58d2fd6e137b46f8f6f043fc711e8b8d 100644
--- a/chrome/browser/chromeos/bluetooth/bluetooth_utils_unittest.cc
+++ b/device/bluetooth/bluetooth_utils_unittest.cc
@@ -2,13 +2,16 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#if defined(OS_CHROMEOS)
#include <bluetooth/bluetooth.h>
+#endif
-#include "chrome/browser/chromeos/bluetooth/bluetooth_utils.h"
+#include "device/bluetooth/bluetooth_utils.h"
#include "testing/gtest/include/gtest/gtest.h"
-namespace chromeos {
+namespace device {
+#if defined(OS_CHROMEOS)
TEST(BluetoothUtilsTest, str2ba) {
bdaddr_t bluetooth_address;
@@ -22,10 +25,11 @@ TEST(BluetoothUtilsTest, str2ba) {
EXPECT_FALSE(bluetooth_utils::str2ba("obviously wrong", &bluetooth_address));
EXPECT_FALSE(bluetooth_utils::str2ba("00:00", &bluetooth_address));
- EXPECT_FALSE(bluetooth_utils::str2ba("00:00:00:00:00:00:00",
- &bluetooth_address));
+ EXPECT_FALSE(
+ bluetooth_utils::str2ba("00:00:00:00:00:00:00", &bluetooth_address));
EXPECT_FALSE(bluetooth_utils::str2ba("01:02:03:0A:10:A0", NULL));
}
+#endif
TEST(BluetoothUtilsTest, CanonicalUuid) {
// Does nothing for an already canonical UUID
@@ -69,4 +73,4 @@ TEST(BluetoothUtilsTest, CanonicalUuid) {
bluetooth_utils::CanonicalUuid("0x00001101-0000-1000-8000-00805f9b34fb"));
}
-} // namespace chromeos
+} // namespace device

Powered by Google App Engine
This is Rietveld 408576698