Index: components/test/run_all_unittests.cc |
diff --git a/components/test/run_all_unittests.cc b/components/test/run_all_unittests.cc |
index 1cee176940ba7e4a60ffc5f9250f9fdfb1a1a02f..9664cce93c27982105c7d62d129c8f2a5b86e8cc 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 { |