Index: chrome/test/data/webui/settings/settings_main_test.js |
diff --git a/chrome/test/data/webui/settings/settings_main_test.js b/chrome/test/data/webui/settings/settings_main_test.js |
index 9d03322510c6b20f3046cfca812a05187db12e56..fb2b11ab57cfc706191bb0e641d142c928788ae9 100644 |
--- a/chrome/test/data/webui/settings/settings_main_test.js |
+++ b/chrome/test/data/webui/settings/settings_main_test.js |
@@ -64,7 +64,7 @@ cr.define('settings_main_page', function() { |
var settingsMain = null; |
setup(function() { |
- settings.navigateTo(settings.Route.BASIC); |
+ settings.navigateTo(settings.routes.BASIC); |
searchManager = new TestSearchManager(); |
settings.setSearchManagerForTesting(searchManager); |
PolymerTest.clearBody(); |
@@ -205,7 +205,7 @@ cr.define('settings_main_page', function() { |
}) |
.then(function() { |
// Imitate behavior of clearing search. |
- settings.navigateTo(settings.Route.BASIC); |
+ settings.navigateTo(settings.routes.BASIC); |
Polymer.dom.flush(); |
return assertPageVisibility('block', expectedAdvanced); |
}); |
@@ -213,7 +213,7 @@ cr.define('settings_main_page', function() { |
test('exiting search mode, advanced collapsed', function() { |
// Simulating searching while the advanced page is collapsed. |
- settingsMain.currentRouteChanged(settings.Route.BASIC); |
+ settingsMain.currentRouteChanged(settings.routes.BASIC); |
Polymer.dom.flush(); |
return assertAdvancedVisibilityAfterSearch('none'); |
}); |
@@ -222,7 +222,7 @@ cr.define('settings_main_page', function() { |
// "advanced" page, when the search has been initiated from a subpage |
// whose parent is the "advanced" page. |
test('exiting search mode, advanced expanded', function() { |
- settings.navigateTo(settings.Route.SITE_SETTINGS); |
+ settings.navigateTo(settings.routes.SITE_SETTINGS); |
Polymer.dom.flush(); |
return assertAdvancedVisibilityAfterSearch('block'); |
}); |
@@ -231,25 +231,25 @@ cr.define('settings_main_page', function() { |
// lands the user in a page where both basic and advanced sections are |
// visible, because the page is still in search mode. |
test('returning from subpage to search results', function() { |
- settings.navigateTo(settings.Route.BASIC); |
+ settings.navigateTo(settings.routes.BASIC); |
Polymer.dom.flush(); |
searchManager.setMatchesFound(true); |
return settingsMain.searchContents('Query1').then(function() { |
// Simulate navigating into a subpage. |
- settings.navigateTo(settings.Route.SEARCH_ENGINES); |
+ settings.navigateTo(settings.routes.SEARCH_ENGINES); |
settingsMain.$$('settings-basic-page').fire('subpage-expand'); |
Polymer.dom.flush(); |
// Simulate clicking the left arrow to go back to the search results. |
- settings.navigateTo(settings.Route.BASIC); |
+ settings.navigateTo(settings.routes.BASIC); |
return assertPageVisibility('block', 'block'); |
}); |
}); |
// TODO(michaelpg): Move these to a new test for settings-basic-page. |
test('can collapse advanced on advanced section route', function() { |
- settings.navigateTo(settings.Route.PRIVACY); |
+ settings.navigateTo(settings.routes.PRIVACY); |
Polymer.dom.flush(); |
var basicPage = settingsMain.$$('settings-basic-page'); |
@@ -274,12 +274,12 @@ cr.define('settings_main_page', function() { |
}); |
test('navigating to a basic page does not collapse advanced', function() { |
- settings.navigateTo(settings.Route.PRIVACY); |
+ settings.navigateTo(settings.routes.PRIVACY); |
Polymer.dom.flush(); |
assertToggleContainerVisible(true); |
- settings.navigateTo(settings.Route.PEOPLE); |
+ settings.navigateTo(settings.routes.PEOPLE); |
Polymer.dom.flush(); |
return assertPageVisibility('block', 'block'); |