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

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

Issue 2122903002: Move search-related files from chrome/common to chrome/common/search (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: move search-related files Created 4 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
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 <stdint.h> 5 #include <stdint.h>
6 6
7 #include <sstream> 7 #include <sstream>
8 8
9 #include "base/base_switches.h" 9 #include "base/base_switches.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 20 matching lines...) Expand all
31 #include "chrome/browser/search_engines/template_url_service_factory.h" 31 #include "chrome/browser/search_engines/template_url_service_factory.h"
32 #include "chrome/browser/themes/theme_service.h" 32 #include "chrome/browser/themes/theme_service.h"
33 #include "chrome/browser/themes/theme_service_factory.h" 33 #include "chrome/browser/themes/theme_service_factory.h"
34 #include "chrome/browser/ui/browser_list.h" 34 #include "chrome/browser/ui/browser_list.h"
35 #include "chrome/browser/ui/browser_tabstrip.h" 35 #include "chrome/browser/ui/browser_tabstrip.h"
36 #include "chrome/browser/ui/search/instant_tab.h" 36 #include "chrome/browser/ui/search/instant_tab.h"
37 #include "chrome/browser/ui/search/instant_test_utils.h" 37 #include "chrome/browser/ui/search/instant_test_utils.h"
38 #include "chrome/browser/ui/search/search_tab_helper.h" 38 #include "chrome/browser/ui/search/search_tab_helper.h"
39 #include "chrome/browser/ui/tabs/tab_strip_model.h" 39 #include "chrome/browser/ui/tabs/tab_strip_model.h"
40 #include "chrome/browser/ui/webui/theme_source.h" 40 #include "chrome/browser/ui/webui/theme_source.h"
41 #include "chrome/common/instant_types.h"
42 #include "chrome/common/pref_names.h" 41 #include "chrome/common/pref_names.h"
42 #include "chrome/common/search/instant_types.h"
43 #include "chrome/common/url_constants.h" 43 #include "chrome/common/url_constants.h"
44 #include "chrome/test/base/in_process_browser_test.h" 44 #include "chrome/test/base/in_process_browser_test.h"
45 #include "chrome/test/base/interactive_test_utils.h" 45 #include "chrome/test/base/interactive_test_utils.h"
46 #include "chrome/test/base/ui_test_utils.h" 46 #include "chrome/test/base/ui_test_utils.h"
47 #include "components/bookmarks/browser/bookmark_utils.h" 47 #include "components/bookmarks/browser/bookmark_utils.h"
48 #include "components/bookmarks/test/bookmark_test_helpers.h" 48 #include "components/bookmarks/test/bookmark_test_helpers.h"
49 #include "components/history/core/browser/history_db_task.h" 49 #include "components/history/core/browser/history_db_task.h"
50 #include "components/history/core/browser/history_service.h" 50 #include "components/history/core/browser/history_service.h"
51 #include "components/history/core/browser/history_types.h" 51 #include "components/history/core/browser/history_types.h"
52 #include "components/history/core/browser/top_sites.h" 52 #include "components/history/core/browser/top_sites.h"
(...skipping 917 matching lines...) Expand 10 before | Expand all | Expand 10 after
970 stream << "link.href = \"" << result_url.spec() << "\";"; 970 stream << "link.href = \"" << result_url.spec() << "\";";
971 stream << "document.body.appendChild(link);"; 971 stream << "document.body.appendChild(link);";
972 stream << "link.click();"; 972 stream << "link.click();";
973 EXPECT_TRUE(content::ExecuteScript(contents, stream.str())); 973 EXPECT_TRUE(content::ExecuteScript(contents, stream.str()));
974 974
975 content::WaitForLoadStop(contents); 975 content::WaitForLoadStop(contents);
976 std::string expected_title = 976 std::string expected_title =
977 "Referrer is " + instant_url().GetWithEmptyPath().spec(); 977 "Referrer is " + instant_url().GetWithEmptyPath().spec();
978 EXPECT_EQ(ASCIIToUTF16(expected_title), contents->GetTitle()); 978 EXPECT_EQ(ASCIIToUTF16(expected_title), contents->GetTitle());
979 } 979 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/search/instant_controller.cc ('k') | chrome/browser/ui/search/instant_extended_manual_interactive_uitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698