| Index: chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
|
| diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
|
| index 77e005b14bb3539b2edc49ef754e0cd4fc283c5e..1c25614f23fe25347947038f27bb144840c4d32e 100644
|
| --- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
|
| +++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
|
| @@ -28,6 +28,7 @@
|
| #include "chrome/browser/google/google_url_tracker_factory.h"
|
| #include "chrome/browser/history/history_service_factory.h"
|
| #include "chrome/browser/invalidation/profile_invalidation_provider_factory.h"
|
| +#include "chrome/browser/media/router/media_router_factory.h"
|
| #include "chrome/browser/media_galleries/media_galleries_preferences_factory.h"
|
| #include "chrome/browser/net/nqe/ui_network_quality_estimator_service_factory.h"
|
| #include "chrome/browser/notifications/extension_welcome_notification_factory.h"
|
| @@ -126,6 +127,7 @@
|
| #include "chrome/browser/android/data_usage/data_use_ui_tab_model_factory.h"
|
| #include "chrome/browser/android/search_geolocation/search_geolocation_service.h"
|
| #else
|
| +#include "chrome/browser/media/router/media_router_ui_service_factory.h"
|
| #include "chrome/browser/ui/global_error/global_error_service_factory.h"
|
| #include "chrome/browser/usb/usb_chooser_context_factory.h"
|
| #endif
|
| @@ -143,13 +145,6 @@
|
| #include "chrome/browser/printing/cloud_print/privet_notifications_factory.h"
|
| #endif
|
|
|
| -#if defined(ENABLE_MEDIA_ROUTER)
|
| -#include "chrome/browser/media/router/media_router_factory.h"
|
| -#if !defined(OS_ANDROID)
|
| -#include "chrome/browser/media/router/media_router_ui_service_factory.h"
|
| -#endif
|
| -#endif
|
| -
|
| namespace chrome {
|
|
|
| void AddProfilesExtraParts(ChromeBrowserMainParts* main_parts) {
|
| @@ -276,12 +271,10 @@ EnsureBrowserContextKeyedServiceFactoriesBuilt() {
|
| ->SetUIDelegateFactory(std::move(networking_private_ui_delegate_factory));
|
| #endif
|
| #endif
|
| -#if defined(ENABLE_MEDIA_ROUTER)
|
| media_router::MediaRouterFactory::GetInstance();
|
| #if !defined(OS_ANDROID)
|
| media_router::MediaRouterUIServiceFactory::GetInstance();
|
| #endif
|
| -#endif // defined(ENABLE_MEDIA_ROUTER)
|
| #if !defined(OS_ANDROID)
|
| MediaGalleriesPreferencesFactory::GetInstance();
|
| NTPResourceCacheFactory::GetInstance();
|
|
|