Merge from Chromium at DEPS revision r205460
This commit was generated by merge_to_master.py.
Change-Id: I4a744a5e426bd3bb378d887cfa56fe054742a540
diff --git a/device/bluetooth/bluetooth.gyp b/device/bluetooth/bluetooth.gyp
new file mode 100644
index 0000000..cd4788b
--- /dev/null
+++ b/device/bluetooth/bluetooth.gyp
@@ -0,0 +1,121 @@
+# Copyright 2013 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+{
+ 'variables': {
+ 'chromium_code': 1,
+ },
+ 'targets': [
+ {
+ 'target_name': 'device_bluetooth',
+ 'type': 'static_library',
+ 'dependencies': [
+ '../../base/base.gyp:base',
+ '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+ '../../net/net.gyp:net',
+ '../../third_party/libxml/libxml.gyp:libxml',
+ '../../ui/ui.gyp:ui',
+ 'bluetooth_strings.gyp:device_bluetooth_strings',
+ ],
+ 'sources': [
+ 'bluetooth_adapter.cc',
+ 'bluetooth_adapter.h',
+ 'bluetooth_adapter_experimental_chromeos.cc',
+ 'bluetooth_adapter_experimental_chromeos.h',
+ 'bluetooth_adapter_factory.cc',
+ 'bluetooth_adapter_factory.h',
+ 'bluetooth_adapter_mac.h',
+ 'bluetooth_adapter_mac.mm',
+ 'bluetooth_adapter_win.cc',
+ 'bluetooth_adapter_win.h',
+ 'bluetooth_device.cc',
+ 'bluetooth_device.h',
+ 'bluetooth_device_experimental_chromeos.cc',
+ 'bluetooth_device_experimental_chromeos.h',
+ 'bluetooth_device_mac.h',
+ 'bluetooth_device_mac.mm',
+ 'bluetooth_device_win.cc',
+ 'bluetooth_device_win.h',
+ 'bluetooth_init_win.cc',
+ 'bluetooth_init_win.h',
+ 'bluetooth_out_of_band_pairing_data.h',
+ 'bluetooth_profile.cc',
+ 'bluetooth_profile.h',
+ 'bluetooth_profile_experimental_chromeos.cc',
+ 'bluetooth_profile_experimental_chromeos.h',
+ 'bluetooth_profile_mac.h',
+ 'bluetooth_profile_mac.mm',
+ 'bluetooth_profile_win.cc',
+ 'bluetooth_profile_win.h',
+ 'bluetooth_service_record.cc',
+ 'bluetooth_service_record.h',
+ 'bluetooth_service_record_mac.h',
+ 'bluetooth_service_record_mac.mm',
+ 'bluetooth_service_record_win.cc',
+ 'bluetooth_service_record_win.h',
+ 'bluetooth_socket.h',
+ 'bluetooth_socket_experimental_chromeos.cc',
+ 'bluetooth_socket_experimental_chromeos.h',
+ 'bluetooth_socket_mac.h',
+ 'bluetooth_socket_mac.mm',
+ 'bluetooth_socket_win.cc',
+ 'bluetooth_socket_win.h',
+ 'bluetooth_task_manager_win.cc',
+ 'bluetooth_task_manager_win.h',
+ 'bluetooth_utils.cc',
+ 'bluetooth_utils.h',
+ ],
+ 'conditions': [
+ ['chromeos==1', {
+ 'dependencies': [
+ '../../build/linux/system.gyp:dbus',
+ '../../chromeos/chromeos.gyp:chromeos',
+ '../../dbus/dbus.gyp:dbus',
+ ]
+ }],
+ ['OS=="win"', {
+ 'all_dependent_settings': {
+ 'msvs_settings': {
+ 'VCLinkerTool': {
+ 'DelayLoadDLLs': [
+ # Despite MSDN stating that Bthprops.dll contains the
+ # symbols declared by bthprops.lib, they actually reside here:
+ 'Bthprops.cpl',
+ ],
+ },
+ },
+ },
+ }],
+ ['OS=="mac"', {
+ 'link_settings': {
+ 'libraries': [
+ '$(SDKROOT)/System/Library/Frameworks/IOBluetooth.framework',
+ ],
+ },
+ }],
+ ],
+ },
+ {
+ 'target_name': 'device_bluetooth_mocks',
+ 'type': 'static_library',
+ 'dependencies': [
+ '../../testing/gmock.gyp:gmock',
+ 'device_bluetooth',
+ ],
+ 'include_dirs': [
+ '../../',
+ ],
+ 'sources': [
+ 'test/mock_bluetooth_adapter.cc',
+ 'test/mock_bluetooth_adapter.h',
+ 'test/mock_bluetooth_device.cc',
+ 'test/mock_bluetooth_device.h',
+ 'test/mock_bluetooth_profile.cc',
+ 'test/mock_bluetooth_profile.h',
+ 'test/mock_bluetooth_socket.cc',
+ 'test/mock_bluetooth_socket.h',
+ ],
+ },
+ ],
+}
diff --git a/device/bluetooth/bluetooth_adapter_factory.cc b/device/bluetooth/bluetooth_adapter_factory.cc
index 5959ca4..0b9d160 100644
--- a/device/bluetooth/bluetooth_adapter_factory.cc
+++ b/device/bluetooth/bluetooth_adapter_factory.cc
@@ -44,7 +44,7 @@
void RunAdapterCallbacks() {
CHECK(default_adapter.Get().get());
- scoped_refptr<BluetoothAdapter> adapter(default_adapter.Get());
+ scoped_refptr<BluetoothAdapter> adapter(default_adapter.Get().get());
for (std::vector<BluetoothAdapterFactory::AdapterCallback>::const_iterator
iter = adapter_callbacks.Get().begin();
iter != adapter_callbacks.Get().end();
@@ -90,7 +90,7 @@
}
if (default_adapter.Get()->IsInitialized()) {
- callback.Run(scoped_refptr<BluetoothAdapter>(default_adapter.Get()));
+ callback.Run(scoped_refptr<BluetoothAdapter>(default_adapter.Get().get()));
} else {
adapter_callbacks.Get().push_back(callback);
}
@@ -98,7 +98,7 @@
// static
scoped_refptr<BluetoothAdapter> BluetoothAdapterFactory::MaybeGetAdapter() {
- return scoped_refptr<BluetoothAdapter>(default_adapter.Get());
+ return scoped_refptr<BluetoothAdapter>(default_adapter.Get().get());
}
} // namespace device
diff --git a/device/bluetooth/bluetooth_device.cc b/device/bluetooth/bluetooth_device.cc
index 4a70627..7b6ee0d 100644
--- a/device/bluetooth/bluetooth_device.cc
+++ b/device/bluetooth/bluetooth_device.cc
@@ -6,7 +6,7 @@
#include <string>
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "device/bluetooth/bluetooth_utils.h"
#include "grit/device_bluetooth_strings.h"
#include "ui/base/l10n/l10n_util.h"
diff --git a/device/bluetooth/bluetooth_device.h b/device/bluetooth/bluetooth_device.h
index c1655ed..831e5e5 100644
--- a/device/bluetooth/bluetooth_device.h
+++ b/device/bluetooth/bluetooth_device.h
@@ -10,7 +10,7 @@
#include "base/callback.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_vector.h"
-#include "base/string16.h"
+#include "base/strings/string16.h"
namespace device {
diff --git a/device/bluetooth/bluetooth_device_experimental_chromeos.cc b/device/bluetooth/bluetooth_device_experimental_chromeos.cc
index c7296ba..b6932ba 100644
--- a/device/bluetooth/bluetooth_device_experimental_chromeos.cc
+++ b/device/bluetooth/bluetooth_device_experimental_chromeos.cc
@@ -6,8 +6,8 @@
#include "base/bind.h"
#include "base/metrics/histogram.h"
-#include "base/string_util.h"
#include "base/strings/string_number_conversions.h"
+#include "base/strings/string_util.h"
#include "chromeos/dbus/dbus_thread_manager.h"
#include "chromeos/dbus/experimental_bluetooth_adapter_client.h"
#include "chromeos/dbus/experimental_bluetooth_agent_manager_client.h"
@@ -612,11 +612,11 @@
// Determine the error code from error_name.
ConnectErrorCode error_code = ERROR_UNKNOWN;
- if (error_name == bluetooth_adapter::kErrorFailed) {
+ if (error_name == bluetooth_device::kErrorFailed) {
error_code = ERROR_FAILED;
- } else if (error_name == bluetooth_adapter::kErrorInProgress) {
+ } else if (error_name == bluetooth_device::kErrorInProgress) {
error_code = ERROR_INPROGRESS;
- } else if (error_name == bluetooth_adapter::kErrorNotSupported) {
+ } else if (error_name == bluetooth_device::kErrorNotSupported) {
error_code = ERROR_UNSUPPORTED_DEVICE;
}
@@ -659,7 +659,7 @@
// Determine the error code from error_name.
ConnectErrorCode error_code = ERROR_UNKNOWN;
- if (error_name == bluetooth_adapter::kErrorAlreadyExists)
+ if (error_name == bluetooth_agent_manager::kErrorAlreadyExists)
error_code = ERROR_INPROGRESS;
RecordPairingResult(error_code);
@@ -697,17 +697,17 @@
// Determine the error code from error_name.
ConnectErrorCode error_code = ERROR_UNKNOWN;
- if (error_name == bluetooth_adapter::kErrorConnectionAttemptFailed) {
+ if (error_name == bluetooth_device::kErrorConnectionAttemptFailed) {
error_code = ERROR_FAILED;
- } else if (error_name == bluetooth_adapter::kErrorFailed) {
+ } else if (error_name == bluetooth_device::kErrorFailed) {
error_code = ERROR_FAILED;
- } else if (error_name == bluetooth_adapter::kErrorAuthenticationFailed) {
+ } else if (error_name == bluetooth_device::kErrorAuthenticationFailed) {
error_code = ERROR_AUTH_FAILED;
- } else if (error_name == bluetooth_adapter::kErrorAuthenticationCanceled) {
+ } else if (error_name == bluetooth_device::kErrorAuthenticationCanceled) {
error_code = ERROR_AUTH_CANCELED;
- } else if (error_name == bluetooth_adapter::kErrorAuthenticationRejected) {
+ } else if (error_name == bluetooth_device::kErrorAuthenticationRejected) {
error_code = ERROR_AUTH_REJECTED;
- } else if (error_name == bluetooth_adapter::kErrorAuthenticationTimeout) {
+ } else if (error_name == bluetooth_device::kErrorAuthenticationTimeout) {
error_code = ERROR_AUTH_TIMEOUT;
}
diff --git a/device/bluetooth/bluetooth_device_mac.mm b/device/bluetooth/bluetooth_device_mac.mm
index ef54af1..39acbef 100644
--- a/device/bluetooth/bluetooth_device_mac.mm
+++ b/device/bluetooth/bluetooth_device_mac.mm
@@ -13,8 +13,8 @@
#include "base/basictypes.h"
#include "base/hash.h"
-#include "base/string_number_conversions.h"
-#include "base/stringprintf.h"
+#include "base/strings/string_number_conversions.h"
+#include "base/strings/stringprintf.h"
#include "base/strings/sys_string_conversions.h"
#include "device/bluetooth/bluetooth_out_of_band_pairing_data.h"
#include "device/bluetooth/bluetooth_profile_mac.h"
diff --git a/device/bluetooth/bluetooth_device_win.cc b/device/bluetooth/bluetooth_device_win.cc
index 11dc529..34b7b40 100644
--- a/device/bluetooth/bluetooth_device_win.cc
+++ b/device/bluetooth/bluetooth_device_win.cc
@@ -9,7 +9,7 @@
#include "base/basictypes.h"
#include "base/logging.h"
#include "base/memory/scoped_vector.h"
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
#include "device/bluetooth/bluetooth_out_of_band_pairing_data.h"
#include "device/bluetooth/bluetooth_profile_win.h"
#include "device/bluetooth/bluetooth_service_record_win.h"
diff --git a/device/bluetooth/bluetooth_device_win_unittest.cc b/device/bluetooth/bluetooth_device_win_unittest.cc
index 0f41665..93fd990 100644
--- a/device/bluetooth/bluetooth_device_win_unittest.cc
+++ b/device/bluetooth/bluetooth_device_win_unittest.cc
@@ -6,7 +6,7 @@
#include "base/bind.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/scoped_vector.h"
-#include "base/string_number_conversions.h"
+#include "base/strings/string_number_conversions.h"
#include "device/bluetooth/bluetooth_device_win.h"
#include "device/bluetooth/bluetooth_service_record.h"
#include "device/bluetooth/bluetooth_task_manager_win.h"
diff --git a/device/bluetooth/bluetooth_experimental_chromeos_unittest.cc b/device/bluetooth/bluetooth_experimental_chromeos_unittest.cc
index 0a137c8..a680a4b 100644
--- a/device/bluetooth/bluetooth_experimental_chromeos_unittest.cc
+++ b/device/bluetooth/bluetooth_experimental_chromeos_unittest.cc
@@ -3,7 +3,7 @@
// found in the LICENSE file.
#include "base/message_loop.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "chromeos/dbus/fake_bluetooth_adapter_client.h"
#include "chromeos/dbus/fake_bluetooth_device_client.h"
#include "chromeos/dbus/mock_dbus_thread_manager_without_gmock.h"
diff --git a/device/bluetooth/bluetooth_profile_chromeos_unittest.cc b/device/bluetooth/bluetooth_profile_chromeos_unittest.cc
index a1d623f..140ba2d 100644
--- a/device/bluetooth/bluetooth_profile_chromeos_unittest.cc
+++ b/device/bluetooth/bluetooth_profile_chromeos_unittest.cc
@@ -29,7 +29,7 @@
class BluetoothProfileChromeOSTest : public testing::Test {
public:
BluetoothProfileChromeOSTest()
- : message_loop_(MessageLoop::TYPE_IO),
+ : message_loop_(base::MessageLoop::TYPE_IO),
callback_count_(0),
error_callback_count_(0),
profile_callback_count_(0),
diff --git a/device/bluetooth/bluetooth_profile_experimental_chromeos.cc b/device/bluetooth/bluetooth_profile_experimental_chromeos.cc
index 2ccea24..57a6a43 100644
--- a/device/bluetooth/bluetooth_profile_experimental_chromeos.cc
+++ b/device/bluetooth/bluetooth_profile_experimental_chromeos.cc
@@ -13,7 +13,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/message_loop.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
#include "base/task_runner_util.h"
#include "base/threading/thread_restrictions.h"
#include "base/threading/worker_pool.h"
diff --git a/device/bluetooth/bluetooth_profile_mac.mm b/device/bluetooth/bluetooth_profile_mac.mm
index 7829793..4956651 100644
--- a/device/bluetooth/bluetooth_profile_mac.mm
+++ b/device/bluetooth/bluetooth_profile_mac.mm
@@ -14,7 +14,7 @@
#include "base/basictypes.h"
#include "base/logging.h"
#include "base/memory/ref_counted.h"
-#include "base/string_number_conversions.h"
+#include "base/strings/string_number_conversions.h"
#include "device/bluetooth/bluetooth_device_mac.h"
#include "device/bluetooth/bluetooth_socket_mac.h"
diff --git a/device/bluetooth/bluetooth_service_record_mac.mm b/device/bluetooth/bluetooth_service_record_mac.mm
index 3410351..306d5e5 100644
--- a/device/bluetooth/bluetooth_service_record_mac.mm
+++ b/device/bluetooth/bluetooth_service_record_mac.mm
@@ -14,7 +14,7 @@
#include <string>
#include "base/basictypes.h"
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
#include "base/strings/sys_string_conversions.h"
namespace {
diff --git a/device/bluetooth/bluetooth_service_record_mac_unittest.mm b/device/bluetooth/bluetooth_service_record_mac_unittest.mm
index 8cfb46f..22e4d1a 100644
--- a/device/bluetooth/bluetooth_service_record_mac_unittest.mm
+++ b/device/bluetooth/bluetooth_service_record_mac_unittest.mm
@@ -11,7 +11,7 @@
#include <string>
#include "base/basictypes.h"
-#include "base/string_number_conversions.h"
+#include "base/strings/string_number_conversions.h"
#include "base/strings/sys_string_conversions.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/device/bluetooth/bluetooth_service_record_win.cc b/device/bluetooth/bluetooth_service_record_win.cc
index a09b335..e0ba750 100644
--- a/device/bluetooth/bluetooth_service_record_win.cc
+++ b/device/bluetooth/bluetooth_service_record_win.cc
@@ -7,8 +7,8 @@
#include <string>
#include "base/basictypes.h"
-#include "base/string_number_conversions.h"
-#include "base/stringprintf.h"
+#include "base/strings/string_number_conversions.h"
+#include "base/strings/stringprintf.h"
#include "device/bluetooth/bluetooth_init_win.h"
#include "device/bluetooth/bluetooth_utils.h"
diff --git a/device/bluetooth/bluetooth_service_record_win_unittest.cc b/device/bluetooth/bluetooth_service_record_win_unittest.cc
index 5f5c03e..804b620 100644
--- a/device/bluetooth/bluetooth_service_record_win_unittest.cc
+++ b/device/bluetooth/bluetooth_service_record_win_unittest.cc
@@ -3,7 +3,7 @@
// found in the LICENSE file.
#include "base/basictypes.h"
-#include "base/string_number_conversions.h"
+#include "base/strings/string_number_conversions.h"
#include "device/bluetooth/bluetooth_service_record_win.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/device/bluetooth/bluetooth_socket_mac.mm b/device/bluetooth/bluetooth_socket_mac.mm
index 036f6f1..3751441 100644
--- a/device/bluetooth/bluetooth_socket_mac.mm
+++ b/device/bluetooth/bluetooth_socket_mac.mm
@@ -13,7 +13,7 @@
#include "base/basictypes.h"
#include "base/memory/ref_counted.h"
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
#include "base/strings/sys_string_conversions.h"
#include "device/bluetooth/bluetooth_service_record.h"
#include "device/bluetooth/bluetooth_service_record_mac.h"
diff --git a/device/bluetooth/bluetooth_strings.grd b/device/bluetooth/bluetooth_strings.grd
new file mode 100644
index 0000000..7e10b62
--- /dev/null
+++ b/device/bluetooth/bluetooth_strings.grd
@@ -0,0 +1,204 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+This file contains the strings for bluetooth.
+-->
+
+<grit base_dir="." latest_public_release="0" current_release="1"
+ source_lang_id="en" enc_check="möl">
+ <outputs>
+ <output filename="grit/device_bluetooth_strings.h" type="rc_header">
+ <emit emit_type='prepend'></emit>
+ </output>
+ <output filename="device_bluetooth_strings_am.pak" type="data_package" lang="am" />
+ <output filename="device_bluetooth_strings_ar.pak" type="data_package" lang="ar" />
+ <if expr="pp_ifdef('use_third_party_translations')">
+ <output filename="device_bluetooth_strings_ast.pak" type="data_package" lang="ast" />
+ </if>
+ <output filename="device_bluetooth_strings_bg.pak" type="data_package" lang="bg" />
+ <output filename="device_bluetooth_strings_bn.pak" type="data_package" lang="bn" />
+ <if expr="pp_ifdef('use_third_party_translations')">
+ <output filename="device_bluetooth_strings_bs.pak" type="data_package" lang="bs" />
+ </if>
+ <output filename="device_bluetooth_strings_ca.pak" type="data_package" lang="ca" />
+ <if expr="pp_ifdef('use_third_party_translations')">
+ <output filename="device_bluetooth_strings_ca@valencia.pak" type="data_package" lang="ca@valencia" />
+ </if>
+ <output filename="device_bluetooth_strings_cs.pak" type="data_package" lang="cs" />
+ <output filename="device_bluetooth_strings_da.pak" type="data_package" lang="da" />
+ <output filename="device_bluetooth_strings_de.pak" type="data_package" lang="de" />
+ <output filename="device_bluetooth_strings_el.pak" type="data_package" lang="el" />
+ <if expr="pp_ifdef('use_third_party_translations')">
+ <output filename="device_bluetooth_strings_en-AU.pak" type="data_package" lang="en-AU" />
+ </if>
+ <output filename="device_bluetooth_strings_en-GB.pak" type="data_package" lang="en-GB" />
+ <output filename="device_bluetooth_strings_en-US.pak" type="data_package" lang="en" />
+ <if expr="pp_ifdef('use_third_party_translations')">
+ <output filename="device_bluetooth_strings_eo.pak" type="data_package" lang="eo" />
+ </if>
+ <output filename="device_bluetooth_strings_es.pak" type="data_package" lang="es" />
+ <output filename="device_bluetooth_strings_es-419.pak" type="data_package" lang="es-419" />
+ <output filename="device_bluetooth_strings_et.pak" type="data_package" lang="et" />
+ <if expr="pp_ifdef('use_third_party_translations')">
+ <output filename="device_bluetooth_strings_eu.pak" type="data_package" lang="eu" />
+ </if>
+ <output filename="device_bluetooth_strings_fa.pak" type="data_package" lang="fa" />
+ <output filename="device_bluetooth_strings_fake-bidi.pak" type="data_package" lang="fake-bidi" />
+ <output filename="device_bluetooth_strings_fi.pak" type="data_package" lang="fi" />
+ <output filename="device_bluetooth_strings_fil.pak" type="data_package" lang="fil" />
+ <output filename="device_bluetooth_strings_fr.pak" type="data_package" lang="fr" />
+ <if expr="pp_ifdef('use_third_party_translations')">
+ <output filename="device_bluetooth_strings_gl.pak" type="data_package" lang="gl" />
+ </if>
+ <output filename="device_bluetooth_strings_gu.pak" type="data_package" lang="gu" />
+ <output filename="device_bluetooth_strings_he.pak" type="data_package" lang="he" />
+ <output filename="device_bluetooth_strings_hi.pak" type="data_package" lang="hi" />
+ <output filename="device_bluetooth_strings_hr.pak" type="data_package" lang="hr" />
+ <output filename="device_bluetooth_strings_hu.pak" type="data_package" lang="hu" />
+ <if expr="pp_ifdef('use_third_party_translations')">
+ <output filename="device_bluetooth_strings_hy.pak" type="data_package" lang="hy" />
+ <output filename="device_bluetooth_strings_ia.pak" type="data_package" lang="ia" />
+ </if>
+ <output filename="device_bluetooth_strings_id.pak" type="data_package" lang="id" />
+ <output filename="device_bluetooth_strings_it.pak" type="data_package" lang="it" />
+ <output filename="device_bluetooth_strings_ja.pak" type="data_package" lang="ja" />
+ <if expr="pp_ifdef('use_third_party_translations')">
+ <output filename="device_bluetooth_strings_ka.pak" type="data_package" lang="ka" />
+ </if>
+ <output filename="device_bluetooth_strings_kn.pak" type="data_package" lang="kn" />
+ <output filename="device_bluetooth_strings_ko.pak" type="data_package" lang="ko" />
+ <if expr="pp_ifdef('use_third_party_translations')">
+ <output filename="device_bluetooth_strings_ku.pak" type="data_package" lang="ku" />
+ <output filename="device_bluetooth_strings_kw.pak" type="data_package" lang="kw" />
+ </if>
+ <output filename="device_bluetooth_strings_lt.pak" type="data_package" lang="lt" />
+ <output filename="device_bluetooth_strings_lv.pak" type="data_package" lang="lv" />
+ <output filename="device_bluetooth_strings_ml.pak" type="data_package" lang="ml" />
+ <output filename="device_bluetooth_strings_mr.pak" type="data_package" lang="mr" />
+ <output filename="device_bluetooth_strings_ms.pak" type="data_package" lang="ms" />
+ <output filename="device_bluetooth_strings_nl.pak" type="data_package" lang="nl" />
+ <!-- The translation console uses 'no' for Norwegian Bokmål. It should
+ be 'nb'. -->
+ <output filename="device_bluetooth_strings_nb.pak" type="data_package" lang="no" />
+ <output filename="device_bluetooth_strings_pl.pak" type="data_package" lang="pl" />
+ <output filename="device_bluetooth_strings_pt-BR.pak" type="data_package" lang="pt-BR" />
+ <output filename="device_bluetooth_strings_pt-PT.pak" type="data_package" lang="pt-PT" />
+ <output filename="device_bluetooth_strings_ro.pak" type="data_package" lang="ro" />
+ <output filename="device_bluetooth_strings_ru.pak" type="data_package" lang="ru" />
+ <output filename="device_bluetooth_strings_sk.pak" type="data_package" lang="sk" />
+ <output filename="device_bluetooth_strings_sl.pak" type="data_package" lang="sl" />
+ <output filename="device_bluetooth_strings_sr.pak" type="data_package" lang="sr" />
+ <output filename="device_bluetooth_strings_sv.pak" type="data_package" lang="sv" />
+ <output filename="device_bluetooth_strings_sw.pak" type="data_package" lang="sw" />
+ <output filename="device_bluetooth_strings_ta.pak" type="data_package" lang="ta" />
+ <output filename="device_bluetooth_strings_te.pak" type="data_package" lang="te" />
+ <output filename="device_bluetooth_strings_th.pak" type="data_package" lang="th" />
+ <output filename="device_bluetooth_strings_tr.pak" type="data_package" lang="tr" />
+ <if expr="pp_ifdef('use_third_party_translations')">
+ <output filename="device_bluetooth_strings_ug.pak" type="data_package" lang="ug" />
+ </if>
+ <output filename="device_bluetooth_strings_uk.pak" type="data_package" lang="uk" />
+ <output filename="device_bluetooth_strings_vi.pak" type="data_package" lang="vi" />
+ <output filename="device_bluetooth_strings_zh-CN.pak" type="data_package" lang="zh-CN" />
+ <output filename="device_bluetooth_strings_zh-TW.pak" type="data_package" lang="zh-TW" />
+ </outputs>
+ <translations>
+ <file path="strings/device_bluetooth_strings_am.xtb" lang="am" />
+ <file path="strings/device_bluetooth_strings_ar.xtb" lang="ar" />
+ <file path="strings/device_bluetooth_strings_bg.xtb" lang="bg" />
+ <file path="strings/device_bluetooth_strings_bn.xtb" lang="bn" />
+ <file path="strings/device_bluetooth_strings_ca.xtb" lang="ca" />
+ <file path="strings/device_bluetooth_strings_cs.xtb" lang="cs" />
+ <file path="strings/device_bluetooth_strings_da.xtb" lang="da" />
+ <file path="strings/device_bluetooth_strings_de.xtb" lang="de" />
+ <file path="strings/device_bluetooth_strings_el.xtb" lang="el" />
+ <file path="strings/device_bluetooth_strings_en-GB.xtb" lang="en-GB" />
+ <file path="strings/device_bluetooth_strings_es.xtb" lang="es" />
+ <file path="strings/device_bluetooth_strings_es-419.xtb" lang="es-419" />
+ <file path="strings/device_bluetooth_strings_et.xtb" lang="et" />
+ <file path="strings/device_bluetooth_strings_fa.xtb" lang="fa" />
+ <file path="strings/device_bluetooth_strings_fi.xtb" lang="fi" />
+ <file path="strings/device_bluetooth_strings_fil.xtb" lang="fil" />
+ <file path="strings/device_bluetooth_strings_fr.xtb" lang="fr" />
+ <file path="strings/device_bluetooth_strings_gu.xtb" lang="gu" />
+ <file path="strings/device_bluetooth_strings_hi.xtb" lang="hi" />
+ <file path="strings/device_bluetooth_strings_hr.xtb" lang="hr" />
+ <file path="strings/device_bluetooth_strings_hu.xtb" lang="hu" />
+ <file path="strings/device_bluetooth_strings_id.xtb" lang="id" />
+ <file path="strings/device_bluetooth_strings_it.xtb" lang="it" />
+ <!-- The translation console uses 'iw' for Hebrew, but we use 'he'. -->
+ <file path="strings/device_bluetooth_strings_iw.xtb" lang="he" />
+ <file path="strings/device_bluetooth_strings_ja.xtb" lang="ja" />
+ <file path="strings/device_bluetooth_strings_kn.xtb" lang="kn" />
+ <file path="strings/device_bluetooth_strings_ko.xtb" lang="ko" />
+ <file path="strings/device_bluetooth_strings_lt.xtb" lang="lt" />
+ <file path="strings/device_bluetooth_strings_lv.xtb" lang="lv" />
+ <file path="strings/device_bluetooth_strings_ml.xtb" lang="ml" />
+ <file path="strings/device_bluetooth_strings_mr.xtb" lang="mr" />
+ <file path="strings/device_bluetooth_strings_ms.xtb" lang="ms" />
+ <file path="strings/device_bluetooth_strings_nl.xtb" lang="nl" />
+ <file path="strings/device_bluetooth_strings_no.xtb" lang="no" />
+ <file path="strings/device_bluetooth_strings_pl.xtb" lang="pl" />
+ <file path="strings/device_bluetooth_strings_pt-BR.xtb" lang="pt-BR" />
+ <file path="strings/device_bluetooth_strings_pt-PT.xtb" lang="pt-PT" />
+ <file path="strings/device_bluetooth_strings_ro.xtb" lang="ro" />
+ <file path="strings/device_bluetooth_strings_ru.xtb" lang="ru" />
+ <file path="strings/device_bluetooth_strings_sk.xtb" lang="sk" />
+ <file path="strings/device_bluetooth_strings_sl.xtb" lang="sl" />
+ <file path="strings/device_bluetooth_strings_sr.xtb" lang="sr" />
+ <file path="strings/device_bluetooth_strings_sv.xtb" lang="sv" />
+ <file path="strings/device_bluetooth_strings_sw.xtb" lang="sw" />
+ <file path="strings/device_bluetooth_strings_ta.xtb" lang="ta" />
+ <file path="strings/device_bluetooth_strings_te.xtb" lang="te" />
+ <file path="strings/device_bluetooth_strings_th.xtb" lang="th" />
+ <file path="strings/device_bluetooth_strings_tr.xtb" lang="tr" />
+ <file path="strings/device_bluetooth_strings_uk.xtb" lang="uk" />
+ <file path="strings/device_bluetooth_strings_vi.xtb" lang="vi" />
+ <file path="strings/device_bluetooth_strings_zh-CN.xtb" lang="zh-CN" />
+ <file path="strings/device_bluetooth_strings_zh-TW.xtb" lang="zh-TW" />
+ </translations>
+ <release seq="1" allow_pseudo="false">
+ <messages fallback_to_english="true">
+ <message name="IDS_BLUETOOTH_DEVICE_UNKNOWN" desc="Text to identify Bluetooth devices of unknown or unsupported class.">
+ Unknown or Unsupported Device (<ph name="ADDRESS">$1<ex>12:34:56:78:9A:BC</ex></ph>)
+ </message>
+ <message name="IDS_BLUETOOTH_DEVICE_COMPUTER" desc="Text to identify Bluetooth devices of the computer class.">
+ Computer (<ph name="ADDRESS">$1<ex>12:34:56:78:9A:BC</ex></ph>)
+ </message>
+ <message name="IDS_BLUETOOTH_DEVICE_PHONE" desc="Text to identify Bluetooth devices of the phone class.">
+ Phone (<ph name="ADDRESS">$1<ex>12:34:56:78:9A:BC</ex></ph>)
+ </message>
+ <message name="IDS_BLUETOOTH_DEVICE_MODEM" desc="Text to identify Bluetooth devices of the modem class.">
+ Modem (<ph name="ADDRESS">$1<ex>12:34:56:78:9A:BC</ex></ph>)
+ </message>
+ <message name="IDS_BLUETOOTH_DEVICE_AUDIO" desc="Text to identify Bluetooth devices of the audio class.">
+ Audio (<ph name="ADDRESS">$1<ex>12:34:56:78:9A:BC</ex></ph>)
+ </message>
+ <message name="IDS_BLUETOOTH_DEVICE_CAR_AUDIO" desc="Text to identify Bluetooth devices of the car audio class.">
+ Car audio (<ph name="ADDRESS">$1<ex>12:34:56:78:9A:BC</ex></ph>)
+ </message>
+ <message name="IDS_BLUETOOTH_DEVICE_VIDEO" desc="Text to identify Bluetooth devices of the video class.">
+ Video (<ph name="ADDRESS">$1<ex>12:34:56:78:9A:BC</ex></ph>)
+ </message>
+ <message name="IDS_BLUETOOTH_DEVICE_JOYSTICK" desc="Text to identify Bluetooth devices of the joystick class.">
+ Joystick (<ph name="ADDRESS">$1<ex>12:34:56:78:9A:BC</ex></ph>)
+ </message>
+ <message name="IDS_BLUETOOTH_DEVICE_GAMEPAD" desc="Text to identify Bluetooth devices of the gamepad class.">
+ Gamepad (<ph name="ADDRESS">$1<ex>12:34:56:78:9A:BC</ex></ph>)
+ </message>
+ <message name="IDS_BLUETOOTH_DEVICE_KEYBOARD" desc="Text to identify Bluetooth devices of the keyboard class.">
+ Keyboard (<ph name="ADDRESS">$1<ex>12:34:56:78:9A:BC</ex></ph>)
+ </message>
+ <message name="IDS_BLUETOOTH_DEVICE_TABLET" desc="Text to identify Bluetooth devices of the tablet class.">
+ Tablet (<ph name="ADDRESS">$1<ex>12:34:56:78:9A:BC</ex></ph>)
+ </message>
+ <message name="IDS_BLUETOOTH_DEVICE_MOUSE" desc="Text to identify Bluetooth devices of the mouse class.">
+ Mouse (<ph name="ADDRESS">$1<ex>12:34:56:78:9A:BC</ex></ph>)
+ </message>
+ <message name="IDS_BLUETOOTH_DEVICE_KEYBOARD_MOUSE_COMBO" desc="Text to identify Bluetooth devices of both keyboard and mouse class.">
+ Keyboard/Mouse (<ph name="ADDRESS">$1<ex>12:34:56:78:9A:BC</ex></ph>)
+ </message>
+ </messages>
+ </release>
+</grit>
+
diff --git a/device/bluetooth/bluetooth_strings.gyp b/device/bluetooth/bluetooth_strings.gyp
new file mode 100644
index 0000000..4bf3a30
--- /dev/null
+++ b/device/bluetooth/bluetooth_strings.gyp
@@ -0,0 +1,30 @@
+# Copyright 2013 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+{
+ 'targets': [
+ {
+ 'target_name': 'device_bluetooth_strings',
+ 'type': 'none',
+ 'variables': {
+ 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/device/bluetooth',
+ },
+ 'actions': [
+ {
+ 'action_name': 'device_bluetooth_strings',
+ 'variables': {
+ 'grit_grd_file': 'bluetooth_strings.grd',
+ 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/device/bluetooth/strings',
+ },
+ 'includes': [ '../../build/grit_action.gypi' ],
+ },
+ ],
+ 'direct_dependent_settings': {
+ 'include_dirs': [
+ '<(SHARED_INTERMEDIATE_DIR)/device/bluetooth/strings',
+ ],
+ },
+ },
+ ],
+}
diff --git a/device/bluetooth/bluetooth_task_manager_win.cc b/device/bluetooth/bluetooth_task_manager_win.cc
index 2fca071..3b1ad5f 100644
--- a/device/bluetooth/bluetooth_task_manager_win.cc
+++ b/device/bluetooth/bluetooth_task_manager_win.cc
@@ -14,7 +14,7 @@
#include "base/memory/scoped_vector.h"
#include "base/message_loop.h"
#include "base/sequenced_task_runner.h"
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
#include "base/strings/sys_string_conversions.h"
#include "base/threading/sequenced_worker_pool.h"
#include "base/win/scoped_handle.h"
diff --git a/device/bluetooth/bluetooth_utils.cc b/device/bluetooth/bluetooth_utils.cc
index 4f30202..b1f9f78 100644
--- a/device/bluetooth/bluetooth_utils.cc
+++ b/device/bluetooth/bluetooth_utils.cc
@@ -8,7 +8,7 @@
#include "base/basictypes.h"
#include "base/logging.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
namespace {
static const char* kCommonUuidPostfix = "-0000-1000-8000-00805f9b34fb";
diff --git a/device/bluetooth/strings/device_bluetooth_strings_am.xtb b/device/bluetooth/strings/device_bluetooth_strings_am.xtb
new file mode 100644
index 0000000..6c985cb
--- /dev/null
+++ b/device/bluetooth/strings/device_bluetooth_strings_am.xtb
@@ -0,0 +1,4 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="am">
+</translationbundle>
diff --git a/device/bluetooth/strings/device_bluetooth_strings_ar.xtb b/device/bluetooth/strings/device_bluetooth_strings_ar.xtb
new file mode 100644
index 0000000..e8b5562
--- /dev/null
+++ b/device/bluetooth/strings/device_bluetooth_strings_ar.xtb
@@ -0,0 +1,4 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="ar">
+</translationbundle>
diff --git a/device/bluetooth/strings/device_bluetooth_strings_bg.xtb b/device/bluetooth/strings/device_bluetooth_strings_bg.xtb
new file mode 100644
index 0000000..ebab473
--- /dev/null
+++ b/device/bluetooth/strings/device_bluetooth_strings_bg.xtb
@@ -0,0 +1,4 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="bg">
+</translationbundle>
diff --git a/device/bluetooth/strings/device_bluetooth_strings_bn.xtb b/device/bluetooth/strings/device_bluetooth_strings_bn.xtb
new file mode 100644
index 0000000..a66cc1f
--- /dev/null
+++ b/device/bluetooth/strings/device_bluetooth_strings_bn.xtb
@@ -0,0 +1,4 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="bn">
+</translationbundle>
diff --git a/device/bluetooth/strings/device_bluetooth_strings_ca.xtb b/device/bluetooth/strings/device_bluetooth_strings_ca.xtb
new file mode 100644
index 0000000..1438d89
--- /dev/null
+++ b/device/bluetooth/strings/device_bluetooth_strings_ca.xtb
@@ -0,0 +1,4 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="ca">
+</translationbundle>
diff --git a/device/bluetooth/strings/device_bluetooth_strings_cs.xtb b/device/bluetooth/strings/device_bluetooth_strings_cs.xtb
new file mode 100644
index 0000000..2d95130
--- /dev/null
+++ b/device/bluetooth/strings/device_bluetooth_strings_cs.xtb
@@ -0,0 +1,4 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="cs">
+</translationbundle>
diff --git a/device/bluetooth/strings/device_bluetooth_strings_da.xtb b/device/bluetooth/strings/device_bluetooth_strings_da.xtb
new file mode 100644
index 0000000..751fa4a
--- /dev/null
+++ b/device/bluetooth/strings/device_bluetooth_strings_da.xtb
@@ -0,0 +1,4 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="da">
+</translationbundle>
diff --git a/device/bluetooth/strings/device_bluetooth_strings_de.xtb b/device/bluetooth/strings/device_bluetooth_strings_de.xtb
new file mode 100644
index 0000000..91de7f5
--- /dev/null
+++ b/device/bluetooth/strings/device_bluetooth_strings_de.xtb
@@ -0,0 +1,4 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="de">
+</translationbundle>
diff --git a/device/bluetooth/strings/device_bluetooth_strings_el.xtb b/device/bluetooth/strings/device_bluetooth_strings_el.xtb
new file mode 100644
index 0000000..6e5e7d8
--- /dev/null
+++ b/device/bluetooth/strings/device_bluetooth_strings_el.xtb
@@ -0,0 +1,4 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="el">
+</translationbundle>
diff --git a/device/bluetooth/strings/device_bluetooth_strings_en-GB.xtb b/device/bluetooth/strings/device_bluetooth_strings_en-GB.xtb
new file mode 100644
index 0000000..0fb2133
--- /dev/null
+++ b/device/bluetooth/strings/device_bluetooth_strings_en-GB.xtb
@@ -0,0 +1,4 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="en-GB">
+</translationbundle>
diff --git a/device/bluetooth/strings/device_bluetooth_strings_es-419.xtb b/device/bluetooth/strings/device_bluetooth_strings_es-419.xtb
new file mode 100644
index 0000000..2fe4770
--- /dev/null
+++ b/device/bluetooth/strings/device_bluetooth_strings_es-419.xtb
@@ -0,0 +1,4 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="es-419">
+</translationbundle>
diff --git a/device/bluetooth/strings/device_bluetooth_strings_es.xtb b/device/bluetooth/strings/device_bluetooth_strings_es.xtb
new file mode 100644
index 0000000..64022ec
--- /dev/null
+++ b/device/bluetooth/strings/device_bluetooth_strings_es.xtb
@@ -0,0 +1,4 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="es">
+</translationbundle>
diff --git a/device/bluetooth/strings/device_bluetooth_strings_et.xtb b/device/bluetooth/strings/device_bluetooth_strings_et.xtb
new file mode 100644
index 0000000..5244dfd
--- /dev/null
+++ b/device/bluetooth/strings/device_bluetooth_strings_et.xtb
@@ -0,0 +1,4 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="et">
+</translationbundle>
diff --git a/device/bluetooth/strings/device_bluetooth_strings_fa.xtb b/device/bluetooth/strings/device_bluetooth_strings_fa.xtb
new file mode 100644
index 0000000..18626f8
--- /dev/null
+++ b/device/bluetooth/strings/device_bluetooth_strings_fa.xtb
@@ -0,0 +1,4 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="fa">
+</translationbundle>
diff --git a/device/bluetooth/strings/device_bluetooth_strings_fi.xtb b/device/bluetooth/strings/device_bluetooth_strings_fi.xtb
new file mode 100644
index 0000000..4691cd5
--- /dev/null
+++ b/device/bluetooth/strings/device_bluetooth_strings_fi.xtb
@@ -0,0 +1,4 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="fi">
+</translationbundle>
diff --git a/device/bluetooth/strings/device_bluetooth_strings_fil.xtb b/device/bluetooth/strings/device_bluetooth_strings_fil.xtb
new file mode 100644
index 0000000..443630e
--- /dev/null
+++ b/device/bluetooth/strings/device_bluetooth_strings_fil.xtb
@@ -0,0 +1,4 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="fil">
+</translationbundle>
diff --git a/device/bluetooth/strings/device_bluetooth_strings_fr.xtb b/device/bluetooth/strings/device_bluetooth_strings_fr.xtb
new file mode 100644
index 0000000..63026a3
--- /dev/null
+++ b/device/bluetooth/strings/device_bluetooth_strings_fr.xtb
@@ -0,0 +1,4 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="fr">
+</translationbundle>
diff --git a/device/bluetooth/strings/device_bluetooth_strings_gu.xtb b/device/bluetooth/strings/device_bluetooth_strings_gu.xtb
new file mode 100644
index 0000000..7d8a4df
--- /dev/null
+++ b/device/bluetooth/strings/device_bluetooth_strings_gu.xtb
@@ -0,0 +1,4 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="gu">
+</translationbundle>
diff --git a/device/bluetooth/strings/device_bluetooth_strings_hi.xtb b/device/bluetooth/strings/device_bluetooth_strings_hi.xtb
new file mode 100644
index 0000000..a6ddd5d
--- /dev/null
+++ b/device/bluetooth/strings/device_bluetooth_strings_hi.xtb
@@ -0,0 +1,4 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="hi">
+</translationbundle>
diff --git a/device/bluetooth/strings/device_bluetooth_strings_hr.xtb b/device/bluetooth/strings/device_bluetooth_strings_hr.xtb
new file mode 100644
index 0000000..26f99d0
--- /dev/null
+++ b/device/bluetooth/strings/device_bluetooth_strings_hr.xtb
@@ -0,0 +1,4 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="hr">
+</translationbundle>
diff --git a/device/bluetooth/strings/device_bluetooth_strings_hu.xtb b/device/bluetooth/strings/device_bluetooth_strings_hu.xtb
new file mode 100644
index 0000000..7ef9a5e
--- /dev/null
+++ b/device/bluetooth/strings/device_bluetooth_strings_hu.xtb
@@ -0,0 +1,4 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="hu">
+</translationbundle>
diff --git a/device/bluetooth/strings/device_bluetooth_strings_id.xtb b/device/bluetooth/strings/device_bluetooth_strings_id.xtb
new file mode 100644
index 0000000..aa34783
--- /dev/null
+++ b/device/bluetooth/strings/device_bluetooth_strings_id.xtb
@@ -0,0 +1,4 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="id">
+</translationbundle>
diff --git a/device/bluetooth/strings/device_bluetooth_strings_it.xtb b/device/bluetooth/strings/device_bluetooth_strings_it.xtb
new file mode 100644
index 0000000..a6ac8d4
--- /dev/null
+++ b/device/bluetooth/strings/device_bluetooth_strings_it.xtb
@@ -0,0 +1,4 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="it">
+</translationbundle>
diff --git a/device/bluetooth/strings/device_bluetooth_strings_iw.xtb b/device/bluetooth/strings/device_bluetooth_strings_iw.xtb
new file mode 100644
index 0000000..86b5533
--- /dev/null
+++ b/device/bluetooth/strings/device_bluetooth_strings_iw.xtb
@@ -0,0 +1,4 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="iw">
+</translationbundle>
diff --git a/device/bluetooth/strings/device_bluetooth_strings_ja.xtb b/device/bluetooth/strings/device_bluetooth_strings_ja.xtb
new file mode 100644
index 0000000..23139e6
--- /dev/null
+++ b/device/bluetooth/strings/device_bluetooth_strings_ja.xtb
@@ -0,0 +1,4 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="ja">
+</translationbundle>
diff --git a/device/bluetooth/strings/device_bluetooth_strings_kn.xtb b/device/bluetooth/strings/device_bluetooth_strings_kn.xtb
new file mode 100644
index 0000000..cc3643a
--- /dev/null
+++ b/device/bluetooth/strings/device_bluetooth_strings_kn.xtb
@@ -0,0 +1,4 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="kn">
+</translationbundle>
diff --git a/device/bluetooth/strings/device_bluetooth_strings_ko.xtb b/device/bluetooth/strings/device_bluetooth_strings_ko.xtb
new file mode 100644
index 0000000..e0fc370
--- /dev/null
+++ b/device/bluetooth/strings/device_bluetooth_strings_ko.xtb
@@ -0,0 +1,4 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="ko">
+</translationbundle>
diff --git a/device/bluetooth/strings/device_bluetooth_strings_lt.xtb b/device/bluetooth/strings/device_bluetooth_strings_lt.xtb
new file mode 100644
index 0000000..5804ae2
--- /dev/null
+++ b/device/bluetooth/strings/device_bluetooth_strings_lt.xtb
@@ -0,0 +1,4 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="lt">
+</translationbundle>
diff --git a/device/bluetooth/strings/device_bluetooth_strings_lv.xtb b/device/bluetooth/strings/device_bluetooth_strings_lv.xtb
new file mode 100644
index 0000000..a0a1c47
--- /dev/null
+++ b/device/bluetooth/strings/device_bluetooth_strings_lv.xtb
@@ -0,0 +1,4 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="lv">
+</translationbundle>
diff --git a/device/bluetooth/strings/device_bluetooth_strings_ml.xtb b/device/bluetooth/strings/device_bluetooth_strings_ml.xtb
new file mode 100644
index 0000000..f7db315
--- /dev/null
+++ b/device/bluetooth/strings/device_bluetooth_strings_ml.xtb
@@ -0,0 +1,4 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="ml">
+</translationbundle>
diff --git a/device/bluetooth/strings/device_bluetooth_strings_mr.xtb b/device/bluetooth/strings/device_bluetooth_strings_mr.xtb
new file mode 100644
index 0000000..098d29c
--- /dev/null
+++ b/device/bluetooth/strings/device_bluetooth_strings_mr.xtb
@@ -0,0 +1,4 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="mr">
+</translationbundle>
diff --git a/device/bluetooth/strings/device_bluetooth_strings_ms.xtb b/device/bluetooth/strings/device_bluetooth_strings_ms.xtb
new file mode 100644
index 0000000..1fb470a
--- /dev/null
+++ b/device/bluetooth/strings/device_bluetooth_strings_ms.xtb
@@ -0,0 +1,4 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="ms">
+</translationbundle>
diff --git a/device/bluetooth/strings/device_bluetooth_strings_nl.xtb b/device/bluetooth/strings/device_bluetooth_strings_nl.xtb
new file mode 100644
index 0000000..e782410
--- /dev/null
+++ b/device/bluetooth/strings/device_bluetooth_strings_nl.xtb
@@ -0,0 +1,4 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="nl">
+</translationbundle>
diff --git a/device/bluetooth/strings/device_bluetooth_strings_no.xtb b/device/bluetooth/strings/device_bluetooth_strings_no.xtb
new file mode 100644
index 0000000..913638b
--- /dev/null
+++ b/device/bluetooth/strings/device_bluetooth_strings_no.xtb
@@ -0,0 +1,4 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="no">
+</translationbundle>
diff --git a/device/bluetooth/strings/device_bluetooth_strings_pl.xtb b/device/bluetooth/strings/device_bluetooth_strings_pl.xtb
new file mode 100644
index 0000000..4519e3d
--- /dev/null
+++ b/device/bluetooth/strings/device_bluetooth_strings_pl.xtb
@@ -0,0 +1,4 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="pl">
+</translationbundle>
diff --git a/device/bluetooth/strings/device_bluetooth_strings_pt-BR.xtb b/device/bluetooth/strings/device_bluetooth_strings_pt-BR.xtb
new file mode 100644
index 0000000..e95eb56
--- /dev/null
+++ b/device/bluetooth/strings/device_bluetooth_strings_pt-BR.xtb
@@ -0,0 +1,4 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="pt-BR">
+</translationbundle>
diff --git a/device/bluetooth/strings/device_bluetooth_strings_pt-PT.xtb b/device/bluetooth/strings/device_bluetooth_strings_pt-PT.xtb
new file mode 100644
index 0000000..1dcf557
--- /dev/null
+++ b/device/bluetooth/strings/device_bluetooth_strings_pt-PT.xtb
@@ -0,0 +1,4 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="pt-PT">
+</translationbundle>
diff --git a/device/bluetooth/strings/device_bluetooth_strings_ro.xtb b/device/bluetooth/strings/device_bluetooth_strings_ro.xtb
new file mode 100644
index 0000000..9e43493
--- /dev/null
+++ b/device/bluetooth/strings/device_bluetooth_strings_ro.xtb
@@ -0,0 +1,4 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="ro">
+</translationbundle>
diff --git a/device/bluetooth/strings/device_bluetooth_strings_ru.xtb b/device/bluetooth/strings/device_bluetooth_strings_ru.xtb
new file mode 100644
index 0000000..c4a621b
--- /dev/null
+++ b/device/bluetooth/strings/device_bluetooth_strings_ru.xtb
@@ -0,0 +1,4 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="ru">
+</translationbundle>
diff --git a/device/bluetooth/strings/device_bluetooth_strings_sk.xtb b/device/bluetooth/strings/device_bluetooth_strings_sk.xtb
new file mode 100644
index 0000000..00750d3
--- /dev/null
+++ b/device/bluetooth/strings/device_bluetooth_strings_sk.xtb
@@ -0,0 +1,4 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="sk">
+</translationbundle>
diff --git a/device/bluetooth/strings/device_bluetooth_strings_sl.xtb b/device/bluetooth/strings/device_bluetooth_strings_sl.xtb
new file mode 100644
index 0000000..489b7e4
--- /dev/null
+++ b/device/bluetooth/strings/device_bluetooth_strings_sl.xtb
@@ -0,0 +1,4 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="sl">
+</translationbundle>
diff --git a/device/bluetooth/strings/device_bluetooth_strings_sr.xtb b/device/bluetooth/strings/device_bluetooth_strings_sr.xtb
new file mode 100644
index 0000000..38f6f35
--- /dev/null
+++ b/device/bluetooth/strings/device_bluetooth_strings_sr.xtb
@@ -0,0 +1,4 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="sr">
+</translationbundle>
diff --git a/device/bluetooth/strings/device_bluetooth_strings_sv.xtb b/device/bluetooth/strings/device_bluetooth_strings_sv.xtb
new file mode 100644
index 0000000..ddea3dc
--- /dev/null
+++ b/device/bluetooth/strings/device_bluetooth_strings_sv.xtb
@@ -0,0 +1,4 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="sv">
+</translationbundle>
diff --git a/device/bluetooth/strings/device_bluetooth_strings_sw.xtb b/device/bluetooth/strings/device_bluetooth_strings_sw.xtb
new file mode 100644
index 0000000..b775088
--- /dev/null
+++ b/device/bluetooth/strings/device_bluetooth_strings_sw.xtb
@@ -0,0 +1,4 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="sw">
+</translationbundle>
diff --git a/device/bluetooth/strings/device_bluetooth_strings_ta.xtb b/device/bluetooth/strings/device_bluetooth_strings_ta.xtb
new file mode 100644
index 0000000..ef90687
--- /dev/null
+++ b/device/bluetooth/strings/device_bluetooth_strings_ta.xtb
@@ -0,0 +1,4 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="ta">
+</translationbundle>
diff --git a/device/bluetooth/strings/device_bluetooth_strings_te.xtb b/device/bluetooth/strings/device_bluetooth_strings_te.xtb
new file mode 100644
index 0000000..48c714b
--- /dev/null
+++ b/device/bluetooth/strings/device_bluetooth_strings_te.xtb
@@ -0,0 +1,4 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="te">
+</translationbundle>
diff --git a/device/bluetooth/strings/device_bluetooth_strings_th.xtb b/device/bluetooth/strings/device_bluetooth_strings_th.xtb
new file mode 100644
index 0000000..fae3196
--- /dev/null
+++ b/device/bluetooth/strings/device_bluetooth_strings_th.xtb
@@ -0,0 +1,4 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="th">
+</translationbundle>
diff --git a/device/bluetooth/strings/device_bluetooth_strings_tr.xtb b/device/bluetooth/strings/device_bluetooth_strings_tr.xtb
new file mode 100644
index 0000000..9a29951
--- /dev/null
+++ b/device/bluetooth/strings/device_bluetooth_strings_tr.xtb
@@ -0,0 +1,4 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="tr">
+</translationbundle>
diff --git a/device/bluetooth/strings/device_bluetooth_strings_uk.xtb b/device/bluetooth/strings/device_bluetooth_strings_uk.xtb
new file mode 100644
index 0000000..f0db52c
--- /dev/null
+++ b/device/bluetooth/strings/device_bluetooth_strings_uk.xtb
@@ -0,0 +1,4 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="uk">
+</translationbundle>
diff --git a/device/bluetooth/strings/device_bluetooth_strings_vi.xtb b/device/bluetooth/strings/device_bluetooth_strings_vi.xtb
new file mode 100644
index 0000000..b2957da
--- /dev/null
+++ b/device/bluetooth/strings/device_bluetooth_strings_vi.xtb
@@ -0,0 +1,4 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="vi">
+</translationbundle>
diff --git a/device/bluetooth/strings/device_bluetooth_strings_zh-CN.xtb b/device/bluetooth/strings/device_bluetooth_strings_zh-CN.xtb
new file mode 100644
index 0000000..26e8b40
--- /dev/null
+++ b/device/bluetooth/strings/device_bluetooth_strings_zh-CN.xtb
@@ -0,0 +1,4 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="zh-CN">
+</translationbundle>
diff --git a/device/bluetooth/strings/device_bluetooth_strings_zh-TW.xtb b/device/bluetooth/strings/device_bluetooth_strings_zh-TW.xtb
new file mode 100644
index 0000000..935ef48
--- /dev/null
+++ b/device/bluetooth/strings/device_bluetooth_strings_zh-TW.xtb
@@ -0,0 +1,4 @@
+<?xml version="1.0" ?>
+<!DOCTYPE translationbundle>
+<translationbundle lang="zh-TW">
+</translationbundle>
diff --git a/device/bluetooth/test/mock_bluetooth_device.cc b/device/bluetooth/test/mock_bluetooth_device.cc
index 61ab155..b4c6cfe 100644
--- a/device/bluetooth/test/mock_bluetooth_device.cc
+++ b/device/bluetooth/test/mock_bluetooth_device.cc
@@ -4,7 +4,7 @@
#include "device/bluetooth/test/mock_bluetooth_device.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "device/bluetooth/test/mock_bluetooth_adapter.h"
namespace device {
diff --git a/device/bluetooth/test/mock_bluetooth_device.h b/device/bluetooth/test/mock_bluetooth_device.h
index d61f6ff..6020579 100644
--- a/device/bluetooth/test/mock_bluetooth_device.h
+++ b/device/bluetooth/test/mock_bluetooth_device.h
@@ -7,7 +7,7 @@
#include <string>
-#include "base/string16.h"
+#include "base/strings/string16.h"
#include "device/bluetooth/bluetooth_device.h"
#include "device/bluetooth/bluetooth_out_of_band_pairing_data.h"
#include "testing/gmock/include/gmock/gmock.h"