[Media Router] Fix android compile failure due to test_helper.

Android doesn't need to pull in in-browser discovery or cast channel
code. This patch moves those definitions in test_helper.{cc,h} to
existing #if !defined(OS_ANDROID) guards.

Bug: 820238
Change-Id: Id47f7fa8421daa94f2c6a804240f6541391c3998
Reviewed-on: https://chromium-review.googlesource.com/956353Reviewed-by: Bin Zhao <zhaobin@chromium.org>
Commit-Queue: Derek Cheng <imcheng@chromium.org>
Cr-Commit-Position: refs/heads/master@{#541974}

chrome/browser/media/router/test/test_helper.cc

@@ -8,8 +8,11 @@
 #include "base/json/string_escape.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/common/media_router/media_source.h"
+
+#if !defined(OS_ANDROID)
 #include "services/network/public/cpp/simple_url_loader.h"
 #include "url/gurl.h"
+#endif
 
 namespace media_router {
 
@@ -72,7 +75,6 @@ void TestDialURLFetcher::StartDownload() {
       base::BindOnce(&DialURLFetcher::ProcessResponse, base::Unretained(this)),
       256 * 1024);
 }
-#endif  // !defined(OS_ANDROID)
 
 net::IPEndPoint CreateIPEndPoint(int num) {
   net::IPAddress ip_address;
@@ -112,4 +114,6 @@ MediaSinkInternal CreateCastSink(int num) {
   return MediaSinkInternal(sink, extra_data);
 }
 
+#endif  // !defined(OS_ANDROID)
+
 }  // namespace media_router

chrome/browser/media/router/test/test_helper.h

@@ -13,10 +13,6 @@
 
 #include "base/macros.h"
 #include "build/build_config.h"
-#include "chrome/browser/media/router/discovery/dial/dial_media_sink_service.h"
-#include "chrome/browser/media/router/discovery/dial/dial_url_fetcher.h"
-#include "chrome/browser/media/router/discovery/mdns/cast_media_sink_service.h"
-#include "chrome/browser/media/router/discovery/mdns/cast_media_sink_service_impl.h"
 #include "chrome/browser/media/router/issue_manager.h"
 #include "chrome/browser/media/router/issues_observer.h"
 #include "chrome/browser/media/router/media_routes_observer.h"
@@ -24,9 +20,16 @@
 #include "chrome/common/media_router/discovery/media_sink_internal.h"
 #include "content/public/browser/presentation_service_delegate.h"
 #include "content/public/common/presentation_connection_message.h"
+#include "testing/gmock/include/gmock/gmock.h"
+
+#if !defined(OS_ANDROID)
+#include "chrome/browser/media/router/discovery/dial/dial_media_sink_service.h"
+#include "chrome/browser/media/router/discovery/dial/dial_url_fetcher.h"
+#include "chrome/browser/media/router/discovery/mdns/cast_media_sink_service.h"
+#include "chrome/browser/media/router/discovery/mdns/cast_media_sink_service_impl.h"
 #include "net/base/ip_endpoint.h"
 #include "services/network/test/test_url_loader_factory.h"
-#include "testing/gmock/include/gmock/gmock.h"
+#endif  // !defined(OS_ANDROID)
 
 namespace media_router {
 
@@ -149,7 +152,6 @@ class TestDialURLFetcher : public DialURLFetcher {
  private:
   network::TestURLLoaderFactory* const factory_;
 };
-#endif  // !defined(OS_ANDROID)
 
 // Helper function to create an IP endpoint object.
 // If |num| is 1, returns 192.168.0.101:8009;
@@ -172,6 +174,8 @@ MediaSinkInternal CreateDialSink(int num);
 // Helper function to create a Cast sink.
 MediaSinkInternal CreateCastSink(int num);
 
+#endif  // !defined(OS_ANDROID)
+
 }  // namespace media_router
 
 #endif  // CHROME_BROWSER_MEDIA_ROUTER_TEST_TEST_HELPER_H_