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

Side by Side Diff: chrome/browser/search/search_unittest.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 (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 <stddef.h> 5 #include <stddef.h>
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/metrics/field_trial.h" 9 #include "base/metrics/field_trial.h"
10 #include "base/metrics/histogram_base.h" 10 #include "base/metrics/histogram_base.h"
11 #include "base/metrics/histogram_samples.h" 11 #include "base/metrics/histogram_samples.h"
12 #include "base/prefs/pref_service.h"
13 #include "base/strings/utf_string_conversions.h" 12 #include "base/strings/utf_string_conversions.h"
14 #include "build/build_config.h" 13 #include "build/build_config.h"
15 #include "chrome/browser/search/instant_service.h" 14 #include "chrome/browser/search/instant_service.h"
16 #include "chrome/browser/search/instant_service_factory.h" 15 #include "chrome/browser/search/instant_service_factory.h"
17 #include "chrome/browser/search/search.h" 16 #include "chrome/browser/search/search.h"
18 #include "chrome/browser/search_engines/template_url_service_factory.h" 17 #include "chrome/browser/search_engines/template_url_service_factory.h"
19 #include "chrome/browser/search_engines/ui_thread_search_terms_data.h" 18 #include "chrome/browser/search_engines/ui_thread_search_terms_data.h"
20 #include "chrome/browser/ui/tabs/tab_strip_model.h" 19 #include "chrome/browser/ui/tabs/tab_strip_model.h"
21 #include "chrome/common/chrome_switches.h" 20 #include "chrome/common/chrome_switches.h"
22 #include "chrome/common/pref_names.h" 21 #include "chrome/common/pref_names.h"
23 #include "chrome/common/url_constants.h" 22 #include "chrome/common/url_constants.h"
24 #include "chrome/test/base/browser_with_test_window_test.h" 23 #include "chrome/test/base/browser_with_test_window_test.h"
25 #include "chrome/test/base/search_test_utils.h" 24 #include "chrome/test/base/search_test_utils.h"
26 #include "components/google/core/browser/google_switches.h" 25 #include "components/google/core/browser/google_switches.h"
26 #include "components/prefs/pref_service.h"
27 #include "components/search/search.h" 27 #include "components/search/search.h"
28 #include "components/search_engines/search_engines_switches.h" 28 #include "components/search_engines/search_engines_switches.h"
29 #include "components/search_engines/template_url_service.h" 29 #include "components/search_engines/template_url_service.h"
30 #include "components/variations/entropy_provider.h" 30 #include "components/variations/entropy_provider.h"
31 #include "content/public/browser/navigation_entry.h" 31 #include "content/public/browser/navigation_entry.h"
32 #include "content/public/browser/render_process_host.h" 32 #include "content/public/browser/render_process_host.h"
33 #include "content/public/browser/render_view_host.h" 33 #include "content/public/browser/render_view_host.h"
34 #include "content/public/browser/site_instance.h" 34 #include "content/public/browser/site_instance.h"
35 #include "content/public/browser/web_contents.h" 35 #include "content/public/browser/web_contents.h"
36 #include "content/public/common/renderer_preferences.h" 36 #include "content/public/common/renderer_preferences.h"
(...skipping 715 matching lines...) Expand 10 before | Expand all | Expand 10 after
752 TemplateURLRef::SearchTermsArgs search_terms_args(base::ASCIIToUTF16("foo")); 752 TemplateURLRef::SearchTermsArgs search_terms_args(base::ASCIIToUTF16("foo"));
753 GURL result(template_url_->url_ref().ReplaceSearchTerms( 753 GURL result(template_url_->url_ref().ReplaceSearchTerms(
754 search_terms_args, UIThreadSearchTermsData(profile()))); 754 search_terms_args, UIThreadSearchTermsData(profile())));
755 ASSERT_TRUE(result.is_valid()); 755 ASSERT_TRUE(result.is_valid());
756 // Query extraction is disabled. Make sure 756 // Query extraction is disabled. Make sure
757 // {google:instantExtendedEnabledParameter} is not set in the search URL. 757 // {google:instantExtendedEnabledParameter} is not set in the search URL.
758 EXPECT_EQ("http://www.google.com/search?q=foo", result.spec()); 758 EXPECT_EQ("http://www.google.com/search?q=foo", result.spec());
759 } 759 }
760 760
761 } // namespace search 761 } // namespace search
OLDNEW
« no previous file with comments | « chrome/browser/search/search.cc ('k') | chrome/browser/search/suggestions/suggestions_service_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698