Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/browser/bluetooth/bluetooth_blocklist.h" | 5 #include "content/browser/bluetooth/bluetooth_blocklist.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "base/metrics/histogram_macros.h" | 8 #include "base/metrics/histogram_macros.h" |
| 9 #include "base/optional.h" | 9 #include "base/optional.h" |
| 10 #include "base/strings/string_split.h" | 10 #include "base/strings/string_split.h" |
| (...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 169 // Characteristics: | 169 // Characteristics: |
| 170 Add(BluetoothUUID("2a02"), Value::EXCLUDE_WRITES); | 170 Add(BluetoothUUID("2a02"), Value::EXCLUDE_WRITES); |
| 171 Add(BluetoothUUID("2a03"), Value::EXCLUDE); | 171 Add(BluetoothUUID("2a03"), Value::EXCLUDE); |
| 172 Add(BluetoothUUID("2a25"), Value::EXCLUDE); | 172 Add(BluetoothUUID("2a25"), Value::EXCLUDE); |
| 173 // Characteristics for Layout Tests: | 173 // Characteristics for Layout Tests: |
| 174 Add(BluetoothUUID("bad1c9a2-9a5b-4015-8b60-1579bbbf2135"), | 174 Add(BluetoothUUID("bad1c9a2-9a5b-4015-8b60-1579bbbf2135"), |
| 175 Value::EXCLUDE_READS); | 175 Value::EXCLUDE_READS); |
| 176 // Descriptors: | 176 // Descriptors: |
| 177 Add(BluetoothUUID("2902"), Value::EXCLUDE_WRITES); | 177 Add(BluetoothUUID("2902"), Value::EXCLUDE_WRITES); |
| 178 Add(BluetoothUUID("2903"), Value::EXCLUDE_WRITES); | 178 Add(BluetoothUUID("2903"), Value::EXCLUDE_WRITES); |
| 179 // Descriptor for Layout Tests: | |
| 180 Add(BluetoothUUID("bad0"), Value::EXCLUDE); | |
|
ortuno
2016/12/07 08:05:12
hmm why do we need this? We already have a Value::
dougt
2016/12/07 19:50:34
Done. Removed.
| |
| 179 // Descriptors for Layout Tests: | 181 // Descriptors for Layout Tests: |
| 180 Add(BluetoothUUID("bad2ddcf-60db-45cd-bef9-fd72b153cf7c"), Value::EXCLUDE); | 182 Add(BluetoothUUID("bad2ddcf-60db-45cd-bef9-fd72b153cf7c"), Value::EXCLUDE); |
| 181 Add(BluetoothUUID("bad3ec61-3cc3-4954-9702-7977df514114"), | 183 Add(BluetoothUUID("bad3ec61-3cc3-4954-9702-7977df514114"), |
| 182 Value::EXCLUDE_READS); | 184 Value::EXCLUDE_READS); |
| 183 } | 185 } |
| 184 | 186 |
| 185 void BluetoothBlocklist::PopulateWithServerProvidedValues() { | 187 void BluetoothBlocklist::PopulateWithServerProvidedValues() { |
| 186 // DCHECK to maybe help debug https://crbug.com/604078. | 188 // DCHECK to maybe help debug https://crbug.com/604078. |
| 187 DCHECK(GetContentClient()); | 189 DCHECK(GetContentClient()); |
| 188 Add(GetContentClient()->browser()->GetWebBluetoothBlocklist()); | 190 Add(GetContentClient()->browser()->GetWebBluetoothBlocklist()); |
| 189 } | 191 } |
| 190 | 192 |
| 191 } // namespace content | 193 } // namespace content |
| OLD | NEW |