Put more files under the enable_service_discovery build flag.

chrome/browser/extensions/browser_context_keyed_service_factories.cc

Index: chrome/browser/extensions/browser_context_keyed_service_factories.cc
diff --git a/chrome/browser/extensions/browser_context_keyed_service_factories.cc b/chrome/browser/extensions/browser_context_keyed_service_factories.cc
index 19f04056048b45fd2a4cdc79ad9d73789a59eb55..ac5c6fd066756c17a26ac8454d1b2a4f6c9be663 100644
--- a/chrome/browser/extensions/browser_context_keyed_service_factories.cc
+++ b/chrome/browser/extensions/browser_context_keyed_service_factories.cc
@@ -57,7 +57,7 @@
 #include "chrome/browser/speech/extension_api/tts_extension_api.h"
 #include "chrome/browser/ui/toolbar/toolbar_actions_model_factory.h"
 
-#if !defined(OS_ANDROID)
+#if defined(ENABLE_SERVICE_DISCOVERY)
 #include "chrome/browser/extensions/api/gcd_private/gcd_private_api.h"
 #include "chrome/browser/extensions/api/mdns/mdns_api.h"
 #endif
@@ -98,7 +98,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() {
   extensions::ExtensionWebUIOverrideRegistrar::GetFactoryInstance();
   extensions::FeedbackPrivateAPI::GetFactoryInstance();
   extensions::FontSettingsAPI::GetFactoryInstance();
-#if !defined(OS_ANDROID)
+#if defined(ENABLE_SERVICE_DISCOVERY)
   extensions::GcdPrivateAPI::GetFactoryInstance();
 #endif
   extensions::HistoryAPI::GetFactoryInstance();
@@ -115,7 +115,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() {
 #if defined(OS_CHROMEOS)
   extensions::LogPrivateAPI::GetFactoryInstance();
 #endif
-#if !defined(OS_ANDROID)
+#if defined(ENABLE_SERVICE_DISCOVERY)
   extensions::MDnsAPI::GetFactoryInstance();
 #endif
 #if defined(OS_CHROMEOS)