| Index: extensions/common/api/bluetooth/bluetooth_manifest_permission.cc
|
| diff --git a/extensions/common/api/bluetooth/bluetooth_manifest_permission.cc b/extensions/common/api/bluetooth/bluetooth_manifest_permission.cc
|
| index 60fb04d35eb42f5dc039f1624e566fdffdbc2cb9..9b2e7a34a4bb774efc8ff2f0bfabc0398b4793a1 100644
|
| --- a/extensions/common/api/bluetooth/bluetooth_manifest_permission.cc
|
| +++ b/extensions/common/api/bluetooth/bluetooth_manifest_permission.cc
|
| @@ -67,8 +67,8 @@ BluetoothManifestPermission::~BluetoothManifestPermission() {}
|
| scoped_ptr<BluetoothManifestPermission> BluetoothManifestPermission::FromValue(
|
| const base::Value& value,
|
| base::string16* error) {
|
| - scoped_ptr<core_api::extensions_manifest_types::Bluetooth> bluetooth =
|
| - core_api::extensions_manifest_types::Bluetooth::FromValue(value, error);
|
| + scoped_ptr<api::extensions_manifest_types::Bluetooth> bluetooth =
|
| + api::extensions_manifest_types::Bluetooth::FromValue(value, error);
|
| if (!bluetooth)
|
| return scoped_ptr<BluetoothManifestPermission>();
|
|
|
| @@ -178,7 +178,7 @@ bool BluetoothManifestPermission::FromValue(const base::Value* value) {
|
| }
|
|
|
| scoped_ptr<base::Value> BluetoothManifestPermission::ToValue() const {
|
| - core_api::extensions_manifest_types::Bluetooth bluetooth;
|
| + api::extensions_manifest_types::Bluetooth bluetooth;
|
| bluetooth.uuids.reset(new std::vector<std::string>(uuids_.begin(),
|
| uuids_.end()));
|
| return bluetooth.ToValue().Pass();
|
|
|