Index: chrome/test/base/testing_profile.cc |
diff --git a/chrome/test/base/testing_profile.cc b/chrome/test/base/testing_profile.cc |
index d49df37d25c58acc61a6d9a838facc2c1b7bd1f9..72f1e80b7b13ed31f89f5080308e4d0a89ac0caf 100644 |
--- a/chrome/test/base/testing_profile.cc |
+++ b/chrome/test/base/testing_profile.cc |
@@ -19,8 +19,6 @@ |
#include "chrome/browser/browser_process.h" |
#include "chrome/browser/chrome_notification_types.h" |
#include "chrome/browser/content_settings/host_content_settings_map.h" |
-#include "chrome/browser/extensions/extension_system_factory.h" |
-#include "chrome/browser/extensions/test_extension_system.h" |
#include "chrome/browser/favicon/chrome_favicon_client_factory.h" |
#include "chrome/browser/favicon/favicon_service.h" |
#include "chrome/browser/favicon/favicon_service_factory.h" |
@@ -84,6 +82,8 @@ |
#if defined(ENABLE_EXTENSIONS) |
#include "chrome/browser/extensions/extension_special_storage_policy.h" |
+#include "chrome/browser/extensions/extension_system_factory.h" |
+#include "chrome/browser/extensions/test_extension_system.h" |
#include "chrome/browser/guest_view/guest_view_manager.h" |
#include "extensions/browser/extension_system.h" |
#endif |
@@ -354,8 +354,10 @@ void TestingProfile::Init() { |
if (!IsOffTheRecord()) |
CreateProfilePolicyConnector(); |
+#if defined(ENABLE_EXTENSIONS) |
extensions::ExtensionSystemFactory::GetInstance()->SetTestingFactory( |
this, extensions::TestExtensionSystem::Build); |
+#endif |
// If no original profile was specified for this profile: register preferences |
// even if this is an incognito profile - this allows tests to create a |