| Index: chrome/browser/extensions/api/networking_private/networking_private_event_router_factory.cc
|
| diff --git a/chrome/browser/extensions/api/networking_private/networking_private_event_router_factory.cc b/chrome/browser/extensions/api/networking_private/networking_private_event_router_factory.cc
|
| index 6814ffe7f458b510240850f5b1378df403247a85..689cdeedfa0eb7442f45d4c147e6d6d03694adba 100644
|
| --- a/chrome/browser/extensions/api/networking_private/networking_private_event_router_factory.cc
|
| +++ b/chrome/browser/extensions/api/networking_private/networking_private_event_router_factory.cc
|
| @@ -5,12 +5,13 @@
|
| #include "chrome/browser/extensions/api/networking_private/networking_private_event_router_factory.h"
|
|
|
| #include "chrome/browser/extensions/api/networking_private/networking_private_event_router.h"
|
| +#include "chrome/browser/extensions/api/networking_private/networking_private_service_client_factory.h"
|
| #include "chrome/browser/extensions/extension_system_factory.h"
|
| #include "chrome/browser/profiles/incognito_helpers.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| #include "components/browser_context_keyed_service/browser_context_dependency_manager.h"
|
|
|
| -namespace chromeos {
|
| +namespace extensions {
|
|
|
| // static
|
| NetworkingPrivateEventRouter*
|
| @@ -30,6 +31,9 @@ NetworkingPrivateEventRouterFactory::NetworkingPrivateEventRouterFactory()
|
| "NetworkingPrivateEventRouter",
|
| BrowserContextDependencyManager::GetInstance()) {
|
| DependsOn(extensions::ExtensionSystemFactory::GetInstance());
|
| +#if !defined(OS_CHROMEOS)
|
| + DependsOn(extensions::NetworkingPrivateServiceClientFactory::GetInstance());
|
| +#endif
|
| }
|
|
|
| NetworkingPrivateEventRouterFactory::~NetworkingPrivateEventRouterFactory() {
|
| @@ -38,11 +42,7 @@ NetworkingPrivateEventRouterFactory::~NetworkingPrivateEventRouterFactory() {
|
| BrowserContextKeyedService*
|
| NetworkingPrivateEventRouterFactory::BuildServiceInstanceFor(
|
| content::BrowserContext* profile) const {
|
| -#if defined(OS_CHROMEOS)
|
| - return new NetworkingPrivateEventRouter(static_cast<Profile*>(profile));
|
| -#else // OS_CHROMEOS
|
| - return NULL;
|
| -#endif // OS_CHROMEOS
|
| + return NetworkingPrivateEventRouter::Create(static_cast<Profile*>(profile));
|
| }
|
|
|
| content::BrowserContext*
|
| @@ -60,4 +60,4 @@ bool NetworkingPrivateEventRouterFactory::ServiceIsNULLWhileTesting() const {
|
| return true;
|
| }
|
|
|
| -} // namespace chromeos
|
| +} // namespace extensions
|
|
|