| Index: chrome/browser/resources/settings/basic_page/basic_page.js | 
| diff --git a/chrome/browser/resources/settings/basic_page/basic_page.js b/chrome/browser/resources/settings/basic_page/basic_page.js | 
| index 840b2f41d522cb3e4d3f20ea5a3c2d38bed3e24e..d360e891f428705bfcc79d468745f7fb91989688 100644 | 
| --- a/chrome/browser/resources/settings/basic_page/basic_page.js | 
| +++ b/chrome/browser/resources/settings/basic_page/basic_page.js | 
| @@ -114,8 +114,10 @@ Polymer({ | 
| ]; | 
|  | 
| if (this.pageVisibility.advancedSettings !== false) { | 
| -      whenSearchDone.push(settings.getSearchManager().search( | 
| -          query, assert(this.$$('#advancedPageTemplate').get()))); | 
| +      whenSearchDone.push(this.$$('#advancedPageTemplate').get().then( | 
| +          function(advancedPage) { | 
| +            return settings.getSearchManager().search(query, advancedPage); | 
| +          })); | 
| } | 
|  | 
| return Promise.all(whenSearchDone).then(function(requests) { | 
|  |