Index: chrome/test/base/chrome_unit_test_suite.cc |
diff --git a/chrome/test/base/chrome_unit_test_suite.cc b/chrome/test/base/chrome_unit_test_suite.cc |
index 2ea8d389d64562c5c66de360af24bdfb428fbd2f..d2911472c2d663da69f10cec6584ce0d48953164 100644 |
--- a/chrome/test/base/chrome_unit_test_suite.cc |
+++ b/chrome/test/base/chrome_unit_test_suite.cc |
@@ -27,8 +27,6 @@ |
#if !defined(OS_IOS) |
#include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h" |
-#include "chrome/common/extensions/chrome_extensions_client.h" |
-#include "extensions/common/extension_paths.h" |
#include "ui/gl/gl_surface.h" |
#endif |
@@ -36,6 +34,11 @@ |
#include "base/memory/shared_memory.h" |
#endif |
+#if defined(ENABLE_EXTENSIONS) |
+#include "chrome/common/extensions/chrome_extensions_client.h" |
+#include "extensions/common/extension_paths.h" |
+#endif |
+ |
namespace { |
// Creates a TestingBrowserProcess for each test. |
@@ -127,12 +130,14 @@ void ChromeUnitTestSuite::InitializeProviders() { |
chromeos::RegisterPathProvider(); |
#endif |
-#if !defined(OS_IOS) |
+#if defined(ENABLE_EXTENSIONS) |
extensions::RegisterPathProvider(); |
extensions::ExtensionsClient::Set( |
extensions::ChromeExtensionsClient::GetInstance()); |
+#endif |
+#if !defined(OS_IOS) |
content::WebUIControllerFactory::RegisterFactory( |
ChromeWebUIControllerFactory::GetInstance()); |