| Index: chrome/browser/search_engines/template_url_service_test_util.cc
|
| diff --git a/chrome/browser/search_engines/template_url_service_test_util.cc b/chrome/browser/search_engines/template_url_service_test_util.cc
|
| index ea4971a9cd787006dc7731d8a688471cc8853946..74b8b613f65c8122d546ef857a553a69aa90aeee 100644
|
| --- a/chrome/browser/search_engines/template_url_service_test_util.cc
|
| +++ b/chrome/browser/search_engines/template_url_service_test_util.cc
|
| @@ -12,7 +12,6 @@
|
| #include "chrome/test/base/testing_profile.h"
|
| #include "components/search_engines/keyword_table.h"
|
| #include "components/search_engines/keyword_web_data_service.h"
|
| -#include "components/search_engines/search_engines_test_util.h"
|
| #include "components/search_engines/template_url_data_util.h"
|
| #include "components/search_engines/template_url_service.h"
|
| #include "components/search_engines/testing_search_terms_data.h"
|
| @@ -155,28 +154,3 @@
|
| search_terms_data_->set_google_base_url(base_url.spec());
|
| model_->GoogleBaseURLChanged();
|
| }
|
| -
|
| -TemplateURL* TemplateURLServiceTestUtil::AddExtensionControlledTURL(
|
| - std::unique_ptr<TemplateURL> extension_turl,
|
| - std::unique_ptr<TemplateURL::AssociatedExtensionInfo> info) {
|
| - bool wants_to_be_default = info->wants_to_be_default_engine;
|
| - TemplateURL* result = model()->AddExtensionControlledTURL(
|
| - std::move(extension_turl), std::move(info));
|
| - if (wants_to_be_default && result) {
|
| - SetExtensionDefaultSearchInPrefs(profile()->GetTestingPrefService(),
|
| - result->data());
|
| - }
|
| - return result;
|
| -}
|
| -
|
| -void TemplateURLServiceTestUtil::RemoveExtensionControlledTURL(
|
| - const std::string& extension_id) {
|
| - TemplateURL* turl = model()->FindTemplateURLForExtension(
|
| - extension_id, TemplateURL::NORMAL_CONTROLLED_BY_EXTENSION);
|
| - ASSERT_TRUE(turl);
|
| - ASSERT_TRUE(turl->GetExtensionInfoForTesting());
|
| - if (turl->GetExtensionInfoForTesting()->wants_to_be_default_engine)
|
| - RemoveExtensionDefaultSearchFromPrefs(profile()->GetTestingPrefService());
|
| - model()->RemoveExtensionControlledTURL(
|
| - extension_id, TemplateURL::NORMAL_CONTROLLED_BY_EXTENSION);
|
| -}
|
|
|