[Media Router] Don't build dial_device_description_parser on Android.

chrome/utility/chrome_content_utility_client.cc

Index: chrome/utility/chrome_content_utility_client.cc
diff --git a/chrome/utility/chrome_content_utility_client.cc b/chrome/utility/chrome_content_utility_client.cc
index 15e0ea66f4c2a32315246c7f60e8567cf4507585..f500b5bf56c2e5be9f2d028ff8a02cb5e884f2e6 100644
--- a/chrome/utility/chrome_content_utility_client.cc
+++ b/chrome/utility/chrome_content_utility_client.cc
@@ -14,7 +14,6 @@
 #include "base/memory/ref_counted.h"
 #include "base/time/time.h"
 #include "chrome/common/file_patcher.mojom.h"
-#include "chrome/utility/media_router/dial_device_description_parser_impl.h"
 #include "chrome/utility/utility_message_handler.h"
 #include "components/payments/content/utility/payment_manifest_parser.h"
 #include "components/safe_json/utility/safe_json_parser_mojo_impl.h"
@@ -35,7 +34,10 @@
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "net/proxy/mojo_proxy_resolver_factory_impl.h"
 #include "net/proxy/proxy_resolver_v8.h"
+#if defined(ENABLE_MEDIA_ROUTER)

[jam, 2017/03/30 00:25:46]

this can be in its own block, not nested right?
ditto below

[imcheng, 2017/03/30 00:47:17]

Actually we are getting rid of ENABLE_MEDIA_ROUTER so I will remove the nested
check here.

+#include "chrome/utility/media_router/dial_device_description_parser_impl.h"
 #endif
+#endif  // !defined(OS_ANDROID)
 
 #if defined(OS_CHROMEOS)
 #include "chrome/common/zip_file_creator.mojom.h"
@@ -279,7 +281,11 @@ void ChromeContentUtilityClient::ExposeInterfacesToBrowser(
       base::Bind(CreateProxyResolverFactory));
   registry->AddInterface(base::Bind(CreateResourceUsageReporter));
   registry->AddInterface(base::Bind(&ProfileImportHandler::Create));
+#if defined(ENABLE_MEDIA_ROUTER)
+  registry->AddInterface(
+      base::Bind(&media_router::DialDeviceDescriptionParserImpl::Create));
 #endif
+#endif  // !defined(OS_ANDROID)
   registry->AddInterface(base::Bind(&payments::PaymentManifestParser::Create));
   registry->AddInterface(
       base::Bind(&safe_json::SafeJsonParserMojoImpl::Create));
@@ -292,10 +298,6 @@ void ChromeContentUtilityClient::ExposeInterfacesToBrowser(
 #if defined(FULL_SAFE_BROWSING)
   registry->AddInterface(base::Bind(&SafeArchiveAnalyzerImpl::Create));
 #endif
-#if defined(ENABLE_MEDIA_ROUTER)
-  registry->AddInterface(
-      base::Bind(&media_router::DialDeviceDescriptionParserImpl::Create));
-#endif  // defined(ENABLE_MEDIA_ROUTER)
 }
 
 // static