Revert "Save bluetooth state to user pref in settings page"
This reverts commit 70d8265ddf6e4c51e3b47958620b0f28e430457c.
Reason for revert: CrSettingsBluetoothPageTest.All failing on Linux ChromiumOS Tests (dbg)(1) (e.g., https://build.chromium.org/p/chromium.chromiumos/builders/Linux%20ChromiumOS%20Tests%20%28dbg%29%281%29/builds/29782) with: "Uncaught ReferenceError: PrefsBehavior is not defined", source: chrome://settings/bluetooth_page/bluetooth_page.js (28). Seems related to this CL.
Original change's description:
> Save bluetooth state to user pref in settings page
>
> BUG=741962
> NOTRY=true
>
> Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
> Change-Id: I4490d8e5c1033b5a2bc52a51adbe2c3140f55e73
> Reviewed-on: https://chromium-review.googlesource.com/645836
> Commit-Queue: Sonny Sasaka <sonnysasaka@chromium.org>
> Reviewed-by: Steven Bennetts <stevenjb@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#499296}
TBR=stevenjb@chromium.org,rkc@chromium.org,sonnysasaka@chromium.org
# Not skipping CQ checks because original CL landed > 1 day ago.
Bug: 741962
Change-Id: I7280f66ce34f72d641bc0032a41706b6bf8225cd
Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
Reviewed-on: https://chromium-review.googlesource.com/647752
Reviewed-by: Greg Thompson <grt@chromium.org>
Commit-Queue: Greg Thompson <grt@chromium.org>
Cr-Commit-Position: refs/heads/master@{#499475}diff --git a/chrome/browser/resources/settings/bluetooth_page/bluetooth_page.js b/chrome/browser/resources/settings/bluetooth_page/bluetooth_page.js
index a626139..35b5c439 100644
--- a/chrome/browser/resources/settings/bluetooth_page/bluetooth_page.js
+++ b/chrome/browser/resources/settings/bluetooth_page/bluetooth_page.js
@@ -25,8 +25,6 @@
Polymer({
is: 'settings-bluetooth-page',
- behaviors: [PrefsBehavior],
-
properties: {
/** Preferences state. */
prefs: {
@@ -168,7 +166,6 @@
this.adapterState_ = state;
this.bluetoothToggleState_ = state.powered;
this.bluetoothToggleDisabled_ = !state.available;
- this.setPrefValue('ash.user.bluetooth.adapter_enabled', state.powered);
},
/** @private */
diff --git a/chrome/browser/resources/settings/bluetooth_page/compiled_resources2.gyp b/chrome/browser/resources/settings/bluetooth_page/compiled_resources2.gyp
index 975856e1..3d4051ba 100644
--- a/chrome/browser/resources/settings/bluetooth_page/compiled_resources2.gyp
+++ b/chrome/browser/resources/settings/bluetooth_page/compiled_resources2.gyp
@@ -7,7 +7,6 @@
'target_name': 'bluetooth_page',
'dependencies': [
'../compiled_resources2.gyp:route',
- '../prefs/compiled_resources2.gyp:prefs_behavior',
'../settings_page/compiled_resources2.gyp:settings_animated_pages',
'<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:assert',
'<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:i18n_behavior',
diff --git a/chrome/test/data/webui/settings/bluetooth_page_tests.js b/chrome/test/data/webui/settings/bluetooth_page_tests.js
index 5da95ac2..5644558 100644
--- a/chrome/test/data/webui/settings/bluetooth_page_tests.js
+++ b/chrome/test/data/webui/settings/bluetooth_page_tests.js
@@ -2,22 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-function getFakePrefs() {
- return {
- ash: {
- user: {
- bluetooth: {
- adapter_enabled: {
- key: 'ash.user.bluetooth.adapter_enabled',
- type: chrome.settingsPrivate.PrefType.BOOLEAN,
- value: false,
- }
- }
- }
- }
- };
-}
-
suite('Bluetooth', function() {
var bluetoothPage = null;
@@ -76,7 +60,6 @@
setup(function() {
PolymerTest.clearBody();
bluetoothPage = document.createElement('settings-bluetooth-page');
- bluetoothPage.prefs = getFakePrefs();
assertTrue(!!bluetoothPage);
bluetoothApi_.setDevicesForTest([]);
