Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(159)

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/browser/ui/search/instant_extended_interactive_uitest.cc

Issue 368273011: Revert of Componentize TemplateURLService (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/ui/search/instant_controller.cc ('k') | chrome/browser/ui/search/instant_test_utils.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 16 matching lines...) Expand all
27 #include "chrome/browser/favicon/favicon_tab_helper.h" 27 #include "chrome/browser/favicon/favicon_tab_helper.h"
28 #include "chrome/browser/history/history_db_task.h" 28 #include "chrome/browser/history/history_db_task.h"
29 #include "chrome/browser/history/history_service.h" 29 #include "chrome/browser/history/history_service.h"
30 #include "chrome/browser/history/history_service_factory.h" 30 #include "chrome/browser/history/history_service_factory.h"
31 #include "chrome/browser/history/history_types.h" 31 #include "chrome/browser/history/history_types.h"
32 #include "chrome/browser/history/top_sites.h" 32 #include "chrome/browser/history/top_sites.h"
33 #include "chrome/browser/profiles/profile.h" 33 #include "chrome/browser/profiles/profile.h"
34 #include "chrome/browser/search/instant_service.h" 34 #include "chrome/browser/search/instant_service.h"
35 #include "chrome/browser/search/instant_service_factory.h" 35 #include "chrome/browser/search/instant_service_factory.h"
36 #include "chrome/browser/search/search.h" 36 #include "chrome/browser/search/search.h"
37 #include "chrome/browser/search_engines/template_url_service.h"
37 #include "chrome/browser/search_engines/template_url_service_factory.h" 38 #include "chrome/browser/search_engines/template_url_service_factory.h"
38 #include "chrome/browser/task_manager/task_manager.h" 39 #include "chrome/browser/task_manager/task_manager.h"
39 #include "chrome/browser/task_manager/task_manager_browsertest_util.h" 40 #include "chrome/browser/task_manager/task_manager_browsertest_util.h"
40 #include "chrome/browser/themes/theme_service.h" 41 #include "chrome/browser/themes/theme_service.h"
41 #include "chrome/browser/themes/theme_service_factory.h" 42 #include "chrome/browser/themes/theme_service_factory.h"
42 #include "chrome/browser/ui/browser_list.h" 43 #include "chrome/browser/ui/browser_list.h"
43 #include "chrome/browser/ui/browser_tabstrip.h" 44 #include "chrome/browser/ui/browser_tabstrip.h"
44 #include "chrome/browser/ui/omnibox/omnibox_view.h" 45 #include "chrome/browser/ui/omnibox/omnibox_view.h"
45 #include "chrome/browser/ui/search/instant_tab.h" 46 #include "chrome/browser/ui/search/instant_tab.h"
46 #include "chrome/browser/ui/search/instant_test_utils.h" 47 #include "chrome/browser/ui/search/instant_test_utils.h"
47 #include "chrome/browser/ui/search/search_tab_helper.h" 48 #include "chrome/browser/ui/search/search_tab_helper.h"
48 #include "chrome/browser/ui/tabs/tab_strip_model.h" 49 #include "chrome/browser/ui/tabs/tab_strip_model.h"
49 #include "chrome/browser/ui/webui/theme_source.h" 50 #include "chrome/browser/ui/webui/theme_source.h"
50 #include "chrome/common/chrome_switches.h" 51 #include "chrome/common/chrome_switches.h"
51 #include "chrome/common/instant_types.h" 52 #include "chrome/common/instant_types.h"
52 #include "chrome/common/pref_names.h" 53 #include "chrome/common/pref_names.h"
53 #include "chrome/common/url_constants.h" 54 #include "chrome/common/url_constants.h"
54 #include "chrome/test/base/in_process_browser_test.h" 55 #include "chrome/test/base/in_process_browser_test.h"
55 #include "chrome/test/base/interactive_test_utils.h" 56 #include "chrome/test/base/interactive_test_utils.h"
56 #include "chrome/test/base/ui_test_utils.h" 57 #include "chrome/test/base/ui_test_utils.h"
57 #include "components/bookmarks/browser/bookmark_utils.h" 58 #include "components/bookmarks/browser/bookmark_utils.h"
58 #include "components/bookmarks/test/bookmark_test_helpers.h" 59 #include "components/bookmarks/test/bookmark_test_helpers.h"
59 #include "components/google/core/browser/google_url_tracker.h" 60 #include "components/google/core/browser/google_url_tracker.h"
60 #include "components/history/core/common/thumbnail_score.h" 61 #include "components/history/core/common/thumbnail_score.h"
61 #include "components/search_engines/template_url_service.h"
62 #include "components/sessions/serialized_navigation_entry.h" 62 #include "components/sessions/serialized_navigation_entry.h"
63 #include "content/public/browser/navigation_controller.h" 63 #include "content/public/browser/navigation_controller.h"
64 #include "content/public/browser/navigation_entry.h" 64 #include "content/public/browser/navigation_entry.h"
65 #include "content/public/browser/notification_service.h" 65 #include "content/public/browser/notification_service.h"
66 #include "content/public/browser/render_process_host.h" 66 #include "content/public/browser/render_process_host.h"
67 #include "content/public/browser/render_view_host.h" 67 #include "content/public/browser/render_view_host.h"
68 #include "content/public/browser/site_instance.h" 68 #include "content/public/browser/site_instance.h"
69 #include "content/public/browser/url_data_source.h" 69 #include "content/public/browser/url_data_source.h"
70 #include "content/public/browser/web_contents.h" 70 #include "content/public/browser/web_contents.h"
71 #include "content/public/common/bindings_policy.h" 71 #include "content/public/common/bindings_policy.h"
(...skipping 902 matching lines...) Expand 10 before | Expand all | Expand 10 after
974 stream << "link.href = \"" << result_url.spec() << "\";"; 974 stream << "link.href = \"" << result_url.spec() << "\";";
975 stream << "document.body.appendChild(link);"; 975 stream << "document.body.appendChild(link);";
976 stream << "link.click();"; 976 stream << "link.click();";
977 EXPECT_TRUE(content::ExecuteScript(contents, stream.str())); 977 EXPECT_TRUE(content::ExecuteScript(contents, stream.str()));
978 978
979 content::WaitForLoadStop(contents); 979 content::WaitForLoadStop(contents);
980 std::string expected_title = 980 std::string expected_title =
981 "Referrer is " + instant_url().GetWithEmptyPath().spec(); 981 "Referrer is " + instant_url().GetWithEmptyPath().spec();
982 EXPECT_EQ(ASCIIToUTF16(expected_title), contents->GetTitle()); 982 EXPECT_EQ(ASCIIToUTF16(expected_title), contents->GetTitle());
983 } 983 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/search/instant_controller.cc ('k') | chrome/browser/ui/search/instant_test_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698