From e684a3455bcc29a6e3e66a004e352dea4e1141e7 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Wed, 13 Feb 2019 15:05:36 +0100 Subject: BASELINE: Update Chromium to 72.0.3626.110 and Ninja to 1.9.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ic57220b00ecc929a893c91f5cc552f5d3e99e922 Reviewed-by: Michael Brüning --- chromium/net/android/network_library.cc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'chromium/net/android/network_library.cc') diff --git a/chromium/net/android/network_library.cc b/chromium/net/android/network_library.cc index bc6fe9acfc9..818565d7d26 100644 --- a/chromium/net/android/network_library.cc +++ b/chromium/net/android/network_library.cc @@ -10,7 +10,7 @@ #include "base/android/scoped_java_ref.h" #include "base/logging.h" #include "jni/AndroidNetworkLibrary_jni.h" -#include "net/dns/dns_protocol.h" +#include "net/dns/public/dns_protocol.h" using base::android::AttachCurrentThread; using base::android::ConvertJavaStringToUTF8; @@ -128,8 +128,7 @@ internal::ConfigParsePosixResult GetDnsServers( JNIEnv* env = AttachCurrentThread(); std::vector dns_servers_strings; base::android::JavaArrayOfByteArrayToStringVector( - env, Java_AndroidNetworkLibrary_getDnsServers(env).obj(), - &dns_servers_strings); + env, Java_AndroidNetworkLibrary_getDnsServers(env), &dns_servers_strings); if (dns_servers_strings.size() == 0) return internal::CONFIG_PARSE_POSIX_NO_NAMESERVERS; if (dns_servers_strings.size() == 1 && dns_servers_strings[0].size() == 1) -- cgit v1.2.1