Index: chrome/browser/extensions/api/settings_overrides/default_search_manager_browsertest.cc |
diff --git a/chrome/browser/extensions/api/settings_overrides/default_search_manager_browsertest.cc b/chrome/browser/extensions/api/settings_overrides/default_search_manager_browsertest.cc |
new file mode 100644 |
index 0000000000000000000000000000000000000000..8f25489411109b65b9665a01755b59bca07316b3 |
--- /dev/null |
+++ b/chrome/browser/extensions/api/settings_overrides/default_search_manager_browsertest.cc |
@@ -0,0 +1,137 @@ |
+// Copyright 2016 The Chromium Authors. All rights reserved. |
+// Use of this source code is governed by a BSD-style license that can be |
+// found in the LICENSE file. |
+ |
+#include "base/run_loop.h" |
+#include "base/strings/string_split.h" |
+#include "base/strings/utf_string_conversions.h" |
+#include "chrome/browser/extensions/extension_browsertest.h" |
+#include "chrome/browser/search_engines/template_url_service_factory.h" |
+#include "chrome/test/base/search_test_utils.h" |
+#include "components/policy/core/browser/browser_policy_connector.h" |
+#include "components/policy/core/common/mock_configuration_policy_provider.h" |
+#include "components/policy/core/common/policy_details.h" |
+#include "components/policy/core/common/policy_map.h" |
+#include "components/policy/core/common/policy_types.h" |
+#include "components/policy/core/common/schema.h" |
+#include "components/policy/policy_constants.h" |
+#include "components/search_engines/default_search_manager.h" |
+#include "components/search_engines/search_engines_test_util.h" |
+#include "components/search_engines/template_url_data.h" |
+#include "components/search_engines/template_url_prepopulate_data.h" |
+#include "components/search_engines/template_url_service.h" |
+#include "components/version_info/version_info.h" |
+#include "extensions/common/features/feature_channel.h" |
+ |
+namespace { |
+// TemplateURLData with search engines settings from test extension manifest. |
+std::unique_ptr<TemplateURLData> TestExtensionSearchEngine(PrefService* prefs) { |
+ auto result = base::MakeUnique<TemplateURLData>(); |
+ result->SetShortName(base::ASCIIToUTF16("name.de")); |
+ result->SetKeyword(base::ASCIIToUTF16("keyword.de")); |
+ result->SetURL("http://www.foo.de/s?q={searchTerms}&id=10"); |
+ result->favicon_url = GURL("http://www.foo.de/favicon.ico?id=10"); |
+ result->suggestions_url = "http://www.foo.de/suggest?q={searchTerms}&id=10"; |
+ result->instant_url = "http://www.foo.de/instant?q={searchTerms}&id=10"; |
+ result->image_url = "http://www.foo.de/image?q={searchTerms}&id=10"; |
+ result->search_url_post_params = "search_lang=de"; |
+ result->suggestions_url_post_params = "suggest_lang=de"; |
+ result->instant_url_post_params = "instant_lang=de"; |
+ result->image_url_post_params = "image_lang=de"; |
+ result->alternate_urls.push_back("http://www.moo.de/s?q={searchTerms}&id=10"); |
+ result->alternate_urls.push_back("http://www.noo.de/s?q={searchTerms}&id=10"); |
+ result->input_encodings.push_back("UTF-8"); |
+ |
+ std::unique_ptr<TemplateURLData> google_engine( |
+ TemplateURLPrepopulateData::GetPrepopulatedEngine(prefs, 1)); |
+ // Values below are taken for Google engine settings, because extension |
+ // manifest has prepopulate_id 1, which is Google. |
+ result->search_terms_replacement_key = |
+ google_engine->search_terms_replacement_key; |
+ result->contextual_search_url = google_engine->contextual_search_url; |
+ result->new_tab_url = google_engine->new_tab_url; |
+ return result; |
+} |
+} // namespace |
+ |
+// Browser test to check how DefaultSearchManager interacts with policy and |
+// extension overriden DSE. |
+class DefaultSearchManagerBrowserTest : public ExtensionBrowserTest { |
+ protected: |
+ void SetUpInProcessBrowserTestFixture() override { |
+ EXPECT_CALL(provider_, IsInitializationComplete(testing::_)) |
+ .WillRepeatedly(testing::Return(true)); |
+ policy::BrowserPolicyConnector::SetPolicyProviderForTesting(&provider_); |
+ } |
+ |
+ void SetUpOnMainThread() override { |
+ ExtensionBrowserTest::SetUpOnMainThread(); |
+ search_test_utils::WaitForTemplateURLServiceToLoad( |
+ TemplateURLServiceFactory::GetForProfile(browser()->profile())); |
+ } |
+ |
+ void TearDownOnMainThread() override { ClearProviderPolicy(); } |
+ |
+ void ClearProviderPolicy() { |
+ provider_.UpdateChromePolicy(policy::PolicyMap()); |
+ base::RunLoop().RunUntilIdle(); |
+ } |
+ |
+ void OverrideDefaultSearchByPolicy(const TemplateURLData& data) { |
+ // Override the default search provider using policies. |
+ policy::PolicyMap policies; |
+ BuildDefaultSearchPolicy(data, &policies); |
+ provider_.UpdateChromePolicy(policies); |
+ base::RunLoop().RunUntilIdle(); |
vasilii
2016/11/30 14:00:02
RunUntilIdle() is dangerous in the browser tests b
Alexander Yashkin
2016/12/05 18:16:48
Removed browser test, returned unittest.
|
+ } |
+ policy::MockConfigurationPolicyProvider provider_; |
+}; |
+ |
+#if defined(OS_WIN) || defined(OS_MACOSX) |
+// Test that DefaultSearchManager handles extension-controlled DSEs correctly. |
+IN_PROC_BROWSER_TEST_F(DefaultSearchManagerBrowserTest, ExtensionsOverrides) { |
vasilii
2016/11/30 14:00:02
I don't see why you need a separate file for this.
Alexander Yashkin
2016/12/05 18:16:48
Removed this browser test.
Returned to default_sea
|
+ Profile* profile = browser()->profile(); |
+ DefaultSearchManager manager(profile->GetPrefs(), |
+ DefaultSearchManager::ObserverCallback()); |
+ std::unique_ptr<TemplateURLData> user_data = |
+ GenerateDummyTemplateURLData("user"); |
+ manager.SetUserSelectedDefaultSearchEngine(*user_data); |
+ |
+ DefaultSearchManager::Source source = DefaultSearchManager::FROM_FALLBACK; |
+ ExpectSimilar(user_data.get(), manager.GetDefaultSearchEngine(&source)); |
+ EXPECT_EQ(DefaultSearchManager::FROM_USER, source); |
+ |
+#if defined(OS_MACOSX) |
+ // On Mac, this API is limited to trunk. |
+ extensions::ScopedCurrentChannel scoped_channel( |
+ version_info::Channel::UNKNOWN); |
+#endif // OS_MACOSX |
+ |
+ // Install extension that overrides DSE. |
+ const extensions::Extension* extension = LoadExtensionWithInstallParam( |
+ test_data_dir_.AppendASCII("settings_override"), kFlagEnableFileAccess, |
+ "10"); |
+ |
+ auto extension_dse(TestExtensionSearchEngine(profile->GetPrefs())); |
+ ExpectSimilar(extension_dse.get(), manager.GetDefaultSearchEngine(&source)); |
+ EXPECT_EQ(DefaultSearchManager::FROM_EXTENSION, source); |
+ |
+ // Check that policy overrides extension DSE. |
+ std::unique_ptr<TemplateURLData> policy_data = |
+ GenerateDummyTemplateURLData("policy"); |
+ OverrideDefaultSearchByPolicy(*policy_data); |
+ |
+ ExpectSimilar(policy_data.get(), manager.GetDefaultSearchEngine(&source)); |
+ EXPECT_EQ(DefaultSearchManager::FROM_POLICY, source); |
+ |
+ ClearProviderPolicy(); |
+ // After policy is cleared expect that extension DSE is returned. |
+ ExpectSimilar(extension_dse.get(), manager.GetDefaultSearchEngine(&source)); |
+ EXPECT_EQ(DefaultSearchManager::FROM_EXTENSION, source); |
+ |
+ UnloadExtension(extension->id()); |
+ // After extension unload expect that user DSE is default. |
+ ExpectSimilar(user_data.get(), manager.GetDefaultSearchEngine(&source)); |
+ EXPECT_EQ(DefaultSearchManager::FROM_USER, source); |
+} |
+#endif |