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

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

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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"
11 #include "base/macros.h" 11 #include "base/macros.h"
12 #include "base/metrics/histogram_base.h" 12 #include "base/metrics/histogram_base.h"
13 #include "base/metrics/histogram_samples.h" 13 #include "base/metrics/histogram_samples.h"
14 #include "base/metrics/statistics_recorder.h" 14 #include "base/metrics/statistics_recorder.h"
15 #include "base/prefs/pref_service.h"
16 #include "base/run_loop.h" 15 #include "base/run_loop.h"
17 #include "base/strings/string_number_conversions.h" 16 #include "base/strings/string_number_conversions.h"
18 #include "base/strings/string_util.h" 17 #include "base/strings/string_util.h"
19 #include "base/strings/stringprintf.h" 18 #include "base/strings/stringprintf.h"
20 #include "base/strings/utf_string_conversions.h" 19 #include "base/strings/utf_string_conversions.h"
21 #include "base/time/time.h" 20 #include "base/time/time.h"
22 #include "build/build_config.h" 21 #include "build/build_config.h"
23 #include "chrome/browser/bookmarks/bookmark_model_factory.h" 22 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
24 #include "chrome/browser/chrome_notification_types.h" 23 #include "chrome/browser/chrome_notification_types.h"
25 #include "chrome/browser/extensions/extension_browsertest.h" 24 #include "chrome/browser/extensions/extension_browsertest.h"
(...skipping 28 matching lines...) Expand all
54 #include "components/history/core/browser/history_types.h" 53 #include "components/history/core/browser/history_types.h"
55 #include "components/history/core/browser/top_sites.h" 54 #include "components/history/core/browser/top_sites.h"
56 #include "components/history/core/common/thumbnail_score.h" 55 #include "components/history/core/common/thumbnail_score.h"
57 #include "components/omnibox/browser/autocomplete_controller.h" 56 #include "components/omnibox/browser/autocomplete_controller.h"
58 #include "components/omnibox/browser/autocomplete_match.h" 57 #include "components/omnibox/browser/autocomplete_match.h"
59 #include "components/omnibox/browser/autocomplete_provider.h" 58 #include "components/omnibox/browser/autocomplete_provider.h"
60 #include "components/omnibox/browser/autocomplete_result.h" 59 #include "components/omnibox/browser/autocomplete_result.h"
61 #include "components/omnibox/browser/omnibox_field_trial.h" 60 #include "components/omnibox/browser/omnibox_field_trial.h"
62 #include "components/omnibox/browser/omnibox_view.h" 61 #include "components/omnibox/browser/omnibox_view.h"
63 #include "components/omnibox/browser/search_provider.h" 62 #include "components/omnibox/browser/search_provider.h"
63 #include "components/prefs/pref_service.h"
64 #include "components/search/search.h" 64 #include "components/search/search.h"
65 #include "components/search_engines/template_url_service.h" 65 #include "components/search_engines/template_url_service.h"
66 #include "components/sessions/core/serialized_navigation_entry.h" 66 #include "components/sessions/core/serialized_navigation_entry.h"
67 #include "content/public/browser/navigation_controller.h" 67 #include "content/public/browser/navigation_controller.h"
68 #include "content/public/browser/navigation_entry.h" 68 #include "content/public/browser/navigation_entry.h"
69 #include "content/public/browser/notification_service.h" 69 #include "content/public/browser/notification_service.h"
70 #include "content/public/browser/render_process_host.h" 70 #include "content/public/browser/render_process_host.h"
71 #include "content/public/browser/render_view_host.h" 71 #include "content/public/browser/render_view_host.h"
72 #include "content/public/browser/site_instance.h" 72 #include "content/public/browser/site_instance.h"
73 #include "content/public/browser/url_data_source.h" 73 #include "content/public/browser/url_data_source.h"
(...skipping 899 matching lines...) Expand 10 before | Expand all | Expand 10 after
973 stream << "link.href = \"" << result_url.spec() << "\";"; 973 stream << "link.href = \"" << result_url.spec() << "\";";
974 stream << "document.body.appendChild(link);"; 974 stream << "document.body.appendChild(link);";
975 stream << "link.click();"; 975 stream << "link.click();";
976 EXPECT_TRUE(content::ExecuteScript(contents, stream.str())); 976 EXPECT_TRUE(content::ExecuteScript(contents, stream.str()));
977 977
978 content::WaitForLoadStop(contents); 978 content::WaitForLoadStop(contents);
979 std::string expected_title = 979 std::string expected_title =
980 "Referrer is " + instant_url().GetWithEmptyPath().spec(); 980 "Referrer is " + instant_url().GetWithEmptyPath().spec();
981 EXPECT_EQ(ASCIIToUTF16(expected_title), contents->GetTitle()); 981 EXPECT_EQ(ASCIIToUTF16(expected_title), contents->GetTitle());
982 } 982 }
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