| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "base/files/file_path.h" | 5 #include "base/files/file_path.h" |
| 6 #include "base/memory/ptr_util.h" | 6 #include "base/memory/ptr_util.h" |
| 7 #include "base/strings/utf_string_conversions.h" | 7 #include "base/strings/utf_string_conversions.h" |
| 8 #include "base/threading/sequenced_worker_pool.h" |
| 8 #include "chrome/browser/browser_process.h" | 9 #include "chrome/browser/browser_process.h" |
| 9 #include "chrome/browser/search/search.h" | 10 #include "chrome/browser/search/search.h" |
| 10 #include "chrome/browser/search_engines/template_url_service_factory.h" | 11 #include "chrome/browser/search_engines/template_url_service_factory.h" |
| 11 #include "chrome/browser/search_engines/ui_thread_search_terms_data.h" | 12 #include "chrome/browser/search_engines/ui_thread_search_terms_data.h" |
| 12 #include "chrome/browser/ui/browser.h" | 13 #include "chrome/browser/ui/browser.h" |
| 13 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 14 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 14 #include "chrome/common/url_constants.h" | 15 #include "chrome/common/url_constants.h" |
| 15 #include "chrome/test/base/in_process_browser_test.h" | 16 #include "chrome/test/base/in_process_browser_test.h" |
| 16 #include "chrome/test/base/search_test_utils.h" | 17 #include "chrome/test/base/search_test_utils.h" |
| 17 #include "chrome/test/base/ui_test_utils.h" | 18 #include "chrome/test/base/ui_test_utils.h" |
| (...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 113 ChangeDefaultSearchProvider("notarealfile.html"); | 114 ChangeDefaultSearchProvider("notarealfile.html"); |
| 114 | 115 |
| 115 ui_test_utils::NavigateToURL(browser(), new_tab_url()); | 116 ui_test_utils::NavigateToURL(browser(), new_tab_url()); |
| 116 content::WebContents* contents = | 117 content::WebContents* contents = |
| 117 browser()->tab_strip_model()->GetWebContentsAt(0); | 118 browser()->tab_strip_model()->GetWebContentsAt(0); |
| 118 content::NavigationController* controller = &contents->GetController(); | 119 content::NavigationController* controller = &contents->GetController(); |
| 119 // Failed navigation makes a redirect to the local NTP. | 120 // Failed navigation makes a redirect to the local NTP. |
| 120 EXPECT_EQ(GURL(chrome::kChromeSearchLocalNtpUrl), | 121 EXPECT_EQ(GURL(chrome::kChromeSearchLocalNtpUrl), |
| 121 controller->GetLastCommittedEntry()->GetURL()); | 122 controller->GetLastCommittedEntry()->GetURL()); |
| 122 } | 123 } |
| OLD | NEW |