OLD | NEW |
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 "base/command_line.h" | 5 #include "base/command_line.h" |
6 #include "base/metrics/field_trial.h" | 6 #include "base/metrics/field_trial.h" |
7 #include "base/metrics/histogram_base.h" | 7 #include "base/metrics/histogram_base.h" |
8 #include "base/metrics/histogram_samples.h" | 8 #include "base/metrics/histogram_samples.h" |
9 #include "base/metrics/statistics_recorder.h" | 9 #include "base/metrics/statistics_recorder.h" |
10 #include "base/prefs/pref_service.h" | 10 #include "base/prefs/pref_service.h" |
11 #include "base/strings/utf_string_conversions.h" | 11 #include "base/strings/utf_string_conversions.h" |
12 #include "chrome/browser/search/instant_service.h" | 12 #include "chrome/browser/search/instant_service.h" |
13 #include "chrome/browser/search/instant_service_factory.h" | 13 #include "chrome/browser/search/instant_service_factory.h" |
14 #include "chrome/browser/search/search.h" | 14 #include "chrome/browser/search/search.h" |
15 #include "chrome/browser/search_engines/template_url_service.h" | 15 #include "chrome/browser/search_engines/template_url_service.h" |
16 #include "chrome/browser/search_engines/template_url_service_factory.h" | 16 #include "chrome/browser/search_engines/template_url_service_factory.h" |
17 #include "chrome/browser/search_engines/ui_thread_search_terms_data.h" | 17 #include "chrome/browser/search_engines/ui_thread_search_terms_data.h" |
18 #include "chrome/browser/supervised_user/supervised_user_service.h" | |
19 #include "chrome/browser/supervised_user/supervised_user_service_factory.h" | |
20 #include "chrome/browser/supervised_user/supervised_user_url_filter.h" | |
21 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 18 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
22 #include "chrome/common/chrome_switches.h" | 19 #include "chrome/common/chrome_switches.h" |
23 #include "chrome/common/pref_names.h" | 20 #include "chrome/common/pref_names.h" |
24 #include "chrome/common/url_constants.h" | 21 #include "chrome/common/url_constants.h" |
25 #include "chrome/test/base/browser_with_test_window_test.h" | 22 #include "chrome/test/base/browser_with_test_window_test.h" |
26 #include "chrome/test/base/ui_test_utils.h" | 23 #include "chrome/test/base/ui_test_utils.h" |
27 #include "components/google/core/browser/google_switches.h" | 24 #include "components/google/core/browser/google_switches.h" |
28 #include "components/search_engines/search_engines_switches.h" | 25 #include "components/search_engines/search_engines_switches.h" |
29 #include "components/variations/entropy_provider.h" | 26 #include "components/variations/entropy_provider.h" |
30 #include "content/public/browser/render_process_host.h" | 27 #include "content/public/browser/render_process_host.h" |
31 #include "content/public/browser/render_view_host.h" | 28 #include "content/public/browser/render_view_host.h" |
32 #include "content/public/browser/site_instance.h" | 29 #include "content/public/browser/site_instance.h" |
33 #include "content/public/browser/web_contents.h" | 30 #include "content/public/browser/web_contents.h" |
34 #include "content/public/common/renderer_preferences.h" | 31 #include "content/public/common/renderer_preferences.h" |
35 #include "url/gurl.h" | 32 #include "url/gurl.h" |
36 | 33 |
| 34 #if defined(ENABLE_MANAGED_USERS) |
| 35 #include "chrome/browser/supervised_user/supervised_user_service.h" |
| 36 #include "chrome/browser/supervised_user/supervised_user_service_factory.h" |
| 37 #include "chrome/browser/supervised_user/supervised_user_url_filter.h" |
| 38 #endif |
| 39 |
37 namespace chrome { | 40 namespace chrome { |
38 | 41 |
39 class EmbeddedSearchFieldTrialTest : public testing::Test { | 42 class EmbeddedSearchFieldTrialTest : public testing::Test { |
40 protected: | 43 protected: |
41 virtual void SetUp() { | 44 virtual void SetUp() { |
42 field_trial_list_.reset(new base::FieldTrialList( | 45 field_trial_list_.reset(new base::FieldTrialList( |
43 new metrics::SHA1EntropyProvider("42"))); | 46 new metrics::SHA1EntropyProvider("42"))); |
44 base::StatisticsRecorder::Initialize(); | 47 base::StatisticsRecorder::Initialize(); |
45 } | 48 } |
46 | 49 |
(...skipping 498 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
545 TEST_F(SearchTest, UseLocalNTPIfNTPURLIsNotSet) { | 548 TEST_F(SearchTest, UseLocalNTPIfNTPURLIsNotSet) { |
546 // Set an insecure new tab page URL and verify that it's ignored. | 549 // Set an insecure new tab page URL and verify that it's ignored. |
547 SetSearchProvider(false, true); | 550 SetSearchProvider(false, true); |
548 EXPECT_EQ(GURL(chrome::kChromeSearchLocalNtpUrl), | 551 EXPECT_EQ(GURL(chrome::kChromeSearchLocalNtpUrl), |
549 chrome::GetNewTabPageURL(profile())); | 552 chrome::GetNewTabPageURL(profile())); |
550 GURL new_tab_url(chrome::kChromeUINewTabURL); | 553 GURL new_tab_url(chrome::kChromeUINewTabURL); |
551 EXPECT_TRUE(HandleNewTabURLRewrite(&new_tab_url, profile())); | 554 EXPECT_TRUE(HandleNewTabURLRewrite(&new_tab_url, profile())); |
552 EXPECT_EQ(GURL(chrome::kChromeSearchLocalNtpUrl), new_tab_url); | 555 EXPECT_EQ(GURL(chrome::kChromeSearchLocalNtpUrl), new_tab_url); |
553 } | 556 } |
554 | 557 |
| 558 #if defined(ENABLE_MANAGED_USERS) |
555 TEST_F(SearchTest, UseLocalNTPIfNTPURLIsBlockedForSupervisedUser) { | 559 TEST_F(SearchTest, UseLocalNTPIfNTPURLIsBlockedForSupervisedUser) { |
556 // Block access to foo.com in the URL filter. | 560 // Block access to foo.com in the URL filter. |
557 SupervisedUserService* supervised_user_service = | 561 SupervisedUserService* supervised_user_service = |
558 SupervisedUserServiceFactory::GetForProfile(profile()); | 562 SupervisedUserServiceFactory::GetForProfile(profile()); |
559 SupervisedUserURLFilter* url_filter = | 563 SupervisedUserURLFilter* url_filter = |
560 supervised_user_service->GetURLFilterForUIThread(); | 564 supervised_user_service->GetURLFilterForUIThread(); |
561 std::map<std::string, bool> hosts; | 565 std::map<std::string, bool> hosts; |
562 hosts["foo.com"] = false; | 566 hosts["foo.com"] = false; |
563 url_filter->SetManualHosts(&hosts); | 567 url_filter->SetManualHosts(&hosts); |
564 | 568 |
565 EXPECT_EQ(GURL(chrome::kChromeSearchLocalNtpUrl), | 569 EXPECT_EQ(GURL(chrome::kChromeSearchLocalNtpUrl), |
566 chrome::GetNewTabPageURL(profile())); | 570 chrome::GetNewTabPageURL(profile())); |
567 GURL new_tab_url(chrome::kChromeUINewTabURL); | 571 GURL new_tab_url(chrome::kChromeUINewTabURL); |
568 EXPECT_TRUE(HandleNewTabURLRewrite(&new_tab_url, profile())); | 572 EXPECT_TRUE(HandleNewTabURLRewrite(&new_tab_url, profile())); |
569 EXPECT_EQ(GURL(chrome::kChromeSearchLocalNtpUrl), new_tab_url); | 573 EXPECT_EQ(GURL(chrome::kChromeSearchLocalNtpUrl), new_tab_url); |
570 EXPECT_EQ(GURL(), GetInstantURL(profile(), kDisableStartMargin, false)); | 574 EXPECT_EQ(GURL(), GetInstantURL(profile(), kDisableStartMargin, false)); |
571 } | 575 } |
| 576 #endif |
572 | 577 |
573 TEST_F(SearchTest, GetInstantURL) { | 578 TEST_F(SearchTest, GetInstantURL) { |
574 // No Instant URL because "strk" is missing. | 579 // No Instant URL because "strk" is missing. |
575 SetDefaultInstantTemplateUrl(false); | 580 SetDefaultInstantTemplateUrl(false); |
576 EXPECT_EQ(GURL(), GetInstantURL(profile(), kDisableStartMargin, false)); | 581 EXPECT_EQ(GURL(), GetInstantURL(profile(), kDisableStartMargin, false)); |
577 | 582 |
578 // Set an Instant URL with a valid search terms replacement key. | 583 // Set an Instant URL with a valid search terms replacement key. |
579 SetDefaultInstantTemplateUrl(true); | 584 SetDefaultInstantTemplateUrl(true); |
580 | 585 |
581 // Now there should be a valid Instant URL. Note the HTTPS "upgrade". | 586 // Now there should be a valid Instant URL. Note the HTTPS "upgrade". |
(...skipping 631 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1213 } | 1218 } |
1214 | 1219 |
1215 TEST_F(OriginChipTest, CommandLineOnSrp) { | 1220 TEST_F(OriginChipTest, CommandLineOnSrp) { |
1216 CommandLine::ForCurrentProcess()->AppendSwitch( | 1221 CommandLine::ForCurrentProcess()->AppendSwitch( |
1217 switches::kEnableOriginChipOnSrp); | 1222 switches::kEnableOriginChipOnSrp); |
1218 EXPECT_TRUE(ShouldDisplayOriginChip()); | 1223 EXPECT_TRUE(ShouldDisplayOriginChip()); |
1219 EXPECT_EQ(ORIGIN_CHIP_ON_SRP, GetOriginChipCondition()); | 1224 EXPECT_EQ(ORIGIN_CHIP_ON_SRP, GetOriginChipCondition()); |
1220 } | 1225 } |
1221 | 1226 |
1222 } // namespace chrome | 1227 } // namespace chrome |
OLD | NEW |