| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 <sstream> | 5 #include <sstream> |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/metrics/histogram_base.h" | 8 #include "base/metrics/histogram_base.h" |
| 9 #include "base/metrics/histogram_samples.h" | 9 #include "base/metrics/histogram_samples.h" |
| 10 #include "base/metrics/statistics_recorder.h" | 10 #include "base/metrics/statistics_recorder.h" |
| (...skipping 24 matching lines...) Expand all Loading... |
| 35 #include "chrome/browser/search/search.h" | 35 #include "chrome/browser/search/search.h" |
| 36 #include "chrome/browser/search_engines/template_url_service.h" | 36 #include "chrome/browser/search_engines/template_url_service.h" |
| 37 #include "chrome/browser/search_engines/template_url_service_factory.h" | 37 #include "chrome/browser/search_engines/template_url_service_factory.h" |
| 38 #include "chrome/browser/task_manager/task_manager.h" | 38 #include "chrome/browser/task_manager/task_manager.h" |
| 39 #include "chrome/browser/task_manager/task_manager_browsertest_util.h" | 39 #include "chrome/browser/task_manager/task_manager_browsertest_util.h" |
| 40 #include "chrome/browser/themes/theme_service.h" | 40 #include "chrome/browser/themes/theme_service.h" |
| 41 #include "chrome/browser/themes/theme_service_factory.h" | 41 #include "chrome/browser/themes/theme_service_factory.h" |
| 42 #include "chrome/browser/ui/browser_list.h" | 42 #include "chrome/browser/ui/browser_list.h" |
| 43 #include "chrome/browser/ui/browser_tabstrip.h" | 43 #include "chrome/browser/ui/browser_tabstrip.h" |
| 44 #include "chrome/browser/ui/omnibox/omnibox_view.h" | 44 #include "chrome/browser/ui/omnibox/omnibox_view.h" |
| 45 #include "chrome/browser/ui/search/instant_commit_type.h" | |
| 46 #include "chrome/browser/ui/search/instant_ntp.h" | 45 #include "chrome/browser/ui/search/instant_ntp.h" |
| 47 #include "chrome/browser/ui/search/instant_overlay.h" | |
| 48 #include "chrome/browser/ui/search/instant_tab.h" | 46 #include "chrome/browser/ui/search/instant_tab.h" |
| 49 #include "chrome/browser/ui/search/instant_test_utils.h" | 47 #include "chrome/browser/ui/search/instant_test_utils.h" |
| 50 #include "chrome/browser/ui/search/search_tab_helper.h" | 48 #include "chrome/browser/ui/search/search_tab_helper.h" |
| 51 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 49 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 52 #include "chrome/browser/ui/webui/theme_source.h" | 50 #include "chrome/browser/ui/webui/theme_source.h" |
| 53 #include "chrome/common/chrome_notification_types.h" | 51 #include "chrome/common/chrome_notification_types.h" |
| 54 #include "chrome/common/chrome_switches.h" | 52 #include "chrome/common/chrome_switches.h" |
| 55 #include "chrome/common/instant_types.h" | 53 #include "chrome/common/instant_types.h" |
| 56 #include "chrome/common/pref_names.h" | 54 #include "chrome/common/pref_names.h" |
| 57 #include "chrome/common/thumbnail_score.h" | 55 #include "chrome/common/thumbnail_score.h" |
| (...skipping 1605 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1663 EXPECT_TRUE(active_tab->GetController().CanGoBack()); | 1661 EXPECT_TRUE(active_tab->GetController().CanGoBack()); |
| 1664 active_tab->GetController().GoBack(); | 1662 active_tab->GetController().GoBack(); |
| 1665 back_observer.Wait(); | 1663 back_observer.Wait(); |
| 1666 | 1664 |
| 1667 // Verify that onmostvisitedchange event is dispatched when we navigate from | 1665 // Verify that onmostvisitedchange event is dispatched when we navigate from |
| 1668 // SRP to NTP. | 1666 // SRP to NTP. |
| 1669 active_tab = browser()->tab_strip_model()->GetActiveWebContents(); | 1667 active_tab = browser()->tab_strip_model()->GetActiveWebContents(); |
| 1670 EXPECT_TRUE(UpdateSearchState(active_tab)); | 1668 EXPECT_TRUE(UpdateSearchState(active_tab)); |
| 1671 EXPECT_EQ(1, on_most_visited_change_calls_); | 1669 EXPECT_EQ(1, on_most_visited_change_calls_); |
| 1672 } | 1670 } |
| OLD | NEW |