MD Settings: Bluetooth: Move device list to subpage

chrome/test/data/webui/settings/settings_subpage_browsertest.js

 // Copyright 2015 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.
 
 /**
  * @fileoverview Suite of tests to ensure that settings subpages exist and
  * load without errors. Also outputs approximate load times for each subpage.
  */
 
 GEN_INCLUDE(['settings_page_browsertest.js']);
@@ skipping 48 matching lines @@
 
   /**
    * Ensures the subpage is initially hidden, then sets it to visible and
    * times the result, outputting a (rough) approximation of load time for the
    * subpage.
    * @param {Node} page
    * @param {string} subpage
    */
   testSubPage: function(page, subPage) {
     Polymer.dom.flush();
-    expectFalse(!!this.getSection(page, subPage));
+    assertFalse(!!this.getSection(page, subPage));
     var startTime = window.performance.now();
     page.set('pageVisibility.' + subPage, true);
     Polymer.dom.flush();
     var dtime = window.performance.now() - startTime;
     console.log('Page: ' + subPage + ' Load time: ' + dtime.toFixed(0) + ' ms');
-    expectTrue(!!this.getSection(page, subPage));
+    assertTrue(!!this.getSection(page, subPage));
     // Hide the page so that it doesn't interfere with other subPages.
     page.set('pageVisibility.' + subPage, false);
     Polymer.dom.flush();
   },
 
   testSubPages: function() {
     var page = this.getPage(this.pageId);
     this.subPages.forEach(function(subPage) {
       test(subPage, this.testSubPage.bind(this, page, subPage));
     }.bind(this));
   },
 };
 
 /** @constructor @extends {SettingsSubPageBrowserTest} */
 function SettingsBasicSubPageBrowserTest() {
   SettingsSubPageBrowserTest.call(this, 'basic');
 
   /** @override */
   this.subPages = [
     'people',
     'appearance',
     'onStartup',
     'search',
   ];
   if (cr.isChromeOS)
-    this.subPages.push('device', 'internet');
+    this.subPages.push('internet', 'bluetooth', 'device');
   else
     this.subPages.push('defaultBrowser');
 }
 
 SettingsBasicSubPageBrowserTest.prototype = {
   __proto__: SettingsSubPageBrowserTest.prototype,
 };
 
 TEST_F('SettingsBasicSubPageBrowserTest', 'SubPages', function() {
   suite('Basic', this.testSubPages.bind(this));
   mocha.run();
 });
 
 /** @constructor @extends {SettingsSubPageBrowserTest} */
 function SettingsAdvancedSubPageBrowserTest() {
   // "Advanced" sections live in the settings-basic-page.
   SettingsSubPageBrowserTest.call(this, 'basic');
 
   /** @override */
   this.subPages = [
     'privacy',
     'passwordsAndForms',
     'languages',
     'downloads',
     'printing',
     'a11y',
     'reset',
   ];
   if (cr.isChromeOS)
-    this.subPages.push('dateTime', 'bluetooth');
+    this.subPages.push('dateTime');
   else
     this.subPages.push('system');
 };
 
 SettingsAdvancedSubPageBrowserTest.prototype = {
   __proto__: SettingsSubPageBrowserTest.prototype,
 
   /** @override */
   setUp: function() {
     this.toggleAdvanced();
     SettingsSubPageBrowserTest.prototype.setUp.call(this);
   },
 };
 
 TEST_F('SettingsAdvancedSubPageBrowserTest', 'SubPages', function() {
   suite('Advanced', this.testSubPages.bind(this));
   mocha.run();
 });