diff options
Diffstat (limited to 'components/test')
| -rw-r--r-- | components/test/DEPS | 2 | ||||
| -rw-r--r-- | components/test/run_all_unittests.cc | 13 |
2 files changed, 15 insertions, 0 deletions
diff --git a/components/test/DEPS b/components/test/DEPS index 25be319..57345fc 100644 --- a/components/test/DEPS +++ b/components/test/DEPS @@ -1,4 +1,6 @@ include_rules = [ + # To initialize the global data of content_settings. + "+components/content_settings/core/common", "+content/public/test", "+ui/base/android/ui_base_jni_registrar.h", "+ui/base/resource/resource_bundle.h", diff --git a/components/test/run_all_unittests.cc b/components/test/run_all_unittests.cc index 1cee176..9664cce 100644 --- a/components/test/run_all_unittests.cc +++ b/components/test/run_all_unittests.cc @@ -8,10 +8,12 @@ #include "base/path_service.h" #include "base/test/launcher/unit_test_launcher.h" #include "base/test/test_suite.h" +#include "components/content_settings/core/common/content_settings_pattern.h" #include "content/public/test/test_content_client_initializer.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/ui_base_paths.h" +#include "url/url_util.h" #if defined(OS_MACOSX) #include "base/mac/bundle_locations.h" @@ -83,6 +85,17 @@ class ComponentsTestSuite : public base::TestSuite { ui::ResourceBundle::GetSharedInstance().AddDataPackFromPath( resources_pack_path.AppendASCII("resources.pak"), ui::SCALE_FACTOR_NONE); + + // These schemes need to be added globally to pass tests of + // autocomplete_input_unittest.cc and content_settings_pattern* + url::AddStandardScheme("chrome"); + url::AddStandardScheme("chrome-extension"); + url::AddStandardScheme("chrome-devtools"); + url::AddStandardScheme("chrome-search"); + + // Not using kExtensionScheme to avoid the dependency to extensions. + ContentSettingsPattern::SetNonWildcardDomainNonPortScheme( + "chrome-extension"); } virtual void Shutdown() OVERRIDE { |